From ac3cbf547c259275ce6acfbea23a11740ccddf8b Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 20 May 2014 20:20:53 +0400 Subject: [PATCH] Generate "$kotlinClass"/"$kotlinPackage" reflection fields to every class Some seemingly irrelevant tests were changed because now there's in almost every class and class initialization begins with executing it Original commit: 59777e7df641b962ca50285b5d92f72202b2ead2 --- .../test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java | 4 ++-- .../general/CircularDependenciesSamePackage/module1/src/a.kt | 2 +- .../general/CircularDependenciesSamePackage/module2/src/b.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java index 92ed4cf7664..695ef09e8c5 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java @@ -220,8 +220,8 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { // Check that outputs are located properly File facadeWithA = findFileInOutputDir(findModule("module1"), "test/TestPackage.class"); File facadeWithB = findFileInOutputDir(findModule("module2"), "test/TestPackage.class"); - assertSameElements(getMethodsOfClass(facadeWithA), "a", "getA"); - assertSameElements(getMethodsOfClass(facadeWithB), "b", "getB", "setB"); + assertSameElements(getMethodsOfClass(facadeWithA), "", "a", "getA"); + assertSameElements(getMethodsOfClass(facadeWithB), "", "b", "getB", "setB"); checkPackageDeletedFromOutputWhen(Operation.CHANGE, "module1", "module1/src/a.kt", "test.TestPackage"); checkPackageDeletedFromOutputWhen(Operation.CHANGE, "module2", "module2/src/b.kt", "test.TestPackage"); diff --git a/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module1/src/a.kt b/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module1/src/a.kt index 4987d3f36ec..8311da66012 100644 --- a/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module1/src/a.kt +++ b/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module1/src/a.kt @@ -4,4 +4,4 @@ fun a() { } -val a = "" \ No newline at end of file +val a = "" diff --git a/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module2/src/b.kt b/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module2/src/b.kt index 1dcef1df913..b04c387135d 100644 --- a/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module2/src/b.kt +++ b/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module2/src/b.kt @@ -4,4 +4,4 @@ fun b() { } -var b = "" \ No newline at end of file +var b = b()