feat: Migrate JUnit 4 tests to JUnit 5 and adjust access modifiers

Updated test classes and methods to use JUnit 5 annotations and access modifiers.
- Removed deprecated JUnit 4 annotations.
- Changed public test classes and methods to package-private where appropriate.
- Reverted accidental changes to BaseSystemTest and LocalLoggingImpl methods to maintain public access where required for compilation due to inheritance and interface implementation.

Author: lqiu96

google-cloud-logging/src/test/java/com/google/cloud/logging/ExclusionTest.java

@@ -100,7 +100,7 @@ void testOf() {
     assertFalse(exclusion.isDisabled());
   }
 
-  public void compareExclusion(Exclusion expected, Exclusion actual) {
+  void compareExclusion(Exclusion expected, Exclusion actual) {
     assertEquals(expected, actual);
     assertEquals(expected.toString(), actual.toString());
     assertEquals(expected.getName(), actual.getName());

google-cloud-logging/src/test/java/com/google/cloud/logging/InstrumentationTest.java

@@ -102,7 +102,7 @@ void testInvalidInstrumentationRemoved() {
                     Instrumentation.getLibraryVersion(Instrumentation.class)))));
   }
 
-  public static JsonPayload generateInstrumentationPayload(
+  static JsonPayload generateInstrumentationPayload(
       String libraryName, String libraryVersion) {
     Map<String, Object> jsonData = new HashMap<>();
     Map<String, Object> instrumentationData = new HashMap<>();

google-cloud-logging/src/test/java/com/google/cloud/logging/InvalidContextTest.java

@@ -24,7 +24,7 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 class InvalidContextTest {
-  public static List<String> data() {
+  static List<String> data() {
     final String[] INVALID_W3C_TRACE_CONTEXTS = {
       "",
       "abc/efg",

google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingHandlerTest.java

@@ -236,7 +236,7 @@ static class CustomLevel extends Level {
     }
   }
 
-  public final OutputStreamPatcher outputStreamPatcher = new OutputStreamPatcher();
+  final OutputStreamPatcher outputStreamPatcher = new OutputStreamPatcher();
 
   @BeforeEach
   void setUp() {

google-cloud-logging/src/test/java/com/google/cloud/logging/it/ITLoggingTest.java

@@ -53,7 +53,7 @@ class ITLoggingTest extends BaseSystemTest {
       new MonitoredResource[] {GLOBAL_RESOURCE, CLOUDSQL_RESOURCE};
 
   @BeforeAll
-  public static void insertLogs() {
+  static void insertLogs() {
     // This ensures predictability of the test:
     // with batching enabled by default, it's possible that for two log entries,
     // batching
@@ -81,7 +81,7 @@ public static void insertLogs() {
   }
 
   @AfterAll
-  public static void cleanUpLogs() throws InterruptedException {
+  static void cleanUpLogs() throws InterruptedException {
     assertTrue(cleanupLog(LOG_ID));
   }
 
@@ -90,7 +90,7 @@ public static void cleanUpLogs() throws InterruptedException {
   @Timeout(
       value = 600_000,
       unit = TimeUnit.MILLISECONDS) // Note: it can take ~10 minutes for logs to propagate!
-  public void testListEntries() throws InterruptedException {
+  void testListEntries() throws InterruptedException {
     LoggingOptions loggingOptions = logging.getOptions();
     LogName logName = LogName.ofProjectLogName(loggingOptions.getProjectId(), LOG_ID);
 
@@ -127,7 +127,7 @@ public void testListEntries() throws InterruptedException {
   @Timeout(
       value = 600_000,
       unit = TimeUnit.MILLISECONDS) // Note: it can take ~10 minutes for logs to propagate!
-  public void testSortedOrder() throws InterruptedException {
+  void testSortedOrder() throws InterruptedException {
     LoggingOptions loggingOptions = logging.getOptions();
     LogName logName = LogName.ofProjectLogName(loggingOptions.getProjectId(), LOG_ID);
 

google-cloud-logging/src/test/java/com/google/cloud/logging/it/ITSinkTest.java

@@ -40,7 +40,7 @@
 class ITSinkTest extends BaseSystemTest {
 
   @BeforeAll
-  public static void setUp() {
+  static void setUp() {
     // Cleanup all stucked sinks if any
     Logging.ListOption[] options = {Logging.ListOption.pageSize(50)};
     Page<Sink> sinkPage = logging.listSinks(options);

google-cloud-logging/src/test/java/com/google/cloud/logging/it/ITTailLogsTest.java

@@ -38,7 +38,7 @@ class ITTailLogsTest extends BaseSystemTest {
       MonitoredResource.newBuilder("global").build();
 
   @AfterAll
-  public static void cleanUpLogs() throws InterruptedException {
+  static void cleanUpLogs() throws InterruptedException {
     assertTrue(cleanupLog(LOG_ID));
   }
 
@@ -47,7 +47,7 @@ public static void cleanUpLogs() throws InterruptedException {
   @Timeout(
       value = 120_000,
       unit = TimeUnit.MILLISECONDS) // Note: the test should not take longer than 2 min
-  public void testTailLogEntries() throws InterruptedException {
+  void testTailLogEntries() throws InterruptedException {
     LogEntry testLogEntry =
         LogEntry.newBuilder(Payload.StringPayload.of("stringPayload1"))
             .addLabel("key1", "value1")

google-cloud-logging/src/test/java/com/google/cloud/logging/it/ITTracingLogsTest.java

@@ -81,7 +81,7 @@ class ITTracingLogsTest extends BaseSystemTest {
   private static LogName logName;
 
   @BeforeAll
-  public static void prepareLogs() throws InterruptedException {
+  static void prepareLogs() throws InterruptedException {
     LoggingOptions loggingOptions = logging.getOptions();
     logName = LogName.ofProjectLogName(loggingOptions.getProjectId(), LOG_ID);
     logging.setWriteSynchronicity(Synchronicity.SYNC);
@@ -124,7 +124,7 @@ void cleanUpLogs() throws InterruptedException {
 
   @Test
   @Timeout(value = 600_000, unit = TimeUnit.MILLISECONDS)
-  public void testDetectW3CTraceId() throws InterruptedException {
+  void testDetectW3CTraceId() throws InterruptedException {
     // Loads w3c tracing context and writes a log entry
     Context.Builder builder = Context.newBuilder();
     builder.loadW3CTraceParentContext(W3C_TRACE_CONTEXT);
@@ -147,7 +147,7 @@ public void testDetectW3CTraceId() throws InterruptedException {
 
   @Test
   @Timeout(value = 600_000, unit = TimeUnit.MILLISECONDS)
-  public void testDetectXCTCTraceId() throws InterruptedException {
+  void testDetectXCTCTraceId() throws InterruptedException {
     // Loads cloud trace context and writes a log entry
     Context.Builder builder = Context.newBuilder();
     builder.loadCloudTraceContext(X_CLOUD_TRACE_CONTEXT);
@@ -171,7 +171,7 @@ public void testDetectXCTCTraceId() throws InterruptedException {
 
   @Test
   @Timeout(value = 600_000, unit = TimeUnit.MILLISECONDS)
-  public void testDetectOtelTraceId() throws InterruptedException {
+  void testDetectOtelTraceId() throws InterruptedException {
     // Writes a log entry in open telemetry context
     writeLogEntryWithOtelContext(otelEntry);
 
@@ -191,7 +191,7 @@ public void testDetectOtelTraceId() throws InterruptedException {
 
   @Test
   @Timeout(value = 600_000, unit = TimeUnit.MILLISECONDS)
-  public void testW3CTraceIdWithOtelContext() throws InterruptedException {
+  void testW3CTraceIdWithOtelContext() throws InterruptedException {
     // Writes a log entry with W3C context and Open Telemetry context
     Context.Builder builder = Context.newBuilder();
     builder.loadW3CTraceParentContext(W3C_TRACE_CONTEXT);
@@ -214,7 +214,7 @@ public void testW3CTraceIdWithOtelContext() throws InterruptedException {
 
   @Test
   @Timeout(value = 600_000, unit = TimeUnit.MILLISECONDS)
-  public void testXCTCTraceIdWithOtelContext() throws InterruptedException {
+  void testXCTCTraceIdWithOtelContext() throws InterruptedException {
     // Writes a log entry with cloud trace context and Open Telemetry context
     Context.Builder builder = Context.newBuilder();
     builder.loadCloudTraceContext(X_CLOUD_TRACE_CONTEXT);

google-cloud-logging/src/test/java/com/google/cloud/logging/v2/testing/LocalLoggingHelper.java

@@ -23,21 +23,21 @@
 import java.io.IOException;
 
 /** LocalLoggingHelper runs an in-memory Logging server for use in tests. */
-public class LocalLoggingHelper {
+class LocalLoggingHelper {
   private final String address;
   private final Server server;
   private final LocalLoggingImpl loggingImpl;
 
   /** Constructs a new LocalLoggingHelper. The method start() must be called before it is used. */
-  public LocalLoggingHelper(String address) {
+  LocalLoggingHelper(String address) {
     this.address = address;
     this.loggingImpl = new LocalLoggingImpl();
     this.server =
         InProcessServerBuilder.forName(address).addService(loggingImpl.bindService()).build();
   }
 
   /** Starts the in-memory service. */
-  public void start() {
+  void start() {
     try {
       server.start();
     } catch (IOException ex) {
@@ -46,22 +46,22 @@ public void start() {
   }
 
   /** Resets the state of the in-memory service. */
-  public void reset() {
+  void reset() {
     loggingImpl.reset();
   }
 
   /** Returns the internal in-memory service. */
-  public LocalLoggingImpl getLoggingImpl() {
+  LocalLoggingImpl getLoggingImpl() {
     return loggingImpl;
   }
 
   /** Creates a channel for making requests to the in-memory service. */
-  public ManagedChannel createChannel() {
+  ManagedChannel createChannel() {
     return InProcessChannelBuilder.forName(address).usePlaintext().build();
   }
 
   /** Shuts down the in-memory service. */
-  public void shutdownNow() {
+  void shutdownNow() {
     server.shutdownNow();
   }
 }

google-cloud-logging/src/test/java/com/google/cloud/logging/v2/testing/LocalLoggingImpl.java

@@ -33,7 +33,7 @@
 import java.util.List;
 import java.util.Map;
 
-public class LocalLoggingImpl extends LoggingServiceV2Grpc.LoggingServiceV2ImplBase {
+class LocalLoggingImpl extends LoggingServiceV2Grpc.LoggingServiceV2ImplBase {
 
   private final Map<String, List<LogEntry>> logs = new HashMap<>();