-
Notifications
You must be signed in to change notification settings - Fork 25
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 #686 from adobe/staging
Merge `staging` into `main` for Core v3.1.0
- Loading branch information
Showing
15 changed files
with
642 additions
and
11 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
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
48 changes: 48 additions & 0 deletions
48
code/core/src/main/java/com/adobe/marketing/mobile/util/EventUtils.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,48 @@ | ||
| /* | ||
| Copyright 2024 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. | ||
| */ | ||
|
|
||
| @file:JvmName("EventUtils") // Allows Java callers to use EventUtils.<> instead of EventUtilsKt.<> | ||
|
|
||
| package com.adobe.marketing.mobile.util | ||
|
|
||
| import com.adobe.marketing.mobile.Event | ||
| import com.adobe.marketing.mobile.EventSource | ||
| import com.adobe.marketing.mobile.EventType | ||
|
|
||
| private const val KEY_EVENT_DATA_DEBUG = "debug" | ||
| private const val KEY_DEBUG_EVENT_TYPE = "eventType" | ||
| private const val KEY_DEBUG_EVENT_SOURCE = "eventSource" | ||
|
|
||
| /** | ||
| * The debug event type (identified by debug.eventType) from the event data if present, otherwise null | ||
| */ | ||
| val Event.debugEventType: String? | ||
| get() = debugEventData?.get(KEY_DEBUG_EVENT_TYPE) as? String | ||
|
|
||
| /** | ||
| * The debug event source (identified by debug.eventSource) from the event data if present, otherwise null. | ||
| */ | ||
| val Event.debugEventSource: String? | ||
| get() = debugEventData?.get(KEY_DEBUG_EVENT_SOURCE) as? String | ||
|
|
||
| /** | ||
| * Returns the debug event data (identified by data.debug) from the event if present, otherwise null. | ||
| * @return the content of "debug" key within "Event.data" if present, | ||
| * null if the event is not a debug event or if the debug data does not exist | ||
| */ | ||
| private val Event.debugEventData: Map<String, Any?>? | ||
| get() { | ||
| if (type != EventType.SYSTEM || source != EventSource.DEBUG) return null | ||
|
|
||
| if (eventData == null) return null | ||
|
|
||
| return DataReader.optTypedMap(Any::class.java, eventData, KEY_EVENT_DATA_DEBUG, null) ?: null | ||
| } |
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
86 changes: 86 additions & 0 deletions
86
code/core/src/test/java/com/adobe/marketing/mobile/MobileCoreRobolectricTests.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,86 @@ | ||
| /* | ||
| Copyright 2024 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 | ||
|
|
||
| import android.app.Application | ||
| import androidx.core.os.UserManagerCompat | ||
| import com.adobe.marketing.mobile.internal.eventhub.EventHub | ||
| import junit.framework.TestCase.assertTrue | ||
| import org.junit.Before | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
| import org.mockito.Mockito | ||
| import org.mockito.kotlin.any | ||
| import org.mockito.kotlin.never | ||
| import org.mockito.kotlin.times | ||
| import org.mockito.kotlin.verify | ||
| import org.robolectric.RobolectricTestRunner | ||
| import org.robolectric.RuntimeEnvironment | ||
| import org.robolectric.annotation.Config | ||
| import java.util.concurrent.atomic.AtomicBoolean | ||
| import kotlin.test.assertFalse | ||
|
|
||
| @RunWith(RobolectricTestRunner::class) | ||
| class MobileCoreRobolectricTests { | ||
|
|
||
| @Before | ||
| fun setup() { | ||
| MobileCore.sdkInitializedWithContext = AtomicBoolean(false) | ||
| } | ||
|
|
||
| @Test | ||
| @Config(sdk = [23]) | ||
| fun `test setApplication when the device doesn't support direct boot mode`() { | ||
| // Android supports direct boot mode on API level 24 and above | ||
| val app = RuntimeEnvironment.application as Application | ||
| val mockedEventHub = Mockito.mock(EventHub::class.java) | ||
| Mockito.mockStatic(UserManagerCompat::class.java).use { mockedStaticUserManagerCompat -> | ||
| mockedStaticUserManagerCompat.`when`<Any> { UserManagerCompat.isUserUnlocked(Mockito.any()) } | ||
| .thenReturn(false) | ||
| MobileCore.setApplication(app) | ||
| mockedStaticUserManagerCompat.verify({ UserManagerCompat.isUserUnlocked(Mockito.any()) }, never()) | ||
| } | ||
| verify(mockedEventHub, never()).executeInEventHubExecutor(any()) | ||
| assertTrue(MobileCore.sdkInitializedWithContext.get()) | ||
| } | ||
|
|
||
| @Test | ||
| @Config(sdk = [24]) | ||
| fun `test setApplication when the app is not configured to run in direct boot mode`() { | ||
| val app = RuntimeEnvironment.application as Application | ||
| val mockedEventHub = Mockito.mock(EventHub::class.java) | ||
| EventHub.shared = mockedEventHub | ||
| Mockito.mockStatic(UserManagerCompat::class.java).use { mockedStaticUserManagerCompat -> | ||
| // when initializing SDK, the app is not in direct boot mode (device is unlocked) | ||
| mockedStaticUserManagerCompat.`when`<Any> { UserManagerCompat.isUserUnlocked(Mockito.any()) }.thenReturn(true) | ||
| MobileCore.setApplication(app) | ||
| mockedStaticUserManagerCompat.verify({ UserManagerCompat.isUserUnlocked(Mockito.any()) }, times(1)) | ||
| } | ||
| verify(mockedEventHub, times(1)).executeInEventHubExecutor(any()) | ||
| assertTrue(MobileCore.sdkInitializedWithContext.get()) | ||
| } | ||
|
|
||
| @Test | ||
| @Config(sdk = [24]) | ||
| fun `test setApplication when the app is launched in direct boot mode`() { | ||
| val app = RuntimeEnvironment.application as Application | ||
| val mockedEventHub = Mockito.mock(EventHub::class.java) | ||
| Mockito.mockStatic(UserManagerCompat::class.java).use { mockedStaticUserManagerCompat -> | ||
| // when initializing SDK, the app is in direct boot mode (device is still locked) | ||
| mockedStaticUserManagerCompat.`when`<Any> { UserManagerCompat.isUserUnlocked(Mockito.any()) }.thenReturn(false) | ||
| MobileCore.setApplication(app) | ||
| mockedStaticUserManagerCompat.verify({ UserManagerCompat.isUserUnlocked(Mockito.any()) }, times(1)) | ||
| } | ||
| verify(mockedEventHub, never()).executeInEventHubExecutor(any()) | ||
| assertFalse(MobileCore.sdkInitializedWithContext.get()) | ||
| } | ||
| } |
Oops, something went wrong.