commit ac3e5a243a7663822a6e50fb8644fb17907e4839
author Hal Canary <halcanary@google.com> Thu Jun 07 15:42:27 2018 -0400
committer Leon Scroggins III <scroggo@google.com> Thu Jun 07 16:10:53 2018 -0400
tree b6dd465a9b9d5c45eec922f3444984c33659e362
parent e07e0d09fb03ff258f07ae7092a41fc01895b47d

SkQP: junit uses java identifiers

Bug: 109842281
Test: This

Fix up test names to only include valid characters.

Change-Id: I4709d7a92e6ad822ec1f208823ddb3b37356d142

platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java

diff --git a/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java b/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java
index 0c6008c..297c653 100644
--- a/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java
+++ b/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java
@@ -61,15 +61,18 @@
         mTests = new Description[this.testCount()];
         mShouldSkipTest = new boolean[mTests.length]; // = {false, false, ....};
         int index = 0;
+        String badIdentifiers = "[^A-Za-z0-9_]";
         for (int backend = 0; backend < impl.mBackends.length; backend++) {
+            String backendName = impl.mBackends[backend];
+            assert(!backendName.matches("^[0-9]"));
             for (int gm = 0; gm < impl.mGMs.length; gm++) {
-                mTests[index++] = Description.createTestDescription(SkQPRunner.class,
-                    impl.mBackends[backend] + "_" + impl.mGMs[gm]);
+                String name = (backendName + "_" + impl.mGMs[gm]).replaceAll(badIdentifiers, "_");
+                mTests[index++] = Description.createTestDescription(SkQPRunner.class, name);
             }
         }
         for (int unitTest = 0; unitTest < impl.mUnitTests.length; unitTest++) {
-            mTests[index++] = Description.createTestDescription(SkQPRunner.class,
-                    "unitTest_" + impl.mUnitTests[unitTest]);
+            String name = ("unitTest_" + impl.mUnitTests[unitTest]).replaceAll(badIdentifiers, "_");
+            mTests[index++] = Description.createTestDescription(SkQPRunner.class, name);
         }
         assert(index == mTests.length);
         mShouldRunTestCount = mTests.length;