Fix test assumptions.

Author: woess

truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/object/basic/test/DOTestAsserts.java

@@ -40,6 +40,9 @@
  */
 package com.oracle.truffle.object.basic.test;
 
+import static org.hamcrest.CoreMatchers.either;
+import static org.hamcrest.CoreMatchers.endsWith;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -141,6 +144,14 @@ public static Class<?> getLocationType(Location location) {
         }
     }
 
+    public static void assumeExtLayout() {
+        Shape shape = Shape.newBuilder().build();
+        assertThat("Unexpected Shape class name (the assertion may need to be updated if the code is refactored)",
+                        shape.getClass().getName(), either(endsWith("ShapeExt")).or(endsWith("ShapeBasic")));
+        Assume.assumeTrue("Test is specific to the Extended Dynamic Object Layout",
+                        shape.getClass().getName().endsWith("ShapeExt"));
+    }
+
     public static Location assumeCoreLocation(Location location) {
         Assume.assumeTrue(isCoreLocation(location));
         return location;

truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/object/ext/test/GR42603.java

@@ -40,6 +40,8 @@
  */
 package com.oracle.truffle.object.ext.test;
 
+import static com.oracle.truffle.object.basic.test.DOTestAsserts.assumeExtLayout;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
@@ -54,7 +56,6 @@
 import com.oracle.truffle.api.object.DynamicObjectLibrary;
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.object.ext.test.ObjectModelRegressionTest.TestDynamicObject;
-import com.oracle.truffle.tck.tests.TruffleTestAssumptions;
 
 public class GR42603 {
 
@@ -63,7 +64,7 @@ public class GR42603 {
 
     @Test
     public void testReplacePropertyRace() throws Throwable {
-        TruffleTestAssumptions.assumeEnterpriseRuntime();
+        assumeExtLayout();
         for (int i = 0; i < 100; i++) {
             testConcurrentReplaceProperty();
         }

truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/object/ext/test/GR52036.java

@@ -40,6 +40,7 @@
  */
 package com.oracle.truffle.object.ext.test;
 
+import static com.oracle.truffle.object.basic.test.DOTestAsserts.assumeExtLayout;
 import static com.oracle.truffle.object.basic.test.DOTestAsserts.getTypeAssumption;
 import static com.oracle.truffle.object.basic.test.DOTestAsserts.getTypeAssumptionRecord;
 import static org.junit.Assert.assertFalse;
@@ -55,7 +56,6 @@
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectLibrary;
 import com.oracle.truffle.api.object.Shape;
-import com.oracle.truffle.tck.tests.TruffleTestAssumptions;
 
 public class GR52036 {
 
@@ -70,7 +70,7 @@ public class GR52036 {
     @SuppressWarnings("try")
     @Test
     public void testGR52036Reproducer() throws Throwable {
-        TruffleTestAssumptions.assumeEnterpriseRuntime();
+        assumeExtLayout();
 
         class ObjType1 extends DynamicObject {
             protected ObjType1(Shape shape) {

truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/object/ext/test/ObjectModelRegressionTest.java

@@ -42,6 +42,7 @@
 
 import static com.oracle.truffle.object.basic.test.DOTestAsserts.assertObjectLocation;
 import static com.oracle.truffle.object.basic.test.DOTestAsserts.assertPrimitiveLocation;
+import static com.oracle.truffle.object.basic.test.DOTestAsserts.assumeExtLayout;
 import static com.oracle.truffle.object.basic.test.DOTestAsserts.invokeGetter;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -67,7 +68,6 @@
 import com.oracle.truffle.api.object.DynamicObjectLibrary;
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.test.AbstractParametrizedLibraryTest;
-import com.oracle.truffle.tck.tests.TruffleTestAssumptions;
 
 @SuppressWarnings("deprecation")
 @RunWith(Parameterized.class)
@@ -386,7 +386,7 @@ public void testChangeFlagsConstantToNonConstant() {
 
     @Test
     public void testTryMergeShapes() {
-        TruffleTestAssumptions.assumeEnterpriseRuntime();
+        assumeExtLayout();
 
         // Assume (MaxMergeDepth >= 5)
         Shape emptyShape = Shape.newBuilder().allowImplicitCastIntToDouble(true).build();
@@ -437,7 +437,7 @@ public void testTryMergeShapes() {
 
     @Test
     public void testTryMergeShapes2() {
-        TruffleTestAssumptions.assumeEnterpriseRuntime();
+        assumeExtLayout();
 
         // Assume (MaxMergeDepth >= 5 && MaxMergeDiff >= 2)
 

truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/object/ext/test/PolymorphicPrimitivesTest.java

@@ -42,6 +42,7 @@
 
 import static com.oracle.truffle.object.basic.test.DOTestAsserts.assertObjectLocation;
 import static com.oracle.truffle.object.basic.test.DOTestAsserts.assertPrimitiveLocation;
+import static com.oracle.truffle.object.basic.test.DOTestAsserts.assumeExtLayout;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
@@ -61,7 +62,6 @@
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.test.AbstractParametrizedLibraryTest;
 import com.oracle.truffle.object.ext.test.ObjectModelRegressionTest.TestDynamicObject;
-import com.oracle.truffle.tck.tests.TruffleTestAssumptions;
 
 @SuppressWarnings("deprecation")
 @RunWith(Parameterized.class)
@@ -86,7 +86,7 @@ private static DynamicObject newInstance(Shape emptyShape) {
 
     @Before
     public void before() {
-        TruffleTestAssumptions.assumeEnterpriseRuntime();
+        assumeExtLayout();
     }
 
     @Test