diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/android/ResourceFilterFactoryTest.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/ResourceFilterFactoryTest.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/ResourceFilterFactoryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/ResourceFilterFactoryTest.java index 5ab028a7cd..d09214c3e0 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/ResourceFilterFactoryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/ResourceFilterFactoryTest.java @@ -38,9 +38,9 @@ import org.junit.runners.JUnit4; @RunWith(JUnit4.class) public class ResourceFilterFactoryTest extends ResourceTestBase { - private NestedSet<ValidatedAndroidData> getResources(ImmutableList<Artifact>... resources) + private NestedSet<ValidatedAndroidResources> getResources(ImmutableList<Artifact>... resources) throws Exception { - NestedSetBuilder<ValidatedAndroidData> builder = NestedSetBuilder.naiveLinkOrder(); + NestedSetBuilder<ValidatedAndroidResources> builder = NestedSetBuilder.naiveLinkOrder(); for (ImmutableList<Artifact> resourceList : resources) { builder.add(getResources(resourceList)); } @@ -386,29 +386,29 @@ public class ResourceFilterFactoryTest extends ResourceTestBase { .containsExactly(directResourceToKeep, transitiveResourceToKeep) .inOrder(); - List<ValidatedAndroidData> directContainers = + List<ValidatedAndroidResources> directContainers = filteredResourceDeps.getDirectResourceContainers().toList(); assertThat(directContainers).hasSize(2); - ValidatedAndroidData directToDiscard = directContainers.get(0); + ValidatedAndroidResources directToDiscard = directContainers.get(0); assertThat(directToDiscard.getResources()).isEmpty(); assertThat(directToDiscard.getResourceRoots()).isEmpty(); - ValidatedAndroidData directToKeep = directContainers.get(1); + ValidatedAndroidResources directToKeep = directContainers.get(1); assertThat(directToKeep.getResources()).containsExactly(directResourceToKeep); assertThat(directToKeep.getResourceRoots()) .containsExactly( directResourceToKeep.getExecPath().getParentDirectory().getParentDirectory()); - List<ValidatedAndroidData> transitiveContainers = + List<ValidatedAndroidResources> transitiveContainers = filteredResourceDeps.getTransitiveResourceContainers().toList(); assertThat(transitiveContainers).hasSize(2); - ValidatedAndroidData transitiveToDiscard = transitiveContainers.get(0); + ValidatedAndroidResources transitiveToDiscard = transitiveContainers.get(0); assertThat(transitiveToDiscard.getResources()).isEmpty(); assertThat(transitiveToDiscard.getResourceRoots()).isEmpty(); - ValidatedAndroidData transitiveToKeep = transitiveContainers.get(1); + ValidatedAndroidResources transitiveToKeep = transitiveContainers.get(1); assertThat(transitiveToKeep.getResources()).containsExactly(transitiveResourceToKeep); assertThat(transitiveToKeep.getResourceRoots()) .containsExactly( |