commit cc5b17b351503e53be177b41ae4b7dfdb1c8ce7c
author vadimt <vadimt@google.com> Mon Aug 12 14:46:48 2019 -0700
committer vadimt <vadimt@google.com> Tue Aug 13 17:49:15 2019 -0700
tree 4383657616ee2a86c5894a650cedd271477572a4
parent e4061fc931cb8bc50306a76e617761936a74b97f

Improving screenshot path

Change-Id: If61bbf0bbc8ace31142bc0e2d598d72ce48de360

tests/src/com/android/launcher3/util/rule/FailureWatcher.java

diff --git a/tests/src/com/android/launcher3/util/rule/FailureWatcher.java b/tests/src/com/android/launcher3/util/rule/FailureWatcher.java
index eef2f24..e7a2bca 100644
--- a/tests/src/com/android/launcher3/util/rule/FailureWatcher.java
+++ b/tests/src/com/android/launcher3/util/rule/FailureWatcher.java
@@ -15,7 +15,6 @@
 
 public class FailureWatcher extends TestWatcher {
     private static final String TAG = "FailureWatcher";
-    private static int sScreenshotCount = 0;
     final private UiDevice mDevice;
 
     public FailureWatcher(UiDevice device) {
@@ -40,7 +39,8 @@
     protected void failed(Throwable e, Description description) {
         if (mDevice == null) return;
         final String pathname = getInstrumentation().getTargetContext().
-                getFilesDir().getPath() + "/TaplTestScreenshot" + sScreenshotCount++ + ".png";
+                getFilesDir().getPath() + "/TestScreenshot-" + description.getMethodName()
+                + ".png";
         Log.e(TAG, "Failed test " + description.getMethodName() +
                 ", screenshot will be saved to " + pathname +
                 ", track trace is below, UI object dump is further below:\n" +