diff options
| author |  Carmi Grushko <carmi@google.com> | 2017-02-09 22:17:34 +0000 |
|---|---|---|
| committer |  Kristina Chodorow <kchodorow@google.com> | 2017-02-10 15:34:17 +0000 |
| commit | d6135c52d0be70eda53768a8b340a449ef6d825c (patch) | |
| tree | 30af13dd43127111e42e7d67e6e0a2bd77bd1fd9 | |
| parent | fc9750c5828f398bb448dcb6c6de7e195a744eba (diff) | |
--
PiperOrigin-RevId: 147080281
MOS_MIGRATED_REVID=147080281
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java index a5ab962a59..064177538e 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java @@ -159,12 +159,13 @@ public class SkylarkJavaLiteProtoLibraryTest extends BuildViewTestCase { .getRemainingArguments(); assertThat(args) - .contains( + .containsAllOf( "--java_out=lite,immutable,no_enforce_api_compatibility:" + genfilesDir - + "/x/protolib-lite-src.jar"); - - MoreAsserts.assertContainsSublist(args, "-Ix/file.proto=x/file.proto", "x/file.proto"); + + "/x/protolib-lite-src.jar", + "-Ix/file.proto=x/file.proto", + "x/file.proto") + .inOrder(); } @Test @@ -240,12 +241,13 @@ public class SkylarkJavaLiteProtoLibraryTest extends BuildViewTestCase { List<String> args = getGeneratingSpawnAction(litepb2, "cross/bravo-lite-src.jar").getRemainingArguments(); assertThat(args) - .contains( + .containsAllOf( "--java_out=lite,immutable,no_enforce_api_compatibility:" + genfilesDir - + "/cross/bravo-lite-src.jar"); - MoreAsserts.assertContainsSublist( - args, "-Icross/bravo.proto=cross/bravo.proto", "cross/bravo.proto"); + + "/cross/bravo-lite-src.jar", + "-Icross/bravo.proto=cross/bravo.proto", + "cross/bravo.proto") + .inOrder(); List<String> directJars = prettyJarNames( |