From ff0a24a7502178240347100523cf7217fb53e417 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Fri, 25 Mar 2016 21:42:36 +0300 Subject: [PATCH] Move test output files closer to test data. Move reference dump out of test directory. --- .../output => reference-public-api}/kotlin-runtime.txt | 0 .../output => reference-public-api}/kotlin-stdlib.txt | 0 .../cases => kotlin/cases/companions}/companions.txt | 0 .../output/cases => kotlin/cases/inline}/inline.txt | 0 .../output/cases => kotlin/cases/internal}/internal.txt | 0 .../output/cases => kotlin/cases/java}/java.txt | 0 .../cases => kotlin/cases/localClasses}/localClasses.txt | 0 .../cases/nestedClasses}/nestedClasses.txt | 0 .../output/cases => kotlin/cases/private}/private.txt | 0 .../cases => kotlin/cases/protected}/protected.txt | 0 .../output/cases => kotlin/cases/public}/public.txt | 0 .../output/cases => kotlin/cases/special}/special.txt | 0 .../cases => kotlin/cases/whenMappings}/whenMappings.txt | 0 .../CasesPublicAPITest.kt | 9 ++++++--- .../RuntimePublicAPITest.kt | 2 +- 15 files changed, 7 insertions(+), 4 deletions(-) rename libraries/tools/binary-compatibility-validator/{src/test/resources/output => reference-public-api}/kotlin-runtime.txt (100%) rename libraries/tools/binary-compatibility-validator/{src/test/resources/output => reference-public-api}/kotlin-stdlib.txt (100%) rename libraries/tools/binary-compatibility-validator/src/test/{resources/output/cases => kotlin/cases/companions}/companions.txt (100%) rename libraries/tools/binary-compatibility-validator/src/test/{resources/output/cases => kotlin/cases/inline}/inline.txt (100%) rename libraries/tools/binary-compatibility-validator/src/test/{resources/output/cases => kotlin/cases/internal}/internal.txt (100%) rename libraries/tools/binary-compatibility-validator/src/test/{resources/output/cases => kotlin/cases/java}/java.txt (100%) rename libraries/tools/binary-compatibility-validator/src/test/{resources/output/cases => kotlin/cases/localClasses}/localClasses.txt (100%) rename libraries/tools/binary-compatibility-validator/src/test/{resources/output/cases => kotlin/cases/nestedClasses}/nestedClasses.txt (100%) rename libraries/tools/binary-compatibility-validator/src/test/{resources/output/cases => kotlin/cases/private}/private.txt (100%) rename libraries/tools/binary-compatibility-validator/src/test/{resources/output/cases => kotlin/cases/protected}/protected.txt (100%) rename libraries/tools/binary-compatibility-validator/src/test/{resources/output/cases => kotlin/cases/public}/public.txt (100%) rename libraries/tools/binary-compatibility-validator/src/test/{resources/output/cases => kotlin/cases/special}/special.txt (100%) rename libraries/tools/binary-compatibility-validator/src/test/{resources/output/cases => kotlin/cases/whenMappings}/whenMappings.txt (100%) diff --git a/libraries/tools/binary-compatibility-validator/src/test/resources/output/kotlin-runtime.txt b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-runtime.txt similarity index 100% rename from libraries/tools/binary-compatibility-validator/src/test/resources/output/kotlin-runtime.txt rename to libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-runtime.txt diff --git a/libraries/tools/binary-compatibility-validator/src/test/resources/output/kotlin-stdlib.txt b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib.txt similarity index 100% rename from libraries/tools/binary-compatibility-validator/src/test/resources/output/kotlin-stdlib.txt rename to libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib.txt diff --git a/libraries/tools/binary-compatibility-validator/src/test/resources/output/cases/companions.txt b/libraries/tools/binary-compatibility-validator/src/test/kotlin/cases/companions/companions.txt similarity index 100% rename from libraries/tools/binary-compatibility-validator/src/test/resources/output/cases/companions.txt rename to libraries/tools/binary-compatibility-validator/src/test/kotlin/cases/companions/companions.txt diff --git a/libraries/tools/binary-compatibility-validator/src/test/resources/output/cases/inline.txt b/libraries/tools/binary-compatibility-validator/src/test/kotlin/cases/inline/inline.txt similarity index 100% rename from libraries/tools/binary-compatibility-validator/src/test/resources/output/cases/inline.txt rename to libraries/tools/binary-compatibility-validator/src/test/kotlin/cases/inline/inline.txt diff --git a/libraries/tools/binary-compatibility-validator/src/test/resources/output/cases/internal.txt b/libraries/tools/binary-compatibility-validator/src/test/kotlin/cases/internal/internal.txt similarity index 100% rename from libraries/tools/binary-compatibility-validator/src/test/resources/output/cases/internal.txt rename to libraries/tools/binary-compatibility-validator/src/test/kotlin/cases/internal/internal.txt diff --git a/libraries/tools/binary-compatibility-validator/src/test/resources/output/cases/java.txt b/libraries/tools/binary-compatibility-validator/src/test/kotlin/cases/java/java.txt similarity index 100% rename from libraries/tools/binary-compatibility-validator/src/test/resources/output/cases/java.txt rename to libraries/tools/binary-compatibility-validator/src/test/kotlin/cases/java/java.txt diff --git a/libraries/tools/binary-compatibility-validator/src/test/resources/output/cases/localClasses.txt b/libraries/tools/binary-compatibility-validator/src/test/kotlin/cases/localClasses/localClasses.txt similarity index 100% rename from libraries/tools/binary-compatibility-validator/src/test/resources/output/cases/localClasses.txt rename to libraries/tools/binary-compatibility-validator/src/test/kotlin/cases/localClasses/localClasses.txt diff --git a/libraries/tools/binary-compatibility-validator/src/test/resources/output/cases/nestedClasses.txt b/libraries/tools/binary-compatibility-validator/src/test/kotlin/cases/nestedClasses/nestedClasses.txt similarity index 100% rename from libraries/tools/binary-compatibility-validator/src/test/resources/output/cases/nestedClasses.txt rename to libraries/tools/binary-compatibility-validator/src/test/kotlin/cases/nestedClasses/nestedClasses.txt diff --git a/libraries/tools/binary-compatibility-validator/src/test/resources/output/cases/private.txt b/libraries/tools/binary-compatibility-validator/src/test/kotlin/cases/private/private.txt similarity index 100% rename from libraries/tools/binary-compatibility-validator/src/test/resources/output/cases/private.txt rename to libraries/tools/binary-compatibility-validator/src/test/kotlin/cases/private/private.txt diff --git a/libraries/tools/binary-compatibility-validator/src/test/resources/output/cases/protected.txt b/libraries/tools/binary-compatibility-validator/src/test/kotlin/cases/protected/protected.txt similarity index 100% rename from libraries/tools/binary-compatibility-validator/src/test/resources/output/cases/protected.txt rename to libraries/tools/binary-compatibility-validator/src/test/kotlin/cases/protected/protected.txt diff --git a/libraries/tools/binary-compatibility-validator/src/test/resources/output/cases/public.txt b/libraries/tools/binary-compatibility-validator/src/test/kotlin/cases/public/public.txt similarity index 100% rename from libraries/tools/binary-compatibility-validator/src/test/resources/output/cases/public.txt rename to libraries/tools/binary-compatibility-validator/src/test/kotlin/cases/public/public.txt diff --git a/libraries/tools/binary-compatibility-validator/src/test/resources/output/cases/special.txt b/libraries/tools/binary-compatibility-validator/src/test/kotlin/cases/special/special.txt similarity index 100% rename from libraries/tools/binary-compatibility-validator/src/test/resources/output/cases/special.txt rename to libraries/tools/binary-compatibility-validator/src/test/kotlin/cases/special/special.txt diff --git a/libraries/tools/binary-compatibility-validator/src/test/resources/output/cases/whenMappings.txt b/libraries/tools/binary-compatibility-validator/src/test/kotlin/cases/whenMappings/whenMappings.txt similarity index 100% rename from libraries/tools/binary-compatibility-validator/src/test/resources/output/cases/whenMappings.txt rename to libraries/tools/binary-compatibility-validator/src/test/kotlin/cases/whenMappings/whenMappings.txt diff --git a/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/CasesPublicAPITest.kt b/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/CasesPublicAPITest.kt index 1a962a4d3a8..ec6259db3be 100644 --- a/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/CasesPublicAPITest.kt +++ b/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/CasesPublicAPITest.kt @@ -7,8 +7,11 @@ import java.io.File class CasesPublicAPITest { - val visibilities = readKotlinVisibilities(File("target/cases-declarations.json")) - val baseClassPath = File("target/test-classes/cases").absoluteFile + companion object { + val visibilities = readKotlinVisibilities(File("target/cases-declarations.json")) + val baseClassPath = File("target/test-classes/cases").absoluteFile + val baseOutputPath = File("src/test/kotlin/cases") + } @[Rule JvmField] val testName = TestName() @@ -43,7 +46,7 @@ class CasesPublicAPITest { val api = getBinaryAPI(testClassStreams, visibilities).filterOutNonPublic() - val target = File("src/test/resources/output/cases").resolve(testName.methodName + ".txt") + val target = baseOutputPath.resolve(testClassRelativePath).resolve(testName.methodName + ".txt") api.dumpAndCompareWith(target) } diff --git a/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/RuntimePublicAPITest.kt b/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/RuntimePublicAPITest.kt index 304b4227f48..60e76b93c6a 100644 --- a/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/RuntimePublicAPITest.kt +++ b/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/RuntimePublicAPITest.kt @@ -58,7 +58,7 @@ class RuntimePublicAPITest { println("Reading binary API from $jarFile") val api = getBinaryAPI(JarFile(jarFile), visibilities).filterOutNonPublic() - val target = File("src/test/resources/output") + val target = File("reference-public-api") .resolve(testName.methodName.replaceCamelCaseWithDashedLowerCase() + ".txt") api.dumpAndCompareWith(target)