Update CT dependencies for Android 13 (#536)

hborisoff · web-flow · commit 2aeed4f65dee · 2023-01-17T16:21:19.000+02:00
* Update CT dependencies

* Fix unit tests

* Fix unit tests, second try
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/internal/RequestBatchFactory.java b/AndroidSDKCore/src/main/java/com/leanplum/internal/RequestBatchFactory.java
@@ -21,18 +21,16 @@
 
 package com.leanplum.internal;
 
-import android.os.Build;
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 
 public class RequestBatchFactory {
 
-  static final int MAX_EVENTS_PER_API_CALL = (Build.VERSION.SDK_INT <= 17) ? 5000 : 10000;
+  static final int MAX_EVENTS_PER_API_CALL = 10000;
 
   private final RequestUuidHelper uuidHelper = new RequestUuidHelper();
 
diff --git a/AndroidSDKHms/build.gradle b/AndroidSDKHms/build.gradle
@@ -33,8 +33,8 @@ dependencies {
     api project(':AndroidSDKCore')
     api project(':AndroidSDKPush')
 
-    implementation 'com.huawei.agconnect:agconnect-core:1.6.5.300'
-    implementation 'com.huawei.hms:push:6.5.0.300'
+    implementation 'com.huawei.agconnect:agconnect-core:1.7.2.300'
+    implementation 'com.huawei.hms:push:6.7.0.300'
 }
 
 task generateJavadoc(type: Javadoc) {
diff --git a/AndroidSDKTests/src/test/java/com/leanplum/LeanplumCloudMessagingProviderTest.java b/AndroidSDKTests/src/test/java/com/leanplum/LeanplumCloudMessagingProviderTest.java
@@ -58,7 +58,7 @@
  */
 @RunWith(RobolectricTestRunner.class)
 @Config(
-    sdk = 16,
+    sdk = 19,
     application = LeanplumTestApp.class
 )
 @PowerMockIgnore({
diff --git a/AndroidSDKTests/src/test/java/com/leanplum/LeanplumInboxMessageTest.java b/AndroidSDKTests/src/test/java/com/leanplum/LeanplumInboxMessageTest.java
@@ -46,7 +46,7 @@
  * @author Sayaan Saha
  */
 @RunWith(RobolectricTestRunner.class)
-@Config(sdk = 16)
+@Config(sdk = 19)
 public class LeanplumInboxMessageTest {
 
   private LeanplumInboxMessage createMessageTestData(
diff --git a/AndroidSDKTests/src/test/java/com/leanplum/LeanplumPushServiceTest.java b/AndroidSDKTests/src/test/java/com/leanplum/LeanplumPushServiceTest.java
@@ -91,7 +91,7 @@
  */
 @RunWith(RobolectricTestRunner.class)
 @Config(
-    sdk = 16,
+    sdk = 19,
     application = LeanplumTestApp.class
 )
 @PowerMockIgnore({
diff --git a/AndroidSDKTests/src/test/java/com/leanplum/__setup/AbstractTest.java b/AndroidSDKTests/src/test/java/com/leanplum/__setup/AbstractTest.java
@@ -83,7 +83,7 @@
 
 @RunWith(RobolectricTestRunner.class)
 @Config(
-    sdk = 16,
+    sdk = 19,
     application = LeanplumTestApp.class,
     packageName = "com.leanplum.tests",
     shadows = {
diff --git a/AndroidSDKTests/src/test/java/com/leanplum/internal/AESCryptTest.java b/AndroidSDKTests/src/test/java/com/leanplum/internal/AESCryptTest.java
@@ -53,7 +53,7 @@
 @SuppressWarnings("unused")
 @RunWith(RobolectricTestRunner.class)
 @Config(
-    sdk = 16,
+    sdk = 19,
     application = LeanplumTestApp.class
 )
 @PowerMockIgnore({
diff --git a/AndroidSDKTests/src/test/java/com/leanplum/internal/ApiConfigLoaderTest.java b/AndroidSDKTests/src/test/java/com/leanplum/internal/ApiConfigLoaderTest.java
@@ -41,7 +41,7 @@
 
 @RunWith(RobolectricTestRunner.class)
 @Config(
-    sdk = 16
+    sdk = 19
 )
 public class ApiConfigLoaderTest {
   private String appId;
diff --git a/AndroidSDKTests/src/test/java/com/leanplum/internal/JsonConverterTest.java b/AndroidSDKTests/src/test/java/com/leanplum/internal/JsonConverterTest.java
@@ -44,7 +44,7 @@
 @SuppressWarnings("unused")
 @RunWith(RobolectricTestRunner.class)
 @Config(
-    sdk = 16,
+    sdk = 19,
     application = LeanplumTestApp.class
 )
 @PowerMockIgnore({
diff --git a/AndroidSDKTests/src/test/java/com/leanplum/internal/LeanplumEventDataManagerTest.java b/AndroidSDKTests/src/test/java/com/leanplum/internal/LeanplumEventDataManagerTest.java
@@ -48,7 +48,7 @@
  */
 @RunWith(RobolectricTestRunner.class)
 @Config(
-    sdk = 16,
+    sdk = 19,
     application = LeanplumTestApp.class
 )
 public class LeanplumEventDataManagerTest {
diff --git a/AndroidSDKTests/src/test/java/com/leanplum/internal/LeanplumInternalTest.java b/AndroidSDKTests/src/test/java/com/leanplum/internal/LeanplumInternalTest.java
@@ -51,7 +51,7 @@
  */
 @RunWith(RobolectricTestRunner.class)
 @Config(
-    sdk = 16,
+    sdk = 19,
     application = LeanplumTestApp.class
 )
 @PowerMockIgnore({
diff --git a/AndroidSDKTests/src/test/java/com/leanplum/internal/RequestBatchFactoryTest.java b/AndroidSDKTests/src/test/java/com/leanplum/internal/RequestBatchFactoryTest.java
@@ -48,7 +48,7 @@
 
 @RunWith(RobolectricTestRunner.class)
 @Config(
-    sdk = 16,
+    sdk = 19,
     application = LeanplumTestApp.class,
     shadows = {
         ShadowLooper.class,
@@ -264,11 +264,15 @@ public void testRemoveIrrelevantBackgroundStartRequests() {
     LeanplumEventDataManagerTest.setDatabaseToNull();
   }
 
-  // Given a list of 5000 that generate OOM exceptions
+  // Given a list of 10000 that generate OOM exceptions
   // we want to generate the requests to send
   // The list should try and get a smaller fraction of the available requests
   @Test
   public void testJsonEncodeUnsentRequestsWithExceptionLargeNumbers() throws Exception {
+    final int maxRequests = 10000;
+    final int halfMaxRequests = maxRequests / 2;
+    final int quarterMaxRequests = maxRequests / 4;
+
     RequestBatch requestBatch;
     // Prepare testable objects and method.
     RequestSender requestSender = new RequestSender();
@@ -277,35 +281,35 @@ public void testJsonEncodeUnsentRequestsWithExceptionLargeNumbers() throws Excep
 
     RequestBatchFactory batchFactory = spy(new RequestBatchFactory());
 
-    for (int i = 0; i < 5000; i++) { // remaining requests to make up 5000
+    for (int i = 0; i < maxRequests; i++) { // remaining requests to make up maxRequests
       Request startRequest =
           new Request("POST", RequestBuilder.ACTION_START, RequestType.DEFAULT, null);
       requestSender.send(startRequest);
     }
 
-    // Expectation: 5000 requests returned.
+    // Expectation: maxRequests returned.
     requestBatch = batchFactory.createNextBatch(1.0);
 
     assertNotNull(requestBatch.requests);
     assertNotNull(requestBatch.requestsToSend);
     assertNotNull(requestBatch.jsonEncoded);
-    assertEquals(5000, requestBatch.requests.size());
+    assertEquals(maxRequests, requestBatch.requests.size());
 
-    // Throw OOM on 5000 requests
-    // Expectation: 2500 requests returned.
+    // Throw OOM on maxRequests
+    // Expectation: halfMaxRequests returned.
     when(batchFactory.getUnsentRequests(1.0)).thenThrow(OutOfMemoryError.class);
     requestBatch = batchFactory.createNextBatch(1.0);
 
     assertNotNull(requestBatch.requests);
     assertNotNull(requestBatch.requestsToSend);
     assertNotNull(requestBatch.jsonEncoded);
-    assertEquals(2500, requestBatch.requests.size());
+    assertEquals(halfMaxRequests, requestBatch.requests.size());
 
-    // Throw OOM on 2500, 5000 requests
-    // Expectation: 1250 requests returned.
+    // Throw OOM on halfMaxRequests, maxRequests
+    // Expectation: quarterMaxRequests returned.
     when(batchFactory.getUnsentRequests(0.5)).thenThrow(OutOfMemoryError.class);
     requestBatch = batchFactory.createNextBatch(1.0);
-    assertEquals(1250, requestBatch.requests.size());
+    assertEquals(quarterMaxRequests, requestBatch.requests.size());
 
     // Throw OOM on serializing any finite number of requests (extreme condition)
     // Expectation: Determine only 0 requests to be sent
diff --git a/AndroidSDKTests/src/test/java/com/leanplum/internal/RequestBuilderTest.java b/AndroidSDKTests/src/test/java/com/leanplum/internal/RequestBuilderTest.java
@@ -35,7 +35,7 @@
 
 @RunWith(RobolectricTestRunner.class)
 @Config(
-    sdk = 16
+    sdk = 19
 )
 public class RequestBuilderTest {
   @Test
diff --git a/AndroidSDKTests/src/test/java/com/leanplum/internal/RequestSenderTest.java b/AndroidSDKTests/src/test/java/com/leanplum/internal/RequestSenderTest.java
@@ -50,7 +50,7 @@
  */
 @RunWith(RobolectricTestRunner.class)
 @Config(
-        sdk = 16,
+        sdk = 19,
         application = LeanplumTestApp.class,
         shadows = {
                 ShadowLooper.class,
diff --git a/AndroidSDKTests/src/test/java/com/leanplum/internal/RequestUtilTest.java b/AndroidSDKTests/src/test/java/com/leanplum/internal/RequestUtilTest.java
@@ -22,7 +22,7 @@
 
 @RunWith(RobolectricTestRunner.class)
 @Config(
-        sdk = 16,
+        sdk = 19,
         application = LeanplumTestApp.class
 )
 @PowerMockIgnore({
diff --git a/AndroidSDKTests/src/test/java/com/leanplum/internal/SocketIOClientTest.java b/AndroidSDKTests/src/test/java/com/leanplum/internal/SocketIOClientTest.java
@@ -57,7 +57,7 @@
  */
 @RunWith(RobolectricTestRunner.class)
 @Config(
-    sdk = 16,
+    sdk = 19,
     application = LeanplumTestApp.class
 )
 @PowerMockIgnore({
diff --git a/AndroidSDKTests/src/test/java/com/leanplum/internal/SocketTest.java b/AndroidSDKTests/src/test/java/com/leanplum/internal/SocketTest.java
@@ -38,7 +38,7 @@
  */
 @RunWith(RobolectricTestRunner.class)
 @Config(
-    sdk = 16,
+    sdk = 19,
     application = LeanplumTestApp.class
 )
 @PowerMockIgnore({
diff --git a/AndroidSDKTests/src/test/java/com/leanplum/internal/WebSocketClientTest.java b/AndroidSDKTests/src/test/java/com/leanplum/internal/WebSocketClientTest.java
@@ -47,7 +47,7 @@
  */
 @RunWith(RobolectricTestRunner.class)
 @Config(
-    sdk = 16,
+    sdk = 19,
     application = LeanplumTestApp.class
 )
 @PowerMockIgnore({
diff --git a/AndroidSDKTests/src/test/java/com/leanplum/migration/wrapper/IdentityManagerTest.kt b/AndroidSDKTests/src/test/java/com/leanplum/migration/wrapper/IdentityManagerTest.kt
@@ -12,7 +12,7 @@ import org.robolectric.annotation.Config
 import kotlin.properties.Delegates
 
 @RunWith(RobolectricTestRunner::class)
-@Config(sdk = [16])
+@Config(sdk = [19])
 @PrepareForTest(
   Log::class,
 )
diff --git a/AndroidSDKTests/src/test/java/com/leanplum/utils/BitmapUtilTest.java b/AndroidSDKTests/src/test/java/com/leanplum/utils/BitmapUtilTest.java
@@ -60,7 +60,7 @@
  */
 @RunWith(RobolectricTestRunner.class)
 @Config(
-    sdk = 16,
+    sdk = 19,
     application = LeanplumTestApp.class
 )
 @PowerMockIgnore({
diff --git a/build.gradle b/build.gradle
@@ -5,8 +5,8 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32'
+        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20'
     }
 }
 
diff --git a/common-methods.gradle b/common-methods.gradle
@@ -2,8 +2,8 @@
 ext {
     COMPILE_SDK_VERSION = 33
     APPCOMPAT_LIBRARY_VERSION = '1.2.0'
-    CT_SDK_VERSION = '4.6.6'
-    MIN_SDK_VERSION = 16
+    CT_SDK_VERSION = '4.7.2'
+    MIN_SDK_VERSION = 19 // CT SDK 4.7.2 has minSDK set as 19
     JAVA_VERSION = JavaVersion.VERSION_1_8
 
     LEANPLUM_GROUP_ID = 'com.leanplum'

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,8 @@ dependencies {`
`33`	`33`	`api project(':AndroidSDKCore')`
`34`	`34`	`api project(':AndroidSDKPush')`
`35`	`35`
`36`		`- implementation 'com.huawei.agconnect:agconnect-core:1.6.5.300'`
`37`		`- implementation 'com.huawei.hms:push:6.5.0.300'`
	`36`	`+ implementation 'com.huawei.agconnect:agconnect-core:1.7.2.300'`
	`37`	`+ implementation 'com.huawei.hms:push:6.7.0.300'`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`task generateJavadoc(type: Javadoc) {`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@`
`58`	`58`	`*/`
`59`	`59`	`@RunWith(RobolectricTestRunner.class)`
`60`	`60`	`@Config(`
`61`		`- sdk = 16,`
	`61`	`+ sdk = 19,`
`62`	`62`	`application = LeanplumTestApp.class`
`63`	`63`	`)`
`64`	`64`	`@PowerMockIgnore({`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@`
`91`	`91`	`*/`
`92`	`92`	`@RunWith(RobolectricTestRunner.class)`
`93`	`93`	`@Config(`
`94`		`- sdk = 16,`
	`94`	`+ sdk = 19,`
`95`	`95`	`application = LeanplumTestApp.class`
`96`	`96`	`)`
`97`	`97`	`@PowerMockIgnore({`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@`
`53`	`53`	`@SuppressWarnings("unused")`
`54`	`54`	`@RunWith(RobolectricTestRunner.class)`
`55`	`55`	`@Config(`
`56`		`- sdk = 16,`
	`56`	`+ sdk = 19,`
`57`	`57`	`application = LeanplumTestApp.class`
`58`	`58`	`)`
`59`	`59`	`@PowerMockIgnore({`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@`
`41`	`41`
`42`	`42`	`@RunWith(RobolectricTestRunner.class)`
`43`	`43`	`@Config(`
`44`		`- sdk = 16`
	`44`	`+ sdk = 19`
`45`	`45`	`)`
`46`	`46`	`public class ApiConfigLoaderTest {`
`47`	`47`	`private String appId;`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@`
`44`	`44`	`@SuppressWarnings("unused")`
`45`	`45`	`@RunWith(RobolectricTestRunner.class)`
`46`	`46`	`@Config(`
`47`		`- sdk = 16,`
	`47`	`+ sdk = 19,`
`48`	`48`	`application = LeanplumTestApp.class`
`49`	`49`	`)`
`50`	`50`	`@PowerMockIgnore({`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@`
`48`	`48`	`*/`
`49`	`49`	`@RunWith(RobolectricTestRunner.class)`
`50`	`50`	`@Config(`
`51`		`- sdk = 16,`
	`51`	`+ sdk = 19,`
`52`	`52`	`application = LeanplumTestApp.class`
`53`	`53`	`)`
`54`	`54`	`public class LeanplumEventDataManagerTest {`