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 
automerge: 0b1188e

* commit '0b1188e3c1ff6c814dc64c51c83b19afa36d8ce9':
  Fix tests on jenkins, take 2.
This commit is contained in:
Deepanshu Gupta
2015-01-07 23:53:09 +00:00
committed by android-build-merger
parent 97b7b8637b 0b1188e3c1
commit d8e99c5861
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 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());
}