Merge pull request #2810 from brandonpage/shard-tests

brandonpage · web-flow · commit 4cdc3d0521c6 · 2025-12-03T12:46:55.000-08:00
Fix AndroidManifest issues and warnings in test libraries.
diff --git a/.github/workflows/reusable-workflow.yaml b/.github/workflows/reusable-workflow.yaml
@@ -164,17 +164,20 @@ jobs:
           for LEVEL in $LEVELS_TO_TEST
             do
               GCLOUD_RESULTS_DIR=${{ inputs.lib }}-api-${LEVEL}-build-${{github.run_number}}
+              BUCKET_PATH="gs://test-lab-w87i9sz6q175u-kwp8ium6js0zw/${GCLOUD_RESULTS_DIR}"
 
-              gsutil ls gs://test-lab-w87i9sz6q175u-kwp8ium6js0zw/${GCLOUD_RESULTS_DIR} > /dev/null 2>&1
+              gsutil ls ${BUCKET_PATH} > /dev/null 2>&1
               if [ $? == 0 ] ; then
-                mkdir firebase_${LEVEL}
-                gsutil -m cp -r -U "`gsutil ls gs://test-lab-w87i9sz6q175u-kwp8ium6js0zw/${GCLOUD_RESULTS_DIR} | tail -1`*" ./firebase_${LEVEL}/
-                mv firebase_${LEVEL}/test_result_1.xml firebase_results/api_${LEVEL}_test_result.xml
+                # Copy merged XML file from top level for test reporting
+                gsutil cp "${BUCKET_PATH}/*test_results_merged.xml" firebase_results/api_${LEVEL}_test_result.xml
+
+                # Copy all shard data for code coverage (only needed for one level)
+                if [ "$LEVEL" == "$PR_API_VERSION" ] ; then
+                  mkdir -p firebase
+                  gsutil -m cp -r -U "${BUCKET_PATH}/*" ./firebase/
+                fi
               fi
             done
-
-            # Move one result to the directory expected for code coverge.
-            mv firebase_${PR_API_VERSION} firebase
       - name: Test Report
         uses: mikepenz/action-junit-report@v5
         if: success() || failure()
diff --git a/libs/MobileSync/build.gradle.kts b/libs/MobileSync/build.gradle.kts
@@ -93,7 +93,7 @@ android {
         val javaTree = fileTree("${project.projectDir}/build/intermediates/javac/debug") { setExcludes(fileFilter) }
         val kotlinTree = fileTree("${project.projectDir}/build/tmp/kotlin-classes/debug") { setExcludes(fileFilter) }
         classDirectories.setFrom(javaTree, kotlinTree)
-        executionData.setFrom(fileTree("$rootDir/firebase/artifacts/sdcard") { setIncludes(arrayListOf("*.ec")) })
+        executionData.setFrom(fileTree("$rootDir/firebase") { setIncludes(arrayListOf("**/coverage.ec")) })
     }
 }
 
diff --git a/libs/SalesforceAnalytics/build.gradle.kts b/libs/SalesforceAnalytics/build.gradle.kts
@@ -96,6 +96,6 @@ android {
         val javaTree = fileTree("${project.projectDir}/build/intermediates/javac/debug") { setExcludes(fileFilter) }
         val kotlinTree = fileTree("${project.projectDir}/build/tmp/kotlin-classes/debug") { setExcludes(fileFilter) }
         classDirectories.setFrom(javaTree, kotlinTree)
-        executionData.setFrom(fileTree("$rootDir/firebase/artifacts/sdcard") { setIncludes(arrayListOf("*.ec")) })
+        executionData.setFrom(fileTree("$rootDir/firebase") { setIncludes(arrayListOf("**/coverage.ec")) })
     }
 }
diff --git a/libs/SalesforceHybrid/build.gradle.kts b/libs/SalesforceHybrid/build.gradle.kts
@@ -102,6 +102,6 @@ android {
         val javaTree = fileTree("${project.projectDir}/build/intermediates/javac/debug") { setExcludes(fileFilter) }
         val kotlinTree = fileTree("${project.projectDir}/build/tmp/kotlin-classes/debug") { setExcludes(fileFilter) }
         classDirectories.setFrom(javaTree, kotlinTree)
-        executionData.setFrom(fileTree("$rootDir/firebase/artifacts/sdcard") { setIncludes(arrayListOf("*.ec")) })
+        executionData.setFrom(fileTree("$rootDir/firebase") { setIncludes(arrayListOf("**/coverage.ec")) })
     }
 }
diff --git a/libs/SalesforceReact/build.gradle.kts b/libs/SalesforceReact/build.gradle.kts
@@ -112,7 +112,7 @@ android {
         val javaTree = fileTree("${project.projectDir}/build/intermediates/javac/debug") { setExcludes(fileFilter) }
         val kotlinTree = fileTree("${project.projectDir}/build/tmp/kotlin-classes/debug") { setExcludes(fileFilter) }
         classDirectories.setFrom(javaTree, kotlinTree)
-        executionData.setFrom(fileTree("$rootDir/firebase/artifacts/sdcard") { setIncludes(arrayListOf("*.ec")) })
+        executionData.setFrom(fileTree("$rootDir/firebase") { setIncludes(arrayListOf("**/coverage.ec")) })
     }
 }
 
