JRE-462 Migrate ant based junit tests to gradlejb8u152-b978

Migrate quality tests

38 files changed, 9 insertions, 11 deletions

diff --git a/idea/java/tests/quality_tests.xml b/idea/java/tests/quality_tests.xml
index d54d721f39..74a713834f 100644
--- a/idea/java/tests/quality_tests.xml
+++ b/idea/java/tests/quality_tests.xml
@@ -15,9 +15,9 @@
         <os family="mac" />
     </condition>
 
-    <property name="src" location="src"/>
+    <property name="src" location="../../../test/jbu"/>
     <property name="lib" location="lib"/>
-    <property name="testdata" location="testdata"/>
+    <property name="testdata" location="../../../test/jbu/testdata"/>
     <property name="build" location="build"/>
 
     <target name="set_test_jvm_mac" if="isMac">
@@ -42,7 +42,7 @@
 
     <target name="compile" depends="init,set_test_jvm_mac, set_test_jvm_windows, set_test_jvm_linux"
             description="compile the source">
-        <javac srcdir="${src}" destdir="${build}" executable="${test_javac}" fork="yes">
+        <javac srcdir="${src}" destdir="${build}" executable="${test_javac}" fork="yes" includeantruntime="false">
             <classpath>
                 <pathelement location="${lib}/junit-4.12.jar" />
             </classpath>
