diff options
Diffstat (limited to 'plugins/gradle/testSources/org/jetbrains/plugins')
2 files changed, 32 insertions, 6 deletions
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleFoldersImportingTest.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleFoldersImportingTest.java index 8c57ebb57d29..5fd64533dcc9 100644 --- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleFoldersImportingTest.java +++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleFoldersImportingTest.java @@ -15,6 +15,7 @@ */ package org.jetbrains.plugins.gradle.importing; +import org.jetbrains.annotations.NotNull; import org.junit.Test; /** @@ -34,14 +35,39 @@ public class GradleFoldersImportingTest extends GradleImportingTestCase { assertModules("project"); assertContentRoots("project", getProjectPath()); - assertSources("project", "src/main/java"); - assertResources("project", "src/main/resources"); - assertTestSources("project", "src/test/java"); - assertTestResources("project", "src/test/resources"); - assertExcludes("project", ".gradle", "build"); + assertDefaultGradleJavaProjectFolders("project"); assertModuleOutput("project", getProjectPath() + "/build/classes/main", getProjectPath() + "/build/classes/test"); } + + @Test + public void testProjectWithInheritedOutputDirs() throws Exception { + + importProject( + "apply plugin: 'java'\n" + + "apply plugin: 'idea'\n" + + "idea {\n" + + " module {\n" + + " inheritOutputDirs = true\n" + + " }\n" + + "}" + ); + + assertModules("project"); + assertContentRoots("project", getProjectPath()); + + assertDefaultGradleJavaProjectFolders("project"); + + assertModuleInheritedOutput("project"); + } + + protected void assertDefaultGradleJavaProjectFolders(@NotNull String moduleName) { + assertSources(moduleName, "src/main/java"); + assertResources(moduleName, "src/main/resources"); + assertTestSources(moduleName, "src/test/java"); + assertTestResources(moduleName, "src/test/resources"); + assertExcludes(moduleName, ".gradle", "build"); + } } diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleImportingTestCase.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleImportingTestCase.java index f59ccee38658..2cf4c7125918 100644 --- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleImportingTestCase.java +++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleImportingTestCase.java @@ -160,7 +160,7 @@ public abstract class GradleImportingTestCase extends ExternalSystemImportingTes throw new RuntimeException(e); } if (!location.getScheme().equals("file")) { - throw new RuntimeException(String.format("Cannot determine classpath for wrapper Jar from codebase '%s'.", location)); + throw new RuntimeException(String.format("Cannot determine classpath for wrapper JAR from codebase '%s'.", location)); } return new File(location.getPath()); } |