Merge "Print results of RSTest after each test" am: 60c4fcc60f

am: bfecbc59c8

Change-Id: Idf3ef7bd58259750d0ed35d89dd0a6d6a13bdbbb

12 files changed, 99 insertions, 95 deletions

diff --git a/tests/java_api/RSTestBackward/src/com/android/rs/testbackward/RSBackwardCompatibilityTests.java b/tests/java_api/RSTestBackward/src/com/android/rs/testbackward/RSBackwardCompatibilityTests.java
index b3ee56e4..c203d314 100644
--- a/tests/java_api/RSTestBackward/src/com/android/rs/testbackward/RSBackwardCompatibilityTests.java
+++ b/tests/java_api/RSTestBackward/src/com/android/rs/testbackward/RSBackwardCompatibilityTests.java
@@ -79,12 +79,9 @@ public class RSBackwardCompatibilityTests {
     @Test
     @MediumTest
     public void testRSUnitTest() throws Exception {
-        String thisDeviceName = android.os.Build.DEVICE;
-        int thisApiVersion = android.os.Build.VERSION.SDK_INT;
-        Log.i(TAG, String.format("RenderScript backward compatibility testing (%s) "
-                + "on device %s, API version %d",
-                mTest.toString(), thisDeviceName, thisApiVersion));
+        mTest.logStart(TAG, "RenderScript Backward Compatibility Testing");
         mTest.runTest();
+        mTest.logEnd(TAG);
         Assert.assertTrue(mTest.getSuccess());
     }
 }
diff --git a/tests/java_api/RSTestBackward19/src/com/android/rs/testbackward19/RSBackward19CompatibilityTests.java b/tests/java_api/RSTestBackward19/src/com/android/rs/testbackward19/RSBackward19CompatibilityTests.java
index 64a7a40c..3142bd5f 100644
--- a/tests/java_api/RSTestBackward19/src/com/android/rs/testbackward19/RSBackward19CompatibilityTests.java
+++ b/tests/java_api/RSTestBackward19/src/com/android/rs/testbackward19/RSBackward19CompatibilityTests.java
@@ -93,12 +93,9 @@ public class RSBackward19CompatibilityTests {
     @Test
     @MediumTest
     public void testRSUnitTest() throws Exception {
-        String thisDeviceName = android.os.Build.DEVICE;
-        int thisApiVersion = android.os.Build.VERSION.SDK_INT;
-        Log.i(TAG, String.format("RenderScript backward compatibility 19 testing (%s) "
-                + "on device %s, API version %d",
-                mTest.toString(), thisDeviceName, thisApiVersion));
+        mTest.logStart(TAG, "RenderScript Backward Compatibility 19 Testing");
         mTest.runTest();
+        mTest.logEnd(TAG);
         Assert.assertTrue(mTest.getSuccess());
     }
 }
