From 2235a86054d1192b93ce62bd2c6b56a5b8dfcc87 Mon Sep 17 00:00:00 2001
From: Antonio Zugaldia <antonio@silicalabs.com>
Date: Tue, 15 Sep 2015 14:18:00 -0400
Subject: [PATCH] manually add a screenshot name

---
 .../mapboxgl/testapp/utils/ScreenshotUtil.java      | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxgl/testapp/utils/ScreenshotUtil.java b/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxgl/testapp/utils/ScreenshotUtil.java
index 0e35fad68..51eceaca9 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxgl/testapp/utils/ScreenshotUtil.java
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxgl/testapp/utils/ScreenshotUtil.java
@@ -30,7 +30,7 @@ public class ScreenshotUtil {
     private static final Bitmap.CompressFormat DEFAULT_IMAGE_FORMAT = Bitmap.CompressFormat.PNG;
     private static final int DEFAULT_IMAGE_QUALITY = 100;
 
-    public static void take(Activity activity) {
+    public static void take(Activity activity, String testName) {
 
         // Check if storage is available
         if (!isExternalStorageWritable()) {
@@ -46,7 +46,7 @@ public class ScreenshotUtil {
         rootView.setDrawingCacheEnabled(false);
 
         // Save the bitmap in external storage
-        String uniqueAbsolutePath = getUniqueAbsolutePath();
+        String uniqueAbsolutePath = getUniqueAbsolutePath(testName);
         File outputFile = new File(uniqueAbsolutePath);
         OutputStream outputStream = null;
         try {
@@ -77,9 +77,14 @@ public class ScreenshotUtil {
         return false;
     }
 
-    private static String getUniqueAbsolutePath() {
-        String externalPath = Environment.getExternalStorageDirectory().toString();
+    private static String getUniqueAbsolutePath(String testName) {
+        // A screenshot after every test vs. manual tests
         String filename = UUID.randomUUID().toString() + DEFAULT_IMAGE_EXTENSION;
+        if (testName != null && !testName.isEmpty()) {
+            filename = testName + DEFAULT_IMAGE_EXTENSION;
+        }
+
+        String externalPath = Environment.getExternalStorageDirectory().toString();
         String path = externalPath + File.separator + SCREENSHOT_FOLDER + File.separator + filename;
         Log.d(LOG_TAG, "Screenshot path: " + path);
         return path;