-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #75 from adobe/dev
Merge dev into staging for Assurance 2.2.0 release
- Loading branch information
Showing
23 changed files
with
1,151 additions
and
320 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,11 @@ jobs: | |
| runs-on: macos-latest | ||
|
|
||
| steps: | ||
|
|
||
| - name: Set up Java | ||
| uses: actions/setup-java@v1 | ||
| with: | ||
| java-version: 11 | ||
|
|
||
| - name: Checkout | ||
| uses: actions/[email protected] | ||
| with: | ||
|
|
||
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 0 additions & 35 deletions
35
code/assurance/src/androidTest/java/com/adobe/marketing/mobile/ExampleInstrumentedTest.java
This file was deleted.
Oops, something went wrong.
62 changes: 62 additions & 0 deletions
62
...surance/src/androidTest/java/com/adobe/marketing/mobile/assurance/AssuranceUtilTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* | ||
| * Copyright 2023 Adobe. All rights reserved. | ||
| * This file is licensed to you under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. You may obtain a copy | ||
| * of the License at http://www.apache.org/licenses/LICENSE-2.0 | ||
| * Unless required by applicable law or agreed to in writing, software distributed under | ||
| * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS | ||
| * OF ANY KIND, either express or implied. See the License for the specific language | ||
| * governing permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package com.adobe.marketing.mobile.assurance; | ||
|
|
||
|
|
||
| import android.net.Uri; | ||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
|
|
||
| /** | ||
| * Tests for {@link AssuranceUtil} that involve android specific constructs like {@link | ||
| * android.net.Uri} that cannot be mocked. | ||
| */ | ||
| public class AssuranceUtilTests { | ||
|
|
||
| @Test | ||
| public void testGetEnvironmentFromSocketUri() { | ||
| final Uri devSocketUri = Uri.parse("wss://connect-dev.griffon.adobe.com/client/v1"); | ||
| Assert.assertEquals( | ||
| AssuranceConstants.AssuranceEnvironment.DEV, | ||
| AssuranceUtil.getEnvironmentFromSocketUri(devSocketUri)); | ||
|
|
||
| final Uri qaSocketUri = Uri.parse("wss://connect-qa.griffon.adobe.com/client/v1"); | ||
| Assert.assertEquals( | ||
| AssuranceConstants.AssuranceEnvironment.QA, | ||
| AssuranceUtil.getEnvironmentFromSocketUri(qaSocketUri)); | ||
|
|
||
| final Uri stageSocketUri = Uri.parse("wss://connect-stage.griffon.adobe.com/client/v1"); | ||
|
|
||
| Assert.assertEquals( | ||
| AssuranceConstants.AssuranceEnvironment.STAGE, | ||
| AssuranceUtil.getEnvironmentFromSocketUri(stageSocketUri)); | ||
|
|
||
| final Uri prodSocketUri = Uri.parse("wss://connect.griffon.adobe.com/client/v1"); | ||
| Assert.assertEquals( | ||
| AssuranceConstants.AssuranceEnvironment.PROD, | ||
| AssuranceUtil.getEnvironmentFromSocketUri(prodSocketUri)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testGetEnvironmentFromSocketUri_InvalidURI() { | ||
|
|
||
| final Uri invalidSocketUri = Uri.parse("wss://invalidconnect.griffon.adobe.com/client/v1"); | ||
| Assert.assertEquals( | ||
| AssuranceConstants.AssuranceEnvironment.PROD, | ||
| AssuranceUtil.getEnvironmentFromSocketUri(invalidSocketUri)); | ||
|
|
||
| final Uri invalidFormatUri = Uri.parse("not:://a_valid_uri"); | ||
| Assert.assertEquals( | ||
| AssuranceConstants.AssuranceEnvironment.PROD, | ||
| AssuranceUtil.getEnvironmentFromSocketUri(invalidFormatUri)); | ||
| } | ||
| } |
112 changes: 112 additions & 0 deletions
112
...ance/src/androidTest/java/com/adobe/marketing/mobile/assurance/InboundEventWorkerTests.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| /* | ||
| * Copyright 2023 Adobe. All rights reserved. | ||
| * This file is licensed to you under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. You may obtain a copy | ||
| * of the License at http://www.apache.org/licenses/LICENSE-2.0 | ||
| * Unless required by applicable law or agreed to in writing, software distributed under | ||
| * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS | ||
| * OF ANY KIND, either express or implied. See the License for the specific language | ||
| * governing permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package com.adobe.marketing.mobile.assurance | ||
|
|
||
| import androidx.test.ext.junit.runners.AndroidJUnit4 | ||
| import org.junit.Assert.assertFalse | ||
| import org.junit.Assert.assertTrue | ||
| import org.junit.Assert.fail | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
| import java.util.concurrent.CountDownLatch | ||
| import java.util.concurrent.TimeUnit | ||
|
|
||
| @RunWith(AndroidJUnit4::class) | ||
| class InboundEventWorkerTests { | ||
|
|
||
| companion object { | ||
| private const val WAIT_TIME_SECONDS = 5L | ||
| } | ||
|
|
||
| @Test | ||
| fun testInboundEventWorkerDoesNotNotifyListenerOnEventWhenNotStarted() { | ||
| val countDownLatch = CountDownLatch(1) | ||
| val inboundQueueEventListener: InboundEventQueueWorker.InboundQueueEventListener = | ||
| object : InboundEventQueueWorker.InboundQueueEventListener { | ||
| override fun onInboundEvent(event: AssuranceEvent) { | ||
| fail("Inbound event listener should not be called when worker is not started") | ||
| } | ||
| } | ||
| val inboundEventQueueWorker = InboundEventQueueWorker(inboundQueueEventListener) | ||
|
|
||
| val event1 = constructAssuranceControlEvent(mutableMapOf("key1" to "value1")) | ||
| val event2 = constructAssuranceControlEvent(mutableMapOf("key2" to "value2")) | ||
| val event3 = constructAssuranceControlEvent(mutableMapOf("key3" to "value3")) | ||
|
|
||
| inboundEventQueueWorker.offer(event1) | ||
| inboundEventQueueWorker.offer(event2) | ||
| inboundEventQueueWorker.offer(event3) | ||
|
|
||
| assertFalse(countDownLatch.await(WAIT_TIME_SECONDS, TimeUnit.SECONDS)) | ||
| } | ||
|
|
||
| @Test | ||
| fun testInboundEventWorkerNotifiesListenerOnEventWhenStarted() { | ||
| val countDownLatch = CountDownLatch(1) | ||
| val eventsCollected = mutableListOf<AssuranceEvent>() | ||
| val inboundQueueEventListener: InboundEventQueueWorker.InboundQueueEventListener = | ||
| object : InboundEventQueueWorker.InboundQueueEventListener { | ||
| override fun onInboundEvent(event: AssuranceEvent) { | ||
| eventsCollected.add(event) | ||
| if (eventsCollected.size == 3) { | ||
| countDownLatch.countDown() | ||
| } | ||
| } | ||
| } | ||
| val inboundEventQueueWorker = InboundEventQueueWorker(inboundQueueEventListener) | ||
|
|
||
| val event1 = constructAssuranceControlEvent(mutableMapOf("key1" to "value1")) | ||
| val event2 = constructAssuranceControlEvent(mutableMapOf("key2" to "value2")) | ||
| val event3 = constructAssuranceControlEvent(mutableMapOf("key3" to "value3")) | ||
|
|
||
| inboundEventQueueWorker.start() | ||
|
|
||
| inboundEventQueueWorker.offer(event1) | ||
| inboundEventQueueWorker.offer(event2) | ||
| inboundEventQueueWorker.offer(event3) | ||
|
|
||
| assertTrue(countDownLatch.await(WAIT_TIME_SECONDS, TimeUnit.SECONDS)) | ||
| } | ||
|
|
||
| @Test | ||
| fun testInboundEventWorkerQueuesAndNotifiesListenerOnEvents() { | ||
| val countDownLatch = CountDownLatch(1) | ||
| val eventsCollected = mutableListOf<AssuranceEvent>() | ||
| val inboundQueueEventListener: InboundEventQueueWorker.InboundQueueEventListener = | ||
| object : InboundEventQueueWorker.InboundQueueEventListener { | ||
| override fun onInboundEvent(event: AssuranceEvent) { | ||
| eventsCollected.add(event) | ||
| if (eventsCollected.size == 3) { | ||
| countDownLatch.countDown() | ||
| } | ||
| } | ||
| } | ||
| val inboundEventQueueWorker = InboundEventQueueWorker(inboundQueueEventListener) | ||
|
|
||
| val event1 = constructAssuranceControlEvent(mutableMapOf("key1" to "value1")) | ||
| val event2 = constructAssuranceControlEvent(mutableMapOf("key2" to "value2")) | ||
| val event3 = constructAssuranceControlEvent(mutableMapOf("key3" to "value3")) | ||
|
|
||
| inboundEventQueueWorker.offer(event1) | ||
| inboundEventQueueWorker.offer(event2) | ||
| inboundEventQueueWorker.offer(event3) | ||
|
|
||
| inboundEventQueueWorker.start() | ||
|
|
||
| assertTrue(countDownLatch.await(WAIT_TIME_SECONDS, TimeUnit.SECONDS)) | ||
| } | ||
|
|
||
| private fun constructAssuranceControlEvent(payload: MutableMap<String, Any>): AssuranceEvent { | ||
| payload["type"] = AssuranceConstants.AssuranceEventType.CONTROL | ||
| return AssuranceEvent(AssuranceConstants.AssuranceEventType.CONTROL, payload) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.