Update AEPTestUtils to 3.0.0 (#164)

* Update AEPTestUtils to 3.0.0 * Fix missing param error * Clean up location hint options
adobe · Oct 1, 2024 · 3745949 · 3745949
1 parent db805f1
commit 3745949
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/upstream-integration-test.yml b/.github/workflows/upstream-integration-test.yml
@@ -39,9 +39,8 @@ on:
         type: choice
         description: '(Optional) The Edge location hint to set before each test.'
         required: false
-        default: ''
+        default: '(None)'
         options: 
-          - '' # Interpreted in the test code as no preset location hint; any non-valid location hint string is interpreted this way
           - 'or2'
           - 'va6'
           - 'irl1'

diff --git a/code/edge/build.gradle.kts b/code/edge/build.gradle.kts
@@ -17,6 +17,7 @@ plugins {
 val mavenCoreVersion: String by project
 val mavenEdgeConsentVersion: String by project
 val mavenEdgeIdentityVersion: String by project
+val mavenTestUtilsVersion: String by project
 
 aepLibrary {
     namespace = "com.adobe.marketing.mobile.edge"
@@ -35,9 +36,9 @@ dependencies {
     implementation("com.adobe.marketing.mobile:core:$mavenCoreVersion")
     implementation("com.adobe.marketing.mobile:edgeidentity:$mavenEdgeIdentityVersion")
 
-    testImplementation("com.github.adobe:aepsdk-testutils-android:a4991045da")
+    testImplementation("com.github.adobe:aepsdk-testutils-android:$mavenTestUtilsVersion")
 
-    androidTestImplementation("com.github.adobe:aepsdk-testutils-android:a4991045da")
+    androidTestImplementation("com.github.adobe:aepsdk-testutils-android:$mavenTestUtilsVersion")
     androidTestImplementation("com.adobe.marketing.mobile:edgeconsent:$mavenEdgeConsentVersion")
     {
         exclude(group = "com.adobe.marketing.mobile", module = "edge")

diff --git a/code/edge/src/test/java/com/adobe/marketing/mobile/EdgeNetworkServiceTest.java b/code/edge/src/test/java/com/adobe/marketing/mobile/EdgeNetworkServiceTest.java
@@ -217,7 +217,7 @@ public void test_doRequest_whenRequestHeadersAreNull_setsDefaultHeaders() {
 				DEFAULT_TIMEOUT,
 				DEFAULT_TIMEOUT
 			),
-			mockNetworkService.getAllNetworkRequests().get(0)
+			mockNetworkService.getAllNetworkRequests(2000).get(0)
 		);
 	}
 
@@ -265,7 +265,7 @@ public void onComplete() {}
 				DEFAULT_TIMEOUT,
 				DEFAULT_TIMEOUT
 			),
-			mockNetworkService.getAllNetworkRequests().get(0)
+			mockNetworkService.getAllNetworkRequests(2000).get(0)
 		);
 	}
 

diff --git a/code/gradle.properties b/code/gradle.properties
@@ -20,6 +20,7 @@ moduleVersion=3.0.0
 mavenCoreVersion=3.0.0
 mavenEdgeIdentityVersion=3.0.0
 mavenEdgeConsentVersion=3.0.0
+mavenTestUtilsVersion=3.0.0
 mavenRepoName=AdobeMobileEdgeSdk
 mavenRepoDescription=Adobe Experience Platform Edge extension for the Adobe Experience Platform Mobile SDK
 mavenUploadDryRunFlag=false

diff --git a/code/upstream-integration-tests/build.gradle.kts b/code/upstream-integration-tests/build.gradle.kts
@@ -20,6 +20,7 @@ plugins {
 
 val mavenCoreVersion: String by project
 val mavenEdgeIdentityVersion: String by project
+val mavenTestUtilsVersion: String by project
 
 configure<com.diffplug.gradle.spotless.SpotlessExtension> {
     kotlin {
@@ -88,7 +89,7 @@ dependencies {
 
     implementation("androidx.core:core-ktx:1.9.0")
 
-    androidTestImplementation("com.github.adobe:aepsdk-testutils-android:a4991045da")
+    androidTestImplementation("com.github.adobe:aepsdk-testutils-android:$mavenTestUtilsVersion")
     androidTestImplementation("com.adobe.marketing.mobile:core:$mavenCoreVersion")
     androidTestImplementation("com.adobe.marketing.mobile:edgeidentity:$mavenEdgeIdentityVersion")
     androidTestImplementation("androidx.test.ext:junit:1.1.3")