Skip to content

Commit 6c3b014

Browse files
AbgarSimAbgarSim
committed
feat: Migrate to JUnit 5 and add parallel test execution
1 parent fa0a12e commit 6c3b014

File tree

90 files changed

+478
-444
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+478
-444
lines changed

‎google-cloud-bigquery/pom.xml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,18 @@
162162
<scope>test</scope>
163163
</dependency>
164164
<dependency>
165-
<groupId>junit</groupId>
166-
<artifactId>junit</artifactId>
165+
<groupId>org.junit.jupiter</groupId>
166+
<artifactId>junit-jupiter-api</artifactId>
167+
<scope>test</scope>
168+
</dependency>
169+
<dependency>
170+
<groupId>org.junit.jupiter</groupId>
171+
<artifactId>junit-jupiter-engine</artifactId>
172+
<scope>test</scope>
173+
</dependency>
174+
<dependency>
175+
<groupId>org.mockito</groupId>
176+
<artifactId>mockito-junit-jupiter</artifactId>
167177
<scope>test</scope>
168178
</dependency>
169179
<dependency>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616

1717
package com.google.cloud.bigquery;
1818

19-
import static org.junit.Assert.assertEquals;
19+
import static org.junit.jupiter.api.Assertions.assertEquals;
2020

2121
import com.google.api.services.bigquery.model.MetadataCacheStatistics;
2222
import com.google.common.collect.ImmutableList;
2323
import com.google.common.truth.Truth;
2424
import java.util.List;
2525
import java.util.stream.Collectors;
26-
import org.junit.Test;
26+
import org.junit.jupiter.api.Test;
2727

