Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev

Browse Source 
* commit '3bd33f1d9e8af826fa95095ca391d40f6c75ca2a':
  Fix tests on jenkins, take 2.
This commit is contained in:
Deepanshu Gupta
2015-01-07 19:46:03 +00:00
committed by Android Git Automerger
parent 0e13957a4d 3bd33f1d9e
commit 0b1188e3c1
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
View File

@@ -76,7 +76,10 @@ public class Main {
private static final String PLATFORM_DIR; private static final String PLATFORM_DIR;
private static final String TEST_RES_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 LayoutLog mLayoutLibLog;
private FrameworkResources mFrameworkRepo; private FrameworkResources mFrameworkRepo;
@@ -281,10 +284,9 @@ public class Main {
getLogger().error(session.getResult().getException(), getLogger().error(session.getResult().getException(),
session.getResult().getErrorMessage()); session.getResult().getErrorMessage());
} }
String goldenDataDir = APP_TEST_RES + "/../../../golden/";
try { try {
goldenDataDir = new File(goldenDataDir).getAbsolutePath(); String goldenImagePath = APP_TEST_DIR + "/golden/activity.png";
ImageUtils.requireSimilar(goldenDataDir + "activity.png", session.getImage()); ImageUtils.requireSimilar(goldenImagePath, session.getImage());
} catch (IOException e) { } catch (IOException e) {
getLogger().error(e, e.getMessage()); getLogger().error(e, e.getMessage());
} }