diff options
author | Jean-Marie Henaff <jmhenaff@google.com> | 2015-06-12 16:29:20 +0200 |
---|---|---|
committer | Jean-Marie Henaff <jmhenaff@google.com> | 2015-06-24 13:53:21 +0200 |
commit | f1828481ebcfee3bddc323fca178a4502a60ceef (patch) | |
tree | 1a706277eaae29edc8f7f8532f7686383689cc95 /jack-tests/tests/com/android/jack/experimental/incremental | |
parent | c33c369849c5864b1e918fb4995cd88a2f67aba4 (diff) | |
download | toolchain_jack-f1828481ebcfee3bddc323fca178a4502a60ceef.zip toolchain_jack-f1828481ebcfee3bddc323fca178a4502a60ceef.tar.gz toolchain_jack-f1828481ebcfee3bddc323fca178a4502a60ceef.tar.bz2 |
Remove assertion status from Jack sanity checks
- adds a property to set when invoking ant to disable assertion (-Dtests.disable-assertions=true)
- remove assertion status modification done in tests
(cherry picked from commit 9fcbabb82e5292b7df75ea396eddd34ea8a1558c)
Change-Id: Ibfc41fc8b0e7e47c597d3f92e420dfb151681396
Diffstat (limited to 'jack-tests/tests/com/android/jack/experimental/incremental')
15 files changed, 13 insertions, 66 deletions
diff --git a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest001.java b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest001.java index f53569d..ba61f26 100644 --- a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest001.java +++ b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest001.java @@ -16,14 +16,12 @@ package com.android.jack.experimental.incremental; -import com.android.jack.Main; import com.android.jack.frontend.FrontendCompilationException; import com.android.jack.test.helper.IncrementalTestHelper; import com.android.jack.test.toolchain.AbstractTestTools; import junit.framework.Assert; -import org.junit.BeforeClass; import org.junit.Test; import java.io.ByteArrayOutputStream; @@ -35,11 +33,6 @@ import java.util.List; */ public class DependenciesTest001 { - @BeforeClass - public static void setUpClass() { - Main.class.getClassLoader().setDefaultAssertionStatus(true); - } - /** * Checks that compilation failed due to deletion of B. * Compilation must recompile A and failed since B does not longer exists. diff --git a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest002.java b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest002.java index 0699009..bdaba68 100644 --- a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest002.java +++ b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest002.java @@ -16,13 +16,11 @@ package com.android.jack.experimental.incremental; -import com.android.jack.Main; import com.android.jack.test.helper.IncrementalTestHelper; import com.android.jack.test.toolchain.AbstractTestTools; import junit.framework.Assert; -import org.junit.BeforeClass; import org.junit.Test; import java.util.List; @@ -32,11 +30,6 @@ import java.util.List; */ public class DependenciesTest002 { - @BeforeClass - public static void setUpClass() { - Main.class.getClassLoader().setDefaultAssertionStatus(true); - } - /** * Check that adding a more precise method is well detected. */ diff --git a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest003.java b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest003.java index cfbee6f..ef22e19 100644 --- a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest003.java +++ b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest003.java @@ -32,10 +32,7 @@ import java.util.List; */ public class DependenciesTest003 { - @BeforeClass - public static void setUpClass() { - Main.class.getClassLoader().setDefaultAssertionStatus(true); - } + /** * Check that file modification implying to transform an interface call to a virtual call is well diff --git a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest004.java b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest004.java index 887f9f2..50e401a 100644 --- a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest004.java +++ b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest004.java @@ -32,10 +32,7 @@ import java.util.List; */ public class DependenciesTest004 { - @BeforeClass - public static void setUpClass() { - Main.class.getClassLoader().setDefaultAssertionStatus(true); - } + /** * Check that changing a class into an interface is well detected. diff --git a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest005.java b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest005.java index b1c96cc..1fda728 100644 --- a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest005.java +++ b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest005.java @@ -32,10 +32,7 @@ import java.util.List; */ public class DependenciesTest005 { - @BeforeClass - public static void setUpClass() { - Main.class.getClassLoader().setDefaultAssertionStatus(true); - } + /** * Check that runtime is correct after incremental compilation due to a constant modification. diff --git a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest006.java b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest006.java index 0f1d0e2..4a8fe94 100644 --- a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest006.java +++ b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest006.java @@ -34,10 +34,7 @@ import java.util.List; */ public class DependenciesTest006 { - @BeforeClass - public static void setUpClass() { - Main.class.getClassLoader().setDefaultAssertionStatus(true); - } + /** * Check that runtime is correct after class renaming. diff --git a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest007.java b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest007.java index 389b501..649a0fe 100644 --- a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest007.java +++ b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest007.java @@ -32,10 +32,7 @@ import java.util.List; */ public class DependenciesTest007 { - @BeforeClass - public static void setUpClass() { - Main.class.getClassLoader().setDefaultAssertionStatus(true); - } + /** * Check that runtime is correct after transformation of an interface call to a virtual call. diff --git a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest008.java b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest008.java index 895c3e8..d3c0ab9 100644 --- a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest008.java +++ b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest008.java @@ -31,10 +31,7 @@ import org.junit.Test; */ public class DependenciesTest008 { - @BeforeClass - public static void setUpClass() { - Main.class.getClassLoader().setDefaultAssertionStatus(true); - } + /** * Check that jack files are deleted according to recompiled files. diff --git a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest009.java b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest009.java index ca77390..db51b6b 100644 --- a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest009.java +++ b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest009.java @@ -44,10 +44,7 @@ import javax.annotation.Nonnull; */ public class DependenciesTest009 { - @BeforeClass - public static void setUpClass() { - Main.class.getClassLoader().setDefaultAssertionStatus(true); - } + /** * Check that usages does not change during incremental compilation and that dependencies are diff --git a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest010.java b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest010.java index 062ba0b..266a59c 100644 --- a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest010.java +++ b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest010.java @@ -32,10 +32,7 @@ import java.util.List; */ public class DependenciesTest010 { - @BeforeClass - public static void setUpClass() { - Main.class.getClassLoader().setDefaultAssertionStatus(true); - } + /** * Check that incremental compilation support switch on constant value. diff --git a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest011.java b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest011.java index 4fefa29..6fa081d 100644 --- a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest011.java +++ b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest011.java @@ -34,10 +34,7 @@ import java.util.List; */ public class DependenciesTest011 { - @BeforeClass - public static void setUpClass() { - Main.class.getClassLoader().setDefaultAssertionStatus(true); - } + /** * Check that incremental compilation support throws declaration. diff --git a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest012.java b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest012.java index d19a243..242efe7 100644 --- a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest012.java +++ b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest012.java @@ -33,10 +33,7 @@ import java.io.File; */ public class DependenciesTest012 { - @BeforeClass - public static void setUpClass() { - Main.class.getClassLoader().setDefaultAssertionStatus(true); - } + /** * Check that incremental compilation support class literal usages. diff --git a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest013.java b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest013.java index b29ca2a..885c9f3 100644 --- a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest013.java +++ b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest013.java @@ -34,10 +34,7 @@ import java.io.File; */ public class DependenciesTest013 { - @BeforeClass - public static void setUpClass() { - Main.class.getClassLoader().setDefaultAssertionStatus(true); - } + /** * Check that incremental compilation support array creation. diff --git a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest014.java b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest014.java index 1d8ac8e..02f87fe 100644 --- a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest014.java +++ b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest014.java @@ -34,10 +34,7 @@ import java.io.FileInputStream; */ public class DependenciesTest014 { - @BeforeClass - public static void setUpClass() { - Main.class.getClassLoader().setDefaultAssertionStatus(true); - } + /** * Check that incremental compilation works when file without dependency is deleted. diff --git a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest015.java b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest015.java index 35c351f..9e67b7d 100644 --- a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest015.java +++ b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest015.java @@ -38,10 +38,7 @@ import java.util.Arrays; */ public class DependenciesTest015 { - @BeforeClass - public static void setUpClass() { - Main.class.getClassLoader().setDefaultAssertionStatus(true); - } + /** * Check that incremental compilation works when library on classpath is modified. |