JRE-43 Font.getFamily() does not work in headless modejb8u112-b450

Added golden images for linux font rendering

11 files changed, 28 insertions, 4 deletions

diff --git a/idea/java/tests/quality_tests.xml b/idea/java/tests/quality_tests.xml
index 842cefdefc..fe87352b32 100644
--- a/idea/java/tests/quality_tests.xml
+++ b/idea/java/tests/quality_tests.xml
@@ -1,12 +1,36 @@
 <project name="QualityTests" default="run" basedir=".">
 <description>
-        JBRE Performance tests
+        JBRE Quality tests
     </description>
+
+    <condition property="isWindows">
+        <os family="windows" />
+    </condition>
+
+    <condition property="isLinux">
+        <os family="unix" />
+    </condition>
+
+    <condition property="isMac">
+        <os family="mac" />
+    </condition>
+
     <property name="src" location="src"/>
     <property name="lib" location="lib"/>
     <property name="testdata" location="testdata"/>
     <property name="build" location="build"/>
-    <property name="test_jvm" location="../../../jbsdk/jdk/Contents/Home/bin/java"/>
+
+    <target name="set_test_jvm_mac" if="isMac">
+        <property name="test_jvm" location="../../../jbsdk/jdk/Contents/Home/bin/java"/>
+    </target>
+
+    <target name="set_test_jvm_linux" if="isLinux">
+        <property name="test_jvm" location="../../../jbsdk/bin/java"/>
+    </target>
+
+    <target name="set_test_jvm_windows" if="isWindows">
+        <property name="test_jvm" location="../../../jbsdk/bin/java.exe"/>
+    </target>
 
     <target name="init">
         <tstamp/>
@@ -22,7 +46,7 @@
         </javac>
     </target>
 
-    <target name="run"  depends="compile">
+    <target name="run"  depends="compile,set_test_jvm_mac, set_test_jvm_windows, set_test_jvm_linux">
         <junit printsummary="on" haltonfailure="no" showoutput="on" fork="yes" jvm="${test_jvm}">
             <classpath>
                 <pathelement location="${lib}/junit-4.12.jar" />
diff --git a/idea/java/tests/src/quality/text/DroidFontTest.java b/idea/java/tests/src/quality/text/DroidFontTest.java
index 79c4bcaf74..ef796af71c 100644
--- a/idea/java/tests/src/quality/text/DroidFontTest.java
+++ b/idea/java/tests/src/quality/text/DroidFontTest.java
@@ -36,7 +36,7 @@ public class DroidFontTest {
             throws Exception {
 
         String[] testDataVariant = {
-                "osx_hardware_rendering", "osx_software_rendering"};
+                "osx_hardware_rendering", "osx_software_rendering", "linux_rendering"};
 
         String testDataStr = System.getProperty("testdata");
         assertNotNull("testdata property is not set", testDataStr);
diff --git a/idea/java/tests/testdata/quality/text/linux_rendering/droidsans0_20.png b/idea/java/tests/testdata/quality/text/linux_rendering/droidsans0_20.png
new file mode 100644
index 0000000000..70e6f5655d
--- /dev/null
+++ b/idea/java/tests/testdata/quality/text/linux_rendering/droidsans0_20.png
diff --git a/idea/java/tests/testdata/quality/text/linux_rendering/droidsans1_20.png b/idea/java/tests/testdata/quality/text/linux_rendering/droidsans1_20.png
new file mode 100644
index 0000000000..b8386dcbd4
--- /dev/null
+++ b/idea/java/tests/testdata/quality/text/linux_rendering/droidsans1_20.png
diff --git a/idea/java/tests/testdata/quality/text/linux_rendering/droidsansmono0_20.png b/idea/java/tests/testdata/quality/text/linux_rendering/droidsansmono0_20.png
new file mode 100644
index 0000000000..cf1a89d2c2
--- /dev/null
+++ b/idea/java/tests/testdata/quality/text/linux_rendering/droidsansmono0_20.png
diff --git a/idea/java/tests/testdata/quality/text/linux_rendering/droidsansmonodotted0_20.png b/idea/java/tests/testdata/quality/text/linux_rendering/droidsansmonodotted0_20.png
new file mode 100644
index 0000000000..4090e5b0f1
--- /dev/null
+++ b/idea/java/tests/testdata/quality/text/linux_rendering/droidsansmonodotted0_20.png
diff --git a/idea/java/tests/testdata/quality/text/linux_rendering/droidsansmonoslashed0_20.png b/idea/java/tests/testdata/quality/text/linux_rendering/droidsansmonoslashed0_20.png
new file mode 100644
index 0000000000..4090e5b0f1
--- /dev/null
+++ b/idea/java/tests/testdata/quality/text/linux_rendering/droidsansmonoslashed0_20.png
diff --git a/idea/java/tests/testdata/quality/text/linux_rendering/droidserif0_20.png b/idea/java/tests/testdata/quality/text/linux_rendering/droidserif0_20.png
new file mode 100644
index 0000000000..8f7b89ea03
--- /dev/null
+++ b/idea/java/tests/testdata/quality/text/linux_rendering/droidserif0_20.png
diff --git a/idea/java/tests/testdata/quality/text/linux_rendering/droidserif1_20.png b/idea/java/tests/testdata/quality/text/linux_rendering/droidserif1_20.png
new file mode 100644
index 0000000000..32d0dffb9c
--- /dev/null
+++ b/idea/java/tests/testdata/quality/text/linux_rendering/droidserif1_20.png
diff --git a/idea/java/tests/testdata/quality/text/linux_rendering/droidserif2_20.png b/idea/java/tests/testdata/quality/text/linux_rendering/droidserif2_20.png
new file mode 100644
index 0000000000..2e3b1b3379
--- /dev/null
+++ b/idea/java/tests/testdata/quality/text/linux_rendering/droidserif2_20.png
diff --git a/idea/java/tests/testdata/quality/text/linux_rendering/droidserif3_20.png b/idea/java/tests/testdata/quality/text/linux_rendering/droidserif3_20.png
new file mode 100644
index 0000000000..2d1842bb58
--- /dev/null
+++ b/idea/java/tests/testdata/quality/text/linux_rendering/droidserif3_20.png