diff options
| author | Benoit Lamarche <benoitlamarche@google.com> | 2015-06-18 17:56:00 +0200 |
|---|---|---|
| committer | Benoit Lamarche <benoitlamarche@google.com> | 2015-06-18 18:02:53 +0200 |
| commit | c19224bbab964a20695874b4b8e6b01f79a4a65a (patch) | |
| tree | 6525ac57cb3aa4475fa7aacc209ce45c6ee8e1fc | |
| parent | a631d99a9685ad29955cea6714c07130884f4d53 (diff) | |
| download | toolchain_jack-c19224bbab964a20695874b4b8e6b01f79a4a65a.tar.gz toolchain_jack-c19224bbab964a20695874b4b8e6b01f79a4a65a.tar.bz2 toolchain_jack-c19224bbab964a20695874b4b8e6b01f79a4a65a.zip | |
Fix FileConflictTests, again
The ResourceImportConflictException message has changed, so some
tests are broken.
(cherry picked from commit f162d3fef845afdcf63b48316eec5135c2b2368b)
Change-Id: Ib7f1fa0c54dffef94bf7ad3e955bd16b16b212da
| -rw-r--r-- | jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java b/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java index 8b180940..eb90ff24 100644 --- a/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java +++ b/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java @@ -70,11 +70,11 @@ public class FileConflictTests { private static final VPath TYPE3_PATH = new VPath("com/android/jack/fileconflict/test001/jack/MyClass3", '/'); @Nonnull - private static final VPath RESOURCE1_PATH = new VPath("Resource1", '/'); + private static final VPath RESOURCE1_PATH = new VPath("rsc/Resource1", '/'); @Nonnull - private static final VPath RESOURCE2_PATH = new VPath("Resource2", '/'); + private static final VPath RESOURCE2_PATH = new VPath("rsc/Resource2", '/'); @Nonnull - private static final VPath RESOURCE3_PATH = new VPath("Resource3", '/'); + private static final VPath RESOURCE3_PATH = new VPath("rsc/Resource3", '/'); @Nonnull private static final File TEST001_DIR = @@ -220,7 +220,6 @@ public class FileConflictTests { Assert.assertTrue(e.getCause() instanceof LibraryReadingException); Assert.assertTrue(e.getCause().getCause() instanceof ResourceImportConflictException); String errString = errOut.toString(); - Assert.assertTrue(errString.contains("Resource in")); Assert.assertTrue(errString.contains("rsc/Resource1")); Assert.assertTrue(errString.contains("has already been imported")); } @@ -243,7 +242,6 @@ public class FileConflictTests { Assert.assertTrue(e.getCause() instanceof LibraryReadingException); Assert.assertTrue(e.getCause().getCause() instanceof ResourceImportConflictException); String errString = errOut.toString(); - Assert.assertTrue(errString.contains("Resource in")); Assert.assertTrue(errString.contains("rsc/Resource1")); Assert.assertTrue(errString.contains("has already been imported")); } @@ -292,7 +290,6 @@ public class FileConflictTests { Assert.assertTrue(e.getCause() instanceof LibraryReadingException); Assert.assertTrue(e.getCause().getCause() instanceof ResourceImportConflictException); String errString = errOut.toString(); - Assert.assertTrue(errString.contains("Resource in")); Assert.assertTrue(errString.contains("rsc/Resource1")); Assert.assertTrue(errString.contains("has already been imported")); } @@ -315,7 +312,6 @@ public class FileConflictTests { Assert.assertTrue(e.getCause() instanceof LibraryReadingException); Assert.assertTrue(e.getCause().getCause() instanceof ResourceImportConflictException); String errString = errOut.toString(); - Assert.assertTrue(errString.contains("Resource in")); Assert.assertTrue(errString.contains("rsc/Resource1")); Assert.assertTrue(errString.contains("has already been imported")); } @@ -372,7 +368,6 @@ public class FileConflictTests { } } String errString = errOut.toString(); - Assert.assertTrue(errString.contains("Resource in")); Assert.assertTrue(errString.contains("rsc/Resource1")); Assert.assertTrue(errString.contains("has already been imported")); } |