commit d39d155b818cc612b8ac73d550521b173c8e7375
author Hidehiko Abe <hidehiko@google.com> Tue Aug 16 13:47:18 2016 +0900
committer Hidehiko Abe <hidehiko@google.com> Tue Aug 16 13:47:18 2016 +0900
tree a30fd474d7a714e1105bb98d5446c41ac28149e9
parent 18b146e36053681057b858b976d9c451ae5763b4

Make "done" phase of ScreenPinningTestActivity reentrant.

In the original code, in mDone.run() moves the index
forward so it is not reentrant, unlike other
phases.
With this change, it is reentrant.

Change-Id: Ibc1d119967cb658e422d0ce67e4ed8cba1ebd0be

apps/CtsVerifier/src/com/android/cts/verifier/screenpinning/ScreenPinningTestActivity.java

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/screenpinning/ScreenPinningTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/screenpinning/ScreenPinningTestActivity.java
index 0728fb5..a6e5f98 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/screenpinning/ScreenPinningTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/screenpinning/ScreenPinningTestActivity.java
@@ -84,10 +84,6 @@
         } else {
             mTestIndex = 0;
         }
-        // Display any pre-existing text.
-        for (int i = 0; i < mTestIndex; i++) {
-            mTests[i].showText();
-        }
         mTests[mTestIndex].run();
     };
 
@@ -117,9 +113,6 @@
                 mTestIndex++;
                 if (mTestIndex < mTests.length) {
                     mTests[mTestIndex].run();
-                } else {
-                    mNextButton.setVisibility(View.GONE);
-                    findViewById(R.id.pass_button).setVisibility(View.VISIBLE);
                 }
             }
         });
@@ -222,9 +215,13 @@
     };
 
     private final Test mDone = new Test(R.string.screen_pinning_done) {
+        @Override
         protected void run() {
-            showText();
-            succeed();
+            super.run();
+            // On test completion, hide "next" button, and show "pass" button
+            // instead.
+            mNextButton.setVisibility(View.GONE);
+            findViewById(R.id.pass_button).setVisibility(View.VISIBLE);
         };
     };