Implement fast assertions for non-identity tests.

chumer · chumer · commit e7393d346ba2 · 2020-03-31T00:17:54.000+02:00
diff --git a/truffle/src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/ErrorTypeTest.java b/truffle/src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/ErrorTypeTest.java
@@ -238,7 +238,7 @@ public void testErrorType() {
                 testRun.getSnippet().getExecutableValue().execute(testRun.getActualParameters().toArray());
             } catch (PolyglotException pe) {
                 try {
-                    TestUtil.validateResult(testRun, null, pe);
+                    TestUtil.validateResult(testRun, null, pe, true);
                 } catch (PolyglotException | AssertionError e) {
                     if (pe.equals(e)) {
                         passed = true;
diff --git a/truffle/src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/ExpressionTest.java b/truffle/src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/ExpressionTest.java
@@ -100,10 +100,10 @@ public void testExpression() {
         try {
             try {
                 final Value result = testRun.getSnippet().getExecutableValue().execute(testRun.getActualParameters().toArray());
-                TestUtil.validateResult(testRun, result, null);
+                TestUtil.validateResult(testRun, result, null, true);
                 success = true;
             } catch (PolyglotException pe) {
-                TestUtil.validateResult(testRun, null, pe);
+                TestUtil.validateResult(testRun, null, pe, true);
                 success = true;
             }
         } catch (PolyglotException | AssertionError e) {
diff --git a/truffle/src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/IdentityFunctionTest.java b/truffle/src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/IdentityFunctionTest.java
@@ -107,12 +107,11 @@ public void testIdentityFunction() {
         boolean success = false;
         try {
             try {
-
                 final Value result = testRun.getSnippet().getExecutableValue().execute(testRun.getActualParameters().toArray());
-                TestUtil.validateResult(testRun, result, null);
+                TestUtil.validateResult(testRun, result, null, false);
                 success = true;
             } catch (PolyglotException pe) {
-                TestUtil.validateResult(testRun, null, pe);
+                TestUtil.validateResult(testRun, null, pe, false);
                 success = true;
             }
         } catch (PolyglotException | AssertionError e) {
diff --git a/truffle/src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/InlineExecutionTest.java b/truffle/src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/InlineExecutionTest.java
@@ -102,10 +102,10 @@ public void testInline() throws Exception {
         try {
             try {
                 final Value result = testRun.getSnippet().getExecutableValue().execute(testRun.getActualParameters().toArray());
-                TestUtil.validateResult(testRun, result, null);
+                TestUtil.validateResult(testRun, result, null, true);
                 success = true;
             } catch (PolyglotException pe) {
-                TestUtil.validateResult(testRun, null, pe);
+                TestUtil.validateResult(testRun, null, pe, true);
                 success = true;
             }
             if (verifier != null && verifier.exception != null) {
@@ -133,14 +133,14 @@ private class TestResultVerifier implements InlineVerifier.ResultVerifier {
         public void verify(Object ret) {
             Value result = context.getValue(ret);
             InlineSnippet inlineSnippet = testRun.getInlineSnippet();
-            TestUtil.validateResult(inlineSnippet.getResultVerifier(), testRun, result, null);
+            TestUtil.validateResult(inlineSnippet.getResultVerifier(), testRun, result, null, true);
         }
 
         @Override
         public void verify(PolyglotException pe) {
             InlineSnippet inlineSnippet = testRun.getInlineSnippet();
             try {
-                TestUtil.validateResult(inlineSnippet.getResultVerifier(), testRun, null, pe);
+                TestUtil.validateResult(inlineSnippet.getResultVerifier(), testRun, null, pe, true);
             } catch (Exception exc) {
                 exception = exc;
             }
diff --git a/truffle/src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/ScriptTest.java b/truffle/src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/ScriptTest.java
@@ -91,10 +91,10 @@ public void testScript() {
         try {
             try {
                 final Value result = testRun.getSnippet().getExecutableValue().execute(testRun.getActualParameters().toArray());
-                TestUtil.validateResult(testRun, result, null);
+                TestUtil.validateResult(testRun, result, null, true);
                 success = true;
             } catch (PolyglotException pe) {
-                TestUtil.validateResult(testRun, null, pe);
+                TestUtil.validateResult(testRun, null, pe, true);
                 success = true;
             }
         } finally {
diff --git a/truffle/src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/StatementTest.java b/truffle/src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/StatementTest.java
@@ -100,10 +100,10 @@ public void testStatement() {
         try {
             try {
                 final Value result = testRun.getSnippet().getExecutableValue().execute(testRun.getActualParameters().toArray());
-                TestUtil.validateResult(testRun, result, null);
+                TestUtil.validateResult(testRun, result, null, true);
                 success = true;
             } catch (PolyglotException pe) {
-                TestUtil.validateResult(testRun, null, pe);
+                TestUtil.validateResult(testRun, null, pe, true);
                 success = true;
             }
         } catch (PolyglotException | AssertionError e) {
diff --git a/truffle/src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/TestUtil.java b/truffle/src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/TestUtil.java
@@ -137,28 +137,38 @@ static Collection<? extends TestRun> createTestRuns(
     static void validateResult(
                     final TestRun testRun,
                     final Value result,
-                    final PolyglotException exception) {
+                    final PolyglotException exception,
+                    boolean fastAssertions) {
         ResultVerifier verifier = testRun.getSnippet().getResultVerifier();
-        validateResult(verifier, testRun, result, exception);
+        validateResult(verifier, testRun, result, exception, fastAssertions);
     }
 
     static void validateResult(
                     final ResultVerifier verifier,
                     final TestRun testRun,
                     final Value result,
-                    final PolyglotException exception) {
+                    final PolyglotException exception,
+                    boolean fastAssertions) {
         if (exception == null) {
             verifier.accept(ResultVerifier.SnippetRun.create(testRun.getSnippet(), testRun.getActualParameters(), result));
-            ValueAssert.assertValue(result);
+            assertValue(result, fastAssertions);
         } else {
             verifier.accept(ResultVerifier.SnippetRun.create(testRun.getSnippet(), testRun.getActualParameters(), exception));
             Value exceptionObject = exception.getGuestObject();
             if (exceptionObject != null) {
-                ValueAssert.assertValue(exceptionObject);
+                assertValue(exceptionObject, fastAssertions);
             }
         }
     }
 
+    private static void assertValue(final Value result, boolean fastAssertions) {
+        if (fastAssertions) {
+            ValueAssert.assertValueFast(result);
+        } else {
+            ValueAssert.assertValue(result);
+        }
+    }
+
     static List<List<Map.Entry<String, ? extends Snippet>>> findApplicableParameters(
                     final Snippet operator,
                     final Collection<Map.Entry<String, ? extends Snippet>> valueConstructors) {
diff --git a/truffle/src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/ValueAssert.java b/truffle/src/com.oracle.truffle.tck.tests/src/com/oracle/truffle/tck/tests/ValueAssert.java
@@ -140,6 +140,19 @@ public static void assertValue(Value value, boolean hasHostAccess, Trait... expe
         }
     }
 
+    public static void assertValueFast(Value value) {
+        try {
+            /*
+             * The idea is that type detection triggers all type checks which triggers basic
+             * assertions.
+             */
+            detectSupportedTypes(value);
+        } catch (AssertionError e) {
+            e.addSuppressed(new AssertionError(String.format("assertValue: %s", value)));
+            throw e;
+        }
+    }
+
     public static void assertUnsupported(Value value, Trait... supported) {
         Set<Trait> supportedSet = new HashSet<>(Arrays.asList(supported));
         for (Trait unsupportedType : Trait.values()) {
