Merge pull request #500 from adobe/staging

Staging -> Main [NON-RELEASE: test utils and integration test updates]
adobe · Oct 18, 2024 · d0d3e0d · d0d3e0d
2 parents c57c521 + 2eb50c9
commit d0d3e0d
Show file tree

Hide file tree

Showing 27 changed files with 503 additions and 483 deletions.
diff --git a/.github/workflows/upstream-integration-test.yml b/.github/workflows/upstream-integration-test.yml
@@ -12,41 +12,40 @@ on:
   workflow_dispatch:
     inputs:
       branch:
-        description: 'Branch to use when running integration tests'
+        description: 'The branch to use when running the integration tests.'
         required: false
         default: 'main'
       id:
-        description: 'Identifier for the run (optional)'
+        description: '(Optional) The identifier for the run.'
         required: false
-      environment:
-        type: choice
-        description: 'Edge Network environment to test'
-        required: true
-        default: 'prod'
-        options:
-          - prod
-          - pre-prod
-          - int
+      tags-mobile-property-id:
+        type: string
+        description: '(Optional) The tags mobile property ID to use for the test. A default is used if not set.'
+        required: false
+        default: ''
       edge-location-hint:
         type: choice
-        description: 'Edge location hint to set before each test (optional)'
+        description: '(Optional) The Edge location hint to set before each test.'
         required: false
-        default: ''
-        options: 
-          - '' # Interpreted in the test code as no preset location hint; any non-valid location hint string is interpreted this way
-          - 'or2'
-          - 'va6'
-          - 'irl1'
+        default: 'None'
+        options:
+          - 'aus3'
           - 'ind1'
+          - 'irl1'
           - 'jpn3'
+          - 'or2'
           - 'sgp3'
-          - 'aus3'
+          - 'va6'
+          - 'EmptyString'
+          - 'Invalid'
+          - 'None'
+
 
 run-name: ${{ inputs.id }}
 
 jobs:
   test-integration-upstream:
-    runs-on: macos-13
+    runs-on: macos-latest
     steps:
     - name: Job run identifier ${{ github.event.inputs.id }}
       id: job-run-identifier
@@ -59,17 +58,13 @@ jobs:
 
     - name: Checkout
       id: checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4.2.0
       with:
         ref: ${{ github.event.inputs.branch }}
 
-    - uses: maxim-lobanov/setup-xcode@v1
-      with:
-        xcode-version: '15.0.1'
-
     - name: Cache Cocoapods
       id: cache-cocoapods
-      uses: actions/cache@v3
+      uses: actions/cache@v4.0.2
       with:
         path: Pods
         key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
@@ -78,7 +73,7 @@ jobs:
 
     - name: Execute Edge Network integration tests
       id: execute-integration-tests
-      run: make test-integration-upstream EDGE_ENVIRONMENT=${{ github.event.inputs.environment }} EDGE_LOCATION_HINT=${{ github.event.inputs.edge-location-hint }}
+      run: make test-integration-upstream TAGS_MOBILE_PROPERTY_ID=${{ github.event.inputs.tags-mobile-property-id }} EDGE_LOCATION_HINT=${{ github.event.inputs.edge-location-hint }}
 
     # Potential workflow solutions on job failure
     # All workflow setup step failures give exit code 2, with 3 as fallback
@@ -110,7 +105,11 @@ jobs:
         fi
 
         echo "EXIT_CODE=$EXIT_CODE" >> $GITHUB_OUTPUT
-
+    
+    # Dynamic step name in JSON format, examples on job: 
+    # - During job run (before this step): {"exitCode":${{ steps.on-failure.outputs.EXIT_CODE || 0 }}}
+    # - Failure: {"exitCode":1}
+    # - Success: {"exitCode":0}
     - name: "{\"exitCode\":${{ steps.on-failure.outputs.EXIT_CODE || 0 }}}"
       id: failure-data
       if: ${{ failure() }}

diff --git a/AEPEdge.xcodeproj/project.pbxproj b/AEPEdge.xcodeproj/project.pbxproj
@@ -33,7 +33,7 @@
 		21FFBD5925631E3E00B48A8F /* EdgeEventWarningTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21FFBD5825631E3E00B48A8F /* EdgeEventWarningTests.swift */; };
 		21FFBD6C2563321600B48A8F /* EdgeEventErrorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21FFBD6B2563321600B48A8F /* EdgeEventErrorTests.swift */; };
 		2E1810032ACCB83F0067E444 /* ConfigOverrideTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E1810022ACCB83F0067E444 /* ConfigOverrideTests.swift */; };
