[Smoke-tests] Remove combined flavor.

This change places all of the tests in the default flavor instead of the
custom flavor, "combined". There isn't any particular reason for this
flavor to exist anymore.

Author: allisonbm92

smoke-tests/build.gradle

@@ -52,40 +52,30 @@ android {
   if (project.hasProperty("testBuildType")) {
     testBuildType project.getProperty("testBuildType")
   }
-
-  flavorDimensions "systemUnderTest"
-
-  // TODO(allisonbm92): Switch to the default flavor.
-  productFlavors {
-    combined {
-      dimension "systemUnderTest"
-      applicationId "com.google.firebase.testing.combined"
-    }
-  }
-
 }
 
 apply from: "configure.gradle"
 
 dependencies {
-  // Common
+  // Firebase
+  implementation "com.google.firebase:firebase-analytics"
+  implementation "com.google.firebase:firebase-auth"
+  implementation "com.google.firebase:firebase-common"
+  implementation "com.google.firebase:firebase-database"
+  implementation "com.google.firebase:firebase-dynamic-links"
+  implementation "com.google.firebase:firebase-firestore"
+  implementation "com.google.firebase:firebase-functions"
+  implementation "com.google.firebase:firebase-inappmessaging"
+  implementation "com.google.firebase:firebase-config"
+  implementation "com.google.firebase:firebase-storage"
+
+  // Common utilities (application side)
   implementation "androidx.test:rules:1.2.0"
   implementation "androidx.test:runner:1.2.0"
-  implementation "com.google.firebase:firebase-common"
   implementation "com.google.truth:truth:0.44"
   implementation "junit:junit:4.12"
 
-  // All
-  combinedImplementation "com.google.firebase:firebase-analytics"
-  combinedImplementation "com.google.firebase:firebase-auth"
-  combinedImplementation "com.google.firebase:firebase-database"
-  combinedImplementation "com.google.firebase:firebase-dynamic-links"
-  combinedImplementation "com.google.firebase:firebase-firestore"
-  combinedImplementation "com.google.firebase:firebase-functions"
-  combinedImplementation "com.google.firebase:firebase-inappmessaging"
-  combinedImplementation "com.google.firebase:firebase-config"
-  combinedImplementation "com.google.firebase:firebase-storage"
-
+  // Common utilities (instrumentation side)
   androidTestImplementation "androidx.test:core:1.2.0"
   androidTestImplementation "androidx.test:runner:1.2.0"
   androidTestImplementation "junit:junit:4.12"

smoke-tests/runner.config

@@ -42,7 +42,6 @@ smokeTest {
   # flavors
   ## This option specifies the Android flavors of the test to build for testing.
   ## It may be omitted if there are no flavors.
-  flavors combined
 
   # googleServices
   ## This option is the path to the Google Services file. If provided, the

smoke-tests/src/combined/AndroidManifest.xml

@@ -3,4 +3,15 @@
 
   <uses-permission android:name="android.permission.INTERNET" />
 
+  <application>
+    <activity android:name="android.app.Activity">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+
+    <meta-data android:name="com.google.firebase.testing.classes"
+      android:value="com.google.firebase.testing.combined.AllTests" />
+  </application>
 </manifest>

smoke-tests/src/main/AndroidManifest.xml

@@ -51,7 +51,7 @@ public void buildDynamicLink_UriContainsCorrectComponents() throws Exception {
     assertThat(actual.getHost()).isEqualTo("example.page.link");
     assertThat(query)
         .asList()
-        .containsAtLeast("apn=com.google.firebase.testing.combined", "link=http://www.example.com");
+        .containsAtLeast("apn=com.google.firebase.testing", "link=http://www.example.com");
   }
 
   @Test