Splitting into pre and post proguard tests

ci/fireci/fireci/commands.py

@@ -26,19 +26,34 @@
     help='GRADLE_OPTS passed to the gradle invocation.')
 @ci_command('gradle')
 def gradle_command(task, gradle_opts):
-  """Runs the specified gradle commands."""
-  gradle.run(*task, gradle_opts=gradle_opts)
+    """Runs the specified gradle commands."""
+    gradle.run(*task, gradle_opts=gradle_opts)
 
 
 @ci_command()
-def smoke_tests_experimental():
-  """Builds all SDKs in release mode and then tests test-apps against them."""
-  gradle.run('publishAllToBuildDir')
-
-  cwd = os.getcwd()
-  gradle.run(
-      'connectedReleaseAndroidTest',
-      gradle_opts='-Dmaven.repo.local={}'.format(
-          os.path.join(cwd, 'build', 'm2repository')),
-      workdir=os.path.join(cwd, 'test-apps'),
-  )
+def smoke_tests_proguarded_app():
+    """Builds all SDKs in release mode and then tests test-apps against them."""
+    gradle.run('publishAllToBuildDir')
+
+    cwd = os.getcwd()
+    gradle.run(
+        'connectedCheck',
+        '-PtestBuildType=release',
+        gradle_opts='-Dmaven.repo.local={}'.format(
+            os.path.join(cwd, 'build', 'm2repository')),
+        workdir=os.path.join(cwd, 'test-apps'),
+    )
+
+@ci_command()
+def smoke_tests_unproguarded_app():
+    """Builds all SDKs in release mode and then tests test-apps against them."""
+    gradle.run('publishAllToBuildDir')
+
+    cwd = os.getcwd()
+    gradle.run(
+        'connectedCheck',
+        '-PtestBuildType=debug',
+        gradle_opts='-Dmaven.repo.local={}'.format(
+            os.path.join(cwd, 'build', 'm2repository')),
+        workdir=os.path.join(cwd, 'test-apps'),
+    )

ci/fireci/tests/integ_tests.py

@@ -29,82 +29,128 @@
 
 
 class CliInvocationTests(unittest.TestCase):
