Skip to content

Commit 2d2e931

Browse files
denischilikdenischilik
committed
Fix GA and GA4 kit tests for two-arg onConsentStateUpdated
Align GoogleAnalyticsFirebaseKitTest and GoogleAnalyticsFirebaseGA4KitTest with KitIntegration: drop the removed FilteredMParticleUser argument and unused mock from consent tests. Made-with: Cursor
1 parent 7524884 commit 2d2e931

2 files changed

Lines changed: 20 additions & 66 deletions

File tree

‎kits/ga/ga-23/src/test/kotlin/com/mparticle/kits/GoogleAnalyticsFirebaseKitTest.kt‎

Lines changed: 10 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ class GoogleAnalyticsFirebaseKitTest {
4949
@Mock
5050
lateinit var user: MParticleUser
5151

52-
@Mock
53-
lateinit var filteredMParticleUser: FilteredMParticleUser
54-
5552
@Before
5653
@Throws(JSONException::class)
5754
fun before() {
@@ -193,9 +190,7 @@ class GoogleAnalyticsFirebaseKitTest {
193190
.builder()
194191
.addGDPRConsentState("Marketing", marketingConsent)
195192
.build()
196-
filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance)
197-
198-
kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser)
193+
kitInstance.onConsentStateUpdated(state, state)
199194

200195
val expectedConsentValue =
201196
firebaseSdk.getConsentState().getKeyByValue("AD_PERSONALIZATION").toString()
@@ -236,9 +231,7 @@ class GoogleAnalyticsFirebaseKitTest {
236231
.builder()
237232
.addGDPRConsentState("Marketing", marketingConsent)
238233
.build()
239-
filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance)
240-
241-
kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser)
234+
kitInstance.onConsentStateUpdated(state, state)
242235

243236
val expectedConsentValue =
244237
firebaseSdk.getConsentState().getKeyByValue("AD_PERSONALIZATION").toString()
@@ -279,9 +272,7 @@ class GoogleAnalyticsFirebaseKitTest {
279272
.builder()
280273
.addGDPRConsentState("Performance", performanceConsent)
281274
.build()
282-
filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance)
283-
284-
kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser)
275+
kitInstance.onConsentStateUpdated(state, state)
285276

286277
val expectedConsentValue =
287278
firebaseSdk.getConsentState().getKeyByValue("AD_USER_DATA").toString()
@@ -323,9 +314,7 @@ class GoogleAnalyticsFirebaseKitTest {
323314
.builder()
324315
.addGDPRConsentState("Performance", performanceConsent)
325316
.build()
326-
filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance)
327-
328-
kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser)
317+
kitInstance.onConsentStateUpdated(state, state)
329318

330319
val expectedConsentValue =
331320
firebaseSdk.getConsentState().getKeyByValue("AD_USER_DATA").toString()
@@ -376,9 +365,7 @@ class GoogleAnalyticsFirebaseKitTest {
376365
.addGDPRConsentState("Marketing", marketingConsent)
377366
.addGDPRConsentState("Performance", performanceConsent)
378367
.build()
379-
filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance)
380-
381-
kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser)
368+
kitInstance.onConsentStateUpdated(state, state)
382369

383370
val expectedConsentValue =
384371
firebaseSdk.getConsentState().getKeyByValue("AD_USER_DATA").toString()
@@ -425,9 +412,7 @@ class GoogleAnalyticsFirebaseKitTest {
425412
.addGDPRConsentState("Marketing", marketingConsent)
426413
.addGDPRConsentState("Performance", performanceConsent)
427414
.build()
428-
filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance)
429-
430-
kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser)
415+
kitInstance.onConsentStateUpdated(state, state)
431416

432417
val expectedConsentValue =
433418
firebaseSdk.getConsentState().getKeyByValue("AD_USER_DATA").toString()
@@ -462,9 +447,7 @@ class GoogleAnalyticsFirebaseKitTest {
462447
.addGDPRConsentState("Marketing", marketingConsent)
463448
.addGDPRConsentState("Performance", performanceConsent)
464449
.build()
465-
filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance)
466-
467-
kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser)
450+
kitInstance.onConsentStateUpdated(state, state)
468451

469452
TestCase.assertEquals(0, firebaseSdk.getConsentState().size)
470453
}
@@ -502,9 +485,7 @@ class GoogleAnalyticsFirebaseKitTest {
502485
.addGDPRConsentState("Marketing", marketingConsent)
503486
.addGDPRConsentState("Performance", performanceConsent)
504487
.build()
505-
filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance)
506-
507-
kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser)
488+
kitInstance.onConsentStateUpdated(state, state)
508489

509490
val expectedConsentValue =
510491
firebaseSdk.getConsentState().getKeyByValue("AD_STORAGE").toString()
@@ -553,9 +534,7 @@ class GoogleAnalyticsFirebaseKitTest {
553534
.addGDPRConsentState("Marketing", marketingConsent)
554535
.addGDPRConsentState("Performance", performanceConsent)
555536
.build()
556-
filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance)
557-
558-
kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser)
537+
kitInstance.onConsentStateUpdated(state, state)
559538

560539
TestCase.assertEquals(0, firebaseSdk.getConsentState().size)
561540
}
@@ -594,9 +573,7 @@ class GoogleAnalyticsFirebaseKitTest {
594573
.addGDPRConsentState("Marketing", marketingConsent)
595574
.addGDPRConsentState("Performance", performanceConsent)
596575
.build()
597-
filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance)
598-
599-
kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser)
576+
kitInstance.onConsentStateUpdated(state, state)
600577