2828
public class MetadataCacheStatsTest {
2929
private static List<com.google.api.services.bigquery.model.TableMetadataCacheUsage>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package com.google.cloud.bigquery;
1818

19-
import static org.junit.Assert.assertEquals;
19+
import static org.junit.jupiter.api.Assertions.assertEquals;
2020

2121
import com.google.api.services.bigquery.model.Dataset;
2222
import com.google.cloud.bigquery.Acl.DatasetAclEntity;
@@ -31,7 +31,7 @@
3131
import com.google.cloud.bigquery.Acl.View;
3232
import com.google.common.collect.ImmutableList;
3333
import java.util.List;
34-
import org.junit.Test;
34+
import org.junit.jupiter.api.Test;
3535

3636
public class AclTest {
3737

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
package com.google.cloud.bigquery;
1818

1919
import static com.google.common.truth.Truth.assertThat;
20-
import static org.junit.Assert.fail;
20+
import static org.junit.jupiter.api.Assertions.fail;
2121

2222
import com.google.api.client.util.Data;
2323
import java.util.Collections;
2424
import java.util.HashMap;
2525
import java.util.Map;
26-
import org.junit.Test;
26+
import org.junit.jupiter.api.Test;
2727

2828
public class AnnotationsTest {
2929
@Test

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
package com.google.cloud.bigquery;
1818

19-
import static org.junit.Assert.assertEquals;
19+
import static org.junit.jupiter.api.Assertions.assertEquals;
2020

21-
import org.junit.Test;
21+
import org.junit.jupiter.api.Test;
2222

2323
public class AvroOptionsTest {
2424

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
package com.google.cloud.bigquery;
1818

19-
import static org.junit.Assert.assertEquals;
19+
import static org.junit.jupiter.api.Assertions.assertEquals;
2020

21-
import org.junit.Test;
21+
import org.junit.jupiter.api.Test;
2222

2323
public class BigLakeConfigurationTest {
2424

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
package com.google.cloud.bigquery;
1818

19-
import static org.junit.Assert.assertEquals;
19+
import static org.junit.jupiter.api.Assertions.assertEquals;
2020

21-
import org.junit.Test;
21+
import org.junit.jupiter.api.Test;
2222

2323
public class BigQueryErrorTest {
2424

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
package com.google.cloud.bigquery;
1818

19-
import static org.junit.Assert.assertEquals;
20-
import static org.junit.Assert.assertFalse;
21-
import static org.junit.Assert.assertNull;
22-
import static org.junit.Assert.assertSame;
23-
import static org.junit.Assert.assertTrue;
19+
import static org.junit.jupiter.api.Assertions.assertEquals;
20+
import static org.junit.jupiter.api.Assertions.assertFalse;
21+
import static org.junit.jupiter.api.Assertions.assertNull;
22+
import static org.junit.jupiter.api.Assertions.assertSame;
23+
import static org.junit.jupiter.api.Assertions.assertTrue;
2424
import static org.mockito.Mockito.doReturn;
2525
import static org.mockito.Mockito.doThrow;
2626
import static org.mockito.Mockito.mock;
@@ -40,11 +40,11 @@
4040
import java.net.SocketTimeoutException;
4141
import java.util.HashMap;
4242
import java.util.Map;
43-
import org.junit.Test;
44-
import org.junit.runner.RunWith;
45-
import org.mockito.junit.MockitoJUnitRunner;
43+
import org.junit.jupiter.api.Test;
44+
import org.junit.jupiter.api.extension.ExtendWith;
45+
import org.mockito.junit.jupiter.MockitoExtension;
4646

47-
@RunWith(MockitoJUnitRunner.class)
47+
@ExtendWith(MockitoExtension.class)
4848
public class BigQueryExceptionTest {
4949

5050
@Test

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

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,14 @@
2020
import static com.google.cloud.bigquery.BigQuery.JobField.USER_EMAIL;
2121
import static com.google.cloud.bigquery.BigQueryImpl.optionMap;
2222
import static com.google.common.truth.Truth.assertThat;
23-
import static org.junit.Assert.*;
23+
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
24+
import static org.junit.jupiter.api.Assertions.assertEquals;
25+
import static org.junit.jupiter.api.Assertions.assertFalse;
26+
import static org.junit.jupiter.api.Assertions.assertNotNull;
27+
import static org.junit.jupiter.api.Assertions.assertNull;
28+
import static org.junit.jupiter.api.Assertions.assertSame;
29+
import static org.junit.jupiter.api.Assertions.assertTrue;
30+
import static org.junit.jupiter.api.Assertions.fail;
2431
import static org.mockito.Mockito.*;
2532

2633
import com.google.api.gax.paging.Page;
@@ -47,16 +54,19 @@
4754
import java.util.Collections;
4855
import java.util.List;
4956
import java.util.Map;
50-
import org.junit.Assert;
51-
import org.junit.Before;
52-
import org.junit.Test;
53-
import org.junit.runner.RunWith;
57+
import org.junit.jupiter.api.Assertions;
58+
import org.junit.jupiter.api.BeforeEach;
59+
import org.junit.jupiter.api.Test;
60+
import org.junit.jupiter.api.extension.ExtendWith;
5461
import org.mockito.ArgumentCaptor;
5562
import org.mockito.Captor;
5663
import org.mockito.Mockito;
57-
import org.mockito.junit.MockitoJUnitRunner;
64+
import org.mockito.junit.jupiter.MockitoExtension;
65+
import org.mockito.junit.jupiter.MockitoSettings;
66+
import org.mockito.quality.Strictness;
5867

59-
@RunWith(MockitoJUnitRunner.class)
68+
@ExtendWith(MockitoExtension.class)
69+
@MockitoSettings(strictness = Strictness.LENIENT)
6070
public class BigQueryImplTest {
6171

6272
private static final String PROJECT = "project";
@@ -537,7 +547,7 @@ private BigQueryOptions createBigQueryOptionsForProjectWithLocation(
537547
.build();
538548
}
539549

540-
@Before
550+
@BeforeEach
541551
public void setUp() {
542552
rpcFactoryMock = mock(BigQueryRpcFactory.class);
543553
bigqueryRpcMock = mock(HttpBigQueryRpc.class);
@@ -631,9 +641,9 @@ public void testGetDatasetNotFoundWhenThrowIsEnabled() throws IOException {
631641
bigquery = options.getService();
632642
try {
633643
bigquery.getDataset("dataset-not-found");
634-
Assert.fail();
644+
Assertions.fail();
635645
} catch (BigQueryException ex) {
636-
Assert.assertNotNull(ex.getMessage());
646+
Assertions.assertNotNull(ex.getMessage());
637647
}
638648
verify(bigqueryRpcMock)
639649
.getDatasetSkipExceptionTranslation(PROJECT, "dataset-not-found", EMPTY_RPC_OPTIONS);
@@ -979,9 +989,9 @@ public void testGetTableNotFoundWhenThrowIsEnabled() throws IOException {
979989
bigquery = options.getService();
980990
try {
981991
bigquery.getTable(DATASET, "table-not-found");
982-
Assert.fail();
992+
Assertions.fail();
983993
} catch (BigQueryException ex) {
984-
Assert.assertNotNull(ex.getMessage());
994+
Assertions.assertNotNull(ex.getMessage());
985995
}
986996
verify(bigqueryRpcMock)
987997
.getTableSkipExceptionTranslation(PROJECT, DATASET, "table-not-found", EMPTY_RPC_OPTIONS);
@@ -1468,9 +1478,9 @@ public TableDataInsertAllRequest.Rows apply(RowToInsert rowToInsert) {
14681478
.getService();
14691479
try {
14701480
bigquery.insertAll(request);
1471-
Assert.fail();
1481+
Assertions.fail();
14721482
} catch (BigQueryException ex) {
1473-
Assert.assertNotNull(ex.getMessage());
1483+
Assertions.assertNotNull(ex.getMessage());
14741484
}
14751485
verify(bigqueryRpcMock).insertAll(PROJECT, DATASET, TABLE, requestPb);
14761486
}
@@ -2055,9 +2065,9 @@ public void testGetJobNotFoundWhenThrowIsEnabled() throws IOException {
20552065
bigquery = options.getService();
20562066
try {
20572067
bigquery.getJob("job-not-found");
2058-
Assert.fail();
2068+
Assertions.fail();
20592069
} catch (BigQueryException ex) {
2060-
Assert.assertNotNull(ex.getMessage());
2070+
Assertions.assertNotNull(ex.getMessage());
20612071
}
20622072
verify(bigqueryRpcMock)
20632073
.getJobSkipExceptionTranslation(PROJECT, "job-not-found", null, EMPTY_RPC_OPTIONS);
@@ -2783,9 +2793,9 @@ public void testNonRetryableException() throws IOException {
27832793
.getService();
27842794
try {
27852795
bigquery.getDataset(DatasetId.of(DATASET));
2786-
Assert.fail();
2796+
Assertions.fail();
27872797
} catch (BigQueryException ex) {
2788-
Assert.assertEquals(exceptionMessage, ex.getMessage());
2798+
assertEquals(exceptionMessage, ex.getMessage());
27892799
}
27902800
verify(bigqueryRpcMock).getDatasetSkipExceptionTranslation(PROJECT, DATASET, EMPTY_RPC_OPTIONS);
27912801
}
@@ -2802,9 +2812,9 @@ public void testRuntimeException() throws IOException {
28022812
.getService();
28032813
try {
28042814
bigquery.getDataset(DATASET);
2805-
Assert.fail();
2815+
Assertions.fail();
28062816
} catch (BigQueryException ex) {
2807-
Assert.assertTrue(ex.getMessage().endsWith(exceptionMessage));
2817+
assertTrue(ex.getMessage().endsWith(exceptionMessage));
28082818
}
28092819
verify(bigqueryRpcMock).getDatasetSkipExceptionTranslation(PROJECT, DATASET, EMPTY_RPC_OPTIONS);
28102820
}
@@ -2818,9 +2828,9 @@ public void testQueryDryRun() throws Exception {
28182828
.build()
28192829
.getService()
28202830
.query(QueryJobConfiguration.newBuilder("foo").setDryRun(true).build());
2821-
Assert.fail();
2831+
Assertions.fail();
28222832
} catch (UnsupportedOperationException ex) {
2823-
Assert.assertNotNull(ex.getMessage());
2833+
Assertions.assertNotNull(ex.getMessage());
28242834
}
28252835
}
28262836

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,28 @@
1616

1717
package com.google.cloud.bigquery;
1818

19-
import static org.junit.Assert.assertEquals;
20-
import static org.junit.Assert.assertFalse;
21-
import static org.junit.Assert.assertNotNull;
22-
import static org.junit.Assert.assertTrue;
19+
import static org.junit.jupiter.api.Assertions.assertEquals;
20+
import static org.junit.jupiter.api.Assertions.assertFalse;
21+
import static org.junit.jupiter.api.Assertions.assertNotNull;
22+
import static org.junit.jupiter.api.Assertions.assertTrue;
2323

2424
import com.google.cloud.TransportOptions;
25-
import org.junit.Assert;
26-
import org.junit.Test;
27-
import org.junit.runner.RunWith;
25+
import org.junit.jupiter.api.Assertions;
26+
import org.junit.jupiter.api.Test;
27+
import org.junit.jupiter.api.extension.ExtendWith;
2828
import org.mockito.Mockito;
29-
import org.mockito.junit.MockitoJUnitRunner;
29+
import org.mockito.junit.jupiter.MockitoExtension;
3030

31-
@RunWith(MockitoJUnitRunner.class)
31+
@ExtendWith(MockitoExtension.class)
3232
public class BigQueryOptionsTest {
3333

3434
@Test
3535
public void testInvalidTransport() {
3636
try {
3737
BigQueryOptions.newBuilder().setTransportOptions(Mockito.mock(TransportOptions.class));
38-
Assert.fail();
38+
Assertions.fail();
3939
} catch (IllegalArgumentException expected) {
40-
Assert.assertNotNull(expected.getMessage());
40+
Assertions.assertNotNull(expected.getMessage());
4141
}
4242
}
4343

0 commit comments

Comments
 (0)