Merge pull request #3017 from wordpress-mobile/issue/20857

Remote config crash when retrieving integer value
wordpress-mobile · May 24, 2024 · 01c9833 · 01c9833
2 parents a7d04cd + 0a696cc
commit 01c9833
Show file tree

Hide file tree

Showing 32 changed files with 305 additions and 42 deletions.
diff --git a/...java/org/wordpress/android/fluxc/network/rest/wpcom/activity/ActivityLogRestClientTest.kt b/...java/org/wordpress/android/fluxc/network/rest/wpcom/activity/ActivityLogRestClientTest.kt
@@ -590,7 +590,9 @@ class ActivityLogRestClientTest {
                 eq(ActivitiesResponse::class.java),
                 eq(false),
                 any(),
-                eq(false))
+                eq(false),
+                customGsonBuilder = anyOrNull()
+        )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)
         return response
@@ -609,7 +611,9 @@ class ActivityLogRestClientTest {
                 eq(RewindStatusResponse::class.java),
                 eq(false),
                 any(),
-                eq(false))).thenReturn(response)
+                eq(false),
+                customGsonBuilder = anyOrNull()
+        )).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)
         return response
     }
@@ -693,7 +697,9 @@ class ActivityLogRestClientTest {
                 eq(Array<BackupDownloadStatusResponse>::class.java),
                 eq(false),
                 any(),
-                eq(false))).thenReturn(response)
+                eq(false),
+                customGsonBuilder = anyOrNull()
+        )).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)
         return response
     }
@@ -710,7 +716,9 @@ class ActivityLogRestClientTest {
                 eq(ActivityTypesResponse::class.java),
                 eq(false),
                 any(),
-                eq(false))
+                eq(false),
+                customGsonBuilder = anyOrNull()
+        )
         ).thenReturn(response)
         return response
     }

diff --git a/...st/java/org/wordpress/android/fluxc/network/rest/wpcom/comments/CommentsRestClientTest.kt b/...st/java/org/wordpress/android/fluxc/network/rest/wpcom/comments/CommentsRestClientTest.kt
@@ -571,8 +571,8 @@ class CommentsRestClientTest {
                         eq(kclass),
                         any(),
                         any(),
-                        any()
-
+                        any(),
+                        customGsonBuilder = anyOrNull()
                 )
         ).thenReturn(response)
         return response

diff --git a/...test/java/org/wordpress/android/fluxc/network/rest/wpcom/dashboard/CardsRestClientTest.kt b/...test/java/org/wordpress/android/fluxc/network/rest/wpcom/dashboard/CardsRestClientTest.kt
@@ -13,6 +13,7 @@ import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.mockito.kotlin.KArgumentCaptor
 import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
 import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
@@ -397,7 +398,8 @@ class CardsRestClientTest {
                         eq(CardsResponse::class.java),
                         eq(false),
                         any(),
-                        eq(false)
+                        eq(false),
+                        customGsonBuilder = anyOrNull()
                 )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)

diff --git a/...va/org/wordpress/android/fluxc/network/rest/wpcom/experiments/ExperimentRestClientTest.kt b/...va/org/wordpress/android/fluxc/network/rest/wpcom/experiments/ExperimentRestClientTest.kt
@@ -9,6 +9,7 @@ import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.mockito.kotlin.KArgumentCaptor
 import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
 import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.whenever
@@ -174,7 +175,8 @@ class ExperimentRestClientTest {
                         eq(FetchAssignmentsResponse::class.java),
                         eq(false),
                         any(),
-                        eq(true)
+                        eq(true),
+                        customGsonBuilder = anyOrNull()
                 )
         ).thenReturn(response)
     }

diff --git a/.../java/org/wordpress/android/fluxc/network/rest/wpcom/mobile/FeatureFlagsRestClientTest.kt b/.../java/org/wordpress/android/fluxc/network/rest/wpcom/mobile/FeatureFlagsRestClientTest.kt
@@ -11,6 +11,7 @@ import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.mockito.kotlin.KArgumentCaptor
 import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
 import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
@@ -182,7 +183,8 @@ class FeatureFlagsRestClientTest {
                 eq(Map::class.java),
                 eq(false),
                 any(),
-                eq(false)
+                eq(false),
+                customGsonBuilder = anyOrNull()
             )
         ).thenReturn(response)
     }

diff --git a/.../java/org/wordpress/android/fluxc/network/rest/wpcom/mobile/RemoteConfigRestClientTest.kt b/.../java/org/wordpress/android/fluxc/network/rest/wpcom/mobile/RemoteConfigRestClientTest.kt
@@ -11,6 +11,7 @@ import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.mockito.kotlin.KArgumentCaptor
 import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
 import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