diff --git a/libs/SalesforceSDK/build.gradle.kts b/libs/SalesforceSDK/build.gradle.kts
@@ -136,7 +136,7 @@ android {
         val javaTree = fileTree("${project.projectDir}/build/intermediates/javac/debug") { setExcludes(fileFilter) }
         val kotlinTree = fileTree("${project.projectDir}/build/tmp/kotlin-classes/debug") { setExcludes(fileFilter) }
         classDirectories.setFrom(javaTree, kotlinTree)
-        executionData.setFrom(fileTree("$rootDir/firebase/artifacts/sdcard") { setIncludes(arrayListOf("*.ec")) })
+        executionData.setFrom(fileTree("$rootDir/firebase") { setIncludes(arrayListOf("**/coverage.ec")) })
     }
 }
 
diff --git a/libs/SmartStore/build.gradle.kts b/libs/SmartStore/build.gradle.kts
@@ -98,6 +98,6 @@ android {
         val javaTree = fileTree("${project.projectDir}/build/intermediates/javac/debug") { setExcludes(fileFilter) }
         val kotlinTree = fileTree("${project.projectDir}/build/tmp/kotlin-classes/debug") { setExcludes(fileFilter) }
         classDirectories.setFrom(javaTree, kotlinTree)
-        executionData.setFrom(fileTree("$rootDir/firebase/artifacts/sdcard") { setIncludes(arrayListOf("*.ec")) })
+        executionData.setFrom(fileTree("$rootDir/firebase") { setIncludes(arrayListOf("**/coverage.ec")) })
     }
 }
diff --git a/libs/test/MobileSyncTest/AndroidManifest.xml b/libs/test/MobileSyncTest/AndroidManifest.xml
@@ -16,11 +16,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
-        <!-- Disabling AILTN in tests -->
-        <service android:name="com.salesforce.androidsdk.analytics.AnalyticsPublisherService"
-            android:enabled="false"
-            android:exported="false" />
 	</application>
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
diff --git a/libs/test/SalesforceHybridTest/AndroidManifest.xml b/libs/test/SalesforceHybridTest/AndroidManifest.xml
@@ -11,19 +11,14 @@
         <activity android:label="@string/app_name"
           android:name="com.salesforce.androidsdk.phonegap.ui.SalesforceHybridTestActivity"
           android:configChanges="orientation|keyboardHidden"
-          android:theme="@style/SalesforceSDK_SplashScreen"
+          android:theme="@style/Theme.AppCompat.NoActionBar"
           android:exported="true">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
-        <!-- Disabling AILTN in tests -->
-        <service android:name="com.salesforce.androidsdk.analytics.AnalyticsPublisherService"
-            android:enabled="false"
-            android:exported="false" />
     </application>
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
diff --git a/libs/test/SalesforceReactTest/AndroidManifest.xml b/libs/test/SalesforceReactTest/AndroidManifest.xml
@@ -16,12 +16,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
-        <!-- Disabling AILTN in tests -->
-        <service android:name="com.salesforce.androidsdk.analytics.AnalyticsPublisherService"
-            android:enabled="false"
-            android:exported="false" />
-	</application>
+    </application>
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 </manifest>
diff --git a/libs/test/SalesforceSDKTest/AndroidManifest.xml b/libs/test/SalesforceSDKTest/AndroidManifest.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-	<application android:label="@string/app_name"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <application android:label="@string/app_name"
         android:name="com.salesforce.androidsdk.TestForceApp"
         android:manageSpaceActivity="com.salesforce.androidsdk.ui.ManageSpaceActivity">
 
-	    <!-- Launcher screen -->
+        <!-- Service required for authentication -->
+        <service android:exported="true"
+            android:name="com.salesforce.androidsdk.auth.AuthenticatorService"
+            tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="android.accounts.AccountAuthenticator" />
+            </intent-filter>
+            <meta-data android:name="android.accounts.AccountAuthenticator"
+                android:resource="@xml/authenticator" />
+        </service>
+
+
+
+        <!-- Launcher screen -->
         <activity android:name="com.salesforce.androidsdk.MainActivity"
             android:label="@string/app_name"
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
@@ -16,11 +31,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
-        <!-- Disabling AILTN in tests -->
-        <service android:name="com.salesforce.androidsdk.analytics.AnalyticsPublisherService"
-            android:enabled="false"
-            android:exported="false" />
 	</application>
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
diff --git a/libs/test/SalesforceSDKTest/res/xml/authenticator.xml b/libs/test/SalesforceSDKTest/res/xml/authenticator.xml
@@ -0,0 +1,3 @@
+<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:accountType="@string/account_type" android:icon="@drawable/icon"
+    android:smallIcon="@drawable/icon" android:label="@string/app_name" />
diff --git a/libs/test/SmartStoreTest/AndroidManifest.xml b/libs/test/SmartStoreTest/AndroidManifest.xml
@@ -6,7 +6,7 @@
         android:manageSpaceActivity="com.salesforce.androidsdk.ui.ManageSpaceActivity">
 
         <!-- Launcher screen -->
