From df09d59cd0af503229ed412490e5f3938dbc2c24 Mon Sep 17 00:00:00 2001
From: Michael Hoisie <hoisie@gmail.com>
Date: Fri, 24 May 2024 11:57:18 -0700
Subject: [PATCH] Migrate from GoogleRobolectricTestRunner to
 RobolectricTestRunner (#1596)

GoogleRobolectricTestRunner is internal to Google and is obsolete.
Migrate all references to RobolectricTestRunner.
---
 .../firebase/messaging/MessageForwardingServiceTest.java      | 4 ++--
 .../google/firebase/messaging/cpp/ListenerServiceTest.java    | 4 ++--
 .../com/google/firebase/messaging/cpp/MessageWriterTest.java  | 4 ++--
 testing/templates/JavaTest.java.tmpl                          | 4 ++--
 testing/templates/RobolectricTest.java.tmpl                   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/messaging/src/android/javatests/com/google/firebase/messaging/MessageForwardingServiceTest.java b/messaging/src/android/javatests/com/google/firebase/messaging/MessageForwardingServiceTest.java
index 765857bd6b..1fa2208003 100644
--- a/messaging/src/android/javatests/com/google/firebase/messaging/MessageForwardingServiceTest.java
+++ b/messaging/src/android/javatests/com/google/firebase/messaging/MessageForwardingServiceTest.java
@@ -23,15 +23,15 @@
 import android.content.Context;
 import android.content.Intent;
 import com.google.firebase.messaging.cpp.MessageWriter;
-import com.google.thirdparty.robolectric.GoogleRobolectricTestRunner;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 
-@RunWith(GoogleRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public final class MessageForwardingServiceTest {
   @Mock private Context context;
   @Mock private MessageWriter messageWriter;
diff --git a/messaging/src/android/javatests/com/google/firebase/messaging/cpp/ListenerServiceTest.java b/messaging/src/android/javatests/com/google/firebase/messaging/cpp/ListenerServiceTest.java
index 4fc47a7691..87ad972bef 100644
--- a/messaging/src/android/javatests/com/google/firebase/messaging/cpp/ListenerServiceTest.java
+++ b/messaging/src/android/javatests/com/google/firebase/messaging/cpp/ListenerServiceTest.java
@@ -23,14 +23,14 @@
 import android.os.Bundle;
 import com.google.firebase.messaging.RemoteMessage;
 import com.google.firebase.messaging.RemoteMessageUtil;
-import com.google.thirdparty.robolectric.GoogleRobolectricTestRunner;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 
-@RunWith(GoogleRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public final class ListenerServiceTest {
   @Mock private MessageWriter messageWriter;
 
diff --git a/messaging/src/android/javatests/com/google/firebase/messaging/cpp/MessageWriterTest.java b/messaging/src/android/javatests/com/google/firebase/messaging/cpp/MessageWriterTest.java
index 4c33f27744..46f3e55ed8 100644
--- a/messaging/src/android/javatests/com/google/firebase/messaging/cpp/MessageWriterTest.java
+++ b/messaging/src/android/javatests/com/google/firebase/messaging/cpp/MessageWriterTest.java
@@ -24,7 +24,6 @@
 import com.google.common.io.ByteStreams;
 import com.google.firebase.messaging.RemoteMessage;
 import com.google.firebase.messaging.RemoteMessageUtil;
-import com.google.thirdparty.robolectric.GoogleRobolectricTestRunner;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.nio.ByteBuffer;
@@ -37,8 +36,9 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 
-@RunWith(GoogleRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public final class MessageWriterTest {
   private static final Path STORAGE_FILE_PATH = Paths.get("/tmp/" + MessageWriter.STORAGE_FILE);
 
diff --git a/testing/templates/JavaTest.java.tmpl b/testing/templates/JavaTest.java.tmpl
index 7c3d6eaafd..c0b53b6b47 100644
--- a/testing/templates/JavaTest.java.tmpl
+++ b/testing/templates/JavaTest.java.tmpl
@@ -1,7 +1,7 @@
 package com.google.firebase.test;
 
 import android.app.Activity;
-import com.google.thirdparty.robolectric.GoogleRobolectricTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -10,7 +10,7 @@ import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;
 
 /** A test wrapper that wraps around native C++ code that calls RUN_ALL_TESTS(). */
-@RunWith(GoogleRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
 public final class $wrapper_name {
   @Test
diff --git a/testing/templates/RobolectricTest.java.tmpl b/testing/templates/RobolectricTest.java.tmpl
index 4d66a6d2f1..0d4a9c28fe 100644
--- a/testing/templates/RobolectricTest.java.tmpl
+++ b/testing/templates/RobolectricTest.java.tmpl
@@ -1,15 +1,15 @@
 package com.google.firebase.test.runner;
 
 import com.google.firebase.test.$activity_name;
-import com.google.thirdparty.robolectric.GoogleRobolectricTestRunner;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 /** A test wrapper that wraps around native C++ code that calls RUN_ALL_TESTS(). */
-@RunWith(GoogleRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
 public class $wrapper_name {
   @Test