-		2E1810052ACCBA1B0067E444 /* TestSetupHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E1810042ACCBA1B0067E444 /* TestSetupHelpers.swift */; };
+		2E1810052ACCBA1B0067E444 /* TestEnvironment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E1810042ACCBA1B0067E444 /* TestEnvironment.swift */; };
 		2E1810072ACCE5B00067E444 /* TestBase+EdgeHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E1810062ACCE5B00067E444 /* TestBase+EdgeHelpers.swift */; };
 		2EC056EE2AB4F57100023BDE /* SDKConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EC056ED2AB4F57100023BDE /* SDKConfig.swift */; };
 		2ECFB7522AB391F400653128 /* EdgeDatastreamConfigOverrideTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ECFB7512AB391F400653128 /* EdgeDatastreamConfigOverrideTests.swift */; };
@@ -47,9 +47,6 @@
 		423B5033D43ADB49049383FB /* Pods_FunctionalTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0B13510405D14B13EFD1B58A /* Pods_FunctionalTests.framework */; };
 		4CBEE5D829D637170084BC50 /* AEPEdge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D444995F2519506B0093B364 /* AEPEdge.framework */; };
 		4CBEE5E629D637E90084BC50 /* UpstreamIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CBEE5E229D637E90084BC50 /* UpstreamIntegrationTests.swift */; };
-		4CBEE5EB29D63B180084BC50 /* EnumUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CBEE5EA29D63B180084BC50 /* EnumUtils.swift */; };
-		4CBEE5EF29DB952E0084BC50 /* EdgeLocationHint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CBEE5EE29DB952E0084BC50 /* EdgeLocationHint.swift */; };
-		4CBEE5F129DB953C0084BC50 /* EdgeEnvironment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CBEE5F029DB953C0084BC50 /* EdgeEnvironment.swift */; };
 		4CBEE5FD29FB47270084BC50 /* TestConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4A473C52485938D00D31710 /* TestConstants.swift */; };
 		4CBEE6152A156FB20084BC50 /* CompletionHandlerFunctionalTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CBEE60D2A156FB10084BC50 /* CompletionHandlerFunctionalTests.swift */; };
 		4CBEE6192A1571DC0084BC50 /* Edge+ConsentTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CBEE6182A1571DC0084BC50 /* Edge+ConsentTests.swift */; };
@@ -59,6 +56,7 @@
 		4CBEE6212A1577660084BC50 /* NetworkResponseHandlerFunctionalTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CBEE6202A1577660084BC50 /* NetworkResponseHandlerFunctionalTests.swift */; };
 		4CBEE6232A1577E40084BC50 /* NoConfigFunctionalTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CBEE6222A1577E40084BC50 /* NoConfigFunctionalTests.swift */; };
 		4CBEE6252A157CB40084BC50 /* SampleFunctionalTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CBEE6242A157CB40084BC50 /* SampleFunctionalTests.swift */; };
+		4CF7915E2CA526AB003C1FD8 /* IntegrationTestConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF7915D2CA526AB003C1FD8 /* IntegrationTestConstants.swift */; };
 		783A5F4E903F9B6EABA50D23 /* Pods_UnitTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DA0155731FA82D43DA47B93 /* Pods_UnitTests.framework */; };
 		BF024B7924C6238C002131E9 /* FakeIdentityExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF024B7824C6238C002131E9 /* FakeIdentityExtension.swift */; };
 		BF0C09482465E42100892B5D /* TestableEdge.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF0C09472465E42100892B5D /* TestableEdge.swift */; };