-        <activity android:name=".MainActivity"
+        <activity android:name="com.salesforce.androidsdk.MainActivity"
             android:label="@string/app_name"
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
             android:exported="false">
@@ -16,11 +16,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
-        <!-- Disabling AILTN in tests -->
-        <service android:name="com.salesforce.androidsdk.analytics.AnalyticsPublisherService"
-            android:enabled="false"
-            android:exported="false" />
 	</application>
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ android {`
`93`	`93`	`val javaTree = fileTree("${project.projectDir}/build/intermediates/javac/debug") { setExcludes(fileFilter) }`
`94`	`94`	`val kotlinTree = fileTree("${project.projectDir}/build/tmp/kotlin-classes/debug") { setExcludes(fileFilter) }`
`95`	`95`	`classDirectories.setFrom(javaTree, kotlinTree)`
`96`		`- executionData.setFrom(fileTree("$rootDir/firebase/artifacts/sdcard") { setIncludes(arrayListOf("*.ec")) })`
	`96`	`+ executionData.setFrom(fileTree("$rootDir/firebase") { setIncludes(arrayListOf("**/coverage.ec")) })`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,6 @@ android {`
`96`	`96`	`val javaTree = fileTree("${project.projectDir}/build/intermediates/javac/debug") { setExcludes(fileFilter) }`
`97`	`97`	`val kotlinTree = fileTree("${project.projectDir}/build/tmp/kotlin-classes/debug") { setExcludes(fileFilter) }`
`98`	`98`	`classDirectories.setFrom(javaTree, kotlinTree)`
`99`		`- executionData.setFrom(fileTree("$rootDir/firebase/artifacts/sdcard") { setIncludes(arrayListOf("*.ec")) })`
	`99`	`+ executionData.setFrom(fileTree("$rootDir/firebase") { setIncludes(arrayListOf("**/coverage.ec")) })`
`100`	`100`	`}`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,6 @@ android {`
`102`	`102`	`val javaTree = fileTree("${project.projectDir}/build/intermediates/javac/debug") { setExcludes(fileFilter) }`
`103`	`103`	`val kotlinTree = fileTree("${project.projectDir}/build/tmp/kotlin-classes/debug") { setExcludes(fileFilter) }`
`104`	`104`	`classDirectories.setFrom(javaTree, kotlinTree)`
`105`		`- executionData.setFrom(fileTree("$rootDir/firebase/artifacts/sdcard") { setIncludes(arrayListOf("*.ec")) })`
	`105`	`+ executionData.setFrom(fileTree("$rootDir/firebase") { setIncludes(arrayListOf("**/coverage.ec")) })`
`106`	`106`	`}`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ android {`
`112`	`112`	`val javaTree = fileTree("${project.projectDir}/build/intermediates/javac/debug") { setExcludes(fileFilter) }`
`113`	`113`	`val kotlinTree = fileTree("${project.projectDir}/build/tmp/kotlin-classes/debug") { setExcludes(fileFilter) }`
`114`	`114`	`classDirectories.setFrom(javaTree, kotlinTree)`
`115`		`- executionData.setFrom(fileTree("$rootDir/firebase/artifacts/sdcard") { setIncludes(arrayListOf("*.ec")) })`
	`115`	`+ executionData.setFrom(fileTree("$rootDir/firebase") { setIncludes(arrayListOf("**/coverage.ec")) })`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ android {`
`136`	`136`	`val javaTree = fileTree("${project.projectDir}/build/intermediates/javac/debug") { setExcludes(fileFilter) }`
`137`	`137`	`val kotlinTree = fileTree("${project.projectDir}/build/tmp/kotlin-classes/debug") { setExcludes(fileFilter) }`
`138`	`138`	`classDirectories.setFrom(javaTree, kotlinTree)`
`139`		`- executionData.setFrom(fileTree("$rootDir/firebase/artifacts/sdcard") { setIncludes(arrayListOf("*.ec")) })`
	`139`	`+ executionData.setFrom(fileTree("$rootDir/firebase") { setIncludes(arrayListOf("**/coverage.ec")) })`
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`
Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,6 @@ android {`
`98`	`98`	`val javaTree = fileTree("${project.projectDir}/build/intermediates/javac/debug") { setExcludes(fileFilter) }`
`99`	`99`	`val kotlinTree = fileTree("${project.projectDir}/build/tmp/kotlin-classes/debug") { setExcludes(fileFilter) }`
`100`	`100`	`classDirectories.setFrom(javaTree, kotlinTree)`
`101`		`- executionData.setFrom(fileTree("$rootDir/firebase/artifacts/sdcard") { setIncludes(arrayListOf("*.ec")) })`
	`101`	`+ executionData.setFrom(fileTree("$rootDir/firebase") { setIncludes(arrayListOf("**/coverage.ec")) })`
`102`	`102`	`}`
`103`	`103`	`}`