am 5df729ad: am a98a9b30: am d8e99c58: am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev automerge: 0b1188e

* commit '5df729ad09b85cb68bdf37d58c5d429c2c8663a4':
  Fix tests on jenkins, take 2.

1 files changed, 6 insertions, 4 deletions

diff --git a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
index 8085be1..96725af 100644
--- a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
+++ b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
@@ -76,7 +76,10 @@ public class Main {
 
     private static final String PLATFORM_DIR;
     private static final String TEST_RES_DIR;
-    private static final String APP_TEST_RES = "/testApp/MyApplication/src/main/res";
+    /** Location of the app to test inside {@link #TEST_RES_DIR}*/
+    private static final String APP_TEST_DIR = "/testApp/MyApplication";
+    /** Location of the app's res dir inside {@link #TEST_RES_DIR}*/
+    private static final String APP_TEST_RES = APP_TEST_DIR + "/src/main/res";
 
     private LayoutLog mLayoutLibLog;
     private FrameworkResources mFrameworkRepo;
@@ -281,10 +284,9 @@ public class Main {
             getLogger().error(session.getResult().getException(),
                     session.getResult().getErrorMessage());
         }
-        String goldenDataDir = APP_TEST_RES + "/../../../golden/";
         try {
-            goldenDataDir = new File(goldenDataDir).getAbsolutePath();
-            ImageUtils.requireSimilar(goldenDataDir + "activity.png", session.getImage());
+            String goldenImagePath = APP_TEST_DIR + "/golden/activity.png";
+            ImageUtils.requireSimilar(goldenImagePath, session.getImage());
         } catch (IOException e) {
             getLogger().error(e, e.getMessage());
         }