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

37 files changed, 44 insertions, 182 deletions

diff --git a/jack/src/com/android/jack/Jack.java b/jack/src/com/android/jack/Jack.java
index 86c79a7..1a1c247 100644
--- a/jack/src/com/android/jack/Jack.java
+++ b/jack/src/com/android/jack/Jack.java
@@ -373,10 +373,6 @@ public abstract class Jack {
   public static void check(@Nonnull Options options, @Nonnull RunnableHooks hooks)
       throws IllegalOptionsException, ConfigurationException {
 
-    boolean assertEnable = false;
-    // assertEnable = true if assertions are already enabled
-    assert true == (assertEnable = true);
-
     if (options.proguardFlagsFiles != null && !options.proguardFlagsFiles.isEmpty()) {
       if (options.flags == null) {
         options.flags = new Flags();
@@ -401,13 +397,7 @@ public abstract class Jack {
     ThreadConfig.setConfig(config);
 
     boolean sanityChecks = config.get(Options.SANITY_CHECKS).booleanValue();
-    if (sanityChecks != assertEnable) {
-      logger.log(Level.INFO, "Jack assertion status overriden by sanity checks option");
-    }
 
-    ClassLoader classLoader = Jack.class.getClassLoader();
-    classLoader.clearAssertionStatus();
-    classLoader.setDefaultAssertionStatus(sanityChecks);
     logger.log(Level.INFO, "Jack sanity checks {0}",
         (sanityChecks ? "enabled" : "disabled"));
   }
diff --git a/jack/tests/com/android/jack/ConditionalTest.java b/jack/tests/com/android/jack/ConditionalTest.java
index 2187f74..c361064 100644
--- a/jack/tests/com/android/jack/ConditionalTest.java
+++ b/jack/tests/com/android/jack/ConditionalTest.java
@@ -41,7 +41,6 @@ import org.junit.Test;
 public class ConditionalTest {
   @BeforeClass
   public static void setUpClass() throws ConfigurationException, IllegalOptionsException {
-    Main.class.getClassLoader().setDefaultAssertionStatus(true);
     Options options = new Options();
     RunnableHooks hooks = new RunnableHooks();
     options.checkValidity(hooks);
diff --git a/jack/tests/com/android/jack/FibonacciThreeAddressTest.java b/jack/tests/com/android/jack/FibonacciThreeAddressTest.java
index 7f188a5..3cc829e 100644
--- a/jack/tests/com/android/jack/FibonacciThreeAddressTest.java
+++ b/jack/tests/com/android/jack/FibonacciThreeAddressTest.java
@@ -25,7 +25,6 @@ import com.android.jack.scheduling.marker.ClassDefItemMarker;
 
 import junit.framework.Assert;
 
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.io.File;
@@ -40,12 +39,6 @@ public class FibonacciThreeAddressTest {
   private static final String JAVA_FILENAME = "FibonacciThreeAddress.java";
   private static final File JAVA_FILEPATH = TestTools.getJackTestFromBinaryName(CLASS_BINARY_NAME);
 
-  @BeforeClass
-  public static void setUpClass() {
-    // Enable assertions
-    Main.class.getClassLoader().setDefaultAssertionStatus(true);
-  }
-
   /**
    * Verifies that FibonacciThreeAddress can be loaded in J-AST.
    */
diff --git a/jack/tests/com/android/jack/FinallyTest.java b/jack/tests/com/android/jack/FinallyTest.java
index 7e5af08..8aff858 100644
--- a/jack/tests/com/android/jack/FinallyTest.java
+++ b/jack/tests/com/android/jack/FinallyTest.java
@@ -25,7 +25,6 @@ import com.android.jack.ir.ast.JVisitor;
 
 import junit.framework.Assert;
 
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 import javax.annotation.Nonnull;
@@ -35,11 +34,6 @@ import javax.annotation.Nonnull;
  */
 public class FinallyTest {
 
-  @BeforeClass
-  public static void setUpClass() {
-    Main.class.getClassLoader().setDefaultAssertionStatus(true);
-  }
-
   @Test
   public void testCompile005() throws Exception {
     String classBinaryName = "com/android/jack/tryfinally/finally005/jack/Finally005";
diff --git a/jack/tests/com/android/jack/JarjarTest.java b/jack/tests/com/android/jack/JarjarTest.java
index 0ca1b4c..fc8a400 100644
--- a/jack/tests/com/android/jack/JarjarTest.java
+++ b/jack/tests/com/android/jack/JarjarTest.java
@@ -40,7 +40,6 @@ public class JarjarTest {
 
   @BeforeClass
   public static void setUpClass() {
-    Main.class.getClassLoader().setDefaultAssertionStatus(true);
     Rule rule = new Rule();
     rule.setPattern("org.**");
     rule.setResult("foo.@1");
diff --git a/jack/tests/com/android/jack/MainTest.java b/jack/tests/com/android/jack/MainTest.java
index 0750edf..9056ec3 100644
--- a/jack/tests/com/android/jack/MainTest.java
+++ b/jack/tests/com/android/jack/MainTest.java
@@ -21,7 +21,6 @@ import com.android.jack.ir.ast.JSession;
 
 import junit.framework.Assert;
 
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 /**
@@ -32,12 +31,6 @@ public class MainTest {
   private static final String CLASS_BINARY_NAME = "com/android/jack/fibonacci/test001/jack/Fibo";
   private static final String CLASS_SIGNATURE = "L" + CLASS_BINARY_NAME + ";";
 
-  @BeforeClass
-  public static void setUpClass() {
-    // Enable assertions
-    Main.class.getClassLoader().setDefaultAssertionStatus(true);
-  }
-
   /**
    * Verifies that Fibo can be loaded in J-AST.
    */
diff --git a/jack/tests/com/android/jack/StaticValuesTest.java b/jack/tests/com/android/jack/StaticValuesTest.java
index 63acb3b..946ce9b 100644
--- a/jack/tests/com/android/jack/StaticValuesTest.java
+++ b/jack/tests/com/android/jack/StaticValuesTest.java
@@ -36,7 +36,6 @@ import com.android.sched.scheduler.TagOrMarkerOrComponentSet;
 
 import junit.framework.Assert;
 
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.util.List;
@@ -48,11 +47,6 @@ public class StaticValuesTest {
 
   private static final String CLINIT = "<clinit>";
 
-  @BeforeClass
-  public static void setUpClass() {
-    Main.class.getClassLoader().setDefaultAssertionStatus(true);
-  }
-
   @Test
   public void testGeneratedClinit1() throws Exception {
     Assert.assertTrue(
diff --git a/jack/tests/com/android/jack/TestTools.java b/jack/tests/com/android/jack/TestTools.java
index eb2dc4d..db782f6 100644
--- a/jack/tests/com/android/jack/TestTools.java
+++ b/jack/tests/com/android/jack/TestTools.java
@@ -479,4 +479,12 @@ public class TestTools {
     }
     throw new AssertionError("Encoded method not found.");
   }
+
+  public static boolean areAssertionsEnabled() {
+    boolean assertEnable = false;
+    // assertEnable = true if assertions are already enabled
+    assert true == (assertEnable = true);
+    return assertEnable;
+  }
+
 }
diff --git a/jack/tests/com/android/jack/Types.java b/jack/tests/com/android/jack/Types.java
index 74eea17..f48fb72 100644
--- a/jack/tests/com/android/jack/Types.java
+++ b/jack/tests/com/android/jack/Types.java
@@ -47,7 +47,7 @@ import com.android.sched.util.config.ThreadConfig;
 
 import junit.framework.Assert;
 
-import org.junit.BeforeClass;
+import org.junit.Assume;
 import org.junit.Test;
 
 /**
@@ -66,13 +66,10 @@ public class Types {
     session.getLookup().getOrCreatePackage("java/lang");
   }
 
-  @BeforeClass
-  public static void setUpClass() {
-    Types.class.getClassLoader().setDefaultAssertionStatus(true);
-  }
-
   @Test
   public void unaryPrefixNotGetType() throws Exception {
+    Assume.assumeTrue(TestTools.areAssertionsEnabled());
+
     boolean catched;
 
     try {
@@ -106,6 +103,8 @@ public class Types {
 
   @Test
   public void unaryPrefixBitNotGetType() throws Exception {
+    Assume.assumeTrue(TestTools.areAssertionsEnabled());
+
     boolean catched;
 
     try {
@@ -211,6 +210,8 @@ public class Types {
 
   @Test
   public void shiftGetType() throws Exception {
+    Assume.assumeTrue(TestTools.areAssertionsEnabled());
+
     boolean catched;
 
     try {
@@ -294,6 +295,8 @@ public class Types {
 
   @Test
   public void relationalGetType() throws Exception {
+    Assume.assumeTrue(TestTools.areAssertionsEnabled());
+
     boolean catched;
     try {
       catched = false;
@@ -345,6 +348,8 @@ public class Types {
 
   @Test
   public void logicalAndBitwiseGetType() throws Exception {
+    Assume.assumeTrue(TestTools.areAssertionsEnabled());
+
     boolean catched;
     try {
       catched = false;
@@ -419,6 +424,8 @@ public class Types {
 
   @Test
   public void equalityGetType() throws Exception {
+    Assume.assumeTrue(TestTools.areAssertionsEnabled());
+
     boolean catched;
 
     Assert.assertEquals(JPrimitiveTypeEnum.BOOLEAN.getType(), new JEqOperation(SourceInfo.UNKNOWN,
@@ -463,6 +470,8 @@ public class Types {
 
   @Test
   public void conditionalOperationGetType() throws Exception {
+    Assume.assumeTrue(TestTools.areAssertionsEnabled());
+
     boolean catched;
 
     Assert.assertEquals(JPrimitiveTypeEnum.BOOLEAN.getType(), new JAndOperation(SourceInfo.UNKNOWN,
@@ -487,6 +496,8 @@ public class Types {
 
   @Test
   public void arithmeticGetType() throws Exception {
+    Assume.assumeTrue(TestTools.areAssertionsEnabled());
+
     boolean catched;
     JType objectType = Jack.getSession().getPhantomLookup().getClass(CommonTypes.JAVA_LANG_OBJECT);
     JLocal l = new JLocal(SourceInfo.UNKNOWN, "test", objectType, JModifier.DEFAULT, null);
diff --git a/jack/tests/com/android/jack/UnaryTest.java b/jack/tests/com/android/jack/UnaryTest.java
index f72342e..07d71be 100644
--- a/jack/tests/com/android/jack/UnaryTest.java
+++ b/jack/tests/com/android/jack/UnaryTest.java
@@ -22,7 +22,6 @@ import com.android.jack.ir.ast.JVisitor;
 
 import junit.framework.Assert;
 
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 import javax.annotation.Nonnull;
@@ -32,11 +31,6 @@ import javax.annotation.Nonnull;
  */
 public class UnaryTest {
 
-  @BeforeClass
-  public static void setUpClass() {
-    Main.class.getClassLoader().setDefaultAssertionStatus(true);
-  }
-
   @Test
   public void testCompile5() throws Exception {
     String classBinaryName = "com/android/jack/unary/test005/jack/UnaryNot";
diff --git a/jack/tests/com/android/jack/VersionTest.java b/jack/tests/com/android/jack/VersionTest.java
index 8029b7d..73a1336 100644
--- a/jack/tests/com/android/jack/VersionTest.java
+++ b/jack/tests/com/android/jack/VersionTest.java
@@ -19,14 +19,9 @@ package com.android.jack;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class VersionTest {
-  @BeforeClass
-  public static void setUpClass() {
-    Main.class.getClassLoader().setDefaultAssertionStatus(true);
-  }
 
   @Test
   public void testVersion() {
diff --git a/jack/tests/com/android/jack/backend/dex/rop/RopRegisterManagerTest.java b/jack/tests/com/android/jack/backend/dex/rop/RopRegisterManagerTest.java
index 05f3bfc..f7fed5d 100644
--- a/jack/tests/com/android/jack/backend/dex/rop/RopRegisterManagerTest.java
+++ b/jack/tests/com/android/jack/backend/dex/rop/RopRegisterManagerTest.java
@@ -24,16 +24,10 @@ import com.android.jack.ir.sourceinfo.SourceInfo;
 
 import junit.framework.Assert;
 
-import org.junit.Before;
 import org.junit.Test;
 
 public class RopRegisterManagerTest {
 
-  @Before
-  public void setUp() throws Exception {
-    RopRegisterManagerTest.class.getClassLoader().setDefaultAssertionStatus(true);
-  }
-
   /**
    * Return reg must be created before getting it.
    */
diff --git a/jack/tests/com/android/jack/cfg/BuildCfgErrorTest.java b/jack/tests/com/android/jack/cfg/BuildCfgErrorTest.java
index 68817fb..e440896d 100644
--- a/jack/tests/com/android/jack/cfg/BuildCfgErrorTest.java
+++ b/jack/tests/com/android/jack/cfg/BuildCfgErrorTest.java
@@ -22,18 +22,12 @@ import com.android.jack.TestTools;
 import com.android.jack.ir.ast.JMethod;
 import com.android.jack.util.graph.GraphException;
 
-import org.junit.Before;
 import org.junit.Test;
 
 public class BuildCfgErrorTest {
 
   private static final String CLASS_BINARY_NAME = "com/android/jack/fibonacci/test001/jack/FibonacciThreeAddress";
 
-  @Before
-  public void setUp() throws Exception {
-    BuildCfgErrorTest.class.getClassLoader().setDefaultAssertionStatus(true);
-  }
-
   /**
    * Add a successor twice to a block is not allow.
    * @throws Exception
diff --git a/jack/tests/com/android/jack/cfg/BuildCfgTest.java b/jack/tests/com/android/jack/cfg/BuildCfgTest.java
index 07415de..56cd375 100644
--- a/jack/tests/com/android/jack/cfg/BuildCfgTest.java
+++ b/jack/tests/com/android/jack/cfg/BuildCfgTest.java
@@ -41,8 +41,6 @@ public class BuildCfgTest {
 
   @Before
   public void setUp() throws Exception {
-    BuildCfgTest.class.getClassLoader().setDefaultAssertionStatus(true);
-
     String classSignature = "L" + CLASS_BINARY_NAME + ";";
     File fileName = TestTools.getJackTestFromBinaryName(CLASS_BINARY_NAME);
     final String methodSignature = "fibonacci(I)I";
diff --git a/jack/tests/com/android/jack/frontend/ArrayTest.java b/jack/tests/com/android/jack/frontend/ArrayTest.java
index fe722a1..8a9e021 100644
--- a/jack/tests/com/android/jack/frontend/ArrayTest.java
+++ b/jack/tests/com/android/jack/frontend/ArrayTest.java
@@ -19,16 +19,10 @@ package com.android.jack.frontend;
 
 import com.android.jack.TestTools;
 
-import org.junit.Before;
 import org.junit.Test;
 
 public class ArrayTest {
 
-  @Before
-  public void setUp() throws Exception {
-    ArrayTest.class.getClassLoader().setDefaultAssertionStatus(true);
-  }
-
   @Test
   public void arrayReuse() throws Exception {
     String binaryName = "com/android/jack/newarray/test003/jack/ArrayReuse";
diff --git a/jack/tests/com/android/jack/frontend/ClinitTest.java b/jack/tests/com/android/jack/frontend/ClinitTest.java
index f66a8df..028e3d6 100644
--- a/jack/tests/com/android/jack/frontend/ClinitTest.java
+++ b/jack/tests/com/android/jack/frontend/ClinitTest.java
@@ -16,7 +16,6 @@
 
 package com.android.jack.frontend;
 
-import com.android.jack.Main;
 import com.android.jack.TestTools;
 import com.android.jack.ir.ast.JAsgOperation;
 import com.android.jack.ir.ast.JBlock;
@@ -28,7 +27,6 @@ import com.android.jack.util.NamingTools;
 
 import junit.framework.Assert;
 
-import org.junit.Before;
 import org.junit.Test;
 
 import java.util.List;
@@ -40,11 +38,6 @@ public class ClinitTest {
   public static final String CLASS_BINARY_NAME
     = "com/android/jack/clinit/jack/ClInit";
 
-  @Before
-  public void setUp() throws Exception {
-    Main.class.getClassLoader().setDefaultAssertionStatus(true);
-  }
-
   @Test
   public void searchStaticInit() throws Exception {
     JMethod clinit = TestTools.getJMethodWithRejectAllFilter(
diff --git a/jack/tests/com/android/jack/frontend/ConstantReuseTest.java b/jack/tests/com/android/jack/frontend/ConstantReuseTest.java
index 3253449..efb36df 100644
--- a/jack/tests/com/android/jack/frontend/ConstantReuseTest.java
+++ b/jack/tests/com/android/jack/frontend/ConstantReuseTest.java
@@ -19,7 +19,6 @@ package com.android.jack.frontend;
 
 import com.android.jack.TestTools;
 
-import org.junit.Before;
 import org.junit.Test;
 
 import java.io.File;
@@ -30,10 +29,6 @@ public class ConstantReuseTest {
   private static String CLASS_SIGNATURE = "L" + CLASS_BINARY_NAME + ";";
   private static File TEST_FILE = TestTools.getJackTestFromBinaryName(CLASS_BINARY_NAME);
 
-  @Before
-  public void setUp() throws Exception {
-    ConstantReuseTest.class.getClassLoader().setDefaultAssertionStatus(true);
-  }
 
   @Test
   public void intConstantReuse() throws Exception {
diff --git a/jack/tests/com/android/jack/frontend/FieldModifierTest.java b/jack/tests/com/android/jack/frontend/FieldModifierTest.java
index e8d4427..b369614 100644
--- a/jack/tests/com/android/jack/frontend/FieldModifierTest.java
+++ b/jack/tests/com/android/jack/frontend/FieldModifierTest.java
@@ -40,8 +40,6 @@ public class FieldModifierTest {
 
   @Before
   public void setUp() throws Exception {
-    FieldModifierTest.class.getClassLoader().setDefaultAssertionStatus(true);
-
     Options jackArgs =
         TestTools.buildCommandLineArgs(TestTools
             .getJackTestFromBinaryName(FIELD_MODIFIER_BINARY_NAME));
diff --git a/jack/tests/com/android/jack/frontend/GotoTest.java b/jack/tests/com/android/jack/frontend/GotoTest.java
index 2bedb5b..559cda0 100644
--- a/jack/tests/com/android/jack/frontend/GotoTest.java
+++ b/jack/tests/com/android/jack/frontend/GotoTest.java
@@ -30,7 +30,7 @@ import com.android.jack.ir.sourceinfo.SourceInfo;
 import junit.framework.Assert;
 import junit.framework.AssertionFailedError;
 
-import org.junit.Before;
+import org.junit.Assume;
 import org.junit.Test;
 
 import java.util.List;
@@ -38,13 +38,11 @@ import java.util.List;
 public class GotoTest {
   private static final String TEST_CLASS_BINARY_NAME = "com/android/jack/frontend/SynthetizeCode";
 
-  @Before
-  public void setUp() throws Exception {
-    GotoTest.class.getClassLoader().setDefaultAssertionStatus(true);
-  }
-
   @Test
   public void dumpGoto() throws Exception {
+
+    Assume.assumeTrue(TestTools.areAssertionsEnabled());
+
     JMethod dumpGoto = TestTools.getJMethodWithRejectAllFilter(
         TestTools.getJackUnitTestFromBinaryName(TEST_CLASS_BINARY_NAME),
         "L" + TEST_CLASS_BINARY_NAME + ";", "synthetizeCode()V");
diff --git a/jack/tests/com/android/jack/frontend/InitTest.java b/jack/tests/com/android/jack/frontend/InitTest.java
index db60fbb..8d7dd6c 100644
--- a/jack/tests/com/android/jack/frontend/InitTest.java
+++ b/jack/tests/com/android/jack/frontend/InitTest.java
@@ -22,16 +22,10 @@ import com.android.jack.util.NamingTools;
 
 import junit.framework.Assert;
 
-import org.junit.Before;
 import org.junit.Test;
 
 public class InitTest {
 
-  @Before
-  public void setUp() throws Exception {
-    ConstantReuseTest.class.getClassLoader().setDefaultAssertionStatus(true);
-  }
-
   @Test
   public void searchInit() throws Exception {
     String binaryName = "com/android/jack/fibonacci/test001/jack/Fibo";
diff --git a/jack/tests/com/android/jack/frontend/MethodModifierTest.java b/jack/tests/com/android/jack/frontend/MethodModifierTest.java
index c0e1d22..cabb893 100644
--- a/jack/tests/com/android/jack/frontend/MethodModifierTest.java
+++ b/jack/tests/com/android/jack/frontend/MethodModifierTest.java
@@ -38,8 +38,6 @@ public class MethodModifierTest {
 
   @Before
   public void setUp() throws Exception {
-    MethodModifierTest.class.getClassLoader().setDefaultAssertionStatus(true);
-
     Options jackArgs = TestTools.buildCommandLineArgs(
         TestTools.getJackTestFromBinaryName(classBinaryName));
     jackArgs.addProperty(Options.METHOD_FILTER.getName(), "reject-all-methods");
diff --git a/jack/tests/com/android/jack/frontend/SwitchTest.java b/jack/tests/com/android/jack/frontend/SwitchTest.java
index d4598af..8c3fbc5 100644
--- a/jack/tests/com/android/jack/frontend/SwitchTest.java
+++ b/jack/tests/com/android/jack/frontend/SwitchTest.java
@@ -27,7 +27,6 @@ import com.android.jack.util.filter.SignatureMethodFilter;
 
 import junit.framework.Assert;
 
-import org.junit.Before;
 import org.junit.Test;
 
 import java.io.File;
@@ -44,11 +43,6 @@ public class SwitchTest {
   @Nonnull
   private static final File FILE = TestTools.getJackTestFromBinaryName(CLASS_BINARY_NAME);
 
-  @Before
-  public void setUp() throws Exception {
-    SwitchTest.class.getClassLoader().setDefaultAssertionStatus(true);
-  }
-
   @Test
   public void testCompileSwitch001() throws Exception {
     final String methodSignature = "switch001(I)I";
diff --git a/jack/tests/com/android/jack/frontend/SynchronizedTest.java b/jack/tests/com/android/jack/frontend/SynchronizedTest.java
index 9d27177..0b50034 100644
--- a/jack/tests/com/android/jack/frontend/SynchronizedTest.java
+++ b/jack/tests/com/android/jack/frontend/SynchronizedTest.java
@@ -36,7 +36,6 @@ import com.android.jack.util.filter.SignatureMethodFilter;
 
 import junit.framework.Assert;
 
-import org.junit.Before;
 import org.junit.Test;
 
 import java.io.File;
@@ -52,11 +51,6 @@ public class SynchronizedTest {
   @Nonnull
   private static final File FILE = TestTools.getJackTestFromBinaryName(CLASS_BINARY_NAME);
 
-  @Before
-  public void setUp() throws Exception {
-    SynchronizedTest.class.getClassLoader().setDefaultAssertionStatus(true);
-  }
-
   @Test
   public void testSynchronizedBlock() throws Exception {
     final String methodSignature = "sync(I)I";
diff --git a/jack/tests/com/android/jack/frontend/TypeModifierTest.java b/jack/tests/com/android/jack/frontend/TypeModifierTest.java
index 78a3084..9be7154 100644
--- a/jack/tests/com/android/jack/frontend/TypeModifierTest.java
+++ b/jack/tests/com/android/jack/frontend/TypeModifierTest.java
@@ -34,8 +34,6 @@ public class TypeModifierTest {
 
   @Before
   public void setUp() throws Exception {
-    TypeModifierTest.class.getClassLoader().setDefaultAssertionStatus(true);
-
     Options jackArgs = TestTools.buildCommandLineArgs(
         TestTools.getJackTestFromBinaryName(OUTER_CLASS_BINARY_NAME));
     jackArgs.addProperty(Options.METHOD_FILTER.getName(), "reject-all-methods");
diff --git a/jack/tests/com/android/jack/gwt/BaseGenerationTest.java b/jack/tests/com/android/jack/gwt/BaseGenerationTest.java
index 4a336ce..f97cac8 100644
--- a/jack/tests/com/android/jack/gwt/BaseGenerationTest.java
+++ b/jack/tests/com/android/jack/gwt/BaseGenerationTest.java
@@ -16,7 +16,6 @@
 
 package com.android.jack.gwt;
 
-import com.android.jack.Main;
 import com.android.jack.ir.ast.JAbsentArrayDimension;
 import com.android.jack.ir.ast.JArrayType;
 import com.android.jack.ir.ast.JExpression;
@@ -29,7 +28,6 @@ import com.android.jack.util.DefaultTextOutput;
 
 import junit.framework.Assert;
 
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -37,11 +35,6 @@ import java.util.List;
 
 public class BaseGenerationTest {
 
-  @BeforeClass
-  public static void setUpClass() throws Exception {
-    Main.class.getClassLoader().setDefaultAssertionStatus(true);
-  }
-
   @Test
   public void toStringNewArray001() {
     List<JExpression> dims = new ArrayList<JExpression>();
diff --git a/jack/tests/com/android/jack/gwt/BinaryLookup.java b/jack/tests/com/android/jack/gwt/BinaryLookup.java
index 5eda472..b68699c 100644
--- a/jack/tests/com/android/jack/gwt/BinaryLookup.java
+++ b/jack/tests/com/android/jack/gwt/BinaryLookup.java
@@ -17,7 +17,6 @@
 package com.android.jack.gwt;
 
 import com.android.jack.Jack;
-import com.android.jack.Main;
 import com.android.jack.Options;
 import com.android.jack.TestTools;
 import com.android.jack.ir.ast.JConstructor;
@@ -37,6 +36,7 @@ import com.android.sched.util.RunnableHooks;
 import junit.framework.Assert;
 
 import org.junit.AfterClass;
+import org.junit.Assume;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -48,8 +48,6 @@ public class BinaryLookup {
 
   @BeforeClass
   public static void setUpClass() throws Exception {
-    Main.class.getClassLoader().setDefaultAssertionStatus(true);
-
     Options fiboArgs = TestTools.buildCommandLineArgs(
         TestTools.getJackTestFromBinaryName("com/android/jack/fibonacci/test001/jack/Fibo"));
     fiboArgs.addProperty(Options.METHOD_FILTER.getName(), "reject-all-methods");
@@ -98,6 +96,8 @@ public class BinaryLookup {
 
   @Test
   public void lookupJavaLangStringError2() throws JTypeLookupException {
+    Assume.assumeTrue(TestTools.areAssertionsEnabled());
+
     boolean fail = false;
     try {
       lookup.getType("java/lang/String;");
@@ -111,6 +111,8 @@ public class BinaryLookup {
 
   @Test
   public void lookupTypeError1() throws JTypeLookupException {
+    Assume.assumeTrue(TestTools.areAssertionsEnabled());
+
     boolean fail = false;
     try {
       lookup.getType("L;");
@@ -124,6 +126,8 @@ public class BinaryLookup {
 
   @Test
   public void lookupTypeError2() throws JTypeLookupException {
+    Assume.assumeTrue(TestTools.areAssertionsEnabled());
+
     boolean fail = false;
     try {
       lookup.getType("");
@@ -137,6 +141,8 @@ public class BinaryLookup {
 
   @Test
   public void lookupTypeError3() throws JTypeLookupException {
+    Assume.assumeTrue(TestTools.areAssertionsEnabled());
+
     boolean fail = false;
     try {
       lookup.getType("L/C;");
@@ -150,6 +156,8 @@ public class BinaryLookup {
 
   @Test
   public void lookupTypeError4() throws JTypeLookupException {
+    Assume.assumeTrue(TestTools.areAssertionsEnabled());
+
     boolean fail = false;
     try {
       lookup.getType("Lp/;");
@@ -163,6 +171,8 @@ public class BinaryLookup {
 
   @Test
   public void lookupTypeError5() throws JTypeLookupException {
+    Assume.assumeTrue(TestTools.areAssertionsEnabled());
+
     boolean fail = false;
     try {
       lookup.getType("E");
@@ -176,6 +186,8 @@ public class BinaryLookup {
 
   @Test
   public void lookupArrayError1() throws JTypeLookupException {
+    Assume.assumeTrue(TestTools.areAssertionsEnabled());
+
     boolean fail = false;
     try {
       lookup.getType("[[[[");
diff --git a/jack/tests/com/android/jack/ir/ast/MarkerCollectorTest.java b/jack/tests/com/android/jack/ir/ast/MarkerCollectorTest.java
index 06f35ea..5bce10e 100644
--- a/jack/tests/com/android/jack/ir/ast/MarkerCollectorTest.java
+++ b/jack/tests/com/android/jack/ir/ast/MarkerCollectorTest.java
@@ -50,7 +50,6 @@ public class MarkerCollectorTest {
 
   @BeforeClass
   public static void setUp() throws Exception {
-    MarkerCollectorTest.class.getClassLoader().setDefaultAssertionStatus(true);
     Options options = new Options();
     RunnableHooks hooks = new RunnableHooks();
     options.checkValidity(hooks);
diff --git a/jack/tests/com/android/jack/ir/impl/ReferenceMapperTest.java b/jack/tests/com/android/jack/ir/impl/ReferenceMapperTest.java
index 0caf341..da2ac84 100644
--- a/jack/tests/com/android/jack/ir/impl/ReferenceMapperTest.java
+++ b/jack/tests/com/android/jack/ir/impl/ReferenceMapperTest.java
@@ -16,11 +16,8 @@
 
 package com.android.jack.ir.impl;
 
-import com.android.jack.Main;
-
 import junit.framework.Assert;
 
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 /**
@@ -28,12 +25,6 @@ import org.junit.Test;
  */
 public class ReferenceMapperTest {
 
-  @BeforeClass
-  public static void setUpClass() {
-    // Enable assertions
-    Main.class.getClassLoader().setDefaultAssertionStatus(true);
-  }
-
   private static final String[] TYPES =
     { "Z", "B", "C", "S", "I", "J", "F", "D", "Ljava/lang/Object;" };
 
diff --git a/jack/tests/com/android/jack/optimizations/ExpressionSimplifierTest.java b/jack/tests/com/android/jack/optimizations/ExpressionSimplifierTest.java
index 44af485..0632f5a 100644
--- a/jack/tests/com/android/jack/optimizations/ExpressionSimplifierTest.java
+++ b/jack/tests/com/android/jack/optimizations/ExpressionSimplifierTest.java
@@ -89,7 +89,6 @@ public class ExpressionSimplifierTest {
   }
   @BeforeClass
   public static void setUp() throws Exception {
-    ExpressionSimplifierTest.class.getClassLoader().setDefaultAssertionStatus(true);
     Options options = new Options();
     RunnableHooks hooks = new RunnableHooks();
     options.checkValidity(hooks);
diff --git a/jack/tests/com/android/jack/preprocessor/PreProcessorTest.java b/jack/tests/com/android/jack/preprocessor/PreProcessorTest.java
index cb38d2a..098463e 100644
--- a/jack/tests/com/android/jack/preprocessor/PreProcessorTest.java
+++ b/jack/tests/com/android/jack/preprocessor/PreProcessorTest.java
@@ -16,7 +16,6 @@
 
 package com.android.jack.preprocessor;
 
-import com.android.jack.Main;
 import com.android.jack.Options;
 import com.android.jack.TestTools;
 import com.android.jack.ir.ast.JAnnotationType;
@@ -30,7 +29,6 @@ import junit.framework.Assert;
 
 import org.antlr.runtime.ANTLRFileStream;
 import org.antlr.runtime.CommonTokenStream;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.io.File;
@@ -38,11 +36,6 @@ import java.util.Collection;
 
 public class PreProcessorTest {
 
-  @BeforeClass
-  public static void setUpClass() throws Exception {
-    Main.class.getClassLoader().setDefaultAssertionStatus(true);
-  }
-
   @Test
   public void test001() throws Exception {
     File testDir = TestTools.getJackTestsWithJackFolder("preprocessor/test001");
diff --git a/jack/tests/com/android/jack/shrob/TreeTest.java b/jack/tests/com/android/jack/shrob/TreeTest.java
index 7823d29..bf27811 100644
--- a/jack/tests/com/android/jack/shrob/TreeTest.java
+++ b/jack/tests/com/android/jack/shrob/TreeTest.java
@@ -16,7 +16,6 @@
 
 package com.android.jack.shrob;
 
-import com.android.jack.Main;
 import com.android.jack.Options;
 import com.android.jack.ProguardFlags;
 import com.android.jack.TestTools;
@@ -40,7 +39,6 @@ public class TreeTest {
 
   @BeforeClass
   public static void setUpClass() {
-    Main.class.getClassLoader().setDefaultAssertionStatus(true);
     CORE_SOURCELIST = TestTools.getTargetLibSourcelist("core-libart");
   }
 
diff --git a/jack/tests/com/android/jack/statistics/BlockStatisticsOnCore.java b/jack/tests/com/android/jack/statistics/BlockStatisticsOnCore.java
index 15a4abd..11b6a13 100644
--- a/jack/tests/com/android/jack/statistics/BlockStatisticsOnCore.java
+++ b/jack/tests/com/android/jack/statistics/BlockStatisticsOnCore.java
@@ -33,7 +33,6 @@ import com.android.sched.scheduler.SubPlanBuilder;
 
 import junit.framework.Assert;
 
-import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -42,11 +41,6 @@ import javax.annotation.Nonnull;
 @Ignore("Tree")
 public class BlockStatisticsOnCore {
 
-  @BeforeClass
-  public static void setUpClass() {
-    BlockStatisticsOnCore.class.getClassLoader().setDefaultAssertionStatus(true);
-  }
-
   @Test
   public void computeBlockStatOnCore() throws Exception {
     Options compilerArgs =
diff --git a/jack/tests/com/android/jack/transformations/ast/ImplicitBlockTest.java b/jack/tests/com/android/jack/transformations/ast/ImplicitBlockTest.java
index 7d9a920..d967ecc 100644
--- a/jack/tests/com/android/jack/transformations/ast/ImplicitBlockTest.java
+++ b/jack/tests/com/android/jack/transformations/ast/ImplicitBlockTest.java
@@ -34,7 +34,6 @@ import com.android.sched.scheduler.SubPlanBuilder;
 
 import junit.framework.Assert;
 
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.io.File;
@@ -49,11 +48,6 @@ public class ImplicitBlockTest {
   @Nonnull
   private static final File FILE = TestTools.getJackTestFromBinaryName(CLASS_BINARY_NAME);
 
-  @BeforeClass
-  public static void setUp() throws Exception {
-    ImplicitBlockTest.class.getClassLoader().setDefaultAssertionStatus(true);
-  }
-
   @Test
   public void implicitBlockIfThen() throws Exception {
     buildMethodWithImplicitBlock("ifThen(I)I");
diff --git a/jack/tests/com/android/jack/transformations/ast/SynchronizedTest.java b/jack/tests/com/android/jack/transformations/ast/SynchronizedTest.java
index fbc2e97..101317b 100644
--- a/jack/tests/com/android/jack/transformations/ast/SynchronizedTest.java
+++ b/jack/tests/com/android/jack/transformations/ast/SynchronizedTest.java
@@ -41,7 +41,6 @@ import com.android.sched.scheduler.SubPlanBuilder;
 
 import junit.framework.Assert;
 
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.io.File;
@@ -59,11 +58,6 @@ public class SynchronizedTest {
   @Nonnull
   private static final File FILE = TestTools.getJackTestFromBinaryName(CLASS_BINARY_NAME);
 
-  @BeforeClass
-  public static void setUp() throws Exception {
-    SynchronizedTest.class.getClassLoader().setDefaultAssertionStatus(true);
-  }
-
   @Test
   public void synchronizedStaticMethod() throws Exception {
     JMethod method = buildMethodAndRunSynchronizeTransformer("syncStaticMethod(I)I");
diff --git a/jack/tests/com/android/jack/transformations/ast/TypeLegalizerTest.java b/jack/tests/com/android/jack/transformations/ast/TypeLegalizerTest.java
index 0207a4e..4c785fa 100644
--- a/jack/tests/com/android/jack/transformations/ast/TypeLegalizerTest.java
+++ b/jack/tests/com/android/jack/transformations/ast/TypeLegalizerTest.java
@@ -28,7 +28,6 @@ import com.android.jack.ir.ast.JPrimitiveType.JPrimitiveTypeEnum;
 import com.android.jack.ir.sourceinfo.SourceInfo;
 import com.android.jack.transformations.request.TransformationRequest;
 
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -36,10 +35,6 @@ import java.util.List;
 
 public class TypeLegalizerTest {
 
-  @BeforeClass
-  public static void setUp() throws Exception {
-    TypeLegalizerTest.class.getClassLoader().setDefaultAssertionStatus(true);
-  }
 
   @Test
   public void testNewArrayWithJLongLiteralAsDimension() throws Exception {
diff --git a/jack/tests/com/android/jack/transformations/ast/string/StringSplittingTest.java b/jack/tests/com/android/jack/transformations/ast/string/StringSplittingTest.java
index e781bac..da19bac 100644
--- a/jack/tests/com/android/jack/transformations/ast/string/StringSplittingTest.java
+++ b/jack/tests/com/android/jack/transformations/ast/string/StringSplittingTest.java
@@ -19,16 +19,10 @@ package com.android.jack.transformations.ast.string;
 import com.android.jack.signature.GenericSignatureParser;
 
 import org.junit.Assert;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class StringSplittingTest {
 
-  @BeforeClass
-  public static void setUpClass() throws Exception {
-    StringSplittingTest.class.getClassLoader().setDefaultAssertionStatus(true);
-  }
-
   @Test
   public void testTypeStringSplitting() {
     DummyAction parserActions = new DummyAction();
diff --git a/jack/tests/com/android/jack/transformations/cast/UselessCastRemoverTest.java b/jack/tests/com/android/jack/transformations/cast/UselessCastRemoverTest.java
index da5db0c..cd8cbd5 100644
--- a/jack/tests/com/android/jack/transformations/cast/UselessCastRemoverTest.java
+++ b/jack/tests/com/android/jack/transformations/cast/UselessCastRemoverTest.java
@@ -25,7 +25,6 @@ import com.android.jack.ir.ast.JVisitor;
 
 import junit.framework.Assert;
 
-import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -41,11 +40,6 @@ public class UselessCastRemoverTest {
   @Nonnull
   private static final String CAST_USELESS003 = "com/android/jack/cast/useless003/jack/UselessCast";
 
-  @BeforeClass
-  public static void setUp() throws Exception {
-    UselessCastRemoverTest.class.getClassLoader().setDefaultAssertionStatus(true);
-  }
-
   @Test
   public void castObjectToArray() throws Exception {
     final String methodSignature = "castObjectToArray(Ljava/lang/Object;)[Ljava/lang/Object;";