azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JPS: add tests for: exclude in compiler settings, project with more then one file.

Browse Source
This commit is contained in:
Zalim Bashorov
2013-11-12 15:49:37 +04:00
parent b31e2d7421
commit 4fb995c50b
27 changed files with 276 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java
+129 -28
View File
@@ -36,6 +36,9 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase {
private static final String PROJECT_NAME = "kotlinProject";
private static final String JDK_NAME = "IDEA_JDK";
private static final String[] EXCLUDE_FILES = { "Excluded.class", "YetAnotherExcluded.class" };
private static final String[] NOTHING = {};
@Override
public void setUp() throws Exception {
super.setUp();
@@ -74,34 +77,88 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase {
public void testKotlinProject() {
doTest();
assertOutputDeletedPackageInModule("kotlinProject", "src/test1.kt", "_DefaultPackage");
checkPackageDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/test1.kt", "_DefaultPackage");
}
public void testExcludeFolderInSourceRoot() {
doTest();
JpsModule module = myProject.getModules().get(0);
assertFileExistsInOutput(module, "Foo.class");
assertFilesExistInOutput(module, "Foo.class");
assertFilesNotExistInOutput(module, EXCLUDE_FILES);
assertOutputDeletedInModule("kotlinProject", "src/foo.kt", "Foo");
checkClassesDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/foo.kt", "Foo");
}
public void testExcludeModuleFolderInSourceRootOfAnotherModule() {
doTest();
for (JpsModule module : myProject.getModules()) {
assertFileExistsInOutput(module, "Foo.class");
assertFilesExistInOutput(module, "Foo.class");
}
assertOutputDeletedInModule("kotlinProject", "src/foo.kt", "Foo");
assertOutputDeletedInModule("module2", "src/module2/src/foo.kt", "Foo");
checkClassesDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/foo.kt", "Foo");
checkClassesDeletedFromOutputWhen(Operation.CHANGE, "module2", "src/module2/src/foo.kt", "Foo");
}
public void testExcludeFileUsingCompilerSettings() {
doTest();
JpsModule module = myProject.getModules().get(0);
assertFilesExistInOutput(module, "Foo.class", "Bar.class");
assertFilesNotExistInOutput(module, EXCLUDE_FILES);
checkClassesDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/foo.kt", "Foo");
checkExcludesNotAffectedToOutput("kotlinProject", "src/Excluded.kt", "src/dir/YetAnotherExcluded.kt");
}
public void testExcludeFolderNonRecursivelyUsingCompilerSettings() {
doTest();
JpsModule module = myProject.getModules().get(0);
assertFilesExistInOutput(module, "Foo.class", "Bar.class");
assertFilesNotExistInOutput(module, EXCLUDE_FILES);
checkClassesDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/foo.kt", "Foo");
checkClassesDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/dir/subdir/bar.kt", "Bar");
checkExcludesNotAffectedToOutput("kotlinProject", "src/dir/Excluded.kt", "src/dir/subdir/YetAnotherExcluded.kt");
}
public void testExcludeFolderRecursivelyUsingCompilerSettings() {
doTest();
JpsModule module = myProject.getModules().get(0);
assertFilesExistInOutput(module, "Foo.class", "Bar.class");
assertFilesNotExistInOutput(module, EXCLUDE_FILES);
checkClassesDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/foo.kt", "Foo");
checkExcludesNotAffectedToOutput("kotlinProject",
"src/exclude/Excluded.kt", "src/exclude/YetAnotherExcluded.kt",
"src/exclude/subdir/Excluded.kt", "src/exclude/subdir/YetAnotherExcluded.kt");
}
public void testManyFiles() {
doTest();
JpsModule module = myProject.getModules().get(0);
assertFilesExistInOutput(module, "foo/FooPackage.class", "boo/BooPackage.class", "foo/Bar.class");
checkPackageDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/main.kt", "foo.FooPackage");
checkPackageDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/boo.kt", "boo.BooPackage");
checkClassesDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/Bar.kt", "foo.Bar", "foo.FooPackage");
checkPackageDeletedFromOutputWhen(Operation.DELETE, "kotlinProject", "src/main.kt", "foo.FooPackage");
assertFilesNotExistInOutput(module, "foo/FooPackage.class");
checkPackageDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/boo.kt", "boo.BooPackage");
checkClassesDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/Bar.kt", "foo.Bar");
}
public void testKotlinProjectTwoFilesInOnePackage() {
doTest();
assertOutputDeletedPackageInModule("kotlinProject", "src/test1.kt", "_DefaultPackage");
assertOutputDeletedPackageInModule("kotlinProject", "src/test2.kt", "_DefaultPackage");
checkPackageDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/test1.kt", "_DefaultPackage");
checkPackageDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/test2.kt", "_DefaultPackage");
}
public void testKotlinJavaProject() {
@@ -139,16 +196,16 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase {
// Check that outputs are located properly
for (JpsModule module : myProject.getModules()) {
if (module.getName().equals("module2")) {
assertFileExistsInOutput(module, "kt1/Kt1Package.class");
assertFilesExistInOutput(module, "kt1/Kt1Package.class");
}
if (module.getName().equals("kotlinProject")) {
assertFileExistsInOutput(module, "kt2/Kt2Package.class");
assertFilesExistInOutput(module, "kt2/Kt2Package.class");
}
}
result.assertSuccessful();
assertOutputDeletedPackageInModule("kotlinProject", "src/kt2.kt", "kt2.Kt2Package");
assertOutputDeletedPackageInModule("module2", "module2/src/kt1.kt", "kt1.Kt1Package");
checkPackageDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/kt2.kt", "kt2.Kt2Package");
checkPackageDeletedFromOutputWhen(Operation.CHANGE, "module2", "module2/src/kt1.kt", "kt1.Kt1Package");
}
public void testReexportedDependency() {
@@ -163,16 +220,35 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase {
makeAll().assertSuccessful();
}
private static void assertFileExistsInOutput(JpsModule module, String relativePath) {
private static void assertFilesExistInOutput(JpsModule module, String... relativePaths) {
String outputUrl = JpsJavaExtensionService.getInstance().getOutputUrl(module, false);
assertNotNull(outputUrl);
File outputDir = new File(JpsPathUtil.urlToPath(outputUrl));
File outputFile = new File(outputDir, relativePath);
assertTrue("Output not written: " +
outputFile.getAbsolutePath() +
"\n Directory contents: \n" +
dirContents(outputFile.getParentFile()),
outputFile.exists());
for (String path : relativePaths) {
File outputFile = new File(outputDir, path);
assertTrue("Output not written: " +
outputFile.getAbsolutePath() +
"\n Directory contents: \n" +
dirContents(outputFile.getParentFile()),
outputFile.exists());
}
}
private void checkExcludesNotAffectedToOutput(String module, String... excludeRelativePaths) {
for (String path : excludeRelativePaths) {
checkClassesDeletedFromOutputWhen(Operation.CHANGE, module, path, NOTHING);
}
}
private static void assertFilesNotExistInOutput(JpsModule module, String... relativePaths) {
String outputUrl = JpsJavaExtensionService.getInstance().getOutputUrl(module, false);
assertNotNull(outputUrl);
File outputDir = new File(JpsPathUtil.urlToPath(outputUrl));
for (String path : relativePaths) {
File outputFile = new File(outputDir, path);
assertFalse("Output directory \"" + outputFile.getAbsolutePath() + "\" contains \"" + path + "\"",
outputFile.exists());
}
}
private static String dirContents(File dir) {
@@ -187,30 +263,51 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase {
return builder.toString();
}
private void assertOutputDeletedPackageInModule(String moduleName, String sourceFileName, String packageClassFqNames) {
private void checkPackageDeletedFromOutputWhen(
Operation operation,
String moduleName,
String sourceFileName,
String packageClassFqNamesToDelete
) {
File file = new File(workDir, sourceFileName);
String[] packageClasses = { packageClassFqNames, getInternalNameForPackagePartClass(file, packageClassFqNames) };
String[] packageClasses = { packageClassFqNamesToDelete, getInternalNameForPackagePartClass(file, packageClassFqNamesToDelete) };
assertOutputDeletedInModule(moduleName, sourceFileName, packageClasses);
checkClassesDeletedFromOutputWhen(operation, moduleName, sourceFileName, packageClasses);
}
private void assertOutputDeletedInModule(final String moduleName, String sourceFileName, String... classFqNames) {
String[] paths = ContainerUtil.map2Array(classFqNames, String.class, new Function<String, String>() {
private void checkClassesDeletedFromOutputWhen(
Operation operation,
final String moduleName,
String sourceFileName,
String... classFqNamesToDelete
) {
String[] paths = ContainerUtil.map2Array(classFqNamesToDelete, String.class, new Function<String, String>() {
@Override
public String fun(String classFqName) {
return outputPathInModuleByClassFqName(moduleName, classFqName);
}
});
assertOutputDeleted(sourceFileName, paths);
checkFilesDeletedFromOutputWhen(operation, sourceFileName, paths);
}
private void assertOutputDeleted(String sourceFileName, String... paths) {
private void checkFilesDeletedFromOutputWhen(Operation operation, String sourceFileName, String... pathsToDelete) {
File file = new File(workDir, sourceFileName);
change(file.getAbsolutePath());
if (operation == Operation.CHANGE) {
change(file.getAbsolutePath());
}
else if(operation == Operation.DELETE) {
assertTrue("Can not delete file \"" + file.getAbsolutePath() + "\"",
file.delete());
}
else {
fail("Unknown operation");
}
makeAll().assertSuccessful();
assertDeleted(paths);
assertDeleted(pathsToDelete);
}
private static String outputPathInModuleByClassFqName(String moduleName, String classFqName) {
@@ -228,4 +325,8 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase {
};
return NamespaceCodegen.getNamespacePartType(new FqName(packageClassFqName), fakeVirtualFile).getInternalName();
}
private static enum Operation {
CHANGE, DELETE
}
}
jps-plugin/testData/ExcludeFileUsingCompilerSettings/kotlinProject.iml
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="KotlinRuntime" level="project" />
</component>
</module>
jps-plugin/testData/ExcludeFileUsingCompilerSettings/kotlinProject.ipr
+18
View File
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
<excludeFromCompile>
<file url="file://$PROJECT_DIR$/src/Excluded.kt" />
<file url="file://$PROJECT_DIR$/src/dir/YetAnotherExcluded.kt" />
</excludeFromCompile>
</component>
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
</modules>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>
jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/Excluded.kt
+1
View File
@@ -0,0 +1 @@
class Excluded
jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/dir/YetAnotherExcluded.kt
+1
View File
@@ -0,0 +1 @@
class YetAnotherExcluded
jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/dir/bar.kt
+1
View File
@@ -0,0 +1 @@
class Bar
jps-plugin/testData/ExcludeFolderInSourceRoot/src/exclude/foo.kt → jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/foo.kt
View File
jps-plugin/testData/ExcludeFolderInSourceRoot/src/exclude/Excluded.kt
+1
View File
@@ -0,0 +1 @@
class Excluded
jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.iml
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="KotlinRuntime" level="project" />
</component>
</module>
jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.ipr
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
<excludeFromCompile>
<directory url="file://$PROJECT_DIR$/src/dir" includeSubdirectories="false" />
<file url="file://$PROJECT_DIR$/src/dir/Excluded.kt" />
<file url="file://$PROJECT_DIR$/src/dir/subdir/YetAnotherExcluded.kt" />
</excludeFromCompile>
</component>
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
</modules>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>
jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/Excluded.kt
+1
View File
@@ -0,0 +1 @@
class Excluded
jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/YetAnotherExcluded.kt
+1
View File
@@ -0,0 +1 @@
class YetAnotherExcluded
jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/bar.kt
+1
View File
@@ -0,0 +1 @@
class Bar
jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/foo.kt
+1
View File
@@ -0,0 +1 @@
class Foo
jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.iml
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="KotlinRuntime" level="project" />
</component>
</module>
jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.ipr
+17
View File
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
<excludeFromCompile>
<directory url="file://$PROJECT_DIR$/src/exclude" includeSubdirectories="true" />
</excludeFromCompile>
</component>
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
</modules>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>
jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/bar.kt
+1
View File
@@ -0,0 +1 @@
class Bar
jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/Excluded.kt
+1
View File
@@ -0,0 +1 @@
class Excluded
jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/YetAnotherExcluded.kt
+1
View File
@@ -0,0 +1 @@
class YetAnotherExcluded
jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/Excluded.kt
+1
View File
@@ -0,0 +1 @@
class Excluded
jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/YetAnotherExcluded.kt
+1
View File
@@ -0,0 +1 @@
class YetAnotherExcluded
jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/foo.kt
+1
View File
@@ -0,0 +1 @@
class Foo
jps-plugin/testData/ManyFiles/kotlinProject.iml
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="KotlinRuntime" level="project" />
</component>
</module>
jps-plugin/testData/ManyFiles/kotlinProject.ipr
+14
View File
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
</component>
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
</modules>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>
jps-plugin/testData/ManyFiles/src/Bar.kt
+3
View File
@@ -0,0 +1,3 @@
package foo
class Bar
jps-plugin/testData/ManyFiles/src/boo.kt
+6
View File
@@ -0,0 +1,6 @@
package boo
import foo.Bar
fun boo(bar: Bar) {
}
jps-plugin/testData/ManyFiles/src/main.kt
+8
View File
@@ -0,0 +1,8 @@
package foo
import boo.boo
fun main(args: Array<String>) {
val bar = Bar()
boo(bar)
}