Skip to content

Commit 4ac38c3

Browse files
committed
Address build errors in test code
API adjustments on test code for FDL, messaging, and sessions.
1 parent b12ab96 commit 4ac38c3

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

firebase-dynamic-links/src/test/java/com/google/firebase/dynamiclinks/PendingDynamicLinkDataTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import static junit.framework.Assert.assertNull;
2222
import static org.mockito.ArgumentMatchers.any;
2323
import static org.mockito.ArgumentMatchers.anyInt;
24-
import static org.mockito.Matchers.eq;
24+
import static org.mockito.ArgumentMatchers.eq;
2525
import static org.mockito.Mockito.when;
2626

2727
import android.content.Context;

firebase-dynamic-links/src/test/java/com/google/firebase/dynamiclinks/internal/FirebaseDynamicLinksImplTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import static junit.framework.Assert.assertTrue;
2121
import static junit.framework.Assert.fail;
2222
import static org.mockito.ArgumentMatchers.any;
23-
import static org.mockito.Matchers.eq;
23+
import static org.mockito.ArgumentMatchers.eq;
2424
import static org.mockito.Mockito.verify;
2525

2626
import android.content.Intent;

firebase-messaging/src/test/java/com/google/firebase/messaging/CommonNotificationBuilderRoboTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ public void createNotificationInfo_withValidVisibility() {
431431
CommonNotificationBuilder.createNotificationInfo(appContext, new NotificationParams(data));
432432

433433
// verify
434-
assertThat(NotificationCompat.getVisibility(notificationInfo.notificationBuilder.build()))
434+
assertThat(notificationInfo.notificationBuilder.build().visibility)
435435
.isEqualTo(expectedVisibility);
436436
}
437437

@@ -446,7 +446,7 @@ public void createNotificationInfo_withInvalidVisibility() {
446446
CommonNotificationBuilder.createNotificationInfo(appContext, new NotificationParams(data));
447447

448448
// verify never set
449-
assertThat(NotificationCompat.getVisibility(notificationInfo.notificationBuilder.build()))
449+
assertThat(notificationInfo.notificationBuilder.build().visibility)
450450
.isEqualTo(0);
451451
}
452452

@@ -461,7 +461,7 @@ public void createNotificationInfo_withInvalidVisibility_outOfBoundVisibility()
461461
CommonNotificationBuilder.createNotificationInfo(appContext, new NotificationParams(data));
462462

463463
// verify never set
464-
assertThat(NotificationCompat.getVisibility(notificationInfo.notificationBuilder.build()))
464+
assertThat(notificationInfo.notificationBuilder.build().visibility)
465465
.isEqualTo(0);
466466
}
467467

firebase-sessions/test-app/src/main/kotlin/com/google/firebase/testing/sessions/FirstFragment.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,26 +66,26 @@ class FirstFragment : Fragment() {
6666
}
6767
binding.buttonForegroundProcess.setOnClickListener {
6868
if (binding.buttonForegroundProcess.getText().startsWith("Start")) {
69-
ForegroundService.startService(getContext()!!, "Starting service at ${getDateText()}")
69+
ForegroundService.startService(requireContext(), "Starting service at ${getDateText()}")
7070
binding.buttonForegroundProcess.setText("Stop foreground service")
7171
} else {
72-
ForegroundService.stopService(getContext()!!)
72+
ForegroundService.stopService(requireContext())
7373
binding.buttonForegroundProcess.setText("Start foreground service")
7474
}
7575
}
7676
binding.startSplitscreen.setOnClickListener {
77-
val intent = Intent(getContext()!!, SecondActivity::class.java)
77+
val intent = Intent(requireContext(), SecondActivity::class.java)
7878
intent.addFlags(FLAG_ACTIVITY_NEW_TASK or FLAG_ACTIVITY_LAUNCH_ADJACENT)
7979
startActivity(intent)
8080
activity?.finish()
8181
}
8282
binding.startSplitscreenSame.setOnClickListener {
83-
val intent = Intent(getContext()!!, MainActivity::class.java)
83+
val intent = Intent(requireContext(), MainActivity::class.java)
8484
intent.addFlags(FLAG_ACTIVITY_NEW_TASK or FLAG_ACTIVITY_LAUNCH_ADJACENT)
8585
startActivity(intent)
8686
}
8787
binding.nextActivityButton.setOnClickListener {
88-
val intent = Intent(getContext()!!, SecondActivity::class.java)
88+
val intent = Intent(requireContext(), SecondActivity::class.java)
8989
intent.addFlags(FLAG_ACTIVITY_NEW_TASK)
9090
startActivity(intent)
9191
}

0 commit comments

Comments
 (0)