1 files changed, 2 insertions, 13 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBuildViewTestCase.java
index a360befaac..7a424bf829 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBuildViewTestCase.java
@@ -115,12 +115,12 @@ public abstract class AndroidBuildViewTestCase extends BuildViewTestCase {
         .isNotNull();
   }
 
-  protected List<String> resourceArguments(ValidatedAndroidData resource)
+  protected List<String> resourceArguments(ValidatedAndroidResources resource)
       throws CommandLineExpansionException {
     return getGeneratingSpawnActionArgs(resource.getApk());
   }
 
-  protected SpawnAction resourceGeneratingAction(ValidatedAndroidData resource) {
+  protected SpawnAction resourceGeneratingAction(ValidatedAndroidResources resource) {
     return getGeneratingSpawnAction(resource.getApk());
   }
 
@@ -130,17 +130,6 @@ public abstract class AndroidBuildViewTestCase extends BuildViewTestCase {
 
   protected static ValidatedAndroidResources getValidatedResources(
       ConfiguredTarget target, boolean transitive) {
-    ValidatedAndroidData validated = getValidatedData(target, transitive);
-    assertThat(validated).isInstanceOf(ValidatedAndroidResources.class);
-    return (ValidatedAndroidResources) validated;
-  }
-
-  protected static ValidatedAndroidData getValidatedData(ConfiguredTarget target) {
-    return getValidatedData(target, /* transitive = */ false);
-  }
-
-  protected static ValidatedAndroidData getValidatedData(
-      ConfiguredTarget target, boolean transitive) {
     Preconditions.checkNotNull(target);
     final AndroidResourcesInfo info = target.get(AndroidResourcesInfo.PROVIDER);
     assertThat(info).named("No android resources exported from the target.").isNotNull();