@@ -136,7 +137,8 @@ class RemoteConfigRestClientTest {
                 eq(Map::class.java),
                 eq(false),
                 any(),
-                eq(false)
+                eq(false),
+                customGsonBuilder = anyOrNull()
             )
         ).thenReturn(response)
     }

diff --git a/...ava/org/wordpress/android/fluxc/network/rest/wpcom/planoffers/PlanOffersRestClientTest.kt b/...ava/org/wordpress/android/fluxc/network/rest/wpcom/planoffers/PlanOffersRestClientTest.kt
@@ -10,6 +10,7 @@ import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.mockito.kotlin.KArgumentCaptor
 import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
 import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.whenever
@@ -85,7 +86,8 @@ class PlanOffersRestClientTest {
                         eq(PlanOffersResponse::class.java),
                         eq(false),
                         any(),
-                        eq(true)
+                        eq(true),
+                        customGsonBuilder = anyOrNull()
                 )
         ).thenReturn(response)
     }

diff --git a/...st/java/org/wordpress/android/fluxc/network/rest/wpcom/products/ProductsRestClientTest.kt b/...st/java/org/wordpress/android/fluxc/network/rest/wpcom/products/ProductsRestClientTest.kt
@@ -9,6 +9,7 @@ import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.mockito.kotlin.KArgumentCaptor
 import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
 import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.whenever
@@ -90,7 +91,8 @@ class ProductsRestClientTest {
                         eq(ProductsResponse::class.java),
                         eq(false),
                         any(),
-                        eq(false)
+                        eq(false),
+                        customGsonBuilder = anyOrNull()
                 )
         ).thenReturn(response)
     }

diff --git a/.../wordpress/android/fluxc/network/rest/wpcom/reactnative/ReactNativeWPComRestClientTest.kt b/.../wordpress/android/fluxc/network/rest/wpcom/reactnative/ReactNativeWPComRestClientTest.kt
@@ -125,7 +125,8 @@ class ReactNativeWPComRestClientTest {
                 url,
                 params,
                 JsonElement::class.java,
-                true)
+                true,
+        )
         ).thenReturn(expectedRestCallResponse)
 
         val actual = subject.getRequest(url, params, successHandler, errorHandler)

diff --git a/...e/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/ScanRestClientTest.kt b/...e/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/ScanRestClientTest.kt
@@ -422,7 +422,8 @@ class ScanRestClientTest {
                         eq(ScanStateResponse::class.java),
                         eq(false),
                         any(),
-                        eq(false)
+                        eq(false),
+                        customGsonBuilder = anyOrNull()
                 )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)
@@ -506,7 +507,8 @@ class ScanRestClientTest {
                         eq(FixThreatsStatusResponse::class.java),
                         eq(false),
                         any(),
-                        eq(false)
+                        eq(false),
+                        customGsonBuilder = anyOrNull()
                 )
         ).thenReturn(response)
         return response

diff --git a/...e/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteRestClientTest.kt b/...e/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteRestClientTest.kt
@@ -666,7 +666,8 @@ class SiteRestClientTest {
                         eq(clazz),
                         any(),
                         any(),
-                        any()
+                        any(),
+                        customGsonBuilder = anyOrNull()
 
                 )
         ).thenReturn(response)

diff --git a/...src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/site/XPostsRestClientTest.kt b/...src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/site/XPostsRestClientTest.kt
@@ -33,7 +33,7 @@ internal class XPostsRestClientTest {
                         mapOf("decode_html" to "true"),
                         Array<XPostSiteModel>::class.java,
                         true,
-                        60000
+                        60000,
                 )
         )
                 .thenReturn(expected)

diff --git a/.../test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/InsightsRestClientTest.kt b/.../test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/InsightsRestClientTest.kt
@@ -10,6 +10,7 @@ import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.mockito.kotlin.KArgumentCaptor
 import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
 import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.isNull
@@ -510,7 +511,8 @@ class InsightsRestClientTest {
                         eq(kclass),
                         eq(cachingEnabled),
                         any(),
-                        eq(false)
+                        eq(false),
+                        customGsonBuilder = anyOrNull()
                 )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)

diff --git a/...rg/wordpress/android/fluxc/network/rest/wpcom/stats/insights/MostPopularRestClientTest.kt b/...rg/wordpress/android/fluxc/network/rest/wpcom/stats/insights/MostPopularRestClientTest.kt
@@ -10,6 +10,7 @@ import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.mockito.kotlin.KArgumentCaptor
 import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
 import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
@@ -101,7 +102,8 @@ class MostPopularRestClientTest {
                         eq(MostPopularResponse::class.java),
                         eq(true),
                         any(),
-                        eq(false)
+                        eq(false),
+                        customGsonBuilder = anyOrNull()
                 )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)

diff --git a/...ordpress/android/fluxc/network/rest/wpcom/stats/insights/PostingActivityRestClientTest.kt b/...ordpress/android/fluxc/network/rest/wpcom/stats/insights/PostingActivityRestClientTest.kt
@@ -10,6 +10,7 @@ import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.mockito.kotlin.KArgumentCaptor
 import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
 import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
