Adds versionNameSuffix to build type

Adds support for a versionNameSuffix attribute to the build type
which works like packageNameSuffix -- it is appended to the
version name as derived from the manifest and overridden by the
flavors.

Change-Id: Ib303f30d2253bbd2367664b826d8dc93f5f3731e

1 files changed, 41 insertions, 0 deletions

diff --git a/builder/src/test/java/com/android/builder/VariantConfigurationTest.java b/builder/src/test/java/com/android/builder/VariantConfigurationTest.java
index ee3af55..5ee482a 100644
--- a/builder/src/test/java/com/android/builder/VariantConfigurationTest.java
+++ b/builder/src/test/java/com/android/builder/VariantConfigurationTest.java
@@ -43,6 +43,10 @@ public class VariantConfigurationTest extends TestCase {
         public int getMinSdkVersion(@NonNull File manifestFile) {
             return 0;
         }
+
+        public String getVersionName(File manifestFile) {
+            return "1.0";
+        }
     }
 
     @Override
@@ -93,6 +97,23 @@ public class VariantConfigurationTest extends TestCase {
         assertEquals("fake.package.name.fortytwo", variant.getPackageOverride());
     }
 
+    public void testVersionNameFromFlavorWithSuffix() {
+        mFlavorConfig.setVersionName("1.0");
+        mBuildType.setVersionNameSuffix("-DEBUG");
+
+        VariantConfiguration variant = getVariant();
+
+        assertEquals("1.0-DEBUG", variant.getVersionName());
+    }
+
+    public void testVersionNameWithSuffixOnly() {
+        mBuildType.setVersionNameSuffix("-DEBUG");
+
+        VariantConfiguration variant = getVariantWithManifestVersion("2.0b1");
+
+        assertEquals("2.0b1-DEBUG", variant.getVersionName());
+    }
+
     private VariantConfiguration getVariant() {
         VariantConfiguration variant = new VariantConfiguration(
                 mDefaultConfig, new MockSourceProvider("main"),
@@ -129,4 +150,24 @@ public class VariantConfigurationTest extends TestCase {
         variant.addProductFlavor(mFlavorConfig, new MockSourceProvider("custom"));
         return variant;
     }
+
+    private VariantConfiguration getVariantWithManifestVersion(final String versionName) {
+        VariantConfiguration variant = new VariantConfiguration(
+                mDefaultConfig, new MockSourceProvider("main"),
+                mBuildType, new MockSourceProvider("debug"),
+                VariantConfiguration.Type.DEFAULT) {
+            @Override
+            public String getVersionNameFromManifest() {
+                return versionName;
+            }
+            // don't do validation.
+            @Override
+            protected void validate() {
+
+            }
+        };
+
+        variant.addProductFlavor(mFlavorConfig, new MockSourceProvider("custom"));
+        return variant;
+    }
 }