chore: revert generated tests to junit4 and fix static imports

Author: lqiu96

google-cloud-logging/pom.xml

@@ -123,6 +123,11 @@
       <artifactId>junit-jupiter-params</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>

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

@@ -22,7 +22,9 @@
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.newCapture;
 import static org.easymock.EasyMock.replay;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import com.google.api.core.ApiFutures;
 import com.google.cloud.MonitoredResource;

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

@@ -16,7 +16,10 @@
 
 package com.google.cloud.logging;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.google.api.client.util.Lists;
 import com.google.cloud.Tuple;
@@ -30,7 +33,6 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 class InstrumentationTest {
@@ -60,8 +62,8 @@ void testNoInstrumentationGenerated() {
     Tuple<Boolean, Iterable<LogEntry>> pair =
         Instrumentation.populateInstrumentationInfo(ImmutableList.of(STRING_ENTRY));
     ArrayList<LogEntry> entries = Lists.newArrayList(pair.y());
-    Assertions.assertFalse(pair.x());
-    Assertions.assertEquals(1, entries.size());
+    assertFalse(pair.x());
+    assertEquals(1, entries.size());
     assertSame(Payload.Type.STRING, entries.get(0).getPayload().getType());
   }
 
@@ -120,8 +122,8 @@ private static void verifyEntries(
       HashSet<String> names,
       HashSet<String> versions) {
     ArrayList<LogEntry> entries = Lists.newArrayList(pair.y());
-    Assertions.assertTrue(pair.x());
-    Assertions.assertEquals(expected, entries.size());
+    assertTrue(pair.x());
+    assertEquals(expected, entries.size());
     assertSame(Payload.Type.JSON, entries.get(index).getPayload().getType());
     ListValue infoList =
         entries
@@ -133,18 +135,18 @@ private static void verifyEntries(
             .getFieldsOrThrow(Instrumentation.INSTRUMENTATION_SOURCE_KEY)
             .getListValue();
     for (Value val : infoList.getValuesList()) {
-      Assertions.assertTrue(
+      assertTrue(
           names.remove(
               val.getStructValue()
                   .getFieldsOrThrow(Instrumentation.INSTRUMENTATION_NAME_KEY)
                   .getStringValue()));
-      Assertions.assertTrue(
+      assertTrue(
           versions.remove(
               val.getStructValue()
                   .getFieldsOrThrow(Instrumentation.INSTRUMENTATION_VERSION_KEY)
                   .getStringValue()));
     }
-    Assertions.assertEquals(0, names.size());
-    Assertions.assertEquals(0, versions.size());
+    assertEquals(0, names.size());
+    assertEquals(0, versions.size());
   }
-}
+}

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

@@ -18,11 +18,11 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import com.google.cloud.logging.Logging.ListOption;
 import com.google.cloud.logging.Option.OptionType;
 import com.google.common.testing.EqualsTester;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 class OptionTest {
@@ -54,7 +54,7 @@ void testConstructor() {
     assertNull(option.getValue());
     try {
       new Option(null, VALUE) {};
-      Assertions.fail();
+      fail();
     } catch (NullPointerException expected) {
 
     }

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

@@ -18,7 +18,9 @@
 
 import static com.google.cloud.logging.testing.RemoteLoggingHelper.formatForTest;
 import static com.google.common.truth.Truth.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.google.cloud.MonitoredResource;
 import com.google.cloud.logging.*;