Cleanup of -assumexxx tests
Change-Id: I51181aa7c9f7e50b66b6da759655be35a66a3969
diff --git a/src/test/examples/assumenosideeffects1/keep-rules-discard.txt b/src/test/examples/assumenosideeffects1/keep-rules-discard.txt
deleted file mode 100644
index 9c6b6f7..0000000
--- a/src/test/examples/assumenosideeffects1/keep-rules-discard.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (c) 2017, the R8 project authors. Please see the AUTHORS file
-# for details. All rights reserved. Use of this source code is governed by a
-# BSD-style license that can be found in the LICENSE file.
-
-# Keep the application entry point. Get rid of everything that is not
-# reachable from there.
--keep public class assumenosideeffects1.Assumenosideeffects {
- public static void main(...);
-}
-
-# Mark some methods to have no side effects.
--assumenosideeffects public class assumenosideeffects1.Assumenosideeffects {
- public static void noSideEffectVoid(...);
- public static int noSideEffectInt(...);
-}
-
-# Allow access modification to enable minifcation.
--allowaccessmodification
-
-# Check that methods has been discarded.
--checkdiscard class * {
- @assumenosideeffects1.CheckDiscarded *;
-}
diff --git a/src/test/examples/assumenosideeffects1/keep-rules.txt b/src/test/examples/assumenosideeffects1/keep-rules.txt
index d82c218..64cc5864 100644
--- a/src/test/examples/assumenosideeffects1/keep-rules.txt
+++ b/src/test/examples/assumenosideeffects1/keep-rules.txt
@@ -14,5 +14,10 @@
public static int noSideEffectInt(...);
}
-# Allow access modification to enable minifcation.
+# Allow access modification to enable minification.
-allowaccessmodification
+
+# Check that methods have been discarded.
+-checkdiscard class ** {
+ @assumenosideeffects1.CheckDiscarded *;
+}
diff --git a/src/test/examples/assumenosideeffects2/keep-rules.txt b/src/test/examples/assumenosideeffects2/keep-rules.txt
index 68ad8e8..9cf7fad 100644
--- a/src/test/examples/assumenosideeffects2/keep-rules.txt
+++ b/src/test/examples/assumenosideeffects2/keep-rules.txt
@@ -14,5 +14,5 @@
public void println(...);
}
-# Allow access modification to enable minifcation
+# Allow access modification to enable minification.
-allowaccessmodification
diff --git a/src/test/examples/assumenosideeffects3/keep-rules-discard.txt b/src/test/examples/assumenosideeffects3/keep-rules-discard.txt
deleted file mode 100644
index cdd4b86..0000000
--- a/src/test/examples/assumenosideeffects3/keep-rules-discard.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2017, the R8 project authors. Please see the AUTHORS file
-# for details. All rights reserved. Use of this source code is governed by a
-# BSD-style license that can be found in the LICENSE file.
-
-# Keep the application entry point. Get rid of everything that is not
-# reachable from there.
--keep public class assumenosideeffects3.Assumenosideeffects {
- public static void main(...);
-}
-
-# Mark some methods to have no side effects.
--assumenosideeffects public class assumenosideeffects3.Assumenosideeffects {
- public static int method0(...) return 1;
- public static int method1(...) return 0;
- public static long method0L(...) return 1;
- public static long method1L(...) return 0;
-}
-
-# Allow access modification to enable minifcation.
--allowaccessmodification
-
-# Check that methods has been discarded.
--checkdiscard class * {
- @assumenosideeffects3.CheckDiscarded *;
-}
diff --git a/src/test/examples/assumenosideeffects3/keep-rules.txt b/src/test/examples/assumenosideeffects3/keep-rules.txt
index cb12eb1..b0dc0d9 100644
--- a/src/test/examples/assumenosideeffects3/keep-rules.txt
+++ b/src/test/examples/assumenosideeffects3/keep-rules.txt
@@ -16,5 +16,10 @@
public static long method1L(...) return 0;
}
-# Allow access modification to enable minifcation.
+# Allow access modification to enable minification.
-allowaccessmodification
+
+# Check that methods have been discarded.
+-checkdiscard class ** {
+ @assumenosideeffects3.CheckDiscarded *;
+}
diff --git a/src/test/examples/assumenosideeffects4/keep-rules-discard.txt b/src/test/examples/assumenosideeffects4/keep-rules-discard.txt
deleted file mode 100644
index a6cfcd6..0000000
--- a/src/test/examples/assumenosideeffects4/keep-rules-discard.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (c) 2017, the R8 project authors. Please see the AUTHORS file
-# for details. All rights reserved. Use of this source code is governed by a
-# BSD-style license that can be found in the LICENSE file.
-
-# Keep the application entry point. Get rid of everything that is not
-# reachable from there.
--keep public class assumenosideeffects4.Assumenosideeffects {
- public static final int ASSUMED_VALUE_0;
- public static final int ASSUMED_VALUE_1;
- public static final long ASSUMED_VALUE_0L;
- public static final long ASSUMED_VALUE_1L;
- public static void main(...);
-}
-
-# Mark some methods to have no side effects.
--assumenosideeffects public class assumenosideeffects4.Assumenosideeffects {
- public static int method0(...) return assumenosideeffects4.Assumenosideeffects.ASSUMED_VALUE_1;
- public static int method1(...) return assumenosideeffects4.Assumenosideeffects.ASSUMED_VALUE_0;
- public static long method0L(...) return assumenosideeffects4.Assumenosideeffects.ASSUMED_VALUE_1L;
- public static long method1L(...) return assumenosideeffects4.Assumenosideeffects.ASSUMED_VALUE_0L;
-}
-
-# Allow access modification to enable minifcation.
--allowaccessmodification
-
-# Check that methods has been discarded.
--checkdiscard class * {
- @assumenosideeffects4.CheckDiscarded *;
-}
diff --git a/src/test/examples/assumenosideeffects4/keep-rules.txt b/src/test/examples/assumenosideeffects4/keep-rules.txt
index 1c66b38..843d8e8 100644
--- a/src/test/examples/assumenosideeffects4/keep-rules.txt
+++ b/src/test/examples/assumenosideeffects4/keep-rules.txt
@@ -20,5 +20,10 @@
public static long method1L(...) return assumenosideeffects4.Assumenosideeffects.ASSUMED_VALUE_0L;
}
-# Allow access modification to enable minifcation.
+# Allow access modification to enable minification.
-allowaccessmodification
+
+# Check that methods have been discarded.
+-checkdiscard class ** {
+ @assumenosideeffects4.CheckDiscarded *;
+}
diff --git a/src/test/examples/assumenosideeffects5/keep-rules-discard.txt b/src/test/examples/assumenosideeffects5/keep-rules-discard.txt
deleted file mode 100644
index 2383b2c..0000000
--- a/src/test/examples/assumenosideeffects5/keep-rules-discard.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (c) 2017, the R8 project authors. Please see the AUTHORS file
-# for details. All rights reserved. Use of this source code is governed by a
-# BSD-style license that can be found in the LICENSE file.
-
-# Keep the application entry point. Get rid of everything that is not
-# reachable from there.
--keep public class assumenosideeffects5.Assumenosideeffects {
- public static void main(...);
-}
-
-# Mark some methods to have no side effects.
--assumenosideeffects public class assumenosideeffects5.Assumenosideeffects {
- public static boolean methodTrue(...) return false;
- public static boolean methodFalse(...) return true;
-}
-
-# Allow access modification to enable minifcation.
--allowaccessmodification
-
-# Check that methods has been discarded.
--checkdiscard class * {
- @assumenosideeffects5.CheckDiscarded *;
-}
diff --git a/src/test/examples/assumenosideeffects5/keep-rules.txt b/src/test/examples/assumenosideeffects5/keep-rules.txt
index ac8cb71..f36e394 100644
--- a/src/test/examples/assumenosideeffects5/keep-rules.txt
+++ b/src/test/examples/assumenosideeffects5/keep-rules.txt
@@ -14,5 +14,10 @@
public static boolean methodFalse(...) return true;
}
-# Allow access modification to enable minifcation.
+# Allow access modification to enable minification.
-allowaccessmodification
+
+# Check that methods have been discarded.
+-checkdiscard class ** {
+ @assumenosideeffects5.CheckDiscarded *;
+}
diff --git a/src/test/examples/assumenosideeffects6/keep-rules-discard.txt b/src/test/examples/assumenosideeffects6/keep-rules-discard.txt
deleted file mode 100644
index 0f51575..0000000
--- a/src/test/examples/assumenosideeffects6/keep-rules-discard.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (c) 2018, the R8 project authors. Please see the AUTHORS file
-# for details. All rights reserved. Use of this source code is governed by a
-# BSD-style license that can be found in the LICENSE file.
-
-# Keep the application entry point. Get rid of everything that is not
-# reachable from there.
--keep public class assumenosideeffects6.Assumenosideeffects {
- public static void main(...);
-}
-
-# Mark some methods to return null and have no side effects.
--assumenosideeffects class assumenosideeffects6.A {
- public static java.lang.Object methodStaticNull() return null;
- public java.lang.Object methodNull() return null;
-}
-
-# Allow access modification to enable minification.
--allowaccessmodification
-
-# Check that methods has been discarded.
--checkdiscard class ** {
- @assumenosideeffects6.CheckDiscarded *;
-}
diff --git a/src/test/examples/assumenosideeffects6/keep-rules.txt b/src/test/examples/assumenosideeffects6/keep-rules.txt
index c158dd6..319b353 100644
--- a/src/test/examples/assumenosideeffects6/keep-rules.txt
+++ b/src/test/examples/assumenosideeffects6/keep-rules.txt
@@ -16,3 +16,8 @@
# Allow access modification to enable minification.
-allowaccessmodification
+
+# Check that methods have been discarded.
+-checkdiscard class ** {
+ @assumenosideeffects6.CheckDiscarded *;
+}
diff --git a/src/test/examples/assumevalues2/keep-rules-discard.txt b/src/test/examples/assumevalues2/keep-rules-discard.txt
deleted file mode 100644
index 7817d71..0000000
--- a/src/test/examples/assumevalues2/keep-rules-discard.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (c) 2017, the R8 project authors. Please see the AUTHORS file
-# for details. All rights reserved. Use of this source code is governed by a
-# BSD-style license that can be found in the LICENSE file.
-
-# Keep the application entry point. Get rid of everything that is not
-# reachable from there.
--keep public class assumevalues2.Assumevalues {
- public static void main(...);
-}
-
-# Assume values for a field.
--assumevalues public class assumevalues2.Assumevalues {
- public static int value return 2..3;
- public static long valueL return 2..3;
-}
-
-# Allow access modification to enable minifcation.
--allowaccessmodification
-
-# Check that methods has been discarded.
--checkdiscard class * {
- @assumevalues2.CheckDiscarded *;
-}
diff --git a/src/test/examples/assumevalues2/keep-rules.txt b/src/test/examples/assumevalues2/keep-rules.txt
index c1fead1..7d98c4f 100644
--- a/src/test/examples/assumevalues2/keep-rules.txt
+++ b/src/test/examples/assumevalues2/keep-rules.txt
@@ -14,5 +14,10 @@
public static long valueL return 2..3;
}
-# Allow access modification to enable minifcation.
+# Allow access modification to enable minification.
-allowaccessmodification
+
+# Check that methods have been discarded.
+-checkdiscard class ** {
+ @assumevalues2.CheckDiscarded *;
+}
diff --git a/src/test/java/com/android/tools/r8/shaking/examples/TreeShakingAssumenosideeffects1Test.java b/src/test/java/com/android/tools/r8/shaking/examples/TreeShakingAssumenosideeffects1Test.java
index 2be8af4..cf7f2ad 100644
--- a/src/test/java/com/android/tools/r8/shaking/examples/TreeShakingAssumenosideeffects1Test.java
+++ b/src/test/java/com/android/tools/r8/shaking/examples/TreeShakingAssumenosideeffects1Test.java
@@ -41,7 +41,7 @@
}
@Test
- public void testKeeprules() throws Exception {
+ public void test() throws Exception {
runTest(
null,
TreeShakingAssumenosideeffects1Test::assumenosideeffects1CheckOutput,
@@ -49,15 +49,6 @@
ImmutableList.of("src/test/examples/assumenosideeffects1/keep-rules.txt"));
}
- @Test
- public void testKeeprulesdiscard() throws Exception {
- runTest(
- null,
- TreeShakingAssumenosideeffects1Test::assumenosideeffects1CheckOutput,
- null,
- ImmutableList.of("src/test/examples/assumenosideeffects1/keep-rules-discard.txt"));
- }
-
private static void assumenosideeffects1CheckOutput(String output1, String output2) {
Assert.assertEquals(StringUtils.lines("noSideEffectVoid", "noSideEffectInt"), output1);
Assert.assertEquals("", output2);
diff --git a/src/test/java/com/android/tools/r8/shaking/examples/TreeShakingAssumenosideeffects3Test.java b/src/test/java/com/android/tools/r8/shaking/examples/TreeShakingAssumenosideeffects3Test.java
index ab128c8..18123a3 100644
--- a/src/test/java/com/android/tools/r8/shaking/examples/TreeShakingAssumenosideeffects3Test.java
+++ b/src/test/java/com/android/tools/r8/shaking/examples/TreeShakingAssumenosideeffects3Test.java
@@ -41,7 +41,7 @@
}
@Test
- public void testKeeprules() throws Exception {
+ public void test() throws Exception {
runTest(
null,
TreeShakingAssumenosideeffects3Test::assumenosideeffects3CheckOutput,
@@ -49,15 +49,6 @@
ImmutableList.of("src/test/examples/assumenosideeffects3/keep-rules.txt"));
}
- @Test
- public void testKeeprulesdiscard() throws Exception {
- runTest(
- null,
- TreeShakingAssumenosideeffects3Test::assumenosideeffects3CheckOutput,
- null,
- ImmutableList.of("src/test/examples/assumenosideeffects3/keep-rules-discard.txt"));
- }
-
private static void assumenosideeffects3CheckOutput(String output1, String output2) {
Assert.assertEquals(StringUtils.lines("0", "1", "0L", "1L"), output1);
Assert.assertEquals(StringUtils.lines("1", "0", "1L", "0L"), output2);
diff --git a/src/test/java/com/android/tools/r8/shaking/examples/TreeShakingAssumenosideeffects4Test.java b/src/test/java/com/android/tools/r8/shaking/examples/TreeShakingAssumenosideeffects4Test.java
index 6299394..819e11e 100644
--- a/src/test/java/com/android/tools/r8/shaking/examples/TreeShakingAssumenosideeffects4Test.java
+++ b/src/test/java/com/android/tools/r8/shaking/examples/TreeShakingAssumenosideeffects4Test.java
@@ -41,7 +41,7 @@
}
@Test
- public void testKeeprules() throws Exception {
+ public void test() throws Exception {
runTest(
null,
TreeShakingAssumenosideeffects4Test::assumenosideeffects4CheckOutput,
@@ -49,15 +49,6 @@
ImmutableList.of("src/test/examples/assumenosideeffects4/keep-rules.txt"));
}
- @Test
- public void testKeeprulesdiscard() throws Exception {
- runTest(
- null,
- TreeShakingAssumenosideeffects4Test::assumenosideeffects4CheckOutput,
- null,
- ImmutableList.of("src/test/examples/assumenosideeffects4/keep-rules-discard.txt"));
- }
-
private static void assumenosideeffects4CheckOutput(String output1, String output2) {
Assert.assertEquals(
StringUtils.lines("method0", "0", "method1", "1", "method0L", "0L", "method1L", "1L"),
diff --git a/src/test/java/com/android/tools/r8/shaking/examples/TreeShakingAssumenosideeffects5Test.java b/src/test/java/com/android/tools/r8/shaking/examples/TreeShakingAssumenosideeffects5Test.java
index 8d99efe..967dbc5 100644
--- a/src/test/java/com/android/tools/r8/shaking/examples/TreeShakingAssumenosideeffects5Test.java
+++ b/src/test/java/com/android/tools/r8/shaking/examples/TreeShakingAssumenosideeffects5Test.java
@@ -41,7 +41,7 @@
}
@Test
- public void testKeeprules() throws Exception {
+ public void test() throws Exception {
runTest(
null,
TreeShakingAssumenosideeffects5Test::assumenosideeffects5CheckOutput,
@@ -49,15 +49,6 @@
ImmutableList.of("src/test/examples/assumenosideeffects5/keep-rules.txt"));
}
- @Test
- public void testKeeprulesdiscard() throws Exception {
- runTest(
- null,
- TreeShakingAssumenosideeffects5Test::assumenosideeffects5CheckOutput,
- null,
- ImmutableList.of("src/test/examples/assumenosideeffects5/keep-rules-discard.txt"));
- }
-
private static void assumenosideeffects5CheckOutput(String output1, String output2) {
Assert.assertEquals(StringUtils.lines("methodTrue", "true", "methodFalse", "false"), output1);
Assert.assertEquals(StringUtils.lines("false", "true"), output2);
diff --git a/src/test/java/com/android/tools/r8/shaking/examples/TreeShakingAssumenosideeffects6Test.java b/src/test/java/com/android/tools/r8/shaking/examples/TreeShakingAssumenosideeffects6Test.java
index 578ad2a..dc51fa1 100644
--- a/src/test/java/com/android/tools/r8/shaking/examples/TreeShakingAssumenosideeffects6Test.java
+++ b/src/test/java/com/android/tools/r8/shaking/examples/TreeShakingAssumenosideeffects6Test.java
@@ -41,7 +41,7 @@
}
@Test
- public void testKeeprules() throws Exception {
+ public void test() throws Exception {
runTest(
null,
TreeShakingAssumenosideeffects6Test::assumenosideeffects6CheckOutput,
@@ -49,15 +49,6 @@
ImmutableList.of("src/test/examples/assumenosideeffects6/keep-rules.txt"));
}
- @Test
- public void testKeeprulesdiscard() throws Exception {
- runTest(
- null,
- TreeShakingAssumenosideeffects6Test::assumenosideeffects6CheckOutput,
- null,
- ImmutableList.of("src/test/examples/assumenosideeffects6/keep-rules-discard.txt"));
- }
-
private static void assumenosideeffects6CheckOutput(String output1, String output2) {
Assert.assertEquals(
StringUtils.lines("methodStaticNull", "NOT NULL", "methodNull", "NOT NULL"), output1);
diff --git a/src/test/java/com/android/tools/r8/shaking/examples/TreeShakingAssumevalues2Test.java b/src/test/java/com/android/tools/r8/shaking/examples/TreeShakingAssumevalues2Test.java
index 8303f8b..fd38ee7 100644
--- a/src/test/java/com/android/tools/r8/shaking/examples/TreeShakingAssumevalues2Test.java
+++ b/src/test/java/com/android/tools/r8/shaking/examples/TreeShakingAssumevalues2Test.java
@@ -35,7 +35,7 @@
}
@Test
- public void testKeeprules() throws Exception {
+ public void test() throws Exception {
runTest(
null,
TreeShakingAssumevalues2Test::assumevalues2CheckOutput,
@@ -43,15 +43,6 @@
ImmutableList.of("src/test/examples/assumevalues2/keep-rules.txt"));
}
- @Test
- public void testKeeprulesdiscard() throws Exception {
- runTest(
- null,
- TreeShakingAssumevalues2Test::assumevalues2CheckOutput,
- null,
- ImmutableList.of("src/test/examples/assumevalues2/keep-rules-discard.txt"));
- }
-
private static void assumevalues2CheckOutput(String output1, String output2) {
Assert.assertEquals(StringUtils.lines("1", "2", "3", "4", "1L", "2L", "3L", "4L"), output1);
Assert.assertEquals(StringUtils.lines("2", "3", "2L", "3L"), output2);
