From 0c1d8e29b9e64da06fc531afe5eef666368d975d Mon Sep 17 00:00:00 2001 From: Andrey Uskov Date: Thu, 11 Jul 2019 16:37:20 +0300 Subject: [PATCH] Fix creation of empty source sets in tests --- .../ExternalSystemImportingTestCase.java | 3 ++- .../gradle/TestImportSpecBuilder.java | 25 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/TestImportSpecBuilder.java diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/ExternalSystemImportingTestCase.java b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/ExternalSystemImportingTestCase.java index ecaccdddd06..403ad3e58aa 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/ExternalSystemImportingTestCase.java +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/ExternalSystemImportingTestCase.java @@ -200,7 +200,8 @@ public abstract class ExternalSystemImportingTestCase extends ExternalSystemTest final Ref> error = Ref.create(); ExternalSystemUtil.refreshProjects( - new ImportSpecBuilder(myProject, getExternalSystemId()) + new TestImportSpecBuilder(myProject, getExternalSystemId()) + .setCreateEmptyContentRoots(projectSettings.isCreateEmptyContentRootDirectories()) .use(ProgressExecutionMode.MODAL_SYNC) .callback(new ExternalProjectRefreshCallback() { @Override diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/TestImportSpecBuilder.java b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/TestImportSpecBuilder.java new file mode 100644 index 00000000000..414b12011eb --- /dev/null +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/TestImportSpecBuilder.java @@ -0,0 +1,25 @@ +/* + * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.idea.codeInsight.gradle; + +import com.intellij.openapi.externalSystem.importing.ImportSpec; +import com.intellij.openapi.externalSystem.importing.ImportSpecBuilder; +import com.intellij.openapi.externalSystem.model.ProjectSystemId; +import com.intellij.openapi.project.Project; +import org.jetbrains.annotations.NotNull; + +public class TestImportSpecBuilder extends ImportSpecBuilder { + public TestImportSpecBuilder( + @NotNull Project project, + @NotNull ProjectSystemId id + ) { + super(project, id); + } + + public ImportSpecBuilder setCreateEmptyContentRoots(boolean value) { + return createDirectoriesForEmptyContentRoots(); + } +}