-  runner = CliRunner()
-
-  @in_tempdir
-  def test_gradle_invocation(self):
-    args = ['--arg1', 'task1']
-    create_artifacts(
-        Artifact(
-            'gradlew',
-            content=scripts.with_expected_arguments_and_artifacts(
-                ['./gradlew'] + args,
-                {'GRADLE_OPTS': 'opts'},
-                ('sdk1/build/output/file1', 'content1'),
-                ('sdk1/build/outputss/file2', 'content2'),
-            ),
-            mode=0o744))
-    result = self.runner.invoke(cli, [
-        '--artifact-patterns', '**/build/output', 'gradle', '--gradle-opts',
-        'opts', '--'
-    ] + args)
-    self.assertEqual(result.exit_code, 0)
-
-    artifacts = pathlib.Path('_artifacts')
-    self.assertTrue(artifacts.exists())
-
-    output_file = artifacts / 'sdk1_build_outputss' / 'file2'
-    self.assertFalse(output_file.exists())
-
-    output_file = artifacts / 'sdk1_build_output' / 'file1'
-    self.assertTrue(output_file.is_file())
-
-    with output_file.open() as f:
-      self.assertEqual(f.read(), 'content1')
-
-  @in_tempdir
-  def test_smoke_test_when_build_fails_should_fail(self):
-    create_artifacts(
-        Artifact('gradlew', content=scripts.with_exit(1), mode=0o744))
-    result = self.runner.invoke(cli, ['smoke_tests_experimental'])
-    self.assertNotEqual(result.exit_code, 0)
-
-  @in_tempdir
-  def test_smoke_test_when_build_succeeds_and_tests_fails_should_fail(self):
-    create_artifacts(
-        Artifact('gradlew', content=scripts.with_exit(0), mode=0o744),
-        Artifact('test-apps/gradlew', content=scripts.with_exit(1), mode=0o744),
-    )
-    result = self.runner.invoke(cli, ['smoke_tests_experimental'])
-    self.assertNotEqual(result.exit_code, 0)
-
-  @in_tempdir
-  def test_smoke_test_when_build_succeeds_and_tests_succeed_should_succeed(
-      self):
-    create_artifacts(
-        Artifact('gradlew', content=scripts.with_exit(0), mode=0o744),
-        Artifact('test-apps/gradlew', content=scripts.with_exit(0), mode=0o744),
-    )
-    result = self.runner.invoke(cli, ['smoke_tests_experimental'])
-    self.assertEqual(result.exit_code, 0)
-
-  @in_tempdir
-  def test_smoke_test_should_invoke_gradle_with_expected_arguments(self):
-    create_artifacts(
-        Artifact(
-            'gradlew',
-            content=scripts.with_expected_arguments(
-                ['./gradlew', 'publishAllToBuildDir']),
-            mode=0o744),
-        Artifact(
-            'test-apps/gradlew',
-            content=scripts.with_expected_arguments(
-                ['./gradlew', 'connectedReleaseAndroidTest'], {
-                    'GRADLE_OPTS':
-                        '-Dmaven.repo.local={}'.format(
-                            os.path.join(os.getcwd(), 'build', 'm2repository'))
-                }),
-            mode=0o744),
-    )
-    result = self.runner.invoke(cli, ['smoke_tests_experimental'])
-    self.assertEqual(result.exit_code, 0)
+    runner = CliRunner()
+
+    @in_tempdir
+    def test_gradle_invocation(self):
+        args = ['--arg1', 'task1']
+        create_artifacts(
+            Artifact(
+                'gradlew',
+                content=scripts.with_expected_arguments_and_artifacts(
+                    ['./gradlew'] + args,
+                    {'GRADLE_OPTS': 'opts'},
+                    ('sdk1/build/output/file1', 'content1'),
+                    ('sdk1/build/outputss/file2', 'content2'),
+                    ),
+                mode=0o744))
+        result = self.runner.invoke(cli, [
+            '--artifact-patterns', '**/build/output', 'gradle', '--gradle-opts',
+            'opts', '--'
+        ] + args)
+        self.assertEqual(result.exit_code, 0)
+
+        artifacts = pathlib.Path('_artifacts')
+        self.assertTrue(artifacts.exists())
+
+        output_file = artifacts / 'sdk1_build_outputss' / 'file2'
+        self.assertFalse(output_file.exists())
+
+        output_file = artifacts / 'sdk1_build_output' / 'file1'
+        self.assertTrue(output_file.is_file())
+
+        with output_file.open() as f:
+            self.assertEqual(f.read(), 'content1')
+
+    @in_tempdir
+    def test_smoke_test_proguarded_app_when_build_fails_should_fail(self):
+        create_artifacts(
+            Artifact('gradlew', content=scripts.with_exit(1), mode=0o744))
+        result = self.runner.invoke(cli, ['smoke_tests_proguarded_app'])
+        self.assertNotEqual(result.exit_code, 0)
+
+    @in_tempdir
+    def test_smoke_test_proguarded_app_when_build_succeeds_and_tests_fails_should_fail(self):
+        create_artifacts(
+            Artifact('gradlew', content=scripts.with_exit(0), mode=0o744),
+            Artifact('test-apps/gradlew', content=scripts.with_exit(1), mode=0o744),
+        )
+        result = self.runner.invoke(cli, ['smoke_tests_proguarded_app'])
+        self.assertNotEqual(result.exit_code, 0)
+
+    @in_tempdir
+    def test_smoke_test_proguarded_app_when_build_succeeds_and_tests_succeed_should_succeed(self):
+        create_artifacts(
+            Artifact('gradlew', content=scripts.with_exit(0), mode=0o744),
+            Artifact('test-apps/gradlew', content=scripts.with_exit(0), mode=0o744),
+        )
+        result = self.runner.invoke(cli, ['smoke_tests_proguarded_app'])
+        self.assertEqual(result.exit_code, 0)
+
+    @in_tempdir
+    def test_smoke_test_proguarded_app_should_invoke_gradle_with_expected_arguments(self):
+        create_artifacts(
+            Artifact(
+                'gradlew',
+                content=scripts.with_expected_arguments(
+                    ['./gradlew', 'publishAllToBuildDir']),
+                mode=0o744),
+            Artifact(
+                'test-apps/gradlew',
+                content=scripts.with_expected_arguments(
+                    ['./gradlew', 'connectedCheck', '-PtestBuildType=release'], {
+                        'GRADLE_OPTS':
+                            '-Dmaven.repo.local={}'.format(
+                                os.path.join(os.getcwd(), 'build', 'm2repository'))
+                    }),
+                mode=0o744),
+        )
+        result = self.runner.invoke(cli, ['smoke_tests_proguarded_app'])
+        self.assertEqual(result.exit_code, 0)
+
+    @in_tempdir
+    def test_smoke_test_unproguarded_app_when_build_fails_should_fail(self):
+        create_artifacts(
+            Artifact('gradlew', content=scripts.with_exit(1), mode=0o744))
+        result = self.runner.invoke(cli, ['smoke_tests_unproguarded_app'])
+        self.assertNotEqual(result.exit_code, 0)
+
+    @in_tempdir
+    def test_smoke_test_unproguarded_app_when_build_succeeds_and_tests_fails_should_fail(self):
+        create_artifacts(
+            Artifact('gradlew', content=scripts.with_exit(0), mode=0o744),
+            Artifact('test-apps/gradlew', content=scripts.with_exit(1), mode=0o744),
+        )
+        result = self.runner.invoke(cli, ['smoke_tests_unproguarded_app'])
+        self.assertNotEqual(result.exit_code, 0)
+
+    @in_tempdir
+    def test_smoke_test_unproguarded_app_when_build_succeeds_and_tests_succeed_should_succeed(self):
+        create_artifacts(
+            Artifact('gradlew', content=scripts.with_exit(0), mode=0o744),
+            Artifact('test-apps/gradlew', content=scripts.with_exit(0), mode=0o744),
+        )
+        result = self.runner.invoke(cli, ['smoke_tests_unproguarded_app'])
+        self.assertEqual(result.exit_code, 0)
+
+    @in_tempdir
+    def test_smoke_test_unproguarded_app_should_invoke_gradle_with_expected_arguments(self):
+        create_artifacts(
+            Artifact(
+                'gradlew',
+                content=scripts.with_expected_arguments(
+                    ['./gradlew', 'publishAllToBuildDir']),
+                mode=0o744),
+            Artifact(
+                'test-apps/gradlew',
+                content=scripts.with_expected_arguments(
+                    ['./gradlew', 'connectedCheck', '-PtestBuildType=debug'], {
+                        'GRADLE_OPTS':
+                            '-Dmaven.repo.local={}'.format(
+                                os.path.join(os.getcwd(), 'build', 'm2repository'))
+                    }),
+                mode=0o744),
+        )
+        result = self.runner.invoke(cli, ['smoke_tests_unproguarded_app'])
+        self.assertEqual(result.exit_code, 0)
+