@@ -227,17 +225,14 @@
 		21FFBD5825631E3E00B48A8F /* EdgeEventWarningTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EdgeEventWarningTests.swift; sourceTree = "<group>"; };
 		21FFBD6B2563321600B48A8F /* EdgeEventErrorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EdgeEventErrorTests.swift; sourceTree = "<group>"; };
 		2E1810022ACCB83F0067E444 /* ConfigOverrideTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfigOverrideTests.swift; sourceTree = "<group>"; };
-		2E1810042ACCBA1B0067E444 /* TestSetupHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestSetupHelpers.swift; sourceTree = "<group>"; };
+		2E1810042ACCBA1B0067E444 /* TestEnvironment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestEnvironment.swift; sourceTree = "<group>"; };
 		2E1810062ACCE5B00067E444 /* TestBase+EdgeHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TestBase+EdgeHelpers.swift"; sourceTree = "<group>"; };
 		2EC056ED2AB4F57100023BDE /* SDKConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SDKConfig.swift; sourceTree = "<group>"; };
 		2ECFB7512AB391F400653128 /* EdgeDatastreamConfigOverrideTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EdgeDatastreamConfigOverrideTests.swift; sourceTree = "<group>"; };
 		2EDD05D2286EAA7000229CB2 /* TestApptvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TestApptvOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		316EF062B0B622235F6BB384 /* Pods_TestAppiOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TestAppiOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		4CBEE5E029D637170084BC50 /* UpstreamIntegrationTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = UpstreamIntegrationTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		4CBEE5E229D637E90084BC50 /* UpstreamIntegrationTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UpstreamIntegrationTests.swift; sourceTree = "<group>"; };
-		4CBEE5EA29D63B180084BC50 /* EnumUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnumUtils.swift; sourceTree = "<group>"; };
-		4CBEE5EE29DB952E0084BC50 /* EdgeLocationHint.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EdgeLocationHint.swift; sourceTree = "<group>"; };
-		4CBEE5F029DB953C0084BC50 /* EdgeEnvironment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EdgeEnvironment.swift; sourceTree = "<group>"; };
 		4CBEE60D2A156FB10084BC50 /* CompletionHandlerFunctionalTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CompletionHandlerFunctionalTests.swift; sourceTree = "<group>"; };
 		4CBEE6182A1571DC0084BC50 /* Edge+ConsentTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Edge+ConsentTests.swift"; sourceTree = "<group>"; };
 		4CBEE61A2A1572E50084BC50 /* Edge+PublicAPITests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Edge+PublicAPITests.swift"; sourceTree = "<group>"; };
@@ -246,6 +241,7 @@
 		4CBEE6202A1577660084BC50 /* NetworkResponseHandlerFunctionalTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkResponseHandlerFunctionalTests.swift; sourceTree = "<group>"; };
 		4CBEE6222A1577E40084BC50 /* NoConfigFunctionalTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NoConfigFunctionalTests.swift; sourceTree = "<group>"; };
 		4CBEE6242A157CB40084BC50 /* SampleFunctionalTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SampleFunctionalTests.swift; sourceTree = "<group>"; };
+		4CF7915D2CA526AB003C1FD8 /* IntegrationTestConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntegrationTestConstants.swift; sourceTree = "<group>"; };
 		5DA0155731FA82D43DA47B93 /* Pods_UnitTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_UnitTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		5E8ABC044CA69B7B3B6DA2B8 /* Pods-UpstreamIntegrationTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-UpstreamIntegrationTests.debug.xcconfig"; path = "Target Support Files/Pods-UpstreamIntegrationTests/Pods-UpstreamIntegrationTests.debug.xcconfig"; sourceTree = "<group>"; };
 		7276A55D4B28344E8ED9D27B /* Pods-TestAppiOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TestAppiOS.debug.xcconfig"; path = "Target Support Files/Pods-TestAppiOS/Pods-TestAppiOS.debug.xcconfig"; sourceTree = "<group>"; };
@@ -448,7 +444,6 @@
 				4CBEE5E929D63AFA0084BC50 /* util */,
 				2E1810022ACCB83F0067E444 /* ConfigOverrideTests.swift */,
 				4CBEE5E229D637E90084BC50 /* UpstreamIntegrationTests.swift */,
-				2E1810062ACCE5B00067E444 /* TestBase+EdgeHelpers.swift */,
 			);
 			name = UpstreamIntegrationTests;
 			path = Tests/UpstreamIntegrationTests;
