1 files changed, 1 insertions, 29 deletions
diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/variant/TestVariantData.java b/gradle/src/main/groovy/com/android/build/gradle/internal/variant/TestVariantData.java
index ebd336c..b8d45ed 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/internal/variant/TestVariantData.java
+++ b/gradle/src/main/groovy/com/android/build/gradle/internal/variant/TestVariantData.java
@@ -43,20 +43,12 @@ public class TestVariantData extends ApkVariantData {
         return testedVariantData;
     }
 
-    @NonNull
-    @Override
-    protected String computeName() {
-        return getVariantConfiguration().hasFlavors() ?
-                String.format("%sTest", getFlavoredName(true)) :
-                "Test";
-    }
-
     @Override
     @NonNull
     public String getDescription() {
         if (getVariantConfiguration().hasFlavors()) {
             return String.format("Test build for the %s%s build",
-                    getFlavoredName(true), getCapitalizedBuildTypeName());
+                    getCapitalizedFlavorName(), getCapitalizedBuildTypeName());
         } else {
             return String.format("Test build for the %s build",
                     getCapitalizedBuildTypeName());
@@ -64,26 +56,6 @@ public class TestVariantData extends ApkVariantData {
     }
 
     @Override
-    @NonNull
-    public String getDirName() {
-        if (getVariantConfiguration().hasFlavors()) {
-            return String.format("%s/test", getFlavoredName(false));
-        } else {
-            return "test";
-        }
-    }
-
-    @Override
-    @NonNull
-    public String getBaseName() {
-        if (getVariantConfiguration().hasFlavors()) {
-            return String.format("%s-test", getFlavoredName(false));
-        } else {
-            return "test";
-        }
-    }
-
-    @Override
     public boolean getZipAlign() {
         return false;
     }