From 475551f54a020fc2bf626871f1ebd624c785d087 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 9 Oct 2013 20:43:11 +0400 Subject: [PATCH] Remove binary test data for some tests Launch CLICompiler instead to compile it --- .../duplicateLibraries/DuplicateLibTest-1.jar | Bin 3210 -> 0 bytes .../duplicateLibraries/DuplicateLibTest-2.jar | Bin 3210 -> 0 bytes .../duplicateLibraries/DuplicateTest.kt.txt | 11 ----------- .../duplicateLibraries/library-1/source.kt | 8 ++++++++ .../duplicateLibraries/library-2/source.kt | 8 ++++++++ .../library/source.kt | 3 +++ .../objectBinaries.jar | Bin 1289 -> 0 bytes .../source.kt.txt | 6 ------ .../CompileKotlinAgainstCustomBinariesTest.java | 15 +++++++++------ .../generators/tests/CompileBinaryTestData.kt | 13 ------------- 10 files changed, 28 insertions(+), 36 deletions(-) delete mode 100644 compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-1.jar delete mode 100644 compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-2.jar delete mode 100644 compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateTest.kt.txt create mode 100644 compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/library-1/source.kt create mode 100644 compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/library-2/source.kt create mode 100644 compiler/testData/compileKotlinAgainstCustomBinaries/duplicateObjectInBinaryAndSources/library/source.kt delete mode 100644 compiler/testData/compileKotlinAgainstCustomBinaries/duplicateObjectInBinaryAndSources/objectBinaries.jar delete mode 100644 compiler/testData/compileKotlinAgainstCustomBinaries/duplicateObjectInBinaryAndSources/source.kt.txt diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-1.jar b/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-1.jar deleted file mode 100644 index 8f3b55848e558cc103daf6777afcae5c12aa6984..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3210 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 OzdASw`C$8#r2hd{qx-i2 diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-2.jar b/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-2.jar deleted file mode 100644 index 8f3b55848e558cc103daf6777afcae5c12aa6984..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3210 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 OzdASw`C$8#r2hd{qx-i2 diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateTest.kt.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateTest.kt.txt deleted file mode 100644 index 77f7b2f7d21..00000000000 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateTest.kt.txt +++ /dev/null @@ -1,11 +0,0 @@ -package testing - -// To regenerate this test, run CompileBinaryTestData.kt -// Or manually, compile this file into DuplicateLibTest-1.jar and copy it to DuplicateLibTest-2.jar - -object TopLevelObject - -class Outer { - inner class Inner - class Nested -} diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/library-1/source.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/library-1/source.kt new file mode 100644 index 00000000000..96fd72e944e --- /dev/null +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/library-1/source.kt @@ -0,0 +1,8 @@ +package testing + +object TopLevelObject + +class Outer { + inner class Inner + class Nested +} diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/library-2/source.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/library-2/source.kt new file mode 100644 index 00000000000..96fd72e944e --- /dev/null +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/library-2/source.kt @@ -0,0 +1,8 @@ +package testing + +object TopLevelObject + +class Outer { + inner class Inner + class Nested +} diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateObjectInBinaryAndSources/library/source.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateObjectInBinaryAndSources/library/source.kt new file mode 100644 index 00000000000..ecbd62b4e7e --- /dev/null +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateObjectInBinaryAndSources/library/source.kt @@ -0,0 +1,3 @@ +package test + +public object Lol diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateObjectInBinaryAndSources/objectBinaries.jar b/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateObjectInBinaryAndSources/objectBinaries.jar deleted file mode 100644 index 72beb54369a63cb7d420db8764266a0e7fd9a1ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1289 zcmWIWW@Zs#-~hrk9Zt>+NPv@pg~8V~#8KDN&rSc|DFy~+h5&DN4v-2asImZ@nni#r z;F^6M{XE@VgG2Ou-9G!CIql=Et9OytTUYDcne&^246YbIcv__A<*VcAd$DvC3+IfN zl1FAsX=PZ5i9A`NRq;&qb>^p{k421N+b@V6%eMiV4ZU z`Cv+X@^kc(a}tY-Z3AxSU3L(#eY|z@t~Q$4yE~YiGEQgBd)YpJ&W&Xo`nrAcg%^F~y&wGW z-sz%XiS7OY-{1Lj^zLQNS=<}O!e1!u&EdQ;OzB4l=f2+=I*O9lb>pY|y>hpV*3J?1 zKkIUSttPkX<@QN6=lVE*<(WUr+IgSjjNAXC7f)1wd-$kA-L^KQw0h6KXKxC>PQB0f zq9N*IgGZpx-3evEPum@5P4GYXnXSEf+4X>C3(JtKSA~;gmYnhq`O)IJ(odoEQeMcs z>_fM9oUxey;m!w>>&L&UAKn{(=kbLr3%;+@n)7pw`Z1}_Wv+o%Wk%bN_Pu%Ktf#m> zTwi~7#UkY`M~b~KEPD_YW&dDqOyW=Lu>B9$Z~3pD+o^W(V6(PL>5jD3!eV}F{yyHj z_s8rV%Da>|_AU52{YBDak(7-;*+I$8W!rYuNsJ5(oWL}PJ2u5&u^9r4^?=0W?8Nj` zNUZAio%K56Akeb%55RA8}nM*iLU&rJbEx#pWbmlYH$h_pQEoywV3X7l`G!qlbTQc7!Qq!doIGdj9O zVc9Dq&(Arsp{^!RWm`F)erDOdX|I6ae7EJ_V$H7I-Zgz|aq}j&uH#ICLVsdg{(1(V zITYVCfpz-*1pcGiCl>!<1qDmHT>9+GKu`Y$;s9?(CJ_eIObpARpiGPk;JFf%rO~w_ zXD?6|MgUtN6Rs60LxW7fc0V|i2!d_Hjp}2AT$6bt;5V99snBexxD}Y diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateObjectInBinaryAndSources/source.kt.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateObjectInBinaryAndSources/source.kt.txt deleted file mode 100644 index b54fd6a5d52..00000000000 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateObjectInBinaryAndSources/source.kt.txt +++ /dev/null @@ -1,6 +0,0 @@ -package test - -// To regenerate this test, run CompileBinaryTestData.kt -// Or manually compile this file into jar - -public object Lol diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java index 7fceff4e089..5e730f7c540 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java @@ -22,6 +22,7 @@ import jet.Function0; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.jet.MockLibraryUtil; import org.jetbrains.jet.TestJdkKind; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; @@ -37,10 +38,7 @@ import org.jetbrains.jet.test.util.NamespaceComparator; import java.io.File; import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; +import java.util.*; import java.util.regex.Pattern; import static org.jetbrains.jet.test.util.NamespaceComparator.validateAndCompareNamespaceWithFile; @@ -53,6 +51,11 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { return new File(TEST_DATA_PATH, getTestName(true)); } + @NotNull + private File compileLibrary(@NotNull String sourcePath) { + return MockLibraryUtil.compileLibraryToJar(new File(getTestDataDirectory(), sourcePath).getPath()); + } + private void doTestWithTxt(@NotNull Function0> classPathProducer) throws Exception { File ktFile = new File(getTestDataDirectory(), getTestName(false) + ".kt"); @@ -107,7 +110,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { Collection allDescriptors = analyzeAndGetAllDescriptors(new Function0>() { @Override public List invoke() { - return findAllJars(); + return Collections.singletonList(compileLibrary("library")); } }); assertEquals(allDescriptors.size(), 2); @@ -138,7 +141,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { doTestWithTxt(new Function0>() { @Override public List invoke() { - return findAllJars(); + return Arrays.asList(compileLibrary("library-1"), compileLibrary("library-2")); } }); } diff --git a/generators/src/org/jetbrains/jet/generators/tests/CompileBinaryTestData.kt b/generators/src/org/jetbrains/jet/generators/tests/CompileBinaryTestData.kt index 01b3a5c59f1..c9ad2dabe4c 100644 --- a/generators/src/org/jetbrains/jet/generators/tests/CompileBinaryTestData.kt +++ b/generators/src/org/jetbrains/jet/generators/tests/CompileBinaryTestData.kt @@ -52,19 +52,6 @@ private object BinaryTestData { rm("test") } - GenScript("compiler/testData/compileKotlinAgainstBinariesCustom/duplicateObjectInBinaryAndSources", "source.kt", "objectBinaries.jar") - fun genDuplicateObjectInBinaryAndSources() { - jar("objectBinaries.jar", "test") - rm("test") - } - - GenScript("compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries", "DuplicateTest.kt", "DuplicateLibTest-1.jar") - fun genDuplicateLibraries() { - jar("DuplicateLibTest-1.jar", "testing") - cp("DuplicateLibTest-1.jar", "DuplicateLibTest-2.jar") - rm("testing") - } - GenScript("compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation", "MissingEnum.kt", "MissingEnum.jar") fun genMissingEnumReferencedInAnnotation() { rm("test/E.class")