From e16c5ddb9700fc2e29e5a91c7b901389a05cfb6f Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 13 Jul 2017 07:47:09 +0300 Subject: [PATCH] Avoid using JVM only APIs in IC tests to reuse with JS --- .../enumEntryAdded/getRandomEnumEntry.kt | 6 +----- .../enumEntryRemoved/getRandomEnumEntry.kt | 6 +----- .../classHierarchyAffected/inferredTypeChanged/getAorD.kt | 4 +++- .../classHierarchyAffected/inferredTypeChanged/getBorC.kt | 4 +++- .../classHierarchyAffected/inferredTypeChanged/getBorD.kt | 4 +++- .../classHierarchyAffected/inferredTypeChanged/getCorD.kt | 4 +++- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/getRandomEnumEntry.kt b/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/getRandomEnumEntry.kt index 2845b19351c..8c0a987e8dc 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/getRandomEnumEntry.kt +++ b/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/getRandomEnumEntry.kt @@ -1,6 +1,2 @@ -import java.util.Random - fun getRandomEnumEntry() = - with (Enum.values()) { - get(Random().nextInt(size)) - } \ No newline at end of file + Enum.values()[1] \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/getRandomEnumEntry.kt b/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/getRandomEnumEntry.kt index 2845b19351c..8c0a987e8dc 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/getRandomEnumEntry.kt +++ b/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/getRandomEnumEntry.kt @@ -1,6 +1,2 @@ -import java.util.Random - fun getRandomEnumEntry() = - with (Enum.values()) { - get(Random().nextInt(size)) - } \ No newline at end of file + Enum.values()[1] \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getAorD.kt b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getAorD.kt index 8c69a257410..a902fa655c8 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getAorD.kt +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getAorD.kt @@ -1 +1,3 @@ -fun getAorD() = if (Math.random() > 0.5) getA() else getD() \ No newline at end of file +private var aOrDCounter = 0 + +fun getAorD() = if (aOrDCounter++ % 2 == 0) getA() else getD() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorC.kt b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorC.kt index 9bd769387ff..ebb91d858b8 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorC.kt +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorC.kt @@ -1 +1,3 @@ -fun getBorC() = if (Math.random() > 0.5) getB() else getC() \ No newline at end of file +private var bOrCCounter = 0 + +fun getBorC() = if (bOrCCounter++ % 2 == 0) getB() else getC() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorD.kt b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorD.kt index 153477aaff3..b4345b97d57 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorD.kt +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorD.kt @@ -1 +1,3 @@ -fun getBorD() = if (Math.random() > 0.5) getB() else getD() \ No newline at end of file +private var bOrDCounter = 0 + +fun getBorD() = if (bOrDCounter++ % 2 == 0) getB() else getD() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getCorD.kt b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getCorD.kt index 90dcb344fbf..2114fc4e755 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getCorD.kt +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getCorD.kt @@ -1 +1,3 @@ -fun getCorD() = if (Math.random() > 0.5) getC() else getD() \ No newline at end of file +private var cOrDCounter = 0 + +fun getCorD() = if (cOrDCounter++ % 2 == 0) getC() else getD() \ No newline at end of file