diff options
| author |  Googler <noreply@google.com> | 2017-10-31 11:12:14 -0400 |
|---|---|---|
| committer |  John Cater <jcater@google.com> | 2017-11-01 09:57:31 -0400 |
| commit | 33fc33ff64b754674c6a6701824fb68ae3bc24f2 (patch) | |
| tree | a1c6e2cdfffb9b6ca3dea5864c6b506f859800fe /src/test/java | |
| parent | 58fd82def9ac853c18c25af1f7d7eaed7b2c6ca4 (diff) | |
Clean up LocalResourceContainer.Builder
LocalResourceContainer.Builder is referenced a bunch of times, but most of
those calls are identical. Replace them with a couple of factory methods. This
lets us make the builder private.
Additionally, LocalResourceContainer called attributeError() on the 'resources'
attribute, even though 'resource_files' is now used most of the time instead.
Now, the error is always given for the correct attribute.
RELNOTES: none
PiperOrigin-RevId: 174038035
Diffstat (limited to 'src/test/java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/LocalResourceContainerTest.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/LocalResourceContainerTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/LocalResourceContainerTest.java index 6f397bf5fb..302ff4afdc 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/LocalResourceContainerTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/LocalResourceContainerTest.java @@ -51,7 +51,7 @@ public class LocalResourceContainerTest extends ResourceTestBase { } errorConsumer.assertAttributeError( - "resources", "is not in the expected resource directory structure"); + "resource_files", "is not in the expected resource directory structure"); } @Test @@ -64,7 +64,7 @@ public class LocalResourceContainerTest extends ResourceTestBase { } errorConsumer.assertAttributeError( - "resources", "All resources must share a common directory"); + "resource_files", "All resources must share a common directory"); } @Test @@ -86,7 +86,7 @@ public class LocalResourceContainerTest extends ResourceTestBase { private ImmutableList<PathFragment> getResourceRoots(ImmutableList<Artifact> artifacts) throws Exception { - return LocalResourceContainer.getResourceRoots(errorConsumer, artifacts); + return LocalResourceContainer.getResourceRoots(errorConsumer, artifacts, "resource_files"); } @Test |