test-apps/README.md

@@ -29,5 +29,5 @@ This experimental directory contains apps that are used to smoke test Firebase A
 - From the /test-apps dir, run the tests
 
   ```
-  ./gradlew connectedReleaseAndroidTest -PfirebaseProjectId=<your_project_id> -PfirebaseToken=<your_firebase_token> -Pm2Repository=${PWD}/../build/m2repository/
+  ./gradlew connectedCheck -PtestBuildType=<release|debug> -PfirebaseProjectId=<your_project_id> -PfirebaseToken=<your_firebase_token> -Pm2Repository=${PWD}/../build/m2repository/
   ```

test-apps/build.gradle

@@ -24,7 +24,6 @@ buildscript {
         jcenter()
         mavenLocal()
         google()
-        maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.4'
@@ -38,6 +37,8 @@ plugins {
 }
 
 allprojects {
+    ext.testBuildType = project.getProperties().get("testBuildType", "debug")
+
     apply plugin: 'com.github.sherter.google-java-format'
     googleJavaFormat {
         toolVersion = '1.6'
@@ -71,6 +72,9 @@ allprojects {
         if ( it.name == 'processReleaseGoogleServices') {
             it.dependsOn 'copyRootGoogleServices'
         }
+        if ( it.name == 'processDebugGoogleServices') {
+            it.dependsOn 'copyRootGoogleServices'
+        }
     }
 
     if(file('test_setup.sh').exists()) {
@@ -118,7 +122,7 @@ allprojects {
             }
         }
         tasks.whenTaskAdded {
-            if ( it.name == 'connectedReleaseAndroidTest') {
+            if ( it.name == 'connectedCheck') {
                 it.dependsOn setupSmokeTest
                 it.dependsOn rootProject.tasks.findByName("dependencyUpdates")
             }

test-apps/database-test-app/build.gradle

@@ -17,7 +17,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    testBuildType "release"
+    testBuildType = project.testBuildType
     compileSdkVersion 27
 
     defaultConfig {

test-apps/firestore-test-app/build.gradle

@@ -17,7 +17,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    testBuildType "release"
+    testBuildType = project.testBuildType
     compileSdkVersion 27
 
     defaultConfig {

test-apps/functions-test-app/build.gradle

@@ -17,8 +17,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    // Changes the test build type for instrumented tests to "stage".
-    testBuildType "release"
+    testBuildType = project.testBuildType
     compileSdkVersion 27
 
     defaultConfig {

test-apps/storage-test-app/build.gradle

@@ -17,7 +17,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    testBuildType "release"
+    testBuildType = project.testBuildType
     compileSdkVersion 27
 
     defaultConfig {