diff --git a/tests/src/test/java/org/teavm/classlib/java/io/BufferedInputStreamTest.java b/tests/src/test/java/org/teavm/classlib/java/io/BufferedInputStreamTest.java index 25971f46d..440f472a0 100644 --- a/tests/src/test/java/org/teavm/classlib/java/io/BufferedInputStreamTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/io/BufferedInputStreamTest.java @@ -43,11 +43,9 @@ import java.io.InputStreamReader; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @SuppressWarnings("resource") @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class BufferedInputStreamTest { @Test public void test_ConstructorLjava_io_InputStream() { diff --git a/tests/src/test/java/org/teavm/classlib/java/io/BufferedReaderTest.java b/tests/src/test/java/org/teavm/classlib/java/io/BufferedReaderTest.java index d38a1619e..15295b630 100644 --- a/tests/src/test/java/org/teavm/classlib/java/io/BufferedReaderTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/io/BufferedReaderTest.java @@ -23,10 +23,8 @@ import java.io.StringReader; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class BufferedReaderTest { @Test public void readsCharacters() throws IOException { diff --git a/tests/src/test/java/org/teavm/classlib/java/io/BufferedWriterTest.java b/tests/src/test/java/org/teavm/classlib/java/io/BufferedWriterTest.java index 951bf95a4..1c93eedfa 100644 --- a/tests/src/test/java/org/teavm/classlib/java/io/BufferedWriterTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/io/BufferedWriterTest.java @@ -30,10 +30,8 @@ import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class BufferedWriterTest { private BufferedWriter bw; private StringWriter sw; diff --git a/tests/src/test/java/org/teavm/classlib/java/io/ByteArrayInputStreamTest.java b/tests/src/test/java/org/teavm/classlib/java/io/ByteArrayInputStreamTest.java index 831771307..9d517745e 100644 --- a/tests/src/test/java/org/teavm/classlib/java/io/ByteArrayInputStreamTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/io/ByteArrayInputStreamTest.java @@ -20,10 +20,8 @@ import java.io.ByteArrayInputStream; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class ByteArrayInputStreamTest { @Test public void readsSingleByte() { diff --git a/tests/src/test/java/org/teavm/classlib/java/io/CharArrayReaderTest.java b/tests/src/test/java/org/teavm/classlib/java/io/CharArrayReaderTest.java index 52b1713c1..a913c8391 100644 --- a/tests/src/test/java/org/teavm/classlib/java/io/CharArrayReaderTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/io/CharArrayReaderTest.java @@ -26,10 +26,8 @@ import java.nio.ReadOnlyBufferException; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class CharArrayReaderTest { char[] hw = { 'H', 'e', 'l', 'l', 'o', 'W', 'o', 'r', 'l', 'd' }; CharArrayReader cr; diff --git a/tests/src/test/java/org/teavm/classlib/java/io/CharArrayWriterTest.java b/tests/src/test/java/org/teavm/classlib/java/io/CharArrayWriterTest.java index 1d43611f5..a35c2e38c 100644 --- a/tests/src/test/java/org/teavm/classlib/java/io/CharArrayWriterTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/io/CharArrayWriterTest.java @@ -25,10 +25,8 @@ import java.io.StringWriter; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class CharArrayWriterTest { char[] hw = { 'H', 'e', 'l', 'l', 'o', 'W', 'o', 'r', 'l', 'd' }; CharArrayWriter cw = new CharArrayWriter(); diff --git a/tests/src/test/java/org/teavm/classlib/java/io/FileInputStreamTest.java b/tests/src/test/java/org/teavm/classlib/java/io/FileInputStreamTest.java index 44f06c692..e53eb8cd1 100644 --- a/tests/src/test/java/org/teavm/classlib/java/io/FileInputStreamTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/io/FileInputStreamTest.java @@ -31,10 +31,8 @@ import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class FileInputStreamTest { public String fileName; public String fileString = "" diff --git a/tests/src/test/java/org/teavm/classlib/java/io/FileOutputStreamTest.java b/tests/src/test/java/org/teavm/classlib/java/io/FileOutputStreamTest.java index c4cf7bd43..460b06076 100644 --- a/tests/src/test/java/org/teavm/classlib/java/io/FileOutputStreamTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/io/FileOutputStreamTest.java @@ -28,10 +28,8 @@ import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class FileOutputStreamTest { private String fileName; private String fileString = diff --git a/tests/src/test/java/org/teavm/classlib/java/io/FileTest.java b/tests/src/test/java/org/teavm/classlib/java/io/FileTest.java index 2b297e4e8..0e7ccf9db 100644 --- a/tests/src/test/java/org/teavm/classlib/java/io/FileTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/io/FileTest.java @@ -37,10 +37,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.interop.PlatformMarker; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class FileTest { private static String platformId = "JDK" + System.getProperty("java.vm.version").replace('.', '-'); diff --git a/tests/src/test/java/org/teavm/classlib/java/io/InputStreamReaderTest.java b/tests/src/test/java/org/teavm/classlib/java/io/InputStreamReaderTest.java index 127257ef0..dabe966c0 100644 --- a/tests/src/test/java/org/teavm/classlib/java/io/InputStreamReaderTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/io/InputStreamReaderTest.java @@ -22,10 +22,8 @@ import java.io.InputStreamReader; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class InputStreamReaderTest { @Test public void readsChars() throws IOException { diff --git a/tests/src/test/java/org/teavm/classlib/java/io/InputStreamTest.java b/tests/src/test/java/org/teavm/classlib/java/io/InputStreamTest.java index 4637d728d..e9e8bde31 100644 --- a/tests/src/test/java/org/teavm/classlib/java/io/InputStreamTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/io/InputStreamTest.java @@ -22,10 +22,8 @@ import java.io.InputStream; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class InputStreamTest { @Test @SuppressWarnings("resource") diff --git a/tests/src/test/java/org/teavm/classlib/java/io/OutputStreamWriterTest.java b/tests/src/test/java/org/teavm/classlib/java/io/OutputStreamWriterTest.java index 2b0b03296..09e8c99f0 100644 --- a/tests/src/test/java/org/teavm/classlib/java/io/OutputStreamWriterTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/io/OutputStreamWriterTest.java @@ -45,10 +45,8 @@ import java.io.UnsupportedEncodingException; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class OutputStreamWriterTest { private static final int UPPER = 0xd800; diff --git a/tests/src/test/java/org/teavm/classlib/java/io/PipedInputStreamTest.java b/tests/src/test/java/org/teavm/classlib/java/io/PipedInputStreamTest.java index 4bb0ae672..15be22fc1 100644 --- a/tests/src/test/java/org/teavm/classlib/java/io/PipedInputStreamTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/io/PipedInputStreamTest.java @@ -24,9 +24,11 @@ import java.io.PipedOutputStream; import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.TeaVMTestRunner; @RunWith(TeaVMTestRunner.class) +@EachTestCompiledSeparately public class PipedInputStreamTest { static class PWriter implements Runnable { PipedOutputStream pos; diff --git a/tests/src/test/java/org/teavm/classlib/java/io/PipedOutputStreamTest.java b/tests/src/test/java/org/teavm/classlib/java/io/PipedOutputStreamTest.java index 3c680bb69..48f2d0a6c 100644 --- a/tests/src/test/java/org/teavm/classlib/java/io/PipedOutputStreamTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/io/PipedOutputStreamTest.java @@ -25,9 +25,11 @@ import java.io.PipedOutputStream; import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.TeaVMTestRunner; @RunWith(TeaVMTestRunner.class) +@EachTestCompiledSeparately public class PipedOutputStreamTest { static class PReader implements Runnable { PipedInputStream reader; diff --git a/tests/src/test/java/org/teavm/classlib/java/io/PrintWriterTest.java b/tests/src/test/java/org/teavm/classlib/java/io/PrintWriterTest.java index 7cb06d5b9..fc045f6b8 100644 --- a/tests/src/test/java/org/teavm/classlib/java/io/PrintWriterTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/io/PrintWriterTest.java @@ -47,10 +47,8 @@ import java.util.Locale; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class PrintWriterTest { static class Bogus { public String toString() { diff --git a/tests/src/test/java/org/teavm/classlib/java/io/PushbackInputStreamTest.java b/tests/src/test/java/org/teavm/classlib/java/io/PushbackInputStreamTest.java index 8e7f285b2..59b416be9 100644 --- a/tests/src/test/java/org/teavm/classlib/java/io/PushbackInputStreamTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/io/PushbackInputStreamTest.java @@ -41,11 +41,9 @@ import java.io.PushbackInputStream; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @SuppressWarnings("resource") @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class PushbackInputStreamTest { PushbackInputStream pis; diff --git a/tests/src/test/java/org/teavm/classlib/java/io/StreamTokenizerTest.java b/tests/src/test/java/org/teavm/classlib/java/io/StreamTokenizerTest.java index d0a5761e1..f225aa26f 100644 --- a/tests/src/test/java/org/teavm/classlib/java/io/StreamTokenizerTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/io/StreamTokenizerTest.java @@ -26,10 +26,8 @@ import java.io.StringReader; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class StreamTokenizerTest { private StreamTokenizer st; diff --git a/tests/src/test/java/org/teavm/classlib/java/io/StringWriterTest.java b/tests/src/test/java/org/teavm/classlib/java/io/StringWriterTest.java index e13bd3bc1..9a62c3e54 100644 --- a/tests/src/test/java/org/teavm/classlib/java/io/StringWriterTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/io/StringWriterTest.java @@ -23,10 +23,8 @@ import java.io.StringWriter; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class StringWriterTest { StringWriter sw = new StringWriter(); diff --git a/tests/src/test/java/org/teavm/classlib/java/lang/ByteTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/ByteTest.java index 08c2ef065..9eafcdf23 100644 --- a/tests/src/test/java/org/teavm/classlib/java/lang/ByteTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/lang/ByteTest.java @@ -20,9 +20,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; -@WholeClassCompilation @RunWith(TeaVMTestRunner.class) public class ByteTest { @Test diff --git a/tests/src/test/java/org/teavm/classlib/java/lang/ClassLoaderTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/ClassLoaderTest.java index 81e503312..7d99c0d71 100644 --- a/tests/src/test/java/org/teavm/classlib/java/lang/ClassLoaderTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/lang/ClassLoaderTest.java @@ -23,9 +23,11 @@ import java.io.InputStream; import java.io.InputStreamReader; import org.junit.Test; import org.junit.runner.RunWith; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.TeaVMTestRunner; @RunWith(TeaVMTestRunner.class) +@EachTestCompiledSeparately public class ClassLoaderTest { @Test public void loadsResources() { diff --git a/tests/src/test/java/org/teavm/classlib/java/lang/EnumTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/EnumTest.java index ee73b0f50..0376879d7 100644 --- a/tests/src/test/java/org/teavm/classlib/java/lang/EnumTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/lang/EnumTest.java @@ -20,9 +20,11 @@ import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; import org.junit.Test; import org.junit.runner.RunWith; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.TeaVMTestRunner; @RunWith(TeaVMTestRunner.class) +@EachTestCompiledSeparately public class EnumTest { private enum Foo { A, B, C diff --git a/tests/src/test/java/org/teavm/classlib/java/lang/IntegerTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/IntegerTest.java index aff6ef5b9..a706bc467 100644 --- a/tests/src/test/java/org/teavm/classlib/java/lang/IntegerTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/lang/IntegerTest.java @@ -21,10 +21,8 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class IntegerTest { @Test public void testRightUnsignedShift() { diff --git a/tests/src/test/java/org/teavm/classlib/java/lang/LongTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/LongTest.java index 3b970e8a6..e0697782f 100644 --- a/tests/src/test/java/org/teavm/classlib/java/lang/LongTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/lang/LongTest.java @@ -21,10 +21,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.SkipJVM; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class LongTest { @Test diff --git a/tests/src/test/java/org/teavm/classlib/java/lang/ObjectTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/ObjectTest.java index 7d516da53..e1b180245 100644 --- a/tests/src/test/java/org/teavm/classlib/java/lang/ObjectTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/lang/ObjectTest.java @@ -22,9 +22,11 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import org.junit.Test; import org.junit.runner.RunWith; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.TeaVMTestRunner; @RunWith(TeaVMTestRunner.class) +@EachTestCompiledSeparately public class ObjectTest { @Test public void objectCreated() { diff --git a/tests/src/test/java/org/teavm/classlib/java/lang/ShortTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/ShortTest.java index 3a41d2121..2f265ec77 100644 --- a/tests/src/test/java/org/teavm/classlib/java/lang/ShortTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/lang/ShortTest.java @@ -20,9 +20,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; -@WholeClassCompilation @RunWith(TeaVMTestRunner.class) public class ShortTest { @Test diff --git a/tests/src/test/java/org/teavm/classlib/java/lang/StringBuilderTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/StringBuilderTest.java index 266ef4725..dfabd189c 100644 --- a/tests/src/test/java/org/teavm/classlib/java/lang/StringBuilderTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/lang/StringBuilderTest.java @@ -19,10 +19,8 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class StringBuilderTest { @Test public void integerAppended() { diff --git a/tests/src/test/java/org/teavm/classlib/java/lang/StringTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/StringTest.java index 9259028f1..e15c7d91a 100644 --- a/tests/src/test/java/org/teavm/classlib/java/lang/StringTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/lang/StringTest.java @@ -24,9 +24,13 @@ import static org.junit.Assert.assertTrue; import java.io.UnsupportedEncodingException; import org.junit.Test; import org.junit.runner.RunWith; +import org.teavm.junit.EachTestCompiledSeparately; +import org.teavm.junit.SkipPlatform; import org.teavm.junit.TeaVMTestRunner; +import org.teavm.junit.TestPlatform; @RunWith(TeaVMTestRunner.class) +@EachTestCompiledSeparately public class StringTest { @Test public void charsExtracted() { @@ -102,7 +106,7 @@ public class StringTest { } @Test - public void endsWithWorkds() { + public void endsWithWorks() { assertTrue("12345".endsWith("45")); } @@ -310,12 +314,14 @@ public class StringTest { } @Test + @SkipPlatform({ TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI }) public void interns() { assertSame("xabc".substring(1).intern(), "abcx".substring(0, 3).intern()); assertSame("xabc".substring(1).intern(), "abc"); } @Test + @SkipPlatform({ TestPlatform.C, TestPlatform.WEBASSEMBLY, TestPlatform.WASI }) public void internsConstants() { assertSame("abc", ("a" + "bc").intern()); } diff --git a/tests/src/test/java/org/teavm/classlib/java/lang/SystemTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/SystemTest.java index 40a735d00..a76b46b25 100644 --- a/tests/src/test/java/org/teavm/classlib/java/lang/SystemTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/lang/SystemTest.java @@ -25,10 +25,12 @@ import java.io.PrintStream; import java.util.Properties; import org.junit.Test; import org.junit.runner.RunWith; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.SkipJVM; import org.teavm.junit.TeaVMTestRunner; @RunWith(TeaVMTestRunner.class) +@EachTestCompiledSeparately public class SystemTest { @Test public void copiesArray() { diff --git a/tests/src/test/java/org/teavm/classlib/java/lang/ThreadTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/ThreadTest.java index d2c62b990..544ff424e 100644 --- a/tests/src/test/java/org/teavm/classlib/java/lang/ThreadTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/lang/ThreadTest.java @@ -23,9 +23,11 @@ import java.util.ArrayList; import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.TeaVMTestRunner; @RunWith(TeaVMTestRunner.class) +@EachTestCompiledSeparately public class ThreadTest { @Test public void sleeps() throws InterruptedException { diff --git a/tests/src/test/java/org/teavm/classlib/java/lang/ThrowableTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/ThrowableTest.java index 1404ed866..274a20dc2 100644 --- a/tests/src/test/java/org/teavm/classlib/java/lang/ThrowableTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/lang/ThrowableTest.java @@ -19,9 +19,11 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import org.junit.Test; import org.junit.runner.RunWith; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.TeaVMTestRunner; @RunWith(TeaVMTestRunner.class) +@EachTestCompiledSeparately public class ThrowableTest { @Test public void causeWorks() { diff --git a/tests/src/test/java/org/teavm/classlib/java/lang/invoke/SerializedLambdaTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/invoke/SerializedLambdaTest.java index c33598c1b..b85db1dbb 100644 --- a/tests/src/test/java/org/teavm/classlib/java/lang/invoke/SerializedLambdaTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/lang/invoke/SerializedLambdaTest.java @@ -23,9 +23,11 @@ import java.lang.reflect.Method; import java.util.function.Function; import org.junit.Test; import org.junit.runner.RunWith; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.TeaVMTestRunner; @RunWith(TeaVMTestRunner.class) +@EachTestCompiledSeparately public class SerializedLambdaTest { @Test public void serializableLambdaHasWriteReplaceMethod() throws NoSuchMethodException, InvocationTargetException, diff --git a/tests/src/test/java/org/teavm/classlib/java/lang/ref/WeakReferenceTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/ref/WeakReferenceTest.java index d4ff531bd..3c8e36c41 100644 --- a/tests/src/test/java/org/teavm/classlib/java/lang/ref/WeakReferenceTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/lang/ref/WeakReferenceTest.java @@ -25,11 +25,13 @@ import java.util.concurrent.ArrayBlockingQueue; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.SkipJVM; import org.teavm.junit.TeaVMTestRunner; @RunWith(TeaVMTestRunner.class) @SkipJVM +@EachTestCompiledSeparately public class WeakReferenceTest { private Node lastNode; diff --git a/tests/src/test/java/org/teavm/classlib/java/lang/reflect/ArrayTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/reflect/ArrayTest.java index 8bd89e0f3..cb5a7cb6e 100644 --- a/tests/src/test/java/org/teavm/classlib/java/lang/reflect/ArrayTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/lang/reflect/ArrayTest.java @@ -20,9 +20,11 @@ import static org.junit.Assert.assertEquals; import java.lang.reflect.Array; import org.junit.Test; import org.junit.runner.RunWith; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.TeaVMTestRunner; @RunWith(TeaVMTestRunner.class) +@EachTestCompiledSeparately public class ArrayTest { @Test public void createsNewInstance() { diff --git a/tests/src/test/java/org/teavm/classlib/java/lang/reflect/ConstructorTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/reflect/ConstructorTest.java index 85f94b3de..d818ec001 100644 --- a/tests/src/test/java/org/teavm/classlib/java/lang/reflect/ConstructorTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/lang/reflect/ConstructorTest.java @@ -25,9 +25,11 @@ import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.classlib.support.Reflectable; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.TeaVMTestRunner; @RunWith(TeaVMTestRunner.class) +@EachTestCompiledSeparately public class ConstructorTest { @Test public void constructorsEnumerated() { diff --git a/tests/src/test/java/org/teavm/classlib/java/lang/reflect/FieldTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/reflect/FieldTest.java index 5ecc15b37..5569cdf86 100644 --- a/tests/src/test/java/org/teavm/classlib/java/lang/reflect/FieldTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/lang/reflect/FieldTest.java @@ -21,10 +21,12 @@ import java.lang.reflect.Field; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.classlib.support.Reflectable; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.SkipJVM; import org.teavm.junit.TeaVMTestRunner; @RunWith(TeaVMTestRunner.class) +@EachTestCompiledSeparately public class FieldTest { @Test public void fieldsEnumerated() { diff --git a/tests/src/test/java/org/teavm/classlib/java/lang/reflect/MethodTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/reflect/MethodTest.java index 6d5185e1e..0257010c0 100644 --- a/tests/src/test/java/org/teavm/classlib/java/lang/reflect/MethodTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/lang/reflect/MethodTest.java @@ -24,9 +24,11 @@ import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.classlib.support.Reflectable; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.TeaVMTestRunner; @RunWith(TeaVMTestRunner.class) +@EachTestCompiledSeparately public class MethodTest { @Test public void methodsEnumerated() { diff --git a/tests/src/test/java/org/teavm/classlib/java/math/BigDecimalArithmeticTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigDecimalArithmeticTest.java index 95564c4ef..d585ef3be 100644 --- a/tests/src/test/java/org/teavm/classlib/java/math/BigDecimalArithmeticTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/math/BigDecimalArithmeticTest.java @@ -42,10 +42,8 @@ import java.math.RoundingMode; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class BigDecimalArithmeticTest { /** * Add two numbers of equal positive scales diff --git a/tests/src/test/java/org/teavm/classlib/java/math/BigDecimalCompareTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigDecimalCompareTest.java index c176700be..cc385c90b 100644 --- a/tests/src/test/java/org/teavm/classlib/java/math/BigDecimalCompareTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/math/BigDecimalCompareTest.java @@ -47,10 +47,8 @@ import java.math.RoundingMode; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class BigDecimalCompareTest { /** * Abs() of a negative BigDecimal diff --git a/tests/src/test/java/org/teavm/classlib/java/math/BigDecimalConstructorsTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigDecimalConstructorsTest.java index 7df6a4f23..33195b950 100644 --- a/tests/src/test/java/org/teavm/classlib/java/math/BigDecimalConstructorsTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/math/BigDecimalConstructorsTest.java @@ -45,10 +45,8 @@ import java.math.RoundingMode; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class BigDecimalConstructorsTest { /** * check ONE diff --git a/tests/src/test/java/org/teavm/classlib/java/math/BigDecimalConvertTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigDecimalConvertTest.java index b5203709c..7fbc543e6 100644 --- a/tests/src/test/java/org/teavm/classlib/java/math/BigDecimalConvertTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/math/BigDecimalConvertTest.java @@ -44,10 +44,8 @@ import java.math.BigInteger; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class BigDecimalConvertTest { /** * Double value of a negative BigDecimal diff --git a/tests/src/test/java/org/teavm/classlib/java/math/BigDecimalScaleOperationsTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigDecimalScaleOperationsTest.java index 181f3562e..6af1b1685 100644 --- a/tests/src/test/java/org/teavm/classlib/java/math/BigDecimalScaleOperationsTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/math/BigDecimalScaleOperationsTest.java @@ -45,10 +45,8 @@ import java.math.RoundingMode; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class BigDecimalScaleOperationsTest { /** * Check the default scale diff --git a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerAddTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerAddTest.java index 96c6809b3..0413ac054 100644 --- a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerAddTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerAddTest.java @@ -42,10 +42,8 @@ import java.math.BigInteger; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class BigIntegerAddTest { /** * Add two positive numbers of the same length diff --git a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerAndTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerAndTest.java index f5fb90c79..54e619450 100644 --- a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerAndTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerAndTest.java @@ -42,10 +42,8 @@ import java.math.BigInteger; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class BigIntegerAndTest { /** * And for zero and a positive number diff --git a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerCompareTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerCompareTest.java index 6b57d5378..ffe40dc3f 100644 --- a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerCompareTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerCompareTest.java @@ -43,10 +43,8 @@ import java.math.BigInteger; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class BigIntegerCompareTest { /** * abs() for a positive number diff --git a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerConstructorsTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerConstructorsTest.java index b395aa8d2..3a48460ff 100644 --- a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerConstructorsTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerConstructorsTest.java @@ -44,10 +44,8 @@ import java.util.Random; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class BigIntegerConstructorsTest { /** * Create a number from an array of bytes. diff --git a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerConvertTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerConvertTest.java index 66e552853..e2c15e977 100644 --- a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerConvertTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerConvertTest.java @@ -42,10 +42,8 @@ import java.math.BigInteger; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class BigIntegerConvertTest { /** * Return the double value of ZERO. diff --git a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerDivideTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerDivideTest.java index a6a2ce31d..83ae5ddb1 100644 --- a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerDivideTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerDivideTest.java @@ -43,10 +43,8 @@ import java.math.BigInteger; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class BigIntegerDivideTest { /** * Divide by zero diff --git a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerHashCodeTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerHashCodeTest.java index 9e56561a1..683e8d4cf 100644 --- a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerHashCodeTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerHashCodeTest.java @@ -41,10 +41,8 @@ import java.math.BigInteger; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class BigIntegerHashCodeTest { /** * Test hash codes for the same object diff --git a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerModPowTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerModPowTest.java index 233b4978c..f4b44acfa 100644 --- a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerModPowTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerModPowTest.java @@ -43,10 +43,8 @@ import java.math.BigInteger; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class BigIntegerModPowTest { /** * modPow: non-positive modulus diff --git a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerMultiplyTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerMultiplyTest.java index 82bbaa04c..5917a7824 100644 --- a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerMultiplyTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerMultiplyTest.java @@ -43,10 +43,8 @@ import java.math.BigInteger; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class BigIntegerMultiplyTest { /** * Multiply two negative numbers of the same length diff --git a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerNotTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerNotTest.java index 7a2888fe6..99a4a9d24 100644 --- a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerNotTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerNotTest.java @@ -42,10 +42,8 @@ import java.math.BigInteger; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class BigIntegerNotTest { /** * andNot for two positive numbers; the first is longer diff --git a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerOperateBitsTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerOperateBitsTest.java index 227c62c83..251e0574b 100644 --- a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerOperateBitsTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerOperateBitsTest.java @@ -43,10 +43,8 @@ import java.math.BigInteger; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class BigIntegerOperateBitsTest { /** * bitCount() of zero. diff --git a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerOrTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerOrTest.java index 542354dbb..8e8ed2fa7 100644 --- a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerOrTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerOrTest.java @@ -42,10 +42,8 @@ import java.math.BigInteger; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class BigIntegerOrTest { /** * Or for zero and a positive number diff --git a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerSubtractTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerSubtractTest.java index 6b67f4b7b..c8c43a5a4 100644 --- a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerSubtractTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerSubtractTest.java @@ -42,10 +42,8 @@ import java.math.BigInteger; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class BigIntegerSubtractTest { /** * Subtract two positive numbers of the same length. diff --git a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerToStringTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerToStringTest.java index 0e35c5911..4107bfcda 100644 --- a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerToStringTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerToStringTest.java @@ -41,10 +41,8 @@ import java.math.BigInteger; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class BigIntegerToStringTest { /** * If 36 < radix < 2 it should be set to 10 diff --git a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerXorTest.java b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerXorTest.java index d8c45634d..ae476095e 100644 --- a/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerXorTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/math/BigIntegerXorTest.java @@ -41,10 +41,8 @@ import java.math.BigInteger; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class BigIntegerXorTest { /** * Xor for zero and a positive number diff --git a/tests/src/test/java/org/teavm/classlib/java/net/URLDecoderTest.java b/tests/src/test/java/org/teavm/classlib/java/net/URLDecoderTest.java index 8025fa988..53fde7c57 100644 --- a/tests/src/test/java/org/teavm/classlib/java/net/URLDecoderTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/net/URLDecoderTest.java @@ -24,10 +24,8 @@ import java.net.URLEncoder; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class URLDecoderTest { @Test diff --git a/tests/src/test/java/org/teavm/classlib/java/net/URLEncoderTest.java b/tests/src/test/java/org/teavm/classlib/java/net/URLEncoderTest.java index 773c55857..ed1af43d4 100644 --- a/tests/src/test/java/org/teavm/classlib/java/net/URLEncoderTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/net/URLEncoderTest.java @@ -24,10 +24,8 @@ import java.net.URLEncoder; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class URLEncoderTest { @Test diff --git a/tests/src/test/java/org/teavm/classlib/java/net/URLTest.java b/tests/src/test/java/org/teavm/classlib/java/net/URLTest.java index f65fa0a46..b97ddcfd8 100644 --- a/tests/src/test/java/org/teavm/classlib/java/net/URLTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/net/URLTest.java @@ -31,10 +31,8 @@ import java.net.URLStreamHandlerFactory; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class URLTest { URL u; URL u1; diff --git a/tests/src/test/java/org/teavm/classlib/java/nio/ByteBufferTest.java b/tests/src/test/java/org/teavm/classlib/java/nio/ByteBufferTest.java index 999d3dcd5..842c66b8f 100644 --- a/tests/src/test/java/org/teavm/classlib/java/nio/ByteBufferTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/nio/ByteBufferTest.java @@ -31,10 +31,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.classlib.java.lang.DoubleTest; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class ByteBufferTest { @Test public void allocatesDirect() { diff --git a/tests/src/test/java/org/teavm/classlib/java/nio/ByteBufferWrapperTest.java b/tests/src/test/java/org/teavm/classlib/java/nio/ByteBufferWrapperTest.java index 9db590624..e91388ef4 100644 --- a/tests/src/test/java/org/teavm/classlib/java/nio/ByteBufferWrapperTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/nio/ByteBufferWrapperTest.java @@ -27,10 +27,8 @@ import java.nio.ShortBuffer; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class ByteBufferWrapperTest { @Test public void wrapsIntoShortBuffer() { diff --git a/tests/src/test/java/org/teavm/classlib/java/nio/CharBufferTest.java b/tests/src/test/java/org/teavm/classlib/java/nio/CharBufferTest.java index f174bf5cd..db4aed25e 100644 --- a/tests/src/test/java/org/teavm/classlib/java/nio/CharBufferTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/nio/CharBufferTest.java @@ -28,10 +28,8 @@ import java.nio.ReadOnlyBufferException; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class CharBufferTest { @Test public void allocates() { diff --git a/tests/src/test/java/org/teavm/classlib/java/nio/DoubleBufferTest.java b/tests/src/test/java/org/teavm/classlib/java/nio/DoubleBufferTest.java index ea11e882a..de77b0e83 100644 --- a/tests/src/test/java/org/teavm/classlib/java/nio/DoubleBufferTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/nio/DoubleBufferTest.java @@ -27,10 +27,8 @@ import java.nio.ReadOnlyBufferException; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class DoubleBufferTest { @Test public void allocatesSimple() { diff --git a/tests/src/test/java/org/teavm/classlib/java/nio/FloatBufferTest.java b/tests/src/test/java/org/teavm/classlib/java/nio/FloatBufferTest.java index 5189866b5..49b8e9277 100644 --- a/tests/src/test/java/org/teavm/classlib/java/nio/FloatBufferTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/nio/FloatBufferTest.java @@ -27,10 +27,8 @@ import java.nio.ReadOnlyBufferException; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class FloatBufferTest { @Test public void allocatesSimple() { diff --git a/tests/src/test/java/org/teavm/classlib/java/nio/IntBufferTest.java b/tests/src/test/java/org/teavm/classlib/java/nio/IntBufferTest.java index d7f207f99..34c347e73 100644 --- a/tests/src/test/java/org/teavm/classlib/java/nio/IntBufferTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/nio/IntBufferTest.java @@ -28,10 +28,8 @@ import java.nio.ReadOnlyBufferException; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class IntBufferTest { @Test public void allocatesSimple() { diff --git a/tests/src/test/java/org/teavm/classlib/java/nio/LongBufferTest.java b/tests/src/test/java/org/teavm/classlib/java/nio/LongBufferTest.java index ef1557d0a..16375fbd6 100644 --- a/tests/src/test/java/org/teavm/classlib/java/nio/LongBufferTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/nio/LongBufferTest.java @@ -27,10 +27,8 @@ import java.nio.ReadOnlyBufferException; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class LongBufferTest { @Test public void allocatesSimple() { diff --git a/tests/src/test/java/org/teavm/classlib/java/nio/ShortBufferTest.java b/tests/src/test/java/org/teavm/classlib/java/nio/ShortBufferTest.java index bb506de62..50cdb5d66 100644 --- a/tests/src/test/java/org/teavm/classlib/java/nio/ShortBufferTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/nio/ShortBufferTest.java @@ -27,10 +27,8 @@ import java.nio.ShortBuffer; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class ShortBufferTest { @Test public void allocatesSimple() { diff --git a/tests/src/test/java/org/teavm/classlib/java/nio/charset/AsciiTest.java b/tests/src/test/java/org/teavm/classlib/java/nio/charset/AsciiTest.java index 4a048d97e..3b7082a91 100644 --- a/tests/src/test/java/org/teavm/classlib/java/nio/charset/AsciiTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/nio/charset/AsciiTest.java @@ -20,10 +20,8 @@ import java.nio.charset.StandardCharsets; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class AsciiTest { private static String hex = CharsetTestCommon.bytesToHex(convert(CharsetTestCommon.asciiText)); diff --git a/tests/src/test/java/org/teavm/classlib/java/nio/charset/Iso8859Test.java b/tests/src/test/java/org/teavm/classlib/java/nio/charset/Iso8859Test.java index 15ec97c57..7080f4a4b 100644 --- a/tests/src/test/java/org/teavm/classlib/java/nio/charset/Iso8859Test.java +++ b/tests/src/test/java/org/teavm/classlib/java/nio/charset/Iso8859Test.java @@ -22,10 +22,8 @@ import java.nio.charset.StandardCharsets; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class Iso8859Test { private static String hex = CharsetTestCommon.bytesToHex(convert(CharsetTestCommon.asciiText)); diff --git a/tests/src/test/java/org/teavm/classlib/java/nio/charset/UTF16Test.java b/tests/src/test/java/org/teavm/classlib/java/nio/charset/UTF16Test.java index f22de041b..67bd37ee9 100644 --- a/tests/src/test/java/org/teavm/classlib/java/nio/charset/UTF16Test.java +++ b/tests/src/test/java/org/teavm/classlib/java/nio/charset/UTF16Test.java @@ -20,10 +20,8 @@ import java.nio.charset.StandardCharsets; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class UTF16Test { private static String hexLE = CharsetTestCommon.bytesToHex(convertLE(CharsetTestCommon.text)); private static String hexBE = CharsetTestCommon.bytesToHex(convertBE(CharsetTestCommon.text)); diff --git a/tests/src/test/java/org/teavm/classlib/java/nio/charset/UTF8Test.java b/tests/src/test/java/org/teavm/classlib/java/nio/charset/UTF8Test.java index b71005902..922190d9f 100644 --- a/tests/src/test/java/org/teavm/classlib/java/nio/charset/UTF8Test.java +++ b/tests/src/test/java/org/teavm/classlib/java/nio/charset/UTF8Test.java @@ -26,10 +26,8 @@ import java.util.Arrays; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class UTF8Test { private String hex = "" + "D097D0B4D0B5D181D18C20D0B220D0BCD0BED0B5D0BC20D0BED0B1D18AD18FD181D0BDD0B5D0BDD0B8D0B820D18F20D0BED" diff --git a/tests/src/test/java/org/teavm/classlib/java/text/DateFormatTest.java b/tests/src/test/java/org/teavm/classlib/java/text/DateFormatTest.java index f24a69020..3c67e1d44 100644 --- a/tests/src/test/java/org/teavm/classlib/java/text/DateFormatTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/text/DateFormatTest.java @@ -26,10 +26,8 @@ import java.util.TimeZone; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class DateFormatTest { public DateFormatTest() { TimeZone.setDefault(TimeZone.getTimeZone("GMT")); diff --git a/tests/src/test/java/org/teavm/classlib/java/text/DecimalFormatParseTest.java b/tests/src/test/java/org/teavm/classlib/java/text/DecimalFormatParseTest.java index 9f8382ff2..c36b87045 100644 --- a/tests/src/test/java/org/teavm/classlib/java/text/DecimalFormatParseTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/text/DecimalFormatParseTest.java @@ -24,12 +24,14 @@ import java.text.ParseException; import java.util.Locale; import org.junit.Test; import org.junit.runner.RunWith; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.TeaVMProperties; import org.teavm.junit.TeaVMProperty; import org.teavm.junit.TeaVMTestRunner; @RunWith(TeaVMTestRunner.class) @TeaVMProperties(@TeaVMProperty(key = "java.util.Locale.available", value = "en, en_US, en_GB, ru, ru_RU")) +@EachTestCompiledSeparately public class DecimalFormatParseTest { private static DecimalFormatSymbols symbols = new DecimalFormatSymbols(Locale.ENGLISH); diff --git a/tests/src/test/java/org/teavm/classlib/java/text/DecimalFormatTest.java b/tests/src/test/java/org/teavm/classlib/java/text/DecimalFormatTest.java index cd39aca31..6a59645de 100644 --- a/tests/src/test/java/org/teavm/classlib/java/text/DecimalFormatTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/text/DecimalFormatTest.java @@ -30,11 +30,9 @@ import org.junit.runner.RunWith; import org.teavm.junit.TeaVMProperties; import org.teavm.junit.TeaVMProperty; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) @TeaVMProperties(@TeaVMProperty(key = "java.util.Locale.available", value = "en, en_US, en_GB, ru, ru_RU")) -@WholeClassCompilation public class DecimalFormatTest { private static DecimalFormatSymbols symbols = new DecimalFormatSymbols(Locale.ENGLISH); diff --git a/tests/src/test/java/org/teavm/classlib/java/text/MessageFormatTest.java b/tests/src/test/java/org/teavm/classlib/java/text/MessageFormatTest.java index b7ffb0e38..0925eea46 100644 --- a/tests/src/test/java/org/teavm/classlib/java/text/MessageFormatTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/text/MessageFormatTest.java @@ -39,10 +39,8 @@ import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class MessageFormatTest { private MessageFormat format1; private MessageFormat format2; diff --git a/tests/src/test/java/org/teavm/classlib/java/text/NumberFormatTest.java b/tests/src/test/java/org/teavm/classlib/java/text/NumberFormatTest.java index 05174c9d2..f65de08fa 100644 --- a/tests/src/test/java/org/teavm/classlib/java/text/NumberFormatTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/text/NumberFormatTest.java @@ -21,6 +21,7 @@ import java.util.Currency; import java.util.Locale; import org.junit.Test; import org.junit.runner.RunWith; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.SkipJVM; import org.teavm.junit.TeaVMProperties; import org.teavm.junit.TeaVMProperty; @@ -28,6 +29,7 @@ import org.teavm.junit.TeaVMTestRunner; @RunWith(TeaVMTestRunner.class) @TeaVMProperties(@TeaVMProperty(key = "java.util.Locale.available", value = "en, en_US, en_GB, ru, ru_RU")) +@EachTestCompiledSeparately public class NumberFormatTest { @Test public void formatsNumber() { diff --git a/tests/src/test/java/org/teavm/classlib/java/text/SimpleDateFormatTest.java b/tests/src/test/java/org/teavm/classlib/java/text/SimpleDateFormatTest.java index f6148a61b..77f791254 100644 --- a/tests/src/test/java/org/teavm/classlib/java/text/SimpleDateFormatTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/text/SimpleDateFormatTest.java @@ -27,10 +27,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.SkipJVM; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class SimpleDateFormatTest { public SimpleDateFormatTest() { TimeZone.setDefault(TimeZone.getTimeZone("GMT")); diff --git a/tests/src/test/java/org/teavm/classlib/java/time/TestClock.java b/tests/src/test/java/org/teavm/classlib/java/time/TestClock.java index 2aa318fdd..f045d3a09 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/TestClock.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/TestClock.java @@ -52,7 +52,6 @@ import java.time.Instant; import java.time.ZoneId; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.Test; /** @@ -60,7 +59,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestClock { static class MockInstantClock extends Clock { diff --git a/tests/src/test/java/org/teavm/classlib/java/time/TestClockFixed.java b/tests/src/test/java/org/teavm/classlib/java/time/TestClockFixed.java index 349b1ee94..6766c7f48 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/TestClockFixed.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/TestClockFixed.java @@ -55,7 +55,6 @@ import java.time.ZoneId; import java.time.ZoneOffset; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.Test; /** @@ -63,7 +62,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestClockFixed extends AbstractTest { private static final ZoneId MOSCOW = ZoneId.of("Europe/Moscow"); diff --git a/tests/src/test/java/org/teavm/classlib/java/time/TestClockOffset.java b/tests/src/test/java/org/teavm/classlib/java/time/TestClockOffset.java index c627f9d53..b34a2a357 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/TestClockOffset.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/TestClockOffset.java @@ -56,7 +56,6 @@ import java.time.ZoneId; import java.time.ZoneOffset; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.Test; /** @@ -64,7 +63,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestClockOffset extends AbstractTest { private static final ZoneId MOSCOW = ZoneId.of("Europe/Moscow"); diff --git a/tests/src/test/java/org/teavm/classlib/java/time/TestClockSystem.java b/tests/src/test/java/org/teavm/classlib/java/time/TestClockSystem.java index d8df822b8..a481a7094 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/TestClockSystem.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/TestClockSystem.java @@ -55,7 +55,6 @@ import java.time.ZoneId; import java.time.ZoneOffset; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.Test; /** @@ -63,7 +62,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestClockSystem extends AbstractTest { private static final ZoneId MOSCOW = ZoneId.of("Europe/Moscow"); diff --git a/tests/src/test/java/org/teavm/classlib/java/time/TestClockTick.java b/tests/src/test/java/org/teavm/classlib/java/time/TestClockTick.java index 6dcddf090..27c00cbe8 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/TestClockTick.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/TestClockTick.java @@ -57,7 +57,6 @@ import java.time.ZoneOffset; import java.time.ZonedDateTime; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.Test; /** @@ -65,7 +64,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestClockTick extends AbstractTest { private static final ZoneId MOSCOW = ZoneId.of("Europe/Moscow"); diff --git a/tests/src/test/java/org/teavm/classlib/java/time/TestDateTimesImplementation.java b/tests/src/test/java/org/teavm/classlib/java/time/TestDateTimesImplementation.java index 6a7759abc..6c300d941 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/TestDateTimesImplementation.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/TestDateTimesImplementation.java @@ -49,7 +49,6 @@ package org.teavm.classlib.java.time; import static org.testng.Assert.assertEquals; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import org.threeten.bp.jdk8.Jdk8Methods; @@ -59,7 +58,6 @@ import org.threeten.bp.jdk8.Jdk8Methods; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestDateTimesImplementation { //----------------------------------------------------------------------- diff --git a/tests/src/test/java/org/teavm/classlib/java/time/TestDayOfWeek.java b/tests/src/test/java/org/teavm/classlib/java/time/TestDayOfWeek.java index 144f31537..05e6a1da8 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/TestDayOfWeek.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/TestDayOfWeek.java @@ -70,7 +70,6 @@ import java.util.List; import java.util.Locale; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -80,7 +79,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestDayOfWeek extends AbstractDateTimeTest { @BeforeMethod diff --git a/tests/src/test/java/org/teavm/classlib/java/time/TestDuration.java b/tests/src/test/java/org/teavm/classlib/java/time/TestDuration.java index 9af7594a6..3e3c21c13 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/TestDuration.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/TestDuration.java @@ -65,7 +65,6 @@ import java.time.temporal.TemporalUnit; import java.util.Locale; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -74,7 +73,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestDuration extends AbstractTest { //----------------------------------------------------------------------- diff --git a/tests/src/test/java/org/teavm/classlib/java/time/TestInstant.java b/tests/src/test/java/org/teavm/classlib/java/time/TestInstant.java index 1fcbde56a..4a5846252 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/TestInstant.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/TestInstant.java @@ -74,7 +74,6 @@ import java.util.List; import java.util.Locale; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -83,7 +82,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestInstant extends AbstractDateTimeTest { private static final long MIN_SECOND = Instant.MIN.getEpochSecond(); diff --git a/tests/src/test/java/org/teavm/classlib/java/time/TestLocalDate.java b/tests/src/test/java/org/teavm/classlib/java/time/TestLocalDate.java index 5e56ca30c..e1ba0582a 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/TestLocalDate.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/TestLocalDate.java @@ -100,7 +100,6 @@ import java.util.List; import org.junit.runner.RunWith; import org.teavm.classlib.java.time.temporal.MockFieldNoValue; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -110,7 +109,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestLocalDate extends AbstractDateTimeTest { private static final ZoneOffset OFFSET_PONE = ZoneOffset.ofHours(1); diff --git a/tests/src/test/java/org/teavm/classlib/java/time/TestLocalDateTime.java b/tests/src/test/java/org/teavm/classlib/java/time/TestLocalDateTime.java index dc7830679..1e51f111b 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/TestLocalDateTime.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/TestLocalDateTime.java @@ -116,7 +116,6 @@ import java.util.List; import org.junit.runner.RunWith; import org.teavm.classlib.java.time.temporal.MockFieldNoValue; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -126,7 +125,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestLocalDateTime extends AbstractDateTimeTest { private static final ZoneOffset OFFSET_PONE = ZoneOffset.ofHours(1); diff --git a/tests/src/test/java/org/teavm/classlib/java/time/TestLocalTime.java b/tests/src/test/java/org/teavm/classlib/java/time/TestLocalTime.java index 4cf36f6e8..975428a35 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/TestLocalTime.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/TestLocalTime.java @@ -108,7 +108,6 @@ import java.util.List; import org.junit.runner.RunWith; import org.teavm.classlib.java.time.temporal.MockFieldNoValue; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -118,7 +117,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestLocalTime extends AbstractDateTimeTest { private LocalTime test12x30x40x987654321; diff --git a/tests/src/test/java/org/teavm/classlib/java/time/TestMonth.java b/tests/src/test/java/org/teavm/classlib/java/time/TestMonth.java index 9b0b63f7f..097738f91 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/TestMonth.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/TestMonth.java @@ -69,7 +69,6 @@ import java.util.List; import java.util.Locale; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -78,7 +77,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestMonth extends AbstractDateTimeTest { private static final int MAX_LENGTH = 12; diff --git a/tests/src/test/java/org/teavm/classlib/java/time/TestOffsetDateTime.java b/tests/src/test/java/org/teavm/classlib/java/time/TestOffsetDateTime.java index 00b51855b..1d38336a4 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/TestOffsetDateTime.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/TestOffsetDateTime.java @@ -111,7 +111,6 @@ import java.util.Arrays; import java.util.List; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -121,7 +120,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestOffsetDateTime extends AbstractDateTimeTest { private static final ZoneId ZONE_PARIS = ZoneId.of("Europe/Paris"); diff --git a/tests/src/test/java/org/teavm/classlib/java/time/TestOffsetDateTimeInstants.java b/tests/src/test/java/org/teavm/classlib/java/time/TestOffsetDateTimeInstants.java index 23867a3c1..dcc05e757 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/TestOffsetDateTimeInstants.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/TestOffsetDateTimeInstants.java @@ -57,7 +57,6 @@ import java.time.Year; import java.time.ZoneOffset; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.Test; /** @@ -65,7 +64,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestOffsetDateTimeInstants { private static final ZoneOffset OFFSET_PONE = ZoneOffset.ofHours(1); diff --git a/tests/src/test/java/org/teavm/classlib/java/time/TestOffsetTime.java b/tests/src/test/java/org/teavm/classlib/java/time/TestOffsetTime.java index d2e6815e6..3438c1677 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/TestOffsetTime.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/TestOffsetTime.java @@ -96,7 +96,6 @@ import java.util.Arrays; import java.util.List; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -106,7 +105,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestOffsetTime extends AbstractDateTimeTest { private static final ZoneOffset OFFSET_PONE = ZoneOffset.ofHours(1); diff --git a/tests/src/test/java/org/teavm/classlib/java/time/TestPeriod.java b/tests/src/test/java/org/teavm/classlib/java/time/TestPeriod.java index 50651ad4f..dad93d350 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/TestPeriod.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/TestPeriod.java @@ -53,7 +53,6 @@ import java.time.Period; import org.junit.Ignore; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -62,7 +61,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestPeriod extends AbstractTest { //----------------------------------------------------------------------- // factories diff --git a/tests/src/test/java/org/teavm/classlib/java/time/TestZoneId.java b/tests/src/test/java/org/teavm/classlib/java/time/TestZoneId.java index 6f7bfe3be..16dbc0c09 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/TestZoneId.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/TestZoneId.java @@ -70,7 +70,6 @@ import java.util.SimpleTimeZone; import java.util.TimeZone; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.DataProvider; import org.testng.annotations.Ignore; import org.testng.annotations.Test; @@ -80,7 +79,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestZoneId extends AbstractTest { private static final ZoneId ZONE_PARIS = ZoneId.of("Europe/Paris"); diff --git a/tests/src/test/java/org/teavm/classlib/java/time/TestZoneOffset.java b/tests/src/test/java/org/teavm/classlib/java/time/TestZoneOffset.java index fd902e470..6a96221c9 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/TestZoneOffset.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/TestZoneOffset.java @@ -70,7 +70,6 @@ import java.util.Arrays; import java.util.List; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.Test; /** @@ -78,7 +77,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestZoneOffset extends AbstractDateTimeTest { //----------------------------------------------------------------------- diff --git a/tests/src/test/java/org/teavm/classlib/java/time/TestZonedDateTime.java b/tests/src/test/java/org/teavm/classlib/java/time/TestZonedDateTime.java index 39e8dc38f..a0c29d5f0 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/TestZonedDateTime.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/TestZonedDateTime.java @@ -113,7 +113,6 @@ import java.util.List; import org.junit.runner.RunWith; import org.teavm.classlib.java.time.temporal.MockFieldNoValue; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -123,7 +122,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestZonedDateTime extends AbstractDateTimeTest { private static final ZoneOffset OFFSET_0100 = ZoneOffset.ofHours(1); diff --git a/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestChronoLocalDate.java b/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestChronoLocalDate.java index 51e3f7f99..d86c24bc8 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestChronoLocalDate.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestChronoLocalDate.java @@ -72,7 +72,6 @@ import java.util.Locale; import java.util.Map; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -82,7 +81,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestChronoLocalDate { //----------------------------------------------------------------------- // regular data factory for names and descriptions of available calendars diff --git a/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestChronoLocalDateTime.java b/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestChronoLocalDateTime.java index ea84c2af6..8aa2f7f13 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestChronoLocalDateTime.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestChronoLocalDateTime.java @@ -73,7 +73,6 @@ import java.util.Locale; import java.util.Map; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -83,7 +82,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestChronoLocalDateTime { //----------------------------------------------------------------------- // regular data factory for names and descriptions of available calendars diff --git a/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestChronoZonedDateTime.java b/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestChronoZonedDateTime.java index 71bc6433c..40fe013d5 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestChronoZonedDateTime.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestChronoZonedDateTime.java @@ -74,7 +74,6 @@ import java.util.Locale; import java.util.Map; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -84,7 +83,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestChronoZonedDateTime { //----------------------------------------------------------------------- // regular data factory for names and descriptions of available calendars diff --git a/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestChronology.java b/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestChronology.java index 7d65574ba..a521b06c7 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestChronology.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestChronology.java @@ -61,7 +61,6 @@ import java.util.Locale; import java.util.Set; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; @@ -72,7 +71,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestChronology { @BeforeMethod diff --git a/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestHijrahChronology.java b/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestHijrahChronology.java index 980c6d1d4..7082c973e 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestHijrahChronology.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestHijrahChronology.java @@ -64,7 +64,6 @@ import java.time.chrono.IsoChronology; import java.time.temporal.TemporalAdjusters; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Ignore; @@ -77,7 +76,6 @@ import org.testng.annotations.Test; @Test @Ignore @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestHijrahChronology { //----------------------------------------------------------------------- diff --git a/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestIsoChronology.java b/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestIsoChronology.java index daaccab1d..674808643 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestIsoChronology.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestIsoChronology.java @@ -68,7 +68,6 @@ import java.time.temporal.ChronoField; import java.time.temporal.TemporalAdjusters; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -78,7 +77,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestIsoChronology { //----------------------------------------------------------------------- diff --git a/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestJapaneseChronology.java b/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestJapaneseChronology.java index 0c1842ba0..848c26ec1 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestJapaneseChronology.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestJapaneseChronology.java @@ -64,7 +64,6 @@ import java.time.temporal.TemporalAdjusters; import java.util.List; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -74,7 +73,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestJapaneseChronology { //----------------------------------------------------------------------- diff --git a/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestMinguoChronology.java b/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestMinguoChronology.java index c15e82c26..131088bde 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestMinguoChronology.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestMinguoChronology.java @@ -66,7 +66,6 @@ import java.time.temporal.ChronoUnit; import java.time.temporal.TemporalAdjusters; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -76,7 +75,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestMinguoChronology { //----------------------------------------------------------------------- diff --git a/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestThaiBuddhistChronology.java b/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestThaiBuddhistChronology.java index 1f34d4b5c..1749af4e4 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestThaiBuddhistChronology.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/chrono/TestThaiBuddhistChronology.java @@ -68,7 +68,6 @@ import java.time.temporal.TemporalAdjusters; import java.time.temporal.ValueRange; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -78,7 +77,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestThaiBuddhistChronology { private static final int YDIFF = 543; diff --git a/tests/src/test/java/org/teavm/classlib/java/time/format/TestDateTimeFormatter.java b/tests/src/test/java/org/teavm/classlib/java/time/format/TestDateTimeFormatter.java index 03733eabf..7413d451e 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/format/TestDateTimeFormatter.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/format/TestDateTimeFormatter.java @@ -70,7 +70,6 @@ import java.time.temporal.TemporalQuery; import java.util.Locale; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -79,7 +78,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestDateTimeFormatter { private static final DateTimeFormatter BASIC_FORMATTER = DateTimeFormatter.ofPattern("'ONE'd"); diff --git a/tests/src/test/java/org/teavm/classlib/java/time/format/TestDateTimeFormatterBuilder.java b/tests/src/test/java/org/teavm/classlib/java/time/format/TestDateTimeFormatterBuilder.java index 4983ce99e..7636b4ae3 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/format/TestDateTimeFormatterBuilder.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/format/TestDateTimeFormatterBuilder.java @@ -63,7 +63,6 @@ import java.util.Map; import org.junit.runner.RunWith; import org.teavm.junit.SkipJVM; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -73,7 +72,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestDateTimeFormatterBuilder { private DateTimeFormatterBuilder builder; diff --git a/tests/src/test/java/org/teavm/classlib/java/time/format/TestDateTimeFormatters.java b/tests/src/test/java/org/teavm/classlib/java/time/format/TestDateTimeFormatters.java index e1eef9696..628108fbe 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/format/TestDateTimeFormatters.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/format/TestDateTimeFormatters.java @@ -82,7 +82,6 @@ import java.util.Locale; import java.util.Map; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Ignore; @@ -93,7 +92,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestDateTimeFormatters { @BeforeMethod diff --git a/tests/src/test/java/org/teavm/classlib/java/time/format/TestDateTimeParsing.java b/tests/src/test/java/org/teavm/classlib/java/time/format/TestDateTimeParsing.java index 80dd454cf..07aa74adb 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/format/TestDateTimeParsing.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/format/TestDateTimeParsing.java @@ -69,7 +69,6 @@ import org.junit.runner.RunWith; import org.teavm.junit.TeaVMProperties; import org.teavm.junit.TeaVMProperty; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.DataProvider; import org.testng.annotations.Ignore; import org.testng.annotations.Test; @@ -79,7 +78,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation @TeaVMProperties(@TeaVMProperty(key = "java.util.Locale.available", value = "en, en_US, fr_FR")) public class TestDateTimeParsing { diff --git a/tests/src/test/java/org/teavm/classlib/java/time/format/TestDateTimeTextPrinting.java b/tests/src/test/java/org/teavm/classlib/java/time/format/TestDateTimeTextPrinting.java index e832772b0..e85b4c4d7 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/format/TestDateTimeTextPrinting.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/format/TestDateTimeTextPrinting.java @@ -63,7 +63,6 @@ import org.junit.runner.RunWith; import org.teavm.junit.TeaVMProperties; import org.teavm.junit.TeaVMProperty; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -73,7 +72,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation @TeaVMProperties(@TeaVMProperty(key = "java.util.Locale.available", value = "en, en_US, fr_FR")) public class TestDateTimeTextPrinting { diff --git a/tests/src/test/java/org/teavm/classlib/java/time/format/TestDecimalStyle.java b/tests/src/test/java/org/teavm/classlib/java/time/format/TestDecimalStyle.java index b00d0c192..d671e1fd3 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/format/TestDecimalStyle.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/format/TestDecimalStyle.java @@ -54,7 +54,6 @@ import org.junit.runner.RunWith; import org.teavm.junit.TeaVMProperties; import org.teavm.junit.TeaVMProperty; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.Test; /** @@ -62,7 +61,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation @TeaVMProperties(@TeaVMProperty(key = "java.util.Locale.available", value = "en, en_US")) public class TestDecimalStyle { diff --git a/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestChronoField.java b/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestChronoField.java index 093df95c9..dd0654f9b 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestChronoField.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestChronoField.java @@ -50,7 +50,6 @@ import static org.testng.Assert.assertEquals; import java.time.temporal.ChronoField; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.Test; /** @@ -58,7 +57,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestChronoField { //------------------------------------------------------------------------- diff --git a/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestChronoUnit.java b/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestChronoUnit.java index 078017867..2df046c4d 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestChronoUnit.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestChronoUnit.java @@ -65,7 +65,6 @@ import java.time.ZoneOffset; import java.time.temporal.ChronoUnit; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -74,7 +73,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestChronoUnit { //----------------------------------------------------------------------- diff --git a/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestIsoFields.java b/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestIsoFields.java index 400954d87..041f000cf 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestIsoFields.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestIsoFields.java @@ -64,7 +64,6 @@ import java.time.temporal.IsoFields; import java.time.temporal.ValueRange; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -73,7 +72,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestIsoFields { public void test_enum() { diff --git a/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestJulianFields.java b/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestJulianFields.java index 0a29d6642..81f24fe87 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestJulianFields.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestJulianFields.java @@ -53,7 +53,6 @@ import java.time.temporal.JulianFields; import java.time.temporal.TemporalField; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -63,7 +62,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestJulianFields { private static final LocalDate JAN01_1970 = LocalDate.of(1970, 1, 1); diff --git a/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestMonthDay.java b/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestMonthDay.java index 3ac75c69a..beed24063 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestMonthDay.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestMonthDay.java @@ -78,7 +78,6 @@ import java.util.Set; import org.junit.runner.RunWith; import org.teavm.classlib.java.time.AbstractDateTimeTest; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -88,7 +87,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestMonthDay extends AbstractDateTimeTest { private MonthDay test07x15; diff --git a/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestTemporalAdjusters.java b/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestTemporalAdjusters.java index ed9a26768..f4ff051f6 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestTemporalAdjusters.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestTemporalAdjusters.java @@ -61,7 +61,6 @@ import java.time.Month; import java.time.temporal.TemporalAdjusters; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -70,7 +69,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestTemporalAdjusters { //----------------------------------------------------------------------- diff --git a/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestValueRange.java b/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestValueRange.java index 7077ed88f..238b50767 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestValueRange.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestValueRange.java @@ -51,7 +51,6 @@ import java.time.temporal.ValueRange; import org.junit.runner.RunWith; import org.teavm.classlib.java.time.AbstractTest; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -60,7 +59,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestValueRange extends AbstractTest { //----------------------------------------------------------------------- diff --git a/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestYear.java b/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestYear.java index fbca7750b..8a0252ac0 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestYear.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestYear.java @@ -79,7 +79,6 @@ import java.util.List; import org.junit.runner.RunWith; import org.teavm.classlib.java.time.AbstractDateTimeTest; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -89,7 +88,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestYear extends AbstractDateTimeTest { private static final Year TEST_2008 = Year.of(2008); diff --git a/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestYearMonth.java b/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestYearMonth.java index 6510af894..701281208 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestYearMonth.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/temporal/TestYearMonth.java @@ -82,7 +82,6 @@ import java.util.Set; import org.junit.runner.RunWith; import org.teavm.classlib.java.time.AbstractDateTimeTest; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -92,7 +91,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestYearMonth extends AbstractDateTimeTest { private YearMonth test2008x06; diff --git a/tests/src/test/java/org/teavm/classlib/java/time/zone/TestFixedZoneRules.java b/tests/src/test/java/org/teavm/classlib/java/time/zone/TestFixedZoneRules.java index ae8c50ef0..400e64bd7 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/zone/TestFixedZoneRules.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/zone/TestFixedZoneRules.java @@ -58,7 +58,6 @@ import java.time.zone.ZoneOffsetTransitionRule; import java.time.zone.ZoneRules; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -67,7 +66,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestFixedZoneRules { private static final ZoneOffset OFFSET_PONE = ZoneOffset.ofHours(1); diff --git a/tests/src/test/java/org/teavm/classlib/java/time/zone/TestStandardZoneRules.java b/tests/src/test/java/org/teavm/classlib/java/time/zone/TestStandardZoneRules.java index 462bc78f7..3d36537a7 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/zone/TestStandardZoneRules.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/zone/TestStandardZoneRules.java @@ -74,7 +74,6 @@ import java.util.List; import java.util.Locale; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.Ignore; import org.testng.annotations.Test; @@ -83,7 +82,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestStandardZoneRules { private static final ZoneOffset OFFSET_ZERO = ZoneOffset.ofHours(0); diff --git a/tests/src/test/java/org/teavm/classlib/java/time/zone/TestZoneOffsetTransition.java b/tests/src/test/java/org/teavm/classlib/java/time/zone/TestZoneOffsetTransition.java index 8f2f81a4c..8cd92cedb 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/zone/TestZoneOffsetTransition.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/zone/TestZoneOffsetTransition.java @@ -57,7 +57,6 @@ import java.time.zone.ZoneOffsetTransition; import org.junit.runner.RunWith; import org.teavm.classlib.java.time.AbstractTest; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.Test; /** @@ -65,7 +64,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestZoneOffsetTransition extends AbstractTest { private static final ZoneOffset OFFSET_0100 = ZoneOffset.ofHours(1); diff --git a/tests/src/test/java/org/teavm/classlib/java/time/zone/TestZoneOffsetTransitionRule.java b/tests/src/test/java/org/teavm/classlib/java/time/zone/TestZoneOffsetTransitionRule.java index bebbf3fce..77828b606 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/zone/TestZoneOffsetTransitionRule.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/zone/TestZoneOffsetTransitionRule.java @@ -59,7 +59,6 @@ import java.time.zone.ZoneOffsetTransitionRule.TimeDefinition; import org.junit.runner.RunWith; import org.teavm.classlib.java.time.AbstractTest; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.Test; /** @@ -67,7 +66,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestZoneOffsetTransitionRule extends AbstractTest { private static final LocalTime TIME_0100 = LocalTime.of(1, 0); diff --git a/tests/src/test/java/org/teavm/classlib/java/time/zone/TestZoneRulesProvider.java b/tests/src/test/java/org/teavm/classlib/java/time/zone/TestZoneRulesProvider.java index 43cb8e19f..326bc64bb 100644 --- a/tests/src/test/java/org/teavm/classlib/java/time/zone/TestZoneRulesProvider.java +++ b/tests/src/test/java/org/teavm/classlib/java/time/zone/TestZoneRulesProvider.java @@ -61,7 +61,6 @@ import java.util.Set; import java.util.TreeMap; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.testng.annotations.Test; /** @@ -69,7 +68,6 @@ import org.testng.annotations.Test; */ @Test @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TestZoneRulesProvider { //----------------------------------------------------------------------- diff --git a/tests/src/test/java/org/teavm/classlib/java/util/ArrayListTest.java b/tests/src/test/java/org/teavm/classlib/java/util/ArrayListTest.java index 25f1eb4dd..89e95c4de 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/ArrayListTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/ArrayListTest.java @@ -33,10 +33,8 @@ import java.util.NoSuchElementException; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class ArrayListTest { @Test public void elementsAdded() { diff --git a/tests/src/test/java/org/teavm/classlib/java/util/ArraysTest.java b/tests/src/test/java/org/teavm/classlib/java/util/ArraysTest.java index 11e3b4de7..e6e357903 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/ArraysTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/ArraysTest.java @@ -16,8 +16,8 @@ package org.teavm.classlib.java.util; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -26,10 +26,8 @@ import java.util.stream.Collectors; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class ArraysTest { @Test public void arraySorted() { diff --git a/tests/src/test/java/org/teavm/classlib/java/util/Base64Test.java b/tests/src/test/java/org/teavm/classlib/java/util/Base64Test.java index a9c267e98..de94ef0c0 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/Base64Test.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/Base64Test.java @@ -21,10 +21,8 @@ import java.util.Base64; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class Base64Test { @Test public void decoderWorks() { diff --git a/tests/src/test/java/org/teavm/classlib/java/util/BitSetTest.java b/tests/src/test/java/org/teavm/classlib/java/util/BitSetTest.java index 87c94ff78..49ccffa78 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/BitSetTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/BitSetTest.java @@ -56,10 +56,8 @@ import java.util.BitSet; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class BitSetTest { BitSet eightbs; diff --git a/tests/src/test/java/org/teavm/classlib/java/util/CalendarTest.java b/tests/src/test/java/org/teavm/classlib/java/util/CalendarTest.java index e23c8aaaa..061a947a9 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/CalendarTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/CalendarTest.java @@ -43,10 +43,8 @@ import java.util.TimeZone; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class CalendarTest { Locale defaultLocale; diff --git a/tests/src/test/java/org/teavm/classlib/java/util/ComparatorTest.java b/tests/src/test/java/org/teavm/classlib/java/util/ComparatorTest.java index 76fd8bc7a..bbd5aa5bb 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/ComparatorTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/ComparatorTest.java @@ -22,10 +22,8 @@ import java.util.Comparator; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class ComparatorTest { @Test public void naturalReverseOrder() { diff --git a/tests/src/test/java/org/teavm/classlib/java/util/CurrencyTest.java b/tests/src/test/java/org/teavm/classlib/java/util/CurrencyTest.java index cfb6fdd85..3dc7828d3 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/CurrencyTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/CurrencyTest.java @@ -20,6 +20,7 @@ import java.util.Currency; import java.util.Locale; import org.junit.Test; import org.junit.runner.RunWith; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.SkipJVM; import org.teavm.junit.TeaVMProperties; import org.teavm.junit.TeaVMProperty; @@ -27,6 +28,7 @@ import org.teavm.junit.TeaVMTestRunner; @RunWith(TeaVMTestRunner.class) @TeaVMProperties(@TeaVMProperty(key = "java.util.Locale.available", value = "en, en_US, en_GB, ru, ru_RU")) +@EachTestCompiledSeparately public class CurrencyTest { @Test public void findsByCode() { diff --git a/tests/src/test/java/org/teavm/classlib/java/util/DateTest.java b/tests/src/test/java/org/teavm/classlib/java/util/DateTest.java index e3e16436d..85ae3ef28 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/DateTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/DateTest.java @@ -19,9 +19,11 @@ import static org.junit.Assert.assertEquals; import java.util.Date; import org.junit.Test; import org.junit.runner.RunWith; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.TeaVMTestRunner; @RunWith(TeaVMTestRunner.class) +@EachTestCompiledSeparately public class DateTest { @SuppressWarnings("deprecation") @Test diff --git a/tests/src/test/java/org/teavm/classlib/java/util/FormatterTest.java b/tests/src/test/java/org/teavm/classlib/java/util/FormatterTest.java index 6eb1a5c40..a88dafba4 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/FormatterTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/FormatterTest.java @@ -32,10 +32,8 @@ import java.util.UnknownFormatConversionException; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class FormatterTest { @Test(expected = UnknownFormatConversionException.class) public void unexpectedEndOfFormatString() { diff --git a/tests/src/test/java/org/teavm/classlib/java/util/HashtableTest.java b/tests/src/test/java/org/teavm/classlib/java/util/HashtableTest.java index 5f7426880..897cf2f7f 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/HashtableTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/HashtableTest.java @@ -72,10 +72,8 @@ import org.junit.runner.RunWith; import org.teavm.classlib.support.MapTest2Support; import org.teavm.classlib.support.UnmodifiableCollectionTestSupport; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class HashtableTest { private Hashtable ht10; diff --git a/tests/src/test/java/org/teavm/classlib/java/util/IdentityHashMapTest.java b/tests/src/test/java/org/teavm/classlib/java/util/IdentityHashMapTest.java index 151b8a82f..d598f47ee 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/IdentityHashMapTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/IdentityHashMapTest.java @@ -40,10 +40,8 @@ import java.util.Objects; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class IdentityHashMapTest { @Test diff --git a/tests/src/test/java/org/teavm/classlib/java/util/LinkedHashMapTest.java b/tests/src/test/java/org/teavm/classlib/java/util/LinkedHashMapTest.java index 12e529198..d1b6dab44 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/LinkedHashMapTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/LinkedHashMapTest.java @@ -50,12 +50,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.classlib.support.MapTest2Support; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @SuppressWarnings({ "UnnecessaryUnboxing", "ClassInitializerMayBeStatic", "MismatchedQueryAndUpdateOfCollection" }) @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class LinkedHashMapTest { private LinkedHashMap hm; diff --git a/tests/src/test/java/org/teavm/classlib/java/util/LinkedListTest.java b/tests/src/test/java/org/teavm/classlib/java/util/LinkedListTest.java index ffc3a2c39..72dbd3131 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/LinkedListTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/LinkedListTest.java @@ -29,10 +29,8 @@ import java.util.NoSuchElementException; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class LinkedListTest { @Test public void emptyListCreated() { diff --git a/tests/src/test/java/org/teavm/classlib/java/util/ListTest.java b/tests/src/test/java/org/teavm/classlib/java/util/ListTest.java index 6e6185c43..af438c915 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/ListTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/ListTest.java @@ -28,10 +28,8 @@ import java.util.ListIterator; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class ListTest { @Test public void of() { diff --git a/tests/src/test/java/org/teavm/classlib/java/util/LocaleTest.java b/tests/src/test/java/org/teavm/classlib/java/util/LocaleTest.java index bd195e2d2..908ebc485 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/LocaleTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/LocaleTest.java @@ -20,12 +20,14 @@ import static org.junit.Assert.assertNotEquals; import java.util.Locale; import org.junit.Test; import org.junit.runner.RunWith; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.TeaVMProperties; import org.teavm.junit.TeaVMProperty; import org.teavm.junit.TeaVMTestRunner; @RunWith(TeaVMTestRunner.class) @TeaVMProperties(@TeaVMProperty(key = "java.util.Locale.available", value = "en, en_US, en_GB, ru, ru_RU")) +@EachTestCompiledSeparately public class LocaleTest { @Test public void availableLocalesFound() { diff --git a/tests/src/test/java/org/teavm/classlib/java/util/MapTest.java b/tests/src/test/java/org/teavm/classlib/java/util/MapTest.java index a064366e1..30c7688bc 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/MapTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/MapTest.java @@ -27,10 +27,8 @@ import java.util.TreeMap; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class MapTest { @Test public void of() { diff --git a/tests/src/test/java/org/teavm/classlib/java/util/RandomTest.java b/tests/src/test/java/org/teavm/classlib/java/util/RandomTest.java index 2d5b42d5d..eb85b5ac7 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/RandomTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/RandomTest.java @@ -28,10 +28,8 @@ import java.util.stream.LongStream; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class RandomTest { @Test public void testDoubles() { diff --git a/tests/src/test/java/org/teavm/classlib/java/util/ResourceBundleTest.java b/tests/src/test/java/org/teavm/classlib/java/util/ResourceBundleTest.java index bf3ea486c..fd4e443dc 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/ResourceBundleTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/ResourceBundleTest.java @@ -24,9 +24,11 @@ import java.util.MissingResourceException; import java.util.ResourceBundle; import org.junit.Test; import org.junit.runner.RunWith; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.TeaVMTestRunner; @RunWith(TeaVMTestRunner.class) +@EachTestCompiledSeparately public class ResourceBundleTest { @Test public void getObjectLjava_lang_String() { diff --git a/tests/src/test/java/org/teavm/classlib/java/util/ServiceLoaderTest.java b/tests/src/test/java/org/teavm/classlib/java/util/ServiceLoaderTest.java index db04e0fe2..392b150d8 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/ServiceLoaderTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/ServiceLoaderTest.java @@ -22,9 +22,11 @@ import java.util.List; import java.util.ServiceLoader; import org.junit.Test; import org.junit.runner.RunWith; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.TeaVMTestRunner; @RunWith(TeaVMTestRunner.class) +@EachTestCompiledSeparately public class ServiceLoaderTest { @Test public void loadsService() { diff --git a/tests/src/test/java/org/teavm/classlib/java/util/SetTest.java b/tests/src/test/java/org/teavm/classlib/java/util/SetTest.java index 8174bf4e0..d763f4c2a 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/SetTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/SetTest.java @@ -27,10 +27,8 @@ import java.util.Set; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class SetTest { @Test public void of() { diff --git a/tests/src/test/java/org/teavm/classlib/java/util/SpliteratorsTest.java b/tests/src/test/java/org/teavm/classlib/java/util/SpliteratorsTest.java index f5bff289a..033ff1b51 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/SpliteratorsTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/SpliteratorsTest.java @@ -29,10 +29,8 @@ import java.util.function.IntConsumer; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class SpliteratorsTest { @Test diff --git a/tests/src/test/java/org/teavm/classlib/java/util/StringTokenizerTest.java b/tests/src/test/java/org/teavm/classlib/java/util/StringTokenizerTest.java index 5456e27d6..7a641821c 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/StringTokenizerTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/StringTokenizerTest.java @@ -41,11 +41,9 @@ import java.util.StringTokenizer; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; -@SuppressWarnings({ "RedundantStringConstructorCall", "RedundantCast" }) +@SuppressWarnings("RedundantCast") @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class StringTokenizerTest { @Test public void test_ConstructorLjava_lang_StringLjava_lang_String() { diff --git a/tests/src/test/java/org/teavm/classlib/java/util/TimeZoneTest.java b/tests/src/test/java/org/teavm/classlib/java/util/TimeZoneTest.java index 1cb01a8c2..e6ecb1df0 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/TimeZoneTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/TimeZoneTest.java @@ -41,9 +41,11 @@ import java.util.GregorianCalendar; import java.util.TimeZone; import org.junit.Test; import org.junit.runner.RunWith; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.TeaVMTestRunner; @RunWith(TeaVMTestRunner.class) +@EachTestCompiledSeparately public class TimeZoneTest { private static final int ONE_HOUR = 3600000; diff --git a/tests/src/test/java/org/teavm/classlib/java/util/TreeMapTest.java b/tests/src/test/java/org/teavm/classlib/java/util/TreeMapTest.java index b3b2abb9b..42a50aac1 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/TreeMapTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/TreeMapTest.java @@ -67,11 +67,9 @@ import java.util.TreeMap; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @SuppressWarnings({ "UnnecessaryTemporaryOnConversionToString", "SuspiciousMethodCalls" }) @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class TreeMapTest { public static class ReversedComparator implements Comparator { diff --git a/tests/src/test/java/org/teavm/classlib/java/util/VectorTest.java b/tests/src/test/java/org/teavm/classlib/java/util/VectorTest.java index 9d7a04e26..bd7ba833c 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/VectorTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/VectorTest.java @@ -67,10 +67,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.classlib.support.ListTestSupport; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class VectorTest { Object[] objArray; private Vector tVector = new Vector<>(); diff --git a/tests/src/test/java/org/teavm/classlib/java/util/concurrent/ArrayBlockingQueueTest.java b/tests/src/test/java/org/teavm/classlib/java/util/concurrent/ArrayBlockingQueueTest.java index d6103dcf8..9d46aee2a 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/concurrent/ArrayBlockingQueueTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/concurrent/ArrayBlockingQueueTest.java @@ -28,9 +28,11 @@ import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; import org.junit.Test; import org.junit.runner.RunWith; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.TeaVMTestRunner; @RunWith(TeaVMTestRunner.class) +@EachTestCompiledSeparately public class ArrayBlockingQueueTest { @Test public void constructed() { diff --git a/tests/src/test/java/org/teavm/classlib/java/util/concurrent/ConcurrentHashMapTest.java b/tests/src/test/java/org/teavm/classlib/java/util/concurrent/ConcurrentHashMapTest.java index fdf9e84b9..142a6a548 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/concurrent/ConcurrentHashMapTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/concurrent/ConcurrentHashMapTest.java @@ -29,10 +29,8 @@ import java.util.function.Function; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class ConcurrentHashMapTest { @Test public void constructor() { diff --git a/tests/src/test/java/org/teavm/classlib/java/util/concurrent/MultiThreadConcurrentHashMapTest.java b/tests/src/test/java/org/teavm/classlib/java/util/concurrent/MultiThreadConcurrentHashMapTest.java index 2e8cf57a9..b00517591 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/concurrent/MultiThreadConcurrentHashMapTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/concurrent/MultiThreadConcurrentHashMapTest.java @@ -25,12 +25,15 @@ import java.util.concurrent.ConcurrentHashMap; import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; +import org.teavm.junit.EachTestCompiledSeparately; +import org.teavm.junit.OnlyPlatform; import org.teavm.junit.SkipJVM; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; +import org.teavm.junit.TestPlatform; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation +@EachTestCompiledSeparately +@OnlyPlatform(TestPlatform.JAVASCRIPT) public class MultiThreadConcurrentHashMapTest { private ArrayBlockingQueue backgroundTasks = new ArrayBlockingQueue<>(100); private boolean stopped; @@ -54,6 +57,7 @@ public class MultiThreadConcurrentHashMapTest { } @Test + @SkipJVM public void containsValue() { var key = new Wrapper("q"); var value = new Wrapper("23"); diff --git a/tests/src/test/java/org/teavm/classlib/java/util/function/PredicateTest.java b/tests/src/test/java/org/teavm/classlib/java/util/function/PredicateTest.java index 6bc1e3eeb..2142baf6f 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/function/PredicateTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/function/PredicateTest.java @@ -21,10 +21,8 @@ import java.util.function.Predicate; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class PredicateTest { @Test diff --git a/tests/src/test/java/org/teavm/classlib/java/util/regex/Matcher2Test.java b/tests/src/test/java/org/teavm/classlib/java/util/regex/Matcher2Test.java index 069bf05a1..f06bdcffe 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/regex/Matcher2Test.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/regex/Matcher2Test.java @@ -43,11 +43,9 @@ import java.util.regex.PatternSyntaxException; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) @SuppressWarnings("nls") -@WholeClassCompilation public class Matcher2Test { @Test public void test_toString() { diff --git a/tests/src/test/java/org/teavm/classlib/java/util/regex/MatcherTest.java b/tests/src/test/java/org/teavm/classlib/java/util/regex/MatcherTest.java index 2d9f654f1..5cbc575d7 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/regex/MatcherTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/regex/MatcherTest.java @@ -42,11 +42,9 @@ import java.util.regex.Pattern; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @SuppressWarnings("nls") @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class MatcherTest { String[] testPatterns = { "(a|b)*abb", diff --git a/tests/src/test/java/org/teavm/classlib/java/util/regex/ModeTest.java b/tests/src/test/java/org/teavm/classlib/java/util/regex/ModeTest.java index a356a69ea..659df3ac7 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/regex/ModeTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/regex/ModeTest.java @@ -41,14 +41,12 @@ import java.util.regex.PatternSyntaxException; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; /** * Tests Pattern compilation modes and modes triggered in pattern strings */ @SuppressWarnings("nls") @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class ModeTest { @Test public void testCase() throws PatternSyntaxException { diff --git a/tests/src/test/java/org/teavm/classlib/java/util/regex/Pattern2Test.java b/tests/src/test/java/org/teavm/classlib/java/util/regex/Pattern2Test.java index fa0bf9bdf..5905020a2 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/regex/Pattern2Test.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/regex/Pattern2Test.java @@ -38,14 +38,12 @@ import junit.framework.TestCase; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; /** * Tests simple Pattern compilation and Matcher methods */ @SuppressWarnings("nls") @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class Pattern2Test extends TestCase { @Test public void testSimpleMatch() throws PatternSyntaxException { diff --git a/tests/src/test/java/org/teavm/classlib/java/util/regex/PatternErrorTest.java b/tests/src/test/java/org/teavm/classlib/java/util/regex/PatternErrorTest.java index ea20a445d..eef3b5fc5 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/regex/PatternErrorTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/regex/PatternErrorTest.java @@ -37,14 +37,12 @@ import java.util.regex.Pattern; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; /** * Test boundary and error conditions in java.util.regex.Pattern */ @SuppressWarnings("nls") @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class PatternErrorTest { @Test public void testCompileErrors() throws Exception { diff --git a/tests/src/test/java/org/teavm/classlib/java/util/regex/PatternSyntaxExceptionTest.java b/tests/src/test/java/org/teavm/classlib/java/util/regex/PatternSyntaxExceptionTest.java index cfe88c7ed..e8eb41019 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/regex/PatternSyntaxExceptionTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/regex/PatternSyntaxExceptionTest.java @@ -39,14 +39,12 @@ import java.util.regex.PatternSyntaxException; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; /** * TODO Type description */ @SuppressWarnings("nls") @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class PatternSyntaxExceptionTest { @Test public void testCase() { diff --git a/tests/src/test/java/org/teavm/classlib/java/util/regex/PatternTest.java b/tests/src/test/java/org/teavm/classlib/java/util/regex/PatternTest.java index 8b2f2cdf3..3a1128404 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/regex/PatternTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/regex/PatternTest.java @@ -44,10 +44,8 @@ import java.util.regex.PatternSyntaxException; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class PatternTest { String[] testPatterns = { "(a|b)*abb", diff --git a/tests/src/test/java/org/teavm/classlib/java/util/regex/ReplaceTest.java b/tests/src/test/java/org/teavm/classlib/java/util/regex/ReplaceTest.java index 95feac6c4..e6c121c7d 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/regex/ReplaceTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/regex/ReplaceTest.java @@ -39,10 +39,8 @@ import java.util.regex.PatternSyntaxException; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class ReplaceTest { @Test diff --git a/tests/src/test/java/org/teavm/classlib/java/util/regex/SplitTest.java b/tests/src/test/java/org/teavm/classlib/java/util/regex/SplitTest.java index 8f47b98c2..356554d98 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/regex/SplitTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/regex/SplitTest.java @@ -40,10 +40,8 @@ import java.util.regex.PatternSyntaxException; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class SplitTest { @Test diff --git a/tests/src/test/java/org/teavm/classlib/java/util/stream/CollectorsTest.java b/tests/src/test/java/org/teavm/classlib/java/util/stream/CollectorsTest.java index 4efe438fe..36666f8c3 100644 --- a/tests/src/test/java/org/teavm/classlib/java/util/stream/CollectorsTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/util/stream/CollectorsTest.java @@ -33,10 +33,8 @@ import java.util.stream.Stream; import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation public class CollectorsTest { @Test public void joining() { diff --git a/tests/src/test/java/org/teavm/jso/test/AnnotationsTest.java b/tests/src/test/java/org/teavm/jso/test/AnnotationsTest.java index 3e521afac..e1834de3d 100644 --- a/tests/src/test/java/org/teavm/jso/test/AnnotationsTest.java +++ b/tests/src/test/java/org/teavm/jso/test/AnnotationsTest.java @@ -22,11 +22,16 @@ import org.teavm.jso.JSBody; import org.teavm.jso.JSMethod; import org.teavm.jso.JSObject; import org.teavm.jso.JSProperty; +import org.teavm.junit.EachTestCompiledSeparately; +import org.teavm.junit.OnlyPlatform; import org.teavm.junit.SkipJVM; import org.teavm.junit.TeaVMTestRunner; +import org.teavm.junit.TestPlatform; @RunWith(TeaVMTestRunner.class) @SkipJVM +@OnlyPlatform(TestPlatform.JAVASCRIPT) +@EachTestCompiledSeparately public class AnnotationsTest { @Test public void staticBodyWorks() { diff --git a/tests/src/test/java/org/teavm/jso/test/ConversionTest.java b/tests/src/test/java/org/teavm/jso/test/ConversionTest.java index ad6a93ea7..0e1e92afb 100644 --- a/tests/src/test/java/org/teavm/jso/test/ConversionTest.java +++ b/tests/src/test/java/org/teavm/jso/test/ConversionTest.java @@ -26,11 +26,16 @@ import org.teavm.jso.JSByRef; import org.teavm.jso.JSObject; import org.teavm.jso.JSProperty; import org.teavm.jso.core.JSString; +import org.teavm.junit.EachTestCompiledSeparately; +import org.teavm.junit.OnlyPlatform; import org.teavm.junit.SkipJVM; import org.teavm.junit.TeaVMTestRunner; +import org.teavm.junit.TestPlatform; @RunWith(TeaVMTestRunner.class) @SkipJVM +@OnlyPlatform(TestPlatform.JAVASCRIPT) +@EachTestCompiledSeparately public class ConversionTest { @Test public void convertsPrimitivesToJavaScript() { diff --git a/tests/src/test/java/org/teavm/jso/test/ExceptionsTest.java b/tests/src/test/java/org/teavm/jso/test/ExceptionsTest.java index ed4622cf6..3266bfeb1 100644 --- a/tests/src/test/java/org/teavm/jso/test/ExceptionsTest.java +++ b/tests/src/test/java/org/teavm/jso/test/ExceptionsTest.java @@ -24,11 +24,16 @@ import org.teavm.jso.JSExceptions; import org.teavm.jso.JSFunctor; import org.teavm.jso.JSObject; import org.teavm.jso.core.JSError; +import org.teavm.junit.EachTestCompiledSeparately; +import org.teavm.junit.OnlyPlatform; import org.teavm.junit.SkipJVM; import org.teavm.junit.TeaVMTestRunner; +import org.teavm.junit.TestPlatform; @RunWith(TeaVMTestRunner.class) @SkipJVM +@OnlyPlatform(TestPlatform.JAVASCRIPT) +@EachTestCompiledSeparately public class ExceptionsTest { @Test public void throwExceptionThroughJSCode() { diff --git a/tests/src/test/java/org/teavm/jso/test/ExportClassTest.java b/tests/src/test/java/org/teavm/jso/test/ExportClassTest.java index 983176445..57a33e54c 100644 --- a/tests/src/test/java/org/teavm/jso/test/ExportClassTest.java +++ b/tests/src/test/java/org/teavm/jso/test/ExportClassTest.java @@ -21,13 +21,16 @@ import org.junit.runner.RunWith; import org.teavm.jso.JSBody; import org.teavm.jso.JSObject; import org.teavm.jso.JSProperty; +import org.teavm.junit.EachTestCompiledSeparately; +import org.teavm.junit.OnlyPlatform; import org.teavm.junit.SkipJVM; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; +import org.teavm.junit.TestPlatform; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation @SkipJVM +@OnlyPlatform(TestPlatform.JAVASCRIPT) +@EachTestCompiledSeparately public class ExportClassTest { @Test public void simpleClassExported() { diff --git a/tests/src/test/java/org/teavm/jso/test/FunctorTest.java b/tests/src/test/java/org/teavm/jso/test/FunctorTest.java index 09b78b905..c3fd76a93 100644 --- a/tests/src/test/java/org/teavm/jso/test/FunctorTest.java +++ b/tests/src/test/java/org/teavm/jso/test/FunctorTest.java @@ -23,11 +23,16 @@ import org.teavm.jso.JSBody; import org.teavm.jso.JSFunctor; import org.teavm.jso.JSObject; import org.teavm.jso.JSProperty; +import org.teavm.junit.EachTestCompiledSeparately; +import org.teavm.junit.OnlyPlatform; import org.teavm.junit.SkipJVM; import org.teavm.junit.TeaVMTestRunner; +import org.teavm.junit.TestPlatform; @RunWith(TeaVMTestRunner.class) @SkipJVM +@OnlyPlatform(TestPlatform.JAVASCRIPT) +@EachTestCompiledSeparately public class FunctorTest { @Test public void functorPassed() { diff --git a/tests/src/test/java/org/teavm/jso/test/ImplementationTest.java b/tests/src/test/java/org/teavm/jso/test/ImplementationTest.java index 40614404b..fdde8da67 100644 --- a/tests/src/test/java/org/teavm/jso/test/ImplementationTest.java +++ b/tests/src/test/java/org/teavm/jso/test/ImplementationTest.java @@ -20,11 +20,16 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.jso.JSBody; import org.teavm.jso.JSObject; +import org.teavm.junit.EachTestCompiledSeparately; +import org.teavm.junit.OnlyPlatform; import org.teavm.junit.SkipJVM; import org.teavm.junit.TeaVMTestRunner; +import org.teavm.junit.TestPlatform; @RunWith(TeaVMTestRunner.class) @SkipJVM +@OnlyPlatform(TestPlatform.JAVASCRIPT) +@EachTestCompiledSeparately public class ImplementationTest { @Test public void respectsPrecedence() { diff --git a/tests/src/test/java/org/teavm/jso/test/ImportModuleTest.java b/tests/src/test/java/org/teavm/jso/test/ImportModuleTest.java index dee379cfa..93908c3a5 100644 --- a/tests/src/test/java/org/teavm/jso/test/ImportModuleTest.java +++ b/tests/src/test/java/org/teavm/jso/test/ImportModuleTest.java @@ -21,13 +21,16 @@ import org.junit.runner.RunWith; import org.teavm.jso.JSBody; import org.teavm.jso.JSBodyImport; import org.teavm.junit.AttachJavaScript; +import org.teavm.junit.EachTestCompiledSeparately; +import org.teavm.junit.OnlyPlatform; import org.teavm.junit.SkipJVM; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; +import org.teavm.junit.TestPlatform; @RunWith(TeaVMTestRunner.class) @SkipJVM -@WholeClassCompilation +@OnlyPlatform(TestPlatform.JAVASCRIPT) +@EachTestCompiledSeparately public class ImportModuleTest { @Test @AttachJavaScript({ diff --git a/tests/src/test/java/org/teavm/jso/test/JSWrapperTest.java b/tests/src/test/java/org/teavm/jso/test/JSWrapperTest.java index cf4bb2bb7..51fc2aa7b 100644 --- a/tests/src/test/java/org/teavm/jso/test/JSWrapperTest.java +++ b/tests/src/test/java/org/teavm/jso/test/JSWrapperTest.java @@ -32,13 +32,16 @@ import org.teavm.jso.JSObject; import org.teavm.jso.core.JSNumber; import org.teavm.jso.core.JSObjects; import org.teavm.jso.core.JSString; +import org.teavm.junit.EachTestCompiledSeparately; +import org.teavm.junit.OnlyPlatform; import org.teavm.junit.SkipJVM; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; +import org.teavm.junit.TestPlatform; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation @SkipJVM +@OnlyPlatform(TestPlatform.JAVASCRIPT) +@EachTestCompiledSeparately public class JSWrapperTest { private List list = new ArrayList<>(); diff --git a/tests/src/test/java/org/teavm/jso/test/JavaInvocationTest.java b/tests/src/test/java/org/teavm/jso/test/JavaInvocationTest.java index 7256caca7..780d45057 100644 --- a/tests/src/test/java/org/teavm/jso/test/JavaInvocationTest.java +++ b/tests/src/test/java/org/teavm/jso/test/JavaInvocationTest.java @@ -20,11 +20,16 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.jso.JSBody; import org.teavm.jso.JSObject; +import org.teavm.junit.EachTestCompiledSeparately; +import org.teavm.junit.OnlyPlatform; import org.teavm.junit.SkipJVM; import org.teavm.junit.TeaVMTestRunner; +import org.teavm.junit.TestPlatform; @RunWith(TeaVMTestRunner.class) @SkipJVM +@OnlyPlatform(TestPlatform.JAVASCRIPT) +@EachTestCompiledSeparately public class JavaInvocationTest { @Test public void callStaticMethod() { diff --git a/tests/src/test/java/org/teavm/metaprogramming/test/MetaprogrammingTest.java b/tests/src/test/java/org/teavm/metaprogramming/test/MetaprogrammingTest.java index 4c94c6eb2..766cf1f4f 100644 --- a/tests/src/test/java/org/teavm/metaprogramming/test/MetaprogrammingTest.java +++ b/tests/src/test/java/org/teavm/metaprogramming/test/MetaprogrammingTest.java @@ -28,6 +28,7 @@ import static org.teavm.metaprogramming.Metaprogramming.unsupportedCase; import java.util.function.Consumer; import org.junit.Test; import org.junit.runner.RunWith; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.SkipJVM; import org.teavm.junit.TeaVMTestRunner; import org.teavm.metaprogramming.CompileTime; @@ -41,6 +42,7 @@ import org.teavm.metaprogramming.test.subpackage.MetaprogrammingGenerator; @CompileTime @RunWith(TeaVMTestRunner.class) @SkipJVM +@EachTestCompiledSeparately public class MetaprogrammingTest { @Test public void works() { diff --git a/tests/src/test/java/org/teavm/metaprogramming/test/ProxyTest.java b/tests/src/test/java/org/teavm/metaprogramming/test/ProxyTest.java index cfc725ced..204c02ca5 100644 --- a/tests/src/test/java/org/teavm/metaprogramming/test/ProxyTest.java +++ b/tests/src/test/java/org/teavm/metaprogramming/test/ProxyTest.java @@ -23,6 +23,7 @@ import static org.teavm.metaprogramming.Metaprogramming.proxy; import static org.teavm.metaprogramming.Metaprogramming.unsupportedCase; import org.junit.Test; import org.junit.runner.RunWith; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.SkipJVM; import org.teavm.junit.TeaVMTestRunner; import org.teavm.metaprogramming.CompileTime; @@ -33,6 +34,7 @@ import org.teavm.metaprogramming.Value; @CompileTime @RunWith(TeaVMTestRunner.class) @SkipJVM +@EachTestCompiledSeparately public class ProxyTest { @Test public void createsProxy() { diff --git a/tests/src/test/java/org/teavm/parsing/substitution/ClasspathResourceMapperTest.java b/tests/src/test/java/org/teavm/parsing/substitution/ClasspathResourceMapperTest.java index e1f8fb77e..b5ef5700b 100644 --- a/tests/src/test/java/org/teavm/parsing/substitution/ClasspathResourceMapperTest.java +++ b/tests/src/test/java/org/teavm/parsing/substitution/ClasspathResourceMapperTest.java @@ -20,7 +20,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.teavm.junit.SkipJVM; import org.teavm.junit.TeaVMTestRunner; -import org.teavm.junit.WholeClassCompilation; import org.teavm.parsing.substitution.java.RootPackageClass1; import org.teavm.parsing.substitution.java.RootPackageClass2; import org.teavm.parsing.substitution.java.RootPackageClass3; @@ -38,7 +37,6 @@ import org.teavm.parsing.substitution.java.subpackage.SubPackageClass4; import org.teavm.parsing.substitution.java.subpackage.subsubpackage.SubSubPackageClass1; @RunWith(TeaVMTestRunner.class) -@WholeClassCompilation @SkipJVM public class ClasspathResourceMapperTest { @Test diff --git a/tests/src/test/java/org/teavm/vm/LambdaTest.java b/tests/src/test/java/org/teavm/vm/LambdaTest.java index c8de82535..d16ab5afc 100644 --- a/tests/src/test/java/org/teavm/vm/LambdaTest.java +++ b/tests/src/test/java/org/teavm/vm/LambdaTest.java @@ -25,9 +25,11 @@ import java.util.function.IntPredicate; import java.util.function.Supplier; import org.junit.Test; import org.junit.runner.RunWith; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.TeaVMTestRunner; @RunWith(TeaVMTestRunner.class) +@EachTestCompiledSeparately public class LambdaTest { @Test public void lambdaWithMarkers() { diff --git a/tests/src/test/java/org/teavm/vm/LongTest.java b/tests/src/test/java/org/teavm/vm/LongTest.java index e3bb3bc5f..90bbf1db2 100644 --- a/tests/src/test/java/org/teavm/vm/LongTest.java +++ b/tests/src/test/java/org/teavm/vm/LongTest.java @@ -18,9 +18,11 @@ package org.teavm.vm; import static org.junit.Assert.assertEquals; import org.junit.Test; import org.junit.runner.RunWith; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.TeaVMTestRunner; @RunWith(TeaVMTestRunner.class) +@EachTestCompiledSeparately public class LongTest { @Test public void longIntegersMultipied() { diff --git a/tests/src/test/java/org/teavm/vm/RecordTest.java b/tests/src/test/java/org/teavm/vm/RecordTest.java index e0c3a86e9..9a757ab4e 100644 --- a/tests/src/test/java/org/teavm/vm/RecordTest.java +++ b/tests/src/test/java/org/teavm/vm/RecordTest.java @@ -21,9 +21,11 @@ import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; import org.junit.Test; import org.junit.runner.RunWith; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.TeaVMTestRunner; @RunWith(TeaVMTestRunner.class) +@EachTestCompiledSeparately public class RecordTest { @Test public void equalsMethod() { diff --git a/tests/src/test/java/org/teavm/vm/RttiTest.java b/tests/src/test/java/org/teavm/vm/RttiTest.java index bef2241b7..9587d12f8 100644 --- a/tests/src/test/java/org/teavm/vm/RttiTest.java +++ b/tests/src/test/java/org/teavm/vm/RttiTest.java @@ -22,9 +22,11 @@ import java.util.ArrayList; import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.TeaVMTestRunner; @RunWith(TeaVMTestRunner.class) +@EachTestCompiledSeparately public class RttiTest { @Test public void instanceOfInterface() { diff --git a/tests/src/test/java/org/teavm/vm/SwitchTest.java b/tests/src/test/java/org/teavm/vm/SwitchTest.java index f456e5b12..a016b1002 100644 --- a/tests/src/test/java/org/teavm/vm/SwitchTest.java +++ b/tests/src/test/java/org/teavm/vm/SwitchTest.java @@ -18,10 +18,12 @@ package org.teavm.vm; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import org.junit.runner.RunWith; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.TeaVMTestRunner; import org.testng.annotations.Test; @RunWith(TeaVMTestRunner.class) +@EachTestCompiledSeparately public class SwitchTest { private static int switchWithLogic(Object o) { return switch (o) { diff --git a/tests/src/test/java/org/teavm/vm/VMTest.java b/tests/src/test/java/org/teavm/vm/VMTest.java index 888f5f70f..0e60fed5f 100644 --- a/tests/src/test/java/org/teavm/vm/VMTest.java +++ b/tests/src/test/java/org/teavm/vm/VMTest.java @@ -28,10 +28,12 @@ import org.junit.runner.RunWith; import org.teavm.interop.Async; import org.teavm.interop.AsyncCallback; import org.teavm.jso.JSBody; +import org.teavm.junit.EachTestCompiledSeparately; import org.teavm.junit.SkipJVM; import org.teavm.junit.TeaVMTestRunner; @RunWith(TeaVMTestRunner.class) +@EachTestCompiledSeparately public class VMTest { @Test public void multiArrayCreated() {