feat: Migrate to JUnit 5 and add parallel test execution

Author: AbgarSim

google-cloud-bigquery/pom.xml

@@ -162,8 +162,13 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

google-cloud-bigquery/src/test/java/MetadataCacheStatsTest.java

@@ -16,14 +16,14 @@
 
 package com.google.cloud.bigquery;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.google.api.services.bigquery.model.MetadataCacheStatistics;
 import com.google.common.collect.ImmutableList;
 import com.google.common.truth.Truth;
 import java.util.List;
 import java.util.stream.Collectors;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class MetadataCacheStatsTest {
   private static List<com.google.api.services.bigquery.model.TableMetadataCacheUsage>

google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/AclTest.java

@@ -16,7 +16,7 @@
 
 package com.google.cloud.bigquery;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.google.api.services.bigquery.model.Dataset;
 import com.google.cloud.bigquery.Acl.DatasetAclEntity;
@@ -31,7 +31,7 @@
 import com.google.cloud.bigquery.Acl.View;
 import com.google.common.collect.ImmutableList;
 import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class AclTest {
 

google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/AnnotationsTest.java

@@ -17,13 +17,13 @@
 package com.google.cloud.bigquery;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import com.google.api.client.util.Data;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class AnnotationsTest {
   @Test

google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/AvroOptionsTest.java

@@ -16,9 +16,9 @@
 
 package com.google.cloud.bigquery;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class AvroOptionsTest {
 

google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigLakeConfigurationTest.java

@@ -16,9 +16,9 @@
 
 package com.google.cloud.bigquery;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BigLakeConfigurationTest {
 

google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryErrorTest.java

@@ -16,9 +16,9 @@
 
 package com.google.cloud.bigquery;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BigQueryErrorTest {
 

google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryExceptionTest.java

@@ -16,11 +16,11 @@
 
 package com.google.cloud.bigquery;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+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 static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
@@ -40,11 +40,11 @@
 import java.net.SocketTimeoutException;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class BigQueryExceptionTest {
 
   @Test

google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java

@@ -47,16 +47,19 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class BigQueryImplTest {
 
   private static final String PROJECT = "project";
@@ -537,7 +540,7 @@ private BigQueryOptions createBigQueryOptionsForProjectWithLocation(
         .build();
   }
 
-  @Before
+  @BeforeEach
   public void setUp() {
     rpcFactoryMock = mock(BigQueryRpcFactory.class);
     bigqueryRpcMock = mock(HttpBigQueryRpc.class);
@@ -631,9 +634,9 @@ public void testGetDatasetNotFoundWhenThrowIsEnabled() throws IOException {
     bigquery = options.getService();
     try {
       bigquery.getDataset("dataset-not-found");
-      Assert.fail();
+      Assertions.fail();
     } catch (BigQueryException ex) {
-      Assert.assertNotNull(ex.getMessage());
+      Assertions.assertNotNull(ex.getMessage());
     }
     verify(bigqueryRpcMock)
         .getDatasetSkipExceptionTranslation(PROJECT, "dataset-not-found", EMPTY_RPC_OPTIONS);
@@ -979,9 +982,9 @@ public void testGetTableNotFoundWhenThrowIsEnabled() throws IOException {
     bigquery = options.getService();
     try {
       bigquery.getTable(DATASET, "table-not-found");
-      Assert.fail();
+      Assertions.fail();
     } catch (BigQueryException ex) {
-      Assert.assertNotNull(ex.getMessage());
+      Assertions.assertNotNull(ex.getMessage());
     }
     verify(bigqueryRpcMock)
         .getTableSkipExceptionTranslation(PROJECT, DATASET, "table-not-found", EMPTY_RPC_OPTIONS);
@@ -1468,9 +1471,9 @@ public TableDataInsertAllRequest.Rows apply(RowToInsert rowToInsert) {
             .getService();
     try {
       bigquery.insertAll(request);
-      Assert.fail();
+      Assertions.fail();
     } catch (BigQueryException ex) {
-      Assert.assertNotNull(ex.getMessage());
+      Assertions.assertNotNull(ex.getMessage());
     }
     verify(bigqueryRpcMock).insertAll(PROJECT, DATASET, TABLE, requestPb);
   }
@@ -2055,9 +2058,9 @@ public void testGetJobNotFoundWhenThrowIsEnabled() throws IOException {
     bigquery = options.getService();
     try {
       bigquery.getJob("job-not-found");
-      Assert.fail();
+      Assertions.fail();
     } catch (BigQueryException ex) {
-      Assert.assertNotNull(ex.getMessage());
+      Assertions.assertNotNull(ex.getMessage());
     }
     verify(bigqueryRpcMock)
         .getJobSkipExceptionTranslation(PROJECT, "job-not-found", null, EMPTY_RPC_OPTIONS);
@@ -2783,9 +2786,9 @@ public void testNonRetryableException() throws IOException {
             .getService();
     try {
       bigquery.getDataset(DatasetId.of(DATASET));
-      Assert.fail();
+      Assertions.fail();
     } catch (BigQueryException ex) {
-      Assert.assertEquals(exceptionMessage, ex.getMessage());
+      Assertions.assertEquals(exceptionMessage, ex.getMessage());
     }
     verify(bigqueryRpcMock).getDatasetSkipExceptionTranslation(PROJECT, DATASET, EMPTY_RPC_OPTIONS);
   }
@@ -2802,9 +2805,9 @@ public void testRuntimeException() throws IOException {
             .getService();
     try {
       bigquery.getDataset(DATASET);
-      Assert.fail();
+      Assertions.fail();
     } catch (BigQueryException ex) {
-      Assert.assertTrue(ex.getMessage().endsWith(exceptionMessage));
+      Assertions.assertTrue(ex.getMessage().endsWith(exceptionMessage));
     }
     verify(bigqueryRpcMock).getDatasetSkipExceptionTranslation(PROJECT, DATASET, EMPTY_RPC_OPTIONS);
   }
@@ -2818,9 +2821,9 @@ public void testQueryDryRun() throws Exception {
           .build()
           .getService()
           .query(QueryJobConfiguration.newBuilder("foo").setDryRun(true).build());
-      Assert.fail();
+      Assertions.fail();
     } catch (UnsupportedOperationException ex) {
-      Assert.assertNotNull(ex.getMessage());
+      Assertions.assertNotNull(ex.getMessage());
     }
   }
 

google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryOptionsTest.java

@@ -16,28 +16,28 @@
 
 package com.google.cloud.bigquery;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import com.google.cloud.TransportOptions;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class BigQueryOptionsTest {
 
   @Test
   public void testInvalidTransport() {
     try {
       BigQueryOptions.newBuilder().setTransportOptions(Mockito.mock(TransportOptions.class));
-      Assert.fail();
+      Assertions.fail();
     } catch (IllegalArgumentException expected) {
-      Assert.assertNotNull(expected.getMessage());
+      Assertions.assertNotNull(expected.getMessage());
     }
   }