From 7b7619d1f32e0d94306122937ac02867e995bc24 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 12 Mar 2014 00:14:56 +0400 Subject: [PATCH] Refactor CompileKotlinAgainstCustomBinariesTest Make all filenames start with lowercase letter (instead of half lower / half upper) --- .../library/source.kt | 0 ...singEnumReferencedInAnnotationArgument.kt} | 0 ...ingEnumReferencedInAnnotationArgument.txt} | 0 .../library-1/source.kt | 0 .../library-2/source.kt | 0 .../sameLibraryTwiceInClasspath.kt} | 0 .../sameLibraryTwiceInClasspath.txt} | 0 ...ompileKotlinAgainstCustomBinariesTest.java | 23 ++++++++++--------- 8 files changed, 12 insertions(+), 11 deletions(-) rename compiler/testData/compileKotlinAgainstCustomBinaries/{missingEnumReferencedInAnnotation => missingEnumReferencedInAnnotationArgument}/library/source.kt (100%) rename compiler/testData/compileKotlinAgainstCustomBinaries/{missingEnumReferencedInAnnotation/MissingEnumReferencedInAnnotation.kt => missingEnumReferencedInAnnotationArgument/missingEnumReferencedInAnnotationArgument.kt} (100%) rename compiler/testData/compileKotlinAgainstCustomBinaries/{missingEnumReferencedInAnnotation/MissingEnumReferencedInAnnotation.txt => missingEnumReferencedInAnnotationArgument/missingEnumReferencedInAnnotationArgument.txt} (100%) rename compiler/testData/compileKotlinAgainstCustomBinaries/{duplicateLibraries => sameLibraryTwiceInClasspath}/library-1/source.kt (100%) rename compiler/testData/compileKotlinAgainstCustomBinaries/{duplicateLibraries => sameLibraryTwiceInClasspath}/library-2/source.kt (100%) rename compiler/testData/compileKotlinAgainstCustomBinaries/{duplicateLibraries/DuplicateLibraries.kt => sameLibraryTwiceInClasspath/sameLibraryTwiceInClasspath.kt} (100%) rename compiler/testData/compileKotlinAgainstCustomBinaries/{duplicateLibraries/DuplicateLibraries.txt => sameLibraryTwiceInClasspath/sameLibraryTwiceInClasspath.txt} (100%) diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/library/source.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotationArgument/library/source.kt similarity index 100% rename from compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/library/source.kt rename to compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotationArgument/library/source.kt diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/MissingEnumReferencedInAnnotation.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotationArgument/missingEnumReferencedInAnnotationArgument.kt similarity index 100% rename from compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/MissingEnumReferencedInAnnotation.kt rename to compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotationArgument/missingEnumReferencedInAnnotationArgument.kt diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/MissingEnumReferencedInAnnotation.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotationArgument/missingEnumReferencedInAnnotationArgument.txt similarity index 100% rename from compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/MissingEnumReferencedInAnnotation.txt rename to compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotationArgument/missingEnumReferencedInAnnotationArgument.txt diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/library-1/source.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/sameLibraryTwiceInClasspath/library-1/source.kt similarity index 100% rename from compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/library-1/source.kt rename to compiler/testData/compileKotlinAgainstCustomBinaries/sameLibraryTwiceInClasspath/library-1/source.kt diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/library-2/source.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/sameLibraryTwiceInClasspath/library-2/source.kt similarity index 100% rename from compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/library-2/source.kt rename to compiler/testData/compileKotlinAgainstCustomBinaries/sameLibraryTwiceInClasspath/library-2/source.kt diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibraries.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/sameLibraryTwiceInClasspath/sameLibraryTwiceInClasspath.kt similarity index 100% rename from compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibraries.kt rename to compiler/testData/compileKotlinAgainstCustomBinaries/sameLibraryTwiceInClasspath/sameLibraryTwiceInClasspath.kt diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibraries.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/sameLibraryTwiceInClasspath/sameLibraryTwiceInClasspath.txt similarity index 100% rename from compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibraries.txt rename to compiler/testData/compileKotlinAgainstCustomBinaries/sameLibraryTwiceInClasspath/sameLibraryTwiceInClasspath.txt diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java index f9f79f7ce88..517d940b59a 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java @@ -56,29 +56,31 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { return new File(TEST_DATA_PATH, getTestName(true)); } + @NotNull + private File getTestDataFileWithExtension(@NotNull String extension) { + return new File(getTestDataDirectory(), getTestName(true) + "." + extension); + } + @NotNull private File compileLibrary(@NotNull String sourcePath) { return MockLibraryUtil.compileLibraryToJar(new File(getTestDataDirectory(), sourcePath).getPath(), false); } private void doTestWithTxt(@NotNull File... extraClassPath) throws Exception { - File ktFile = new File(getTestDataDirectory(), getTestName(false) + ".kt"); - - PackageViewDescriptor packageView = analyzeFileToPackageView(ktFile, extraClassPath); + PackageViewDescriptor packageView = analyzeFileToPackageView(extraClassPath); RecursiveDescriptorComparator.Configuration comparator = RecursiveDescriptorComparator.DONT_INCLUDE_METHODS_OF_OBJECT.withValidationStrategy( DescriptorValidator.ValidationVisitor.ALLOW_ERROR_TYPES); - File txtFile = new File(getTestDataDirectory(), FileUtil.getNameWithoutExtension(ktFile) + ".txt"); - validateAndCompareDescriptorWithFile(packageView, comparator, txtFile); + validateAndCompareDescriptorWithFile(packageView, comparator, getTestDataFileWithExtension("txt")); } @NotNull - private PackageViewDescriptor analyzeFileToPackageView(@NotNull File ktFile, @NotNull File... extraClassPath) throws IOException { + private PackageViewDescriptor analyzeFileToPackageView(@NotNull File... extraClassPath) throws IOException { Project project = createEnvironment(Arrays.asList(extraClassPath)).getProject(); AnalyzeExhaust exhaust = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration( - JetTestUtils.loadJetFile(project, ktFile), + JetTestUtils.loadJetFile(project, getTestDataFileWithExtension("kt")), Collections.emptyList() ); @@ -100,8 +102,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { @NotNull private Collection analyzeAndGetAllDescriptors(@NotNull File... extraClassPath) throws IOException { - File ktFile = new File(getTestDataDirectory(), getTestName(true) + ".kt"); - return analyzeFileToPackageView(ktFile, extraClassPath).getMemberScope().getAllDescriptors(); + return analyzeFileToPackageView(extraClassPath).getMemberScope().getAllDescriptors(); } @NotNull @@ -152,11 +153,11 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { assertEmpty("No descriptors should be found: " + allDescriptors, allDescriptors); } - public void testDuplicateLibraries() throws Exception { + public void testSameLibraryTwiceInClasspath() throws Exception { doTestWithTxt(compileLibrary("library-1"), compileLibrary("library-2")); } - public void testMissingEnumReferencedInAnnotation() throws Exception { + public void testMissingEnumReferencedInAnnotationArgument() throws Exception { doTestWithTxt(copyJarFileWithoutEntry(compileLibrary("library"), "test/E.class")); } }