--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringCompareToTest.java	Fri Aug 17 11:56:59 2018 -0500
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringCompareToTest.java	Fri Aug 17 13:20:53 2018 -0700
@@ -24,69 +24,19 @@
 
 package org.graalvm.compiler.replacements.test;
 
-import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.replacements.nodes.ArrayCompareToNode;
-import org.junit.Assert;
-import org.junit.Assume;
 import org.junit.Test;
 
-import jdk.vm.ci.amd64.AMD64;
-import jdk.vm.ci.aarch64.AArch64;
-import jdk.vm.ci.code.InstalledCode;
-import jdk.vm.ci.meta.ResolvedJavaMethod;
-
 /**
  * Tests compareTo method intrinsic.
  */
-public class StringCompareToTest extends MethodSubstitutionTest {
-
-    private ResolvedJavaMethod realMethod = null;
-    private ResolvedJavaMethod testMethod = null;
-    private InstalledCode testCode = null;
-
-    private final String[] testData = new String[]{
-                    "A", "\uFF21", "AB", "A", "a", "Ab", "AA", "\uFF21",
-                    "A\uFF21", "ABC", "AB", "ABcD", "ABCD\uFF21\uFF21", "ABCD\uFF21", "ABCDEFG\uFF21", "ABCD",
-                    "ABCDEFGH\uFF21\uFF21", "\uFF22", "\uFF21\uFF22", "\uFF21A",
-                    "\uFF21\uFF21",
-                    "\u043c\u0430\u043c\u0430\u0020\u043c\u044b\u043b\u0430\u0020\u0440\u0430\u043c\u0443\u002c\u0020\u0440\u0430\u043c\u0430\u0020\u0441\u044a\u0435\u043b\u0430\u0020\u043c\u0430\u043c\u0443",
-                    "crazy dog jumps over laszy fox",
-                    "some-string\0xff",
-                    "XMM-XMM-YMM-YMM-ZMM-ZMM-ZMM-ZMM-",
-                    "XMM-XMM+YMM-YMM-ZMM-ZMM-ZMM-ZMM-",
-                    "XMM-XMM-YMM-YMM+ZMM-ZMM-ZMM-ZMM-",
-                    "XMM-XMM-YMM-YMM-ZMM-ZMM-ZMM-ZMM+",
-                    "XMM-XMM-XMM-XMM-YMM-YMM-YMM-YMM-ZMM-ZMM-ZMM-ZMM-ZMM-ZMM-ZMM-ZMM-",
-                    "XMM-XMM-XMM-XMM+YMM-YMM-YMM-YMM-ZMM-ZMM-ZMM-ZMM-ZMM-ZMM-ZMM-ZMM-",
-                    "XMM-XMM-XMM-XMM-YMM-YMM-YMM-YMM+ZMM-ZMM-ZMM-ZMM-ZMM-ZMM-ZMM-ZMM-",
-                    "XMM-XMM-XMM-XMM-YMM-YMM-YMM-YMM-ZMM-ZMM-ZMM-ZMM-ZMM-ZMM-ZMM-ZMM+",
-                    ""
-    };
+public class StringCompareToTest extends StringSubstitutionTestBase {
 
     public StringCompareToTest() {
-        Assume.assumeTrue((getTarget().arch instanceof AMD64) || (getTarget().arch instanceof AArch64));
-
-        realMethod = getResolvedJavaMethod(String.class, "compareTo", String.class);
-        testMethod = getResolvedJavaMethod("stringCompareTo");
-        StructuredGraph graph = testGraph("stringCompareTo");
-
-        // Check to see if the resulting graph contains the expected node
-        StructuredGraph replacement = getReplacements().getSubstitution(realMethod, -1, false, null);
-        if (replacement == null) {
-            assertInGraph(graph, ArrayCompareToNode.class);
-        }
-
-        // Force compilation
-        testCode = getCode(testMethod);
-        Assert.assertNotNull(testCode);
-    }
-
-    private void executeStringCompareTo(String s0, String s1) {
-        Object expected = invokeSafe(realMethod, s0, s1);
-        // Verify that the original method and the substitution produce the same value
-        assertDeepEquals(expected, invokeSafe(testMethod, null, s0, s1));
-        // Verify that the generated code and the original produce the same value
-        assertDeepEquals(expected, executeVarargsSafe(testCode, s0, s1));
+        initSubstitution(
+                        getResolvedJavaMethod(String.class, "compareTo", String.class),
+                        getResolvedJavaMethod("stringCompareTo"),
+                        ArrayCompareToNode.class);
     }
 
     public static int stringCompareTo(String a, String b) {
@@ -94,36 +44,20 @@
     }
 
     @Test
+    @Override
     public void testEqualString() {
-        String s = "equal-string";
-        executeStringCompareTo(s, new String(s.toCharArray()));
+        super.testEqualString();
     }
 
     @Test
+    @Override
     public void testDifferentString() {
-        // Smoke test for primary cases
-        executeStringCompareTo("AAAAAAAA", "");
-        // LL
-        executeStringCompareTo("some-stringA", "some-string\0xff");
-        // UU
-        executeStringCompareTo("\u2241AAAAAAAB", "\u2241\u0041\u0041\u0041\u0041\u0041\u0041\u0041\uFF41");
-        // LU
-        executeStringCompareTo("AAAAAAAAB", "\u0041\u0041\u0041\u0041\u0041\u0041\u0041\u0041\uFF41");
+        super.testDifferentString();
     }
 
     @Test
+    @Override
     public void testAllStrings() {
-        for (String s0 : testData) {
-            for (String s1 : testData) {
-                try {
-                    executeStringCompareTo(s0, s1);
-                } catch (AssertionError ex) {
-                    System.out.println("FAIL: '" + ex + "'");
-                    System.out.println(" ***: s0 '" + s0 + "'");
-                    System.out.println(" ***: s1 '" + s1 + "'");
-                    throw ex;
-                }
-            }
-        }
+        super.testAllStrings();
     }
 }