Merge develop

Author: satween

reliability/core-it/src/androidTest/kotlin/com/datadog/android/core/integration/tests/SdkCoreTest.kt

@@ -122,28 +122,6 @@ class SdkCoreTest : MockServerTest() {
             .containsExactlyInAnyOrderEntriesOf(fakeUserAdditionalProperties)
     }
 
-    @Test
-    fun must_clearUserInformation_when_clearUserInfo() {
-        // Given
-        testedSdkCore?.setUserInfo(fakeUserId, fakeUserName, fakeUserEmail, fakeUserAdditionalProperties)
-
-        // When
-        testedSdkCore?.clearUserInfo()
-
-        // Then
-        val countDownLatch = CountDownLatch(1)
-        var readUserInfo: UserInfo? = null
-        featureSdkCore?.getFeature(stubFeature.name)?.withWriteContext { datadogContext, _ ->
-            readUserInfo = datadogContext.userInfo
-            countDownLatch.countDown()
-        }
-        countDownLatch.await(SHORT_WAIT_MS, TimeUnit.MILLISECONDS)
-        assertThat(readUserInfo?.id).isNull()
-        assertThat(readUserInfo?.name).isNull()
-        assertThat(readUserInfo?.email).isNull()
-        assertThat(readUserInfo?.additionalProperties).isEmpty()
-    }
-
     // endregion
 
     // region set AccountInfo
@@ -208,6 +186,29 @@ class SdkCoreTest : MockServerTest() {
             .containsExactlyInAnyOrderEntriesOf(fakeUserAdditionalProperties + expectedUserExtraProperties)
     }
 
+    @Test
+    fun must_clearUserInformation_when_clearUserInfo() {
+        // Given
+        testedSdkCore.setUserInfo(fakeUserId, fakeUserName, fakeUserEmail, fakeUserAdditionalProperties)
+
+        // When
+        testedSdkCore.clearUserInfo()
+
+        // Then
+        val countDownLatch = CountDownLatch(1)
+        var readUserInfo: UserInfo? = null
+        featureSdkCore.getFeature(stubFeature.name)?.withWriteContext { datadogContext, _ ->
+            readUserInfo = datadogContext.userInfo
+            countDownLatch.countDown()
+        }
+        countDownLatch.await(SHORT_WAIT_MS, TimeUnit.MILLISECONDS)
+        assertThat(readUserInfo).isNotNull()
+        assertThat(readUserInfo?.id).isNull()
+        assertThat(readUserInfo?.name).isNull()
+        assertThat(readUserInfo?.email).isNull()
+        assertThat(readUserInfo?.additionalProperties).isEmpty()
+    }
+
     @Test
     fun must_useImmutableProperties_when_setUserProperties_attributesValuesModified() {
         // Given