@@ -118,7 +119,8 @@ class PostingActivityRestClientTest {
                         eq(PostingActivityResponse::class.java),
                         eq(true),
                         any(),
-                        eq(false)
+                        eq(false),
+                        customGsonBuilder = anyOrNull()
                 )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)

diff --git a/...va/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/SummaryRestClientTest.kt b/...va/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/SummaryRestClientTest.kt
@@ -10,6 +10,7 @@ import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.mockito.kotlin.KArgumentCaptor
 import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
 import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
@@ -98,7 +99,8 @@ class SummaryRestClientTest {
                 eq(SummaryResponse::class.java),
                 eq(false),
                 any(),
-                eq(false)
+                eq(false),
+                customGsonBuilder = anyOrNull()
             )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)

diff --git a/...wordpress/android/fluxc/network/rest/wpcom/stats/subscribers/SubscribersRestClientTest.kt b/...wordpress/android/fluxc/network/rest/wpcom/stats/subscribers/SubscribersRestClientTest.kt
@@ -10,6 +10,7 @@ import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.mockito.kotlin.KArgumentCaptor
 import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
 import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
@@ -144,7 +145,8 @@ class SubscribersRestClientTest {
                 eq(clazz),
                 eq(cachingEnabled),
                 any(),
-                eq(false)
+                eq(false),
+                customGsonBuilder = anyOrNull()
             )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)

diff --git a/...t/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/AuthorsRestClientTest.kt b/...t/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/AuthorsRestClientTest.kt
@@ -12,6 +12,7 @@ import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.mockito.kotlin.KArgumentCaptor
 import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
 import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.isNull
@@ -172,7 +173,8 @@ class AuthorsRestClientTest {
                         eq(kclass),
                         eq(cachingEnabled),
                         any(),
-                        eq(false)
+                        eq(false),
+                        customGsonBuilder = anyOrNull()
                 )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)

diff --git a/...st/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/ClicksRestClientTest.kt b/...st/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/ClicksRestClientTest.kt
@@ -12,6 +12,7 @@ import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.mockito.kotlin.KArgumentCaptor
 import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
 import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.isNull
@@ -218,7 +219,8 @@ class ClicksRestClientTest {
                         eq(kclass),
                         eq(cachingEnabled),
                         any(),
-                        eq(false)
+                        eq(false),
+                        customGsonBuilder = anyOrNull()
                 )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)

diff --git a/...a/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/CountryViewsRestClientTest.kt b/...a/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/CountryViewsRestClientTest.kt
@@ -10,6 +10,7 @@ import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.mockito.kotlin.KArgumentCaptor
 import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
 import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.isNull
@@ -168,7 +169,8 @@ class CountryViewsRestClientTest {
                         eq(kclass),
                         eq(cachingEnabled),
                         any(),
-                        eq(false)
+                        eq(false),
+                        customGsonBuilder = anyOrNull()
                 )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)

diff --git a/.../org/wordpress/android/fluxc/network/rest/wpcom/stats/time/FileDownloadsRestClientTest.kt b/.../org/wordpress/android/fluxc/network/rest/wpcom/stats/time/FileDownloadsRestClientTest.kt
@@ -12,6 +12,7 @@ import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.mockito.kotlin.KArgumentCaptor
 import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
 import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.isNull
@@ -172,7 +173,8 @@ class FileDownloadsRestClientTest {
                         eq(kclass),
                         eq(cachingEnabled),
                         any(),
-                        eq(false)
+                        eq(false),
+                        customGsonBuilder = anyOrNull()
                 )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)

diff --git a/...g/wordpress/android/fluxc/network/rest/wpcom/stats/time/PostAndPageViewsRestClientTest.kt b/...g/wordpress/android/fluxc/network/rest/wpcom/stats/time/PostAndPageViewsRestClientTest.kt
@@ -10,6 +10,7 @@ import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.mockito.kotlin.KArgumentCaptor
 import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
 import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.isNull
@@ -168,7 +169,8 @@ class PostAndPageViewsRestClientTest {
                         eq(kclass),
                         eq(cachingEnabled),
                         any(),
-                        eq(false)
+                        eq(false),
+                        customGsonBuilder = anyOrNull()
                 )
         ).thenReturn(response)
         whenever(site.siteId).thenReturn(siteId)
-Original file line number
+Diff line change
@@ Expand Up / @@ -125,7 +125,8 @@ class ReactNativeWPComRestClientTest { @@
                     url,
                     params,
                     JsonElement::class.java,
-                    true)
+                    true,
+            )
             ).thenReturn(expectedRestCallResponse)
             val actual = subject.getRequest(url, params, successHandler, errorHandler)
@@ Expand Down @@