From d657b149274aeba0561e68f7172907b300d1b452 Mon Sep 17 00:00:00 2001 From: Deepanshu Gupta Date: Wed, 7 Jan 2015 11:22:22 -0800 Subject: [PATCH] Fix tests on jenkins, take 2. Change-Id: I67386c34a7abd7c3afdf9f0768f36f4786399be0 --- .../com/android/layoutlib/bridge/intensive/Main.java | 10 ++++++---- 1 file 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 8085be1e5a44f..96725af35e72a 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()); }