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/error | |
parent | c33c369849c5864b1e918fb4995cd88a2f67aba4 (diff) | |
download | toolchain_jack-f1828481ebcfee3bddc323fca178a4502a60ceef.tar.gz toolchain_jack-f1828481ebcfee3bddc323fca178a4502a60ceef.tar.bz2 toolchain_jack-f1828481ebcfee3bddc323fca178a4502a60ceef.zip |
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/error')
5 files changed, 0 insertions, 34 deletions
diff --git a/jack-tests/tests/com/android/jack/error/AnnotationProcessorErrorTest.java b/jack-tests/tests/com/android/jack/error/AnnotationProcessorErrorTest.java index 9eb04ed0..eb0c93f3 100644 --- a/jack-tests/tests/com/android/jack/error/AnnotationProcessorErrorTest.java +++ b/jack-tests/tests/com/android/jack/error/AnnotationProcessorErrorTest.java @@ -19,7 +19,6 @@ package com.android.jack.error; import com.google.common.io.Files; import com.android.jack.JackAbortException; -import com.android.jack.Main; import com.android.jack.backend.jayce.JayceFileImporter.CollisionPolicy; import com.android.jack.errorhandling.annotationprocessor.ResourceAnnotationProcessor; import com.android.jack.errorhandling.annotationprocessor.ResourceAnnotationTest; @@ -38,7 +37,6 @@ import junit.framework.Assert; import org.jf.dexlib.ClassDefItem; import org.jf.dexlib.DexFile; -import org.junit.BeforeClass; import org.junit.Test; import java.io.ByteArrayOutputStream; @@ -56,11 +54,6 @@ import javax.annotation.Nonnull; */ public class AnnotationProcessorErrorTest { - @BeforeClass - public static void setUpClass() { - Main.class.getClassLoader().setDefaultAssertionStatus(true); - } - /** * Checks that compilation succeed when running annotation processor to generate resource file. */ diff --git a/jack-tests/tests/com/android/jack/error/CommandLineErrorTest.java b/jack-tests/tests/com/android/jack/error/CommandLineErrorTest.java index 30379d50..a404a8bc 100644 --- a/jack-tests/tests/com/android/jack/error/CommandLineErrorTest.java +++ b/jack-tests/tests/com/android/jack/error/CommandLineErrorTest.java @@ -16,7 +16,6 @@ package com.android.jack.error; -import com.android.jack.Main; import com.android.jack.frontend.FrontendCompilationException; import com.android.jack.test.helper.ErrorTestHelper; import com.android.jack.test.toolchain.AbstractTestTools; @@ -24,7 +23,6 @@ import com.android.jack.test.toolchain.JackApiToolchainBase; import junit.framework.Assert; -import org.junit.BeforeClass; import org.junit.Test; import java.io.ByteArrayOutputStream; @@ -35,11 +33,6 @@ import java.io.File; */ public class CommandLineErrorTest { - @BeforeClass - public static void setUpClass() { - Main.class.getClassLoader().setDefaultAssertionStatus(true); - } - /** * Checks that compilation ends correctly when arguments define no source and no import. */ diff --git a/jack-tests/tests/com/android/jack/error/ErrorTest.java b/jack-tests/tests/com/android/jack/error/ErrorTest.java index cb419a09..3afc22b6 100644 --- a/jack-tests/tests/com/android/jack/error/ErrorTest.java +++ b/jack-tests/tests/com/android/jack/error/ErrorTest.java @@ -22,7 +22,6 @@ import com.android.jack.test.toolchain.JackApiToolchainBase; import junit.framework.Assert; -import org.junit.BeforeClass; import org.junit.Test; import java.io.ByteArrayOutputStream; @@ -35,11 +34,6 @@ import javax.annotation.Nonnull; */ public class ErrorTest { - @BeforeClass - public static void setUpClass() { - ErrorTest.class.getClassLoader().setDefaultAssertionStatus(true); - } - @Test public void testError001() throws Exception { checkInternalCompilerException("error.test001"); diff --git a/jack-tests/tests/com/android/jack/error/FileAccessErrorTest.java b/jack-tests/tests/com/android/jack/error/FileAccessErrorTest.java index 5ee022a2..d4429c52 100644 --- a/jack-tests/tests/com/android/jack/error/FileAccessErrorTest.java +++ b/jack-tests/tests/com/android/jack/error/FileAccessErrorTest.java @@ -18,7 +18,6 @@ package com.android.jack.error; import com.android.jack.JackAbortException; import com.android.jack.JackUserException; -import com.android.jack.Main; import com.android.jack.backend.jayce.JayceFileImporter; import com.android.jack.library.FileType; import com.android.jack.library.InputJackLibrary; @@ -37,7 +36,6 @@ import com.android.sched.vfs.InputVFile; import junit.framework.Assert; -import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -50,11 +48,6 @@ import java.util.Iterator; */ public class FileAccessErrorTest { - @BeforeClass - public static void setUpClass() { - Main.class.getClassLoader().setDefaultAssertionStatus(true); - } - /** * Checks that compilation fails correctly when folder to generate jack files is not readable. */ diff --git a/jack-tests/tests/com/android/jack/error/JayceFormatErrorTest.java b/jack-tests/tests/com/android/jack/error/JayceFormatErrorTest.java index f670a0b7..adfea25d 100644 --- a/jack-tests/tests/com/android/jack/error/JayceFormatErrorTest.java +++ b/jack-tests/tests/com/android/jack/error/JayceFormatErrorTest.java @@ -17,7 +17,6 @@ package com.android.jack.error; import com.android.jack.JackAbortException; -import com.android.jack.Main; import com.android.jack.jayce.JayceProperties; import com.android.jack.library.FileType; import com.android.jack.library.JackLibrary; @@ -31,7 +30,6 @@ import com.android.jack.test.toolchain.JackApiToolchainBase; import junit.framework.Assert; -import org.junit.BeforeClass; import org.junit.Test; import java.io.ByteArrayOutputStream; @@ -42,11 +40,6 @@ import java.io.File; */ public class JayceFormatErrorTest { - @BeforeClass - public static void setUpClass() { - Main.class.getClassLoader().setDefaultAssertionStatus(true); - } - /** * Checks that compilation fails correctly when a jayce file is corrupted. */ |