Separating unit tests and integration tests into separate steps

Author: hiranya911

.github/scripts/package_artifacts.sh renamed to .github/scripts/run_integration_tests.sh

@@ -22,15 +22,5 @@ gpg --quiet --batch --yes --decrypt --passphrase="${FIREBASE_SERVICE_ACCT_KEY}"
 
 echo "${FIREBASE_API_KEY}" > integration_apikey.txt
 
-# Does the following:
-#  1. Runs the Checkstyle plugin (validate phase)
-#  2. Compiles the source (compile phase)
-#  3. Runs the unit tests (test phase)
-#  4. Packages the artifacts - src, bin, javadocs (package phase)
-#  5. Runs the integration tests (verify phase)
-mvn -B clean verify
+mvn -B verify -Dcheckstyle.skip -DskipUTs
 
-# Maven target directory can consist of many files. Just copy the jar artifacts
-# into a new directory for upload.
-mkdir -p dist
-cp target/*.jar dist/

.github/workflows/release.yml

@@ -50,10 +50,10 @@ jobs:
         java-version: 1.7
 
     - name: Compile, test and package
-      run: ./.github/scripts/package_artifacts.sh
-      env:
-        FIREBASE_SERVICE_ACCT_KEY: ${{ secrets.FIREBASE_SERVICE_ACCT_KEY }}
-        FIREBASE_API_KEY: ${{ secrets.FIREBASE_API_KEY }}
+      run: |
+        mvn -B clean package
+        mkdir -p dist/
+        cp target/*.jar dist/
 
     # Attach the packaged artifacts to the workflow output. These can be manually
     # downloaded for later inspection if necessary.
@@ -63,6 +63,12 @@ jobs:
         name: dist
         path: dist
 
+    - name: Run integration tests
+      run: ./.github/scripts/run_integration_tests.sh
+      env:
+        FIREBASE_SERVICE_ACCT_KEY: ${{ secrets.FIREBASE_SERVICE_ACCT_KEY }}
+        FIREBASE_API_KEY: ${{ secrets.FIREBASE_API_KEY }}
+
   publish_release:
     needs: stage_release
 

src/test/java/com/google/firebase/messaging/FirebaseMessagingIT.java

@@ -122,18 +122,22 @@ public void testSendFiveHundred() throws Exception {
 
     BatchResponse response = FirebaseMessaging.getInstance().sendAll(messages, true);
 
+    // This test appears to fail intermittently. Adjusting the structure of the test to help
+    // debug the issue.
     assertEquals(500, response.getResponses().size());
-    assertEquals(500, response.getSuccessCount());
-    assertEquals(0, response.getFailureCount());
     for (SendResponse sendResponse : response.getResponses()) {
       if (!sendResponse.isSuccessful()) {
         sendResponse.getException().printStackTrace();
+        continue;
       }
-      assertTrue(sendResponse.isSuccessful());
+
       String id = sendResponse.getMessageId();
       assertTrue(id != null && id.matches("^projects/.*/messages/.*$"));
       assertNull(sendResponse.getException());
     }
+
+    assertEquals(500, response.getSuccessCount());
+    assertEquals(0, response.getFailureCount());
   }
 
   @Test