@@ -457,10 +452,9 @@
 		4CBEE5E929D63AFA0084BC50 /* util */ = {
 			isa = PBXGroup;
 			children = (
-				4CBEE5EA29D63B180084BC50 /* EnumUtils.swift */,
-				4CBEE5F029DB953C0084BC50 /* EdgeEnvironment.swift */,
-				4CBEE5EE29DB952E0084BC50 /* EdgeLocationHint.swift */,
-				2E1810042ACCBA1B0067E444 /* TestSetupHelpers.swift */,
+				4CF7915D2CA526AB003C1FD8 /* IntegrationTestConstants.swift */,
+				2E1810062ACCE5B00067E444 /* TestBase+EdgeHelpers.swift */,
+				2E1810042ACCBA1B0067E444 /* TestEnvironment.swift */,
 			);
 			path = util;
 			sourceTree = "<group>";
@@ -614,15 +608,15 @@
 				D4A473CF2485B86D00D31710 /* AEPEdgeFunctionalTests.swift */,
 				4CBEE60D2A156FB10084BC50 /* CompletionHandlerFunctionalTests.swift */,
 				4CBEE6182A1571DC0084BC50 /* Edge+ConsentTests.swift */,
-				2ECFB7512AB391F400653128 /* EdgeDatastreamConfigOverrideTests.swift */,
 				4CBEE61A2A1572E50084BC50 /* Edge+PublicAPITests.swift */,
+				2ECFB7512AB391F400653128 /* EdgeDatastreamConfigOverrideTests.swift */,
 				4CBEE61C2A1574CE0084BC50 /* EdgePathOverwriteTests.swift */,
+				BFDF25AA2BD02E58002114B6 /* EdgeQueuedEntityFunctionalTests.swift */,
 				4CBEE61E2A15764B0084BC50 /* IdentityStateFunctionalTests.swift */,
 				4CBEE6202A1577660084BC50 /* NetworkResponseHandlerFunctionalTests.swift */,
 				4CBEE6222A1577E40084BC50 /* NoConfigFunctionalTests.swift */,
 				4CBEE6242A157CB40084BC50 /* SampleFunctionalTests.swift */,
 				D4D5B53724325AB700CAB6E4 /* Info.plist */,
-				BFDF25AA2BD02E58002114B6 /* EdgeQueuedEntityFunctionalTests.swift */,
 			);
 			name = FunctionalTests;
 			path = Tests/FunctionalTests;
@@ -1254,14 +1248,12 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				4CF7915E2CA526AB003C1FD8 /* IntegrationTestConstants.swift in Sources */,
 				4CBEE5FD29FB47270084BC50 /* TestConstants.swift in Sources */,
-				4CBEE5EB29D63B180084BC50 /* EnumUtils.swift in Sources */,
-				4CBEE5EF29DB952E0084BC50 /* EdgeLocationHint.swift in Sources */,
 				4CBEE5E629D637E90084BC50 /* UpstreamIntegrationTests.swift in Sources */,
-				4CBEE5F129DB953C0084BC50 /* EdgeEnvironment.swift in Sources */,
 				2E1810032ACCB83F0067E444 /* ConfigOverrideTests.swift in Sources */,
 				2E1810072ACCE5B00067E444 /* TestBase+EdgeHelpers.swift in Sources */,