diff --git a/idea/java/tests/src/quality/text/DroidFontTest.java b/test/jbu/quality/text/DroidFontTest.java
index ef796af71c..c080b0cfee 100644
--- a/idea/java/tests/src/quality/text/DroidFontTest.java
+++ b/test/jbu/quality/text/DroidFontTest.java
@@ -36,7 +36,8 @@ public class DroidFontTest {
             throws Exception {
 
         String[] testDataVariant = {
-                "osx_hardware_rendering", "osx_software_rendering", "linux_rendering"};
+                "osx_hardware_rendering", "osx_software_rendering", "osx_sierra_rendering",
+                "linux_rendering"};
 
         String testDataStr = System.getProperty("testdata");
         assertNotNull("testdata property is not set", testDataStr);
@@ -70,7 +71,7 @@ public class DroidFontTest {
 
         if (System.getProperty("gentestdata") == null) {
             boolean failed = true;
-            String failureReason = "";
+            StringBuilder failureReason = new StringBuilder();
             for (String variant : testDataVariant) {
                 File goldenFile = new File(testData, variant + File.separator +
                         gfName);
@@ -80,8 +81,7 @@ public class DroidFontTest {
                 if (resultImage.getWidth() != goldenImage.getWidth() ||
                     resultImage.getHeight() != resultImage.getHeight())
                 {
-                    failureReason += variant +
-                            " : Golden image and result have different sizes\n";
+                    failureReason.append(variant).append(" : Golden image and result have different sizes\n");
                     continue;
                 }
 
@@ -98,9 +98,7 @@ public class DroidFontTest {
                         assertTrue(gArr.length == rArr.length);
                         for (int k = 0; k < gArr.length; k++) {
                             if (gArr[k] != rArr[k]) {
-                                failureReason += variant +
-                                        " : Different pixels found " +
-                                        "at (" + i + "," + j + ")";
+                                failureReason.append(variant).append(" : Different pixels found ").append("at (").append(i).append(",").append(j).append(")");
                                 failed = true;
                                 break scan;
                             }
@@ -111,7 +109,7 @@ public class DroidFontTest {
                 if (!failed) break;
             }
 
-            if (failed) throw new RuntimeException(failureReason);
+            if (failed) throw new RuntimeException(failureReason.toString());
         }
         else {
             ImageIO.write(resultImage, "png", new File(testData, gfName));
diff --git a/idea/java/tests/testdata/quality/text/linux_rendering/droidsans0_20.png b/test/jbu/testdata/quality/text/linux_rendering/droidsans0_20.png
index 574c9a6251..574c9a6251 100644
--- a/idea/java/tests/testdata/quality/text/linux_rendering/droidsans0_20.png
+++ b/test/jbu/testdata/quality/text/linux_rendering/droidsans0_20.png
diff --git a/idea/java/tests/testdata/quality/text/linux_rendering/droidsans1_20.png b/test/jbu/testdata/quality/text/linux_rendering/droidsans1_20.png
index 4482b5f577..4482b5f577 100644
--- a/idea/java/tests/testdata/quality/text/linux_rendering/droidsans1_20.png
+++ b/test/jbu/testdata/quality/text/linux_rendering/droidsans1_20.png
diff --git a/idea/java/tests/testdata/quality/text/linux_rendering/droidsansmono0_20.png b/test/jbu/testdata/quality/text/linux_rendering/droidsansmono0_20.png
index 9a947729b0..9a947729b0 100644
--- a/idea/java/tests/testdata/quality/text/linux_rendering/droidsansmono0_20.png
+++ b/test/jbu/testdata/quality/text/linux_rendering/droidsansmono0_20.png
diff --git a/idea/java/tests/testdata/quality/text/linux_rendering/droidsansmonodotted0_20.png b/test/jbu/testdata/quality/text/linux_rendering/droidsansmonodotted0_20.png
index 8b68a6d9c4..8b68a6d9c4 100644
--- a/idea/java/tests/testdata/quality/text/linux_rendering/droidsansmonodotted0_20.png
+++ b/test/jbu/testdata/quality/text/linux_rendering/droidsansmonodotted0_20.png
diff --git a/idea/java/tests/testdata/quality/text/linux_rendering/droidsansmonoslashed0_20.png b/test/jbu/testdata/quality/text/linux_rendering/droidsansmonoslashed0_20.png
index bdb202be19..bdb202be19 100644
--- a/idea/java/tests/testdata/quality/text/linux_rendering/droidsansmonoslashed0_20.png
+++ b/test/jbu/testdata/quality/text/linux_rendering/droidsansmonoslashed0_20.png
diff --git a/idea/java/tests/testdata/quality/text/linux_rendering/droidserif0_20.png b/test/jbu/testdata/quality/text/linux_rendering/droidserif0_20.png
index 2b24d22298..2b24d22298 100644
--- a/idea/java/tests/testdata/quality/text/linux_rendering/droidserif0_20.png
+++ b/test/jbu/testdata/quality/text/linux_rendering/droidserif0_20.png
diff --git a/idea/java/tests/testdata/quality/text/linux_rendering/droidserif1_20.png b/test/jbu/testdata/quality/text/linux_rendering/droidserif1_20.png
index 307074ff3d..307074ff3d 100644
--- a/idea/java/tests/testdata/quality/text/linux_rendering/droidserif1_20.png
+++ b/test/jbu/testdata/quality/text/linux_rendering/droidserif1_20.png
diff --git a/idea/java/tests/testdata/quality/text/linux_rendering/droidserif2_20.png b/test/jbu/testdata/quality/text/linux_rendering/droidserif2_20.png
index 35c1171a44..35c1171a44 100644
--- a/idea/java/tests/testdata/quality/text/linux_rendering/droidserif2_20.png
+++ b/test/jbu/testdata/quality/text/linux_rendering/droidserif2_20.png
diff --git a/idea/java/tests/testdata/quality/text/linux_rendering/droidserif3_20.png b/test/jbu/testdata/quality/text/linux_rendering/droidserif3_20.png
index 1fd8439f57..1fd8439f57 100644
--- a/idea/java/tests/testdata/quality/text/linux_rendering/droidserif3_20.png
+++ b/test/jbu/testdata/quality/text/linux_rendering/droidserif3_20.png
diff --git a/idea/java/tests/testdata/quality/text/osx_hardware_rendering/droidsans0_20.png b/test/jbu/testdata/quality/text/osx_hardware_rendering/droidsans0_20.png
index 70e6f5655d..70e6f5655d 100644
--- a/idea/java/tests/testdata/quality/text/osx_hardware_rendering/droidsans0_20.png
+++ b/test/jbu/testdata/quality/text/osx_hardware_rendering/droidsans0_20.png
diff --git a/idea/java/tests/testdata/quality/text/osx_hardware_rendering/droidsans1_20.png b/test/jbu/testdata/quality/text/osx_hardware_rendering/droidsans1_20.png
index b8386dcbd4..b8386dcbd4 100644
--- a/idea/java/tests/testdata/quality/text/osx_hardware_rendering/droidsans1_20.png
+++ b/test/jbu/testdata/quality/text/osx_hardware_rendering/droidsans1_20.png
diff --git a/idea/java/tests/testdata/quality/text/osx_hardware_rendering/droidsansmono0_20.png b/test/jbu/testdata/quality/text/osx_hardware_rendering/droidsansmono0_20.png
index cf1a89d2c2..cf1a89d2c2 100644
--- a/idea/java/tests/testdata/quality/text/osx_hardware_rendering/droidsansmono0_20.png
+++ b/test/jbu/testdata/quality/text/osx_hardware_rendering/droidsansmono0_20.png
diff --git a/idea/java/tests/testdata/quality/text/osx_hardware_rendering/droidsansmonodotted0_20.png b/test/jbu/testdata/quality/text/osx_hardware_rendering/droidsansmonodotted0_20.png
index 9f68c5bfe9..9f68c5bfe9 100644
--- a/idea/java/tests/testdata/quality/text/osx_hardware_rendering/droidsansmonodotted0_20.png
+++ b/test/jbu/testdata/quality/text/osx_hardware_rendering/droidsansmonodotted0_20.png
diff --git a/idea/java/tests/testdata/quality/text/osx_hardware_rendering/droidsansmonoslashed0_20.png b/test/jbu/testdata/quality/text/osx_hardware_rendering/droidsansmonoslashed0_20.png
index da76ddac78..da76ddac78 100644
--- a/idea/java/tests/testdata/quality/text/osx_hardware_rendering/droidsansmonoslashed0_20.png
+++ b/test/jbu/testdata/quality/text/osx_hardware_rendering/droidsansmonoslashed0_20.png
diff --git a/idea/java/tests/testdata/quality/text/osx_hardware_rendering/droidserif0_20.png b/test/jbu/testdata/quality/text/osx_hardware_rendering/droidserif0_20.png
index 8f7b89ea03..8f7b89ea03 100644
--- a/idea/java/tests/testdata/quality/text/osx_hardware_rendering/droidserif0_20.png
+++ b/test/jbu/testdata/quality/text/osx_hardware_rendering/droidserif0_20.png
diff --git a/idea/java/tests/testdata/quality/text/osx_hardware_rendering/droidserif1_20.png b/test/jbu/testdata/quality/text/osx_hardware_rendering/droidserif1_20.png
index 32d0dffb9c..32d0dffb9c 100644
--- a/idea/java/tests/testdata/quality/text/osx_hardware_rendering/droidserif1_20.png
+++ b/test/jbu/testdata/quality/text/osx_hardware_rendering/droidserif1_20.png
diff --git a/idea/java/tests/testdata/quality/text/osx_hardware_rendering/droidserif2_20.png b/test/jbu/testdata/quality/text/osx_hardware_rendering/droidserif2_20.png
index 2e3b1b3379..2e3b1b3379 100644
--- a/idea/java/tests/testdata/quality/text/osx_hardware_rendering/droidserif2_20.png
+++ b/test/jbu/testdata/quality/text/osx_hardware_rendering/droidserif2_20.png
diff --git a/idea/java/tests/testdata/quality/text/osx_hardware_rendering/droidserif3_20.png b/test/jbu/testdata/quality/text/osx_hardware_rendering/droidserif3_20.png
index 1fd8439f57..1fd8439f57 100644
--- a/idea/java/tests/testdata/quality/text/osx_hardware_rendering/droidserif3_20.png
+++ b/test/jbu/testdata/quality/text/osx_hardware_rendering/droidserif3_20.png
diff --git a/test/jbu/testdata/quality/text/osx_sierra_rendering/droidsans0_20.png b/test/jbu/testdata/quality/text/osx_sierra_rendering/droidsans0_20.png
new file mode 100644
index 0000000000..b6ed012f17
--- /dev/null
+++ b/test/jbu/testdata/quality/text/osx_sierra_rendering/droidsans0_20.png
diff --git a/test/jbu/testdata/quality/text/osx_sierra_rendering/droidsans1_20.png b/test/jbu/testdata/quality/text/osx_sierra_rendering/droidsans1_20.png
new file mode 100644
index 0000000000..cd316621b5
--- /dev/null
+++ b/test/jbu/testdata/quality/text/osx_sierra_rendering/droidsans1_20.png
diff --git a/test/jbu/testdata/quality/text/osx_sierra_rendering/droidsansmono0_20.png b/test/jbu/testdata/quality/text/osx_sierra_rendering/droidsansmono0_20.png
new file mode 100644
index 0000000000..bd70f50e3b
--- /dev/null
+++ b/test/jbu/testdata/quality/text/osx_sierra_rendering/droidsansmono0_20.png
diff --git a/test/jbu/testdata/quality/text/osx_sierra_rendering/droidsansmonodotted0_20.png b/test/jbu/testdata/quality/text/osx_sierra_rendering/droidsansmonodotted0_20.png
new file mode 100644
index 0000000000..d8a2f2f7ea
--- /dev/null
+++ b/test/jbu/testdata/quality/text/osx_sierra_rendering/droidsansmonodotted0_20.png
diff --git a/test/jbu/testdata/quality/text/osx_sierra_rendering/droidsansmonoslashed0_20.png b/test/jbu/testdata/quality/text/osx_sierra_rendering/droidsansmonoslashed0_20.png
new file mode 100644
index 0000000000..7f620b20ea
--- /dev/null
+++ b/test/jbu/testdata/quality/text/osx_sierra_rendering/droidsansmonoslashed0_20.png
diff --git a/test/jbu/testdata/quality/text/osx_sierra_rendering/droidserif0_20.png b/test/jbu/testdata/quality/text/osx_sierra_rendering/droidserif0_20.png
new file mode 100644
index 0000000000..21dd528a7a
--- /dev/null
+++ b/test/jbu/testdata/quality/text/osx_sierra_rendering/droidserif0_20.png
diff --git a/test/jbu/testdata/quality/text/osx_sierra_rendering/droidserif1_20.png b/test/jbu/testdata/quality/text/osx_sierra_rendering/droidserif1_20.png
new file mode 100644
index 0000000000..484bde6d02
--- /dev/null
+++ b/test/jbu/testdata/quality/text/osx_sierra_rendering/droidserif1_20.png
diff --git a/test/jbu/testdata/quality/text/osx_sierra_rendering/droidserif2_20.png b/test/jbu/testdata/quality/text/osx_sierra_rendering/droidserif2_20.png
new file mode 100644
index 0000000000..138de5d6dd
--- /dev/null
+++ b/test/jbu/testdata/quality/text/osx_sierra_rendering/droidserif2_20.png
diff --git a/test/jbu/testdata/quality/text/osx_sierra_rendering/droidserif3_20.png b/test/jbu/testdata/quality/text/osx_sierra_rendering/droidserif3_20.png
new file mode 100644
index 0000000000..b0485f3dc6
--- /dev/null
+++ b/test/jbu/testdata/quality/text/osx_sierra_rendering/droidserif3_20.png
diff --git a/idea/java/tests/testdata/quality/text/osx_software_rendering/droidsans0_20.png b/test/jbu/testdata/quality/text/osx_software_rendering/droidsans0_20.png
index 70e6f5655d..70e6f5655d 100644
--- a/idea/java/tests/testdata/quality/text/osx_software_rendering/droidsans0_20.png
+++ b/test/jbu/testdata/quality/text/osx_software_rendering/droidsans0_20.png
diff --git a/idea/java/tests/testdata/quality/text/osx_software_rendering/droidsans1_20.png b/test/jbu/testdata/quality/text/osx_software_rendering/droidsans1_20.png
index b8386dcbd4..b8386dcbd4 100644
--- a/idea/java/tests/testdata/quality/text/osx_software_rendering/droidsans1_20.png
+++ b/test/jbu/testdata/quality/text/osx_software_rendering/droidsans1_20.png
diff --git a/idea/java/tests/testdata/quality/text/osx_software_rendering/droidsansmono0_20.png b/test/jbu/testdata/quality/text/osx_software_rendering/droidsansmono0_20.png
index cf1a89d2c2..cf1a89d2c2 100644
--- a/idea/java/tests/testdata/quality/text/osx_software_rendering/droidsansmono0_20.png
+++ b/test/jbu/testdata/quality/text/osx_software_rendering/droidsansmono0_20.png
diff --git a/idea/java/tests/testdata/quality/text/osx_software_rendering/droidsansmonodotted0_20.png b/test/jbu/testdata/quality/text/osx_software_rendering/droidsansmonodotted0_20.png
index 9f68c5bfe9..9f68c5bfe9 100644
--- a/idea/java/tests/testdata/quality/text/osx_software_rendering/droidsansmonodotted0_20.png
+++ b/test/jbu/testdata/quality/text/osx_software_rendering/droidsansmonodotted0_20.png
diff --git a/idea/java/tests/testdata/quality/text/osx_software_rendering/droidsansmonoslashed0_20.png b/test/jbu/testdata/quality/text/osx_software_rendering/droidsansmonoslashed0_20.png
index da76ddac78..da76ddac78 100644
--- a/idea/java/tests/testdata/quality/text/osx_software_rendering/droidsansmonoslashed0_20.png
+++ b/test/jbu/testdata/quality/text/osx_software_rendering/droidsansmonoslashed0_20.png
diff --git a/idea/java/tests/testdata/quality/text/osx_software_rendering/droidserif0_20.png b/test/jbu/testdata/quality/text/osx_software_rendering/droidserif0_20.png
index 8f7b89ea03..8f7b89ea03 100644
--- a/idea/java/tests/testdata/quality/text/osx_software_rendering/droidserif0_20.png
+++ b/test/jbu/testdata/quality/text/osx_software_rendering/droidserif0_20.png
diff --git a/idea/java/tests/testdata/quality/text/osx_software_rendering/droidserif1_20.png b/test/jbu/testdata/quality/text/osx_software_rendering/droidserif1_20.png
index 32d0dffb9c..32d0dffb9c 100644
--- a/idea/java/tests/testdata/quality/text/osx_software_rendering/droidserif1_20.png
+++ b/test/jbu/testdata/quality/text/osx_software_rendering/droidserif1_20.png
diff --git a/idea/java/tests/testdata/quality/text/osx_software_rendering/droidserif2_20.png b/test/jbu/testdata/quality/text/osx_software_rendering/droidserif2_20.png
index 2e3b1b3379..2e3b1b3379 100644
--- a/idea/java/tests/testdata/quality/text/osx_software_rendering/droidserif2_20.png
+++ b/test/jbu/testdata/quality/text/osx_software_rendering/droidserif2_20.png
diff --git a/idea/java/tests/testdata/quality/text/osx_software_rendering/droidserif3_20.png b/test/jbu/testdata/quality/text/osx_software_rendering/droidserif3_20.png
index 1fd8439f57..1fd8439f57 100644
--- a/idea/java/tests/testdata/quality/text/osx_software_rendering/droidserif3_20.png
+++ b/test/jbu/testdata/quality/text/osx_software_rendering/droidserif3_20.png