From 346ce86807322ceee5ca415bf13b26736ddb21c9 Mon Sep 17 00:00:00 2001 From: Ivan Dubrov Date: Fri, 25 Apr 2014 14:58:00 -0700 Subject: [PATCH] Excluding certain tests on 'light' flavor --- .../com/github/dcevm/test/fields/AccessDeletedFieldTest.java | 4 ++++ .../dcevm/test/fields/AccessDeletedStaticFieldTest.java | 3 +++ .../dcevm/test/methods/CallDeletedInterfaceMethodTest.java | 3 +++ .../com/github/dcevm/test/methods/CallDeletedMethodTest.java | 3 +++ .../com/github/dcevm/test/methods/OldCodeNonOSRTest.java | 3 +++ .../com/github/dcevm/test/structural/LargeHierarchyTest.java | 3 +++ .../github/dcevm/test/structural/TypeNarrowingHeapTest.java | 3 +++ .../dcevm/test/transformer/BaseClassTransformerTest.java | 3 +++ .../github/dcevm/test/transformer/SimpleTransformerTest.java | 3 +++ .../github/dcevm/test/transformer/StaticTransformerTest.java | 3 +++ 10 files changed, 31 insertions(+) diff --git a/dcevm/src/test/java7/com/github/dcevm/test/fields/AccessDeletedFieldTest.java b/dcevm/src/test/java7/com/github/dcevm/test/fields/AccessDeletedFieldTest.java index d66cfa6d..84a76c92 100644 --- a/dcevm/src/test/java7/com/github/dcevm/test/fields/AccessDeletedFieldTest.java +++ b/dcevm/src/test/java7/com/github/dcevm/test/fields/AccessDeletedFieldTest.java @@ -24,8 +24,10 @@ package com.github.dcevm.test.fields; import com.github.dcevm.test.TestUtil; +import com.github.dcevm.test.category.Full; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__; import static com.github.dcevm.test.util.HotSwapTestHelper.__version__; @@ -118,6 +120,7 @@ public class AccessDeletedFieldTest { } @Test + @Category(Full.class) public void testAccessDeleteBaseClassFieldNormal() { __toVersion__(0); @@ -147,6 +150,7 @@ public class AccessDeletedFieldTest { } @Test + @Category(Full.class) public void testAccessDeleteBaseClassFieldInvalid() { __toVersion__(0); diff --git a/dcevm/src/test/java7/com/github/dcevm/test/fields/AccessDeletedStaticFieldTest.java b/dcevm/src/test/java7/com/github/dcevm/test/fields/AccessDeletedStaticFieldTest.java index 13be2e5f..32fe5829 100644 --- a/dcevm/src/test/java7/com/github/dcevm/test/fields/AccessDeletedStaticFieldTest.java +++ b/dcevm/src/test/java7/com/github/dcevm/test/fields/AccessDeletedStaticFieldTest.java @@ -24,8 +24,10 @@ package com.github.dcevm.test.fields; import com.github.dcevm.test.TestUtil; +import com.github.dcevm.test.category.Full; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__; import static com.github.dcevm.test.util.HotSwapTestHelper.__version__; @@ -89,6 +91,7 @@ public class AccessDeletedStaticFieldTest { } @Test + @Category(Full.class) public void testAccessDeletedStaticField() { assert __version__() == 0; diff --git a/dcevm/src/test/java7/com/github/dcevm/test/methods/CallDeletedInterfaceMethodTest.java b/dcevm/src/test/java7/com/github/dcevm/test/methods/CallDeletedInterfaceMethodTest.java index 8b7fd79c..ff0ed08f 100644 --- a/dcevm/src/test/java7/com/github/dcevm/test/methods/CallDeletedInterfaceMethodTest.java +++ b/dcevm/src/test/java7/com/github/dcevm/test/methods/CallDeletedInterfaceMethodTest.java @@ -24,8 +24,10 @@ package com.github.dcevm.test.methods; +import com.github.dcevm.test.category.Full; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__; import static com.github.dcevm.test.util.HotSwapTestHelper.__version__; @@ -36,6 +38,7 @@ import static org.junit.Assert.assertEquals; * * @author Thomas Wuerthinger */ +@Category(Full.class) public class CallDeletedInterfaceMethodTest { @Before diff --git a/dcevm/src/test/java7/com/github/dcevm/test/methods/CallDeletedMethodTest.java b/dcevm/src/test/java7/com/github/dcevm/test/methods/CallDeletedMethodTest.java index 73c1fdde..ec117033 100644 --- a/dcevm/src/test/java7/com/github/dcevm/test/methods/CallDeletedMethodTest.java +++ b/dcevm/src/test/java7/com/github/dcevm/test/methods/CallDeletedMethodTest.java @@ -26,9 +26,11 @@ package com.github.dcevm.test.methods; import com.github.dcevm.MethodRedefinitionPolicy; import com.github.dcevm.RedefinitionPolicy; +import com.github.dcevm.test.category.Full; import junit.framework.Assert; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__; import static com.github.dcevm.test.util.HotSwapTestHelper.__version__; @@ -39,6 +41,7 @@ import static org.junit.Assert.assertEquals; * * @author Thomas Wuerthinger */ +@Category(Full.class) public class CallDeletedMethodTest { @Before diff --git a/dcevm/src/test/java7/com/github/dcevm/test/methods/OldCodeNonOSRTest.java b/dcevm/src/test/java7/com/github/dcevm/test/methods/OldCodeNonOSRTest.java index aa9fbadb..c40717db 100644 --- a/dcevm/src/test/java7/com/github/dcevm/test/methods/OldCodeNonOSRTest.java +++ b/dcevm/src/test/java7/com/github/dcevm/test/methods/OldCodeNonOSRTest.java @@ -24,8 +24,10 @@ package com.github.dcevm.test.methods; +import com.github.dcevm.test.category.Full; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__; import static com.github.dcevm.test.util.HotSwapTestHelper.__version__; @@ -36,6 +38,7 @@ import static org.junit.Assert.assertEquals; * * @author Thomas Wuerthinger */ +@Category(Full.class) public class OldCodeNonOSRTest { // Chose high enough to make sure method could get OSR (usually the OSR flag in the VM is set to about 15000) diff --git a/dcevm/src/test/java7/com/github/dcevm/test/structural/LargeHierarchyTest.java b/dcevm/src/test/java7/com/github/dcevm/test/structural/LargeHierarchyTest.java index d5ad95de..67905d31 100644 --- a/dcevm/src/test/java7/com/github/dcevm/test/structural/LargeHierarchyTest.java +++ b/dcevm/src/test/java7/com/github/dcevm/test/structural/LargeHierarchyTest.java @@ -24,8 +24,10 @@ package com.github.dcevm.test.structural; +import com.github.dcevm.test.category.Full; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__; import static com.github.dcevm.test.util.HotSwapTestHelper.__version__; @@ -36,6 +38,7 @@ import static org.junit.Assert.assertEquals; * * @author Thomas Wuerthinger */ +@Category(Full.class) public class LargeHierarchyTest { private A a = new A(); diff --git a/dcevm/src/test/java7/com/github/dcevm/test/structural/TypeNarrowingHeapTest.java b/dcevm/src/test/java7/com/github/dcevm/test/structural/TypeNarrowingHeapTest.java index d38495d5..e2287a46 100644 --- a/dcevm/src/test/java7/com/github/dcevm/test/structural/TypeNarrowingHeapTest.java +++ b/dcevm/src/test/java7/com/github/dcevm/test/structural/TypeNarrowingHeapTest.java @@ -25,8 +25,10 @@ package com.github.dcevm.test.structural; import com.github.dcevm.test.TestUtil; +import com.github.dcevm.test.category.Full; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__; import static com.github.dcevm.test.util.HotSwapTestHelper.__version__; @@ -37,6 +39,7 @@ import static org.junit.Assert.assertEquals; * * @author Thomas Wuerthinger */ +@Category(Full.class) public class TypeNarrowingHeapTest { // Version 0 diff --git a/dcevm/src/test/java7/com/github/dcevm/test/transformer/BaseClassTransformerTest.java b/dcevm/src/test/java7/com/github/dcevm/test/transformer/BaseClassTransformerTest.java index ed592f71..27560dcd 100644 --- a/dcevm/src/test/java7/com/github/dcevm/test/transformer/BaseClassTransformerTest.java +++ b/dcevm/src/test/java7/com/github/dcevm/test/transformer/BaseClassTransformerTest.java @@ -24,8 +24,10 @@ package com.github.dcevm.test.transformer; +import com.github.dcevm.test.category.Full; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__; import static com.github.dcevm.test.util.HotSwapTestHelper.__version__; @@ -46,6 +48,7 @@ class BaseClass { * * @author Thomas Wuerthinger */ +@Category(Full.class) public class BaseClassTransformerTest { // Version 0 diff --git a/dcevm/src/test/java7/com/github/dcevm/test/transformer/SimpleTransformerTest.java b/dcevm/src/test/java7/com/github/dcevm/test/transformer/SimpleTransformerTest.java index 7c4ece53..fdebefa5 100644 --- a/dcevm/src/test/java7/com/github/dcevm/test/transformer/SimpleTransformerTest.java +++ b/dcevm/src/test/java7/com/github/dcevm/test/transformer/SimpleTransformerTest.java @@ -24,8 +24,10 @@ package com.github.dcevm.test.transformer; +import com.github.dcevm.test.category.Full; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__; import static com.github.dcevm.test.util.HotSwapTestHelper.__version__; @@ -36,6 +38,7 @@ import static org.junit.Assert.assertEquals; * * @author Thomas Wuerthinger */ +@Category(Full.class) public class SimpleTransformerTest { // Version 0 diff --git a/dcevm/src/test/java7/com/github/dcevm/test/transformer/StaticTransformerTest.java b/dcevm/src/test/java7/com/github/dcevm/test/transformer/StaticTransformerTest.java index a43c1386..8641785c 100644 --- a/dcevm/src/test/java7/com/github/dcevm/test/transformer/StaticTransformerTest.java +++ b/dcevm/src/test/java7/com/github/dcevm/test/transformer/StaticTransformerTest.java @@ -24,8 +24,10 @@ package com.github.dcevm.test.transformer; +import com.github.dcevm.test.category.Full; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__; import static com.github.dcevm.test.util.HotSwapTestHelper.__version__; @@ -36,6 +38,7 @@ import static org.junit.Assert.assertEquals; * * @author Thomas Wuerthinger */ +@Category(Full.class) public class StaticTransformerTest { // Version 0 -- 2.39.5