diff --git a/tests/java_api/RSTestForward/src/com/android/rs/testforward/RSForwardCompatibilityTests.java b/tests/java_api/RSTestForward/src/com/android/rs/testforward/RSForwardCompatibilityTests.java
index f87a17f8..61f084f8 100644
--- a/tests/java_api/RSTestForward/src/com/android/rs/testforward/RSForwardCompatibilityTests.java
+++ b/tests/java_api/RSTestForward/src/com/android/rs/testforward/RSForwardCompatibilityTests.java
@@ -53,7 +53,7 @@ public class RSForwardCompatibilityTests {
         List<UnitTest> validUnitTests = new ArrayList<>();
 
         Iterable<Class<? extends UnitTest>> testClasses =
-            RSUtils.getProperSubclasses(UnitTest.class);
+                UnitTest.getProperSubclasses(ctx);
         for (Class<? extends UnitTest> testClass : testClasses) {
             UnitTest test = testClass.getDeclaredConstructor(Context.class).newInstance(ctx);
             validUnitTests.add(test);
@@ -70,12 +70,9 @@ public class RSForwardCompatibilityTests {
     @Test
     @MediumTest
     public void testRSUnitTest() throws Exception {
-        String thisDeviceName = android.os.Build.DEVICE;
-        int thisApiVersion = android.os.Build.VERSION.SDK_INT;
-        Log.i(TAG, String.format("RenderScript forward compatibility testing (%s) "
-                + "on device %s, API version %d",
-                mTest.toString(), thisDeviceName, thisApiVersion));
+        mTest.logStart(TAG, "RenderScript Forward Compatibility Testing");
         mTest.runTest();
+        mTest.logEnd(TAG);
         Assert.assertTrue(mTest.getSuccess());
     }
 }
diff --git a/tests/java_api/RSTestForward/src/com/android/rs/testforward/RSUtils.java b/tests/java_api/RSTestForward/src/com/android/rs/testforward/RSUtils.java
deleted file mode 100644
index 65042b9f..00000000
--- a/tests/java_api/RSTestForward/src/com/android/rs/testforward/RSUtils.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.rs.testforward;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-
-import dalvik.system.DexFile;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Enumeration;
-
-public class RSUtils {
-    /** Returns a list of all proper subclasses of the input class */
-    public static <T> Iterable<Class<? extends T>> getProperSubclasses(Class<T> klass)
-            throws ClassNotFoundException, IOException {
-        Context context = InstrumentationRegistry.getTargetContext();
-
-        ArrayList<Class<? extends T>> ret = new ArrayList<>();
-        DexFile df = new DexFile(context.getPackageCodePath());
-        Enumeration<String> iter = df.entries();
-        while (iter.hasMoreElements()) {
-            String s = iter.nextElement();
-            Class<?> cur = Class.forName(s);
-            while (cur != null) {
-                if (cur.getSuperclass() == klass) {
-                    break;
-                }
-                cur = cur.getSuperclass();
-            }
-            if (cur != null) {
-                ret.add((Class<? extends T>) cur);
-            }
-        }
-        return ret;
-    }
-}
diff --git a/tests/java_api/RSTest_CompatLib/src/com/android/rs/testcompat/RSSupportLibTests.java b/tests/java_api/RSTest_CompatLib/src/com/android/rs/testcompat/RSSupportLibTests.java
index 51f9d350..927cc8be 100644
--- a/tests/java_api/RSTest_CompatLib/src/com/android/rs/testcompat/RSSupportLibTests.java
+++ b/tests/java_api/RSTest_CompatLib/src/com/android/rs/testcompat/RSSupportLibTests.java
@@ -69,12 +69,9 @@ public class RSSupportLibTests {
     @Test
     @MediumTest
     public void testRSUnitTest() throws Exception {
-        String thisDeviceName = android.os.Build.DEVICE;
-        int thisApiVersion = android.os.Build.VERSION.SDK_INT;
-        Log.i(TAG, String.format("RenderScript support lib testing (%s) "
-                + "on device %s, API version %d",
-                mTest.toString(), thisDeviceName, thisApiVersion));
+        mTest.logStart(TAG, "RenderScript Support Library Testing");
         mTest.runTest();
+        mTest.logEnd(TAG);
         Assert.assertTrue(mTest.getSuccess());
     }
 }
diff --git a/tests/java_api/RSTest_CompatLib/src/com/android/rs/testcompat/RSSupportLibTestsListActivity.java b/tests/java_api/RSTest_CompatLib/src/com/android/rs/testcompat/RSSupportLibTestsListActivity.java
index ad30fe1b..c091637a 100644
--- a/tests/java_api/RSTest_CompatLib/src/com/android/rs/testcompat/RSSupportLibTestsListActivity.java
+++ b/tests/java_api/RSTest_CompatLib/src/com/android/rs/testcompat/RSSupportLibTestsListActivity.java
@@ -28,11 +28,13 @@ public class RSSupportLibTestsListActivity extends RSListActivity {
         return UnitTest.getProperSubclasses(this);
     }
 
+    @Override
     protected void logStartUnitTest(UnitTest test) {
-        String thisDeviceName = android.os.Build.DEVICE;
-        int thisApiVersion = android.os.Build.VERSION.SDK_INT;
-        Log.i(TAG, String.format("RenderScript support lib testing (%s) "
-                + "on device %s, API version %d",
-                test.toString(), thisDeviceName, thisApiVersion));
+        test.logStart(TAG, "RenderScript Support Library Testing");
+    }
+
+    @Override
+    protected void logEndUnitTest(UnitTest test) {
+        test.logEnd(TAG);
     }
 }
diff --git a/tests/java_api/RSTest_CompatLib19/src/com/android/rs/testcompat/RSSupportLibTests.java b/tests/java_api/RSTest_CompatLib19/src/com/android/rs/testcompat/RSSupportLibTests.java
index dca91175..2ed97c0a 100644
--- a/tests/java_api/RSTest_CompatLib19/src/com/android/rs/testcompat/RSSupportLibTests.java
+++ b/tests/java_api/RSTest_CompatLib19/src/com/android/rs/testcompat/RSSupportLibTests.java
@@ -69,12 +69,9 @@ public class RSSupportLibTests {
     @Test
     @MediumTest
     public void testRSUnitTest() throws Exception {
-        String thisDeviceName = android.os.Build.DEVICE;
-        int thisApiVersion = android.os.Build.VERSION.SDK_INT;
-        Log.i(TAG, String.format("RenderScript support lib testing (%s) "
-                + "on device %s, API version %d",
-                mTest.toString(), thisDeviceName, thisApiVersion));
+        mTest.logStart(TAG, "RenderScript Support Library 19 Testing");
         mTest.runTest();
+        mTest.logEnd(TAG);
         Assert.assertTrue(mTest.getSuccess());
     }
 }
diff --git a/tests/java_api/RSUnitTests/gui/com/android/rs/unittest/RSListActivity.java b/tests/java_api/RSUnitTests/gui/com/android/rs/unittest/RSListActivity.java
index 2de6538c..54a1fa08 100644
--- a/tests/java_api/RSUnitTests/gui/com/android/rs/unittest/RSListActivity.java
+++ b/tests/java_api/RSUnitTests/gui/com/android/rs/unittest/RSListActivity.java
@@ -20,6 +20,7 @@ public abstract class RSListActivity extends ListActivity {
     protected abstract Iterable<Class<? extends UnitTest>> getUnitTests() throws Exception;
 
     protected abstract void logStartUnitTest(UnitTest test);
+    protected abstract void logEndUnitTest(UnitTest test);
 
     @Override
     public void onCreate(Bundle bundle) {
@@ -71,6 +72,7 @@ public abstract class RSListActivity extends ListActivity {
                 for (UnitTest unitTest : validUnitTests) {
                     RSListActivity.this.logStartUnitTest(unitTest);
                     unitTest.runTest();
+                    RSListActivity.this.logEndUnitTest(unitTest);
                     RSListActivity.this.runOnUiThread(adapter::notifyDataSetChanged);
                 }
             };
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/UnitTest.java b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/UnitTest.java
index be87e374..7bab7b7c 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/UnitTest.java
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/UnitTest.java
@@ -38,7 +38,24 @@ public abstract class UnitTest {
         UT_NOT_STARTED,
         UT_RUNNING,
         UT_SUCCESS,
-        UT_FAIL,
+        UT_FAIL;
+
+        @Override
+        public String toString() {
+            switch (this) {
+                case UT_NOT_STARTED:
+                    return "NOT STARTED";
+                case UT_RUNNING:
+                    return "RUNNING";
+                case UT_SUCCESS:
+                    return "PASS";
+                case UT_FAIL:
+                    return "FAIL";
+                default:
+                    throw new RuntimeException(
+                        "missing enum case in UnitTestResult#toString()");
+            }
+        }
     }
 
     private final static String TAG = "RSUnitTest";
@@ -111,10 +128,27 @@ public abstract class UnitTest {
         }
     }
 
+    public void logStart(String tag, String testSuite) {
+        String thisDeviceName = android.os.Build.DEVICE;
+        int thisApiVersion = android.os.Build.VERSION.SDK_INT;
+        Log.i(tag, String.format("%s: starting '%s' "
+                + "on device %s, API version %d",
+                testSuite, toString(), thisDeviceName, thisApiVersion));
+    }
+
+    public void logEnd(String tag) {
+        Log.i(tag, String.format("RenderScript test '%s': %s",
+                toString(), getResultString()));
+    }
+
     public UnitTestResult getResult() {
         return mResult;
     }
 
+    public String getResultString() {
+        return mResult.toString();
+    }
+
     public boolean getSuccess() {
         return mResult == UnitTestResult.UT_SUCCESS;
     }
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/UnitTest.java b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/UnitTest.java
index 9f488838..5de45ae4 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/UnitTest.java
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/UnitTest.java
@@ -40,7 +40,24 @@ public abstract class UnitTest {
         UT_NOT_STARTED,
         UT_RUNNING,
         UT_SUCCESS,
-        UT_FAIL,
+        UT_FAIL;
+
+        @Override
+        public String toString() {
+            switch (this) {
+                case UT_NOT_STARTED:
+                    return "NOT STARTED";
+                case UT_RUNNING:
+                    return "RUNNING";
+                case UT_SUCCESS:
+                    return "PASS";
+                case UT_FAIL:
+                    return "FAIL";
+                default:
+                    throw new RuntimeException(
+                        "missing enum case in UnitTestResult#toString()");
+            }
+        }
     }
 
     private final static String TAG = "RSUnitTest";
@@ -113,10 +130,27 @@ public abstract class UnitTest {
         }
     }
 
+    public void logStart(String tag, String testSuite) {
+        String thisDeviceName = android.os.Build.DEVICE;
+        int thisApiVersion = android.os.Build.VERSION.SDK_INT;
+        Log.i(tag, String.format("%s: starting '%s' "
+                + "on device %s, API version %d",
+                testSuite, toString(), thisDeviceName, thisApiVersion));
+    }
+
+    public void logEnd(String tag) {
+        Log.i(tag, String.format("RenderScript test '%s': %s",
+                toString(), getResultString()));
+    }
+
     public UnitTestResult getResult() {
         return mResult;
     }
 
+    public String getResultString() {
+        return mResult.toString();
+    }
+
     public boolean getSuccess() {
         return mResult == UnitTestResult.UT_SUCCESS;
     }
diff --git a/tests/java_api/RsTest/src/com/android/rs/test/RSTest.java b/tests/java_api/RsTest/src/com/android/rs/test/RSTest.java
index c97afaad..4ed34ba0 100644
--- a/tests/java_api/RsTest/src/com/android/rs/test/RSTest.java
+++ b/tests/java_api/RsTest/src/com/android/rs/test/RSTest.java
@@ -70,12 +70,9 @@ public class RSTest {
     @Test
     @MediumTest
     public void testRSUnitTest() throws Exception {
-        String thisDeviceName = android.os.Build.DEVICE;
-        int thisApiVersion = android.os.Build.VERSION.SDK_INT;
-        Log.i(TAG, String.format("RenderScript testing (%s) "
-                + "on device %s, API version %d",
-                mTest.toString(), thisDeviceName, thisApiVersion));
+        mTest.logStart(TAG, "RenderScript Testing");
         mTest.runTest();
+        mTest.logEnd(TAG);
         Assert.assertTrue(mTest.getSuccess());
     }
 }
diff --git a/tests/java_api/RsTest/src/com/android/rs/test/RSTestListActivity.java b/tests/java_api/RsTest/src/com/android/rs/test/RSTestListActivity.java
index db760037..25439c3b 100644
--- a/tests/java_api/RsTest/src/com/android/rs/test/RSTestListActivity.java
+++ b/tests/java_api/RsTest/src/com/android/rs/test/RSTestListActivity.java
@@ -31,11 +31,13 @@ public class RSTestListActivity extends RSListActivity {
         return UnitTest.getProperSubclasses(this);
     }
 
+    @Override
     protected void logStartUnitTest(UnitTest test) {
-        String thisDeviceName = android.os.Build.DEVICE;
-        int thisApiVersion = android.os.Build.VERSION.SDK_INT;
-        Log.i(TAG, String.format("RenderScript testing (%s) "
-                + "on device %s, API version %d",
-                test.toString(), thisDeviceName, thisApiVersion));
+        test.logStart(TAG, "RenderScript Testing");
+    }
+
+    @Override
+    protected void logEndUnitTest(UnitTest test) {
+        test.logEnd(TAG);
     }
 }