Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update AEPTestUtils to 3.0.0 #164

Merged
merged 3 commits into from
Oct 1, 2024
Merged

Update AEPTestUtils to 3.0.0 #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca5d3f2
Update AEPTestUtils to 3.0.0
timkimadobe Oct 1, 2024
046c347
Fix missing param error
timkimadobe Oct 1, 2024
a029af2
Clean up location hint options
timkimadobe Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/upstream-integration-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
5 changes: 3 additions & 2 deletions code/edge/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions code/edge/src/test/java/com/adobe/marketing/mobile/EdgeNetworkServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ public void test_doRequest_whenRequestHeadersAreNull_setsDefaultHeaders() {
DEFAULT_TIMEOUT,
DEFAULT_TIMEOUT
),
mockNetworkService.getAllNetworkRequests().get(0)
mockNetworkService.getAllNetworkRequests(2000).get(0)
);
}

Expand Down Expand Up @@ -265,7 +265,7 @@ public void onComplete() {}
DEFAULT_TIMEOUT,
DEFAULT_TIMEOUT
),
mockNetworkService.getAllNetworkRequests().get(0)
mockNetworkService.getAllNetworkRequests(2000).get(0)
);
}

Expand Down
1 change: 1 addition & 0 deletions code/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion code/upstream-integration-tests/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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")
Expand Down