601578
val expectedConsentValue =
602579
firebaseSdk.getConsentState().getKeyByValue("AD_USER_DATA").toString()

‎kits/ga4/ga4-23/src/test/kotlin/com/mparticle/kits/GoogleAnalyticsFirebaseGA4KitTest.kt‎

Lines changed: 10 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ class GoogleAnalyticsFirebaseGA4KitTest {
5151
@Mock
5252
lateinit var user: MParticleUser
5353

54-
@Mock
55-
lateinit var filteredMParticleUser: FilteredMParticleUser
56-
5754
@Before
5855
@Throws(JSONException::class)
5956
fun before() {
@@ -167,9 +164,7 @@ class GoogleAnalyticsFirebaseGA4KitTest {
167164
.builder()
168165
.addGDPRConsentState("Marketing", marketingConsent)
169166
.build()
170-
filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance)
171-
172-
kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser)
167+
kitInstance.onConsentStateUpdated(state, state)
173168

174169
val expectedConsentValue =
175170
firebaseSdk.getConsentState().getKeyByValue("AD_PERSONALIZATION").toString()
@@ -210,9 +205,7 @@ class GoogleAnalyticsFirebaseGA4KitTest {
210205
.builder()
211206
.addGDPRConsentState("Marketing", marketingConsent)
212207
.build()
213-
filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance)
214-
215-
kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser)
208+
kitInstance.onConsentStateUpdated(state, state)
216209

217210
val expectedConsentValue =
218211
firebaseSdk.getConsentState().getKeyByValue("AD_PERSONALIZATION").toString()
@@ -253,9 +246,7 @@ class GoogleAnalyticsFirebaseGA4KitTest {
253246
.builder()
254247
.addGDPRConsentState("Performance", performanceConsent)
255248
.build()
256-
filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance)
257-
258-
kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser)
249+
kitInstance.onConsentStateUpdated(state, state)
259250

260251
val expectedConsentValue =
261252
firebaseSdk.getConsentState().getKeyByValue("AD_USER_DATA").toString()
@@ -297,9 +288,7 @@ class GoogleAnalyticsFirebaseGA4KitTest {
297288
.builder()
298289
.addGDPRConsentState("Performance", performanceConsent)
299290
.build()
300-
filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance)
301-
302-
kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser)
291+
kitInstance.onConsentStateUpdated(state, state)
303292

304293
val expectedConsentValue =
305294
firebaseSdk.getConsentState().getKeyByValue("AD_USER_DATA").toString()
@@ -350,9 +339,7 @@ class GoogleAnalyticsFirebaseGA4KitTest {
350339
.addGDPRConsentState("Marketing", marketingConsent)
351340
.addGDPRConsentState("Performance", performanceConsent)
352341
.build()
353-
filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance)
354-
355-
kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser)
342+
kitInstance.onConsentStateUpdated(state, state)
356343

357344
val expectedConsentValue =
358345
firebaseSdk.getConsentState().getKeyByValue("AD_USER_DATA").toString()
@@ -399,9 +386,7 @@ class GoogleAnalyticsFirebaseGA4KitTest {
399386
.addGDPRConsentState("Marketing", marketingConsent)
400387
.addGDPRConsentState("Performance", performanceConsent)
401388
.build()
402-
filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance)
403-
404-
kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser)
389+
kitInstance.onConsentStateUpdated(state, state)
405390

406391
val expectedConsentValue =
407392
firebaseSdk.getConsentState().getKeyByValue("AD_USER_DATA").toString()
@@ -436,9 +421,7 @@ class GoogleAnalyticsFirebaseGA4KitTest {
436421
.addGDPRConsentState("Marketing", marketingConsent)
437422
.addGDPRConsentState("Performance", performanceConsent)
438423
.build()
439-
filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance)
440-
441-
kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser)
424+
kitInstance.onConsentStateUpdated(state, state)
442425

443426
TestCase.assertEquals(0, firebaseSdk.getConsentState().size)
444427
}
@@ -476,9 +459,7 @@ class GoogleAnalyticsFirebaseGA4KitTest {
476459
.addGDPRConsentState("Marketing", marketingConsent)
477460
.addGDPRConsentState("Performance", performanceConsent)
478461
.build()
479-
filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance)
480-
481-
kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser)
462+
kitInstance.onConsentStateUpdated(state, state)
482463

483464
val expectedConsentValue =
484465
firebaseSdk.getConsentState().getKeyByValue("AD_STORAGE").toString()
@@ -527,9 +508,7 @@ class GoogleAnalyticsFirebaseGA4KitTest {
527508
.addGDPRConsentState("Marketing", marketingConsent)
528509
.addGDPRConsentState("Performance", performanceConsent)
529510
.build()
530-
filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance)
531-
532-
kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser)
511+
kitInstance.onConsentStateUpdated(state, state)
533512

534513
TestCase.assertEquals(0, firebaseSdk.getConsentState().size)
535514
}
@@ -568,9 +547,7 @@ class GoogleAnalyticsFirebaseGA4KitTest {
568547
.addGDPRConsentState("Marketing", marketingConsent)
569548
.addGDPRConsentState("Performance", performanceConsent)
570549
.build()
571-
filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance)
572-
573-
kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser)
550+
kitInstance.onConsentStateUpdated(state, state)
574551

575552
val expectedConsentValue =
576553
firebaseSdk.getConsentState().getKeyByValue("AD_USER_DATA").toString()

0 commit comments

Comments
 (0)