-				2E1810052ACCBA1B0067E444 /* TestSetupHelpers.swift in Sources */,
+				2E1810052ACCBA1B0067E444 /* TestEnvironment.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/AEPEdge.xcodeproj/xcshareddata/xcschemes/UpstreamIntegrationTests.xcscheme b/AEPEdge.xcodeproj/xcshareddata/xcschemes/UpstreamIntegrationTests.xcscheme
@@ -43,8 +43,8 @@
             isEnabled = "YES">
          </EnvironmentVariable>
          <EnvironmentVariable
-            key = "EDGE_ENVIRONMENT"
-            value = "$(EDGE_ENVIRONMENT)"
+            key = "TAGS_MOBILE_PROPERTY_ID"
+            value = "$(TAGS_MOBILE_PROPERTY_ID)"
             isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>

diff --git a/Makefile b/Makefile
@@ -117,8 +117,8 @@ functional-test-tvos:
 
 # Runs the Edge Network (Konductor) integration tests after installing pod dependencies
 # Usage: 
-# make test-integration-upstream EDGE_ENVIRONMENT=<environment> EDGE_LOCATION_HINT=<location_hint>
-# If EDGE_ENVIRONMENT is not specified, test target will use its default value.
+# make test-integration-upstream MOBILE_PROPERTY_ID=<property_id> EDGE_LOCATION_HINT=<location_hint>
+# If MOBILE_PROPERTY_ID is not specified, test target will use its default value.
 .SILENT: test-integration-upstream # Silences Makefile's automatic echo of commands
 test-integration-upstream: pod-install; \
 	rm -rf build/reports/iosIntegrationUpstreamResults.xcresult; \
@@ -130,15 +130,14 @@ test-integration-upstream: pod-install; \
 		echo ''; \
 	fi; \
 	xcodebuild test \
-	-quiet \
 	-workspace $(PROJECT_NAME).xcworkspace \
 	-scheme UpstreamIntegrationTests \
 	-destination 'platform=iOS Simulator,name=iPhone 15' \
 	-derivedDataPath build/out \
 	-resultBundlePath build/reports/iosIntegrationUpstreamResults.xcresult \
 	-enableCodeCoverage YES \
 	ADB_SKIP_LINT=YES \
-	EDGE_ENVIRONMENT=$(EDGE_ENVIRONMENT) \
+	TAGS_MOBILE_PROPERTY_ID=$(TAGS_MOBILE_PROPERTY_ID) \
 	EDGE_LOCATION_HINT=$(EDGE_LOCATION_HINT)
 
 install-githook:

diff --git a/Podfile b/Podfile
@@ -25,19 +25,19 @@ end
 
 target 'UnitTests' do
   core_pods
-  pod 'AEPTestUtils', :git => 'https://github.com/adobe/aepsdk-testutils-ios.git', :tag => '5.0.2'
+  pod 'AEPTestUtils', :git => 'https://github.com/adobe/aepsdk-core-ios.git', :tag => 'testutils-5.2.1'
 end
 
 target 'UpstreamIntegrationTests' do
   core_pods
   edge_pods
-  pod 'AEPTestUtils', :git => 'https://github.com/adobe/aepsdk-testutils-ios.git', :tag => '5.0.2'
+  pod 'AEPTestUtils', :git => 'https://github.com/adobe/aepsdk-core-ios.git', :tag => 'testutils-5.2.1'
 end
 
 target 'FunctionalTests' do
   core_pods
   edge_pods
-  pod 'AEPTestUtils', :git => 'https://github.com/adobe/aepsdk-testutils-ios.git', :tag => '5.0.2'
+  pod 'AEPTestUtils', :git => 'https://github.com/adobe/aepsdk-core-ios.git', :tag => 'testutils-5.2.1'
 end
 
 target 'TestAppiOS' do

diff --git a/Podfile.lock b/Podfile.lock
@@ -15,9 +15,9 @@ PODS:
     - AEPCore (< 6.0.0, >= 5.0.0)
   - AEPRulesEngine (5.0.0)
   - AEPServices (5.3.1)
-  - AEPTestUtils (5.0.2):
-    - AEPCore (>= 5.2.0)
-    - AEPServices (>= 5.2.0)
+  - AEPTestUtils (5.2.1):
+    - AEPCore (< 6.0.0, >= 5.2.0)
+    - AEPServices (< 6.0.0, >= 5.2.0)
   - SwiftLint (0.52.0)
 
 DEPENDENCIES:
@@ -26,7 +26,7 @@ DEPENDENCIES:
   - AEPEdge (from `./AEPEdge.podspec`)
   - AEPEdgeConsent
   - AEPEdgeIdentity
-  - AEPTestUtils (from `https://github.com/adobe/aepsdk-testutils-ios.git`, tag `5.0.2`)
+  - AEPTestUtils (from `https://github.com/adobe/aepsdk-core-ios.git`, tag `testutils-5.2.1`)
   - SwiftLint (= 0.52.0)
 
 SPEC REPOS:
@@ -43,13 +43,13 @@ EXTERNAL SOURCES:
   AEPEdge:
     :path: "./AEPEdge.podspec"
   AEPTestUtils:
-    :git: https://github.com/adobe/aepsdk-testutils-ios.git
-    :tag: 5.0.2
+    :git: https://github.com/adobe/aepsdk-core-ios.git
+    :tag: testutils-5.2.1
 
 CHECKOUT OPTIONS:
   AEPTestUtils:
-    :git: https://github.com/adobe/aepsdk-testutils-ios.git
-    :tag: 5.0.2
+    :git: https://github.com/adobe/aepsdk-core-ios.git
+    :tag: testutils-5.2.1
 
 SPEC CHECKSUMS:
   AEPAssurance: df04baeace42befb0cc213fd6cdfe51651d11ba6
@@ -59,9 +59,9 @@ SPEC CHECKSUMS:
   AEPEdgeIdentity: 3161ff33434586962946912d6b8e9e8fca1c4d23
   AEPRulesEngine: fe5800653a4bee07b1e41e61b4d5551f0dba557b
   AEPServices: fcba979e90f6916b066aa66f016700d7b7534d96
-  AEPTestUtils: ef5a4f6cf9ef61630b7c68b5d205bb885a6f19a2
+  AEPTestUtils: 95394464ba120b308bfdfa652b7584c8f91de6b1
   SwiftLint: 13280e21cdda6786ad908dc6e416afe5acd1fcb7
 
-PODFILE CHECKSUM: 6202390e59242cb95df7c5f4f4fd723056c21974
+PODFILE CHECKSUM: c0c9dbbbe45188bea36e1e515bd704064d09a041
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.15.2