diff --git a/google-cloud-pubsub/pom.xml b/google-cloud-pubsub/pom.xml index 977a7250e..18e291f60 100644 --- a/google-cloud-pubsub/pom.xml +++ b/google-cloud-pubsub/pom.xml @@ -111,8 +111,18 @@ - junit - junit + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.mockito + mockito-junit-jupiter test diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/it/ITPubSubTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/it/ITPubSubTest.java index 290b9927d..284b9e97b 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/it/ITPubSubTest.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/it/ITPubSubTest.java @@ -17,9 +17,10 @@ package com.google.cloud.pubsub.it; import static com.google.common.truth.Truth.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import com.google.api.gax.rpc.PermissionDeniedException; import com.google.auto.value.AutoValue; @@ -40,9 +41,12 @@ import java.util.concurrent.Future; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; -import org.junit.*; -import org.junit.rules.Timeout; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; +@Timeout(value = 300) public class ITPubSubTest { private static final String NAME_SUFFIX = UUID.randomUUID().toString(); @@ -55,8 +59,6 @@ public class ITPubSubTest { private static final int MAX_INBOUND_MESSAGE_SIZE = 20 * 1024 * 1024; - @Rule public Timeout globalTimeout = Timeout.seconds(300); - @AutoValue abstract static class MessageAndConsumer { abstract PubsubMessage message(); @@ -81,14 +83,14 @@ static MessageAndConsumerWithResponse create( } } - @BeforeClass + @BeforeAll public static void setupClass() throws Exception { topicAdminClient = TopicAdminClient.create(); subscriptionAdminClient = SubscriptionAdminClient.create(); projectId = ServiceOptions.getDefaultProjectId(); } - @AfterClass + @AfterAll public static void tearDownClass() { topicAdminClient.close(); subscriptionAdminClient.close(); @@ -171,7 +173,7 @@ public void testVPCPushSubscriber() { 10, false)); subscriptionAdminClient.deleteSubscription(subscriptionName); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (PermissionDeniedException e) { // expected } diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MessageDispatcherTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MessageDispatcherTest.java index 1285fadd5..f7982887c 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MessageDispatcherTest.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MessageDispatcherTest.java @@ -17,7 +17,10 @@ package com.google.cloud.pubsub.v1; import static com.google.common.truth.Truth.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.ArgumentMatchers.eq; @@ -32,8 +35,8 @@ import java.time.Duration; import java.util.*; import java.util.concurrent.*; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -90,7 +93,7 @@ public class MessageDispatcherTest { private LinkedBlockingQueue consumers; private LinkedBlockingQueue consumersWithResponse; - @Before + @BeforeEach public void setUp() { systemExecutor = new FakeScheduledExecutorService(); clock = new FakeClock(); diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenCensusUtilTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenCensusUtilTest.java index afa316220..af0c14b27 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenCensusUtilTest.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenCensusUtilTest.java @@ -20,9 +20,9 @@ import static com.google.cloud.pubsub.v1.OpenCensusUtil.OPEN_CENSUS_MESSAGE_TRANSFORM; import static com.google.cloud.pubsub.v1.OpenCensusUtil.TAG_CONTEXT_KEY; import static com.google.cloud.pubsub.v1.OpenCensusUtil.TRACE_CONTEXT_KEY; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.fail; import com.google.common.base.Stopwatch; import com.google.protobuf.ByteString; @@ -43,8 +43,8 @@ import java.util.Collection; import java.util.List; import java.util.concurrent.TimeUnit; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; /** Tests for {@link OpenCensusUtil}. */ public class OpenCensusUtilTest { @@ -54,7 +54,7 @@ public class OpenCensusUtilTest { private static final TagValue TEST_TAG_VAL = TagValue.create("TEST_TAG_VAL"); private static final String TEST_PARENT_LINK_NAME = "TEST_PARENT_LINK"; - @BeforeClass + @BeforeAll public static void configureOpenCensus() { Tracing.getExportComponent().getRunningSpanStore().setMaxNumberOfSpans(5); } diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenTelemetryTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenTelemetryTest.java index 52351ddef..c87f0cccf 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenTelemetryTest.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenTelemetryTest.java @@ -16,8 +16,8 @@ package com.google.cloud.pubsub.v1; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import com.google.protobuf.ByteString; import com.google.pubsub.v1.PubsubMessage; @@ -37,7 +37,7 @@ import io.opentelemetry.sdk.trace.data.StatusData; import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class OpenTelemetryTest { private static final TopicName FULL_TOPIC_NAME = diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/PublisherImplTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/PublisherImplTest.java index 39155c848..acdc7bee4 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/PublisherImplTest.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/PublisherImplTest.java @@ -17,11 +17,12 @@ package com.google.cloud.pubsub.v1; import static com.google.common.truth.Truth.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +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.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import com.google.api.core.ApiFuture; import com.google.api.gax.batching.BatchingSettings; @@ -62,13 +63,10 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import org.easymock.EasyMock; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -@RunWith(JUnit4.class) public class PublisherImplTest { private static final ProjectTopicName TEST_TOPIC = @@ -93,7 +91,7 @@ public class PublisherImplTest { private Server testServer; - @Before + @BeforeEach public void setUp() throws Exception { testPublisherServiceImpl = new FakePublisherServiceImpl(); @@ -106,7 +104,7 @@ public void setUp() throws Exception { fakeExecutor = new FakeScheduledExecutorService(); } - @After + @AfterEach public void tearDown() throws Exception { testServer.shutdownNow().awaitTermination(); testChannel.shutdown(); @@ -162,7 +160,6 @@ public void testPublishByNumBatchedMessages() throws Exception { ApiFuture publishFuture3 = sendTestMessage(publisher, "C"); // Note we are not advancing time but message should still get published - assertEquals("1", publishFuture1.get()); assertEquals("2", publishFuture2.get()); @@ -698,7 +695,7 @@ public void testPublishFailureRetries() throws Exception { shutdownTestPublisher(publisher); } - @Test(expected = ExecutionException.class) + @Test public void testPublishFailureRetries_retriesDisabled() throws Exception { Publisher publisher = getTestPublisherBuilder() @@ -715,7 +712,7 @@ public void testPublishFailureRetries_retriesDisabled() throws Exception { ApiFuture publishFuture1 = sendTestMessage(publisher, "A"); try { - publishFuture1.get(); + assertThrows(ExecutionException.class, () -> publishFuture1.get()); } finally { assertSame(testPublisherServiceImpl.getCapturedRequests().size(), 1); shutdownTestPublisher(publisher); @@ -771,7 +768,7 @@ public void testPublishFailureRetries_maxRetriesSetUnlimited() throws Exception assertTrue(publisher.awaitTermination(1, TimeUnit.MINUTES)); } - @Test(expected = ExecutionException.class) + @Test public void testPublishFailureRetries_nonRetryableFailsImmediately() throws Exception { Publisher publisher = getTestPublisherBuilder() @@ -791,7 +788,7 @@ public void testPublishFailureRetries_nonRetryableFailsImmediately() throws Exce ApiFuture publishFuture1 = sendTestMessage(publisher, "A"); try { - publishFuture1.get(); + assertThrows(ExecutionException.class, () -> publishFuture1.get()); } finally { assertTrue(testPublisherServiceImpl.getCapturedRequests().size() >= 1); publisher.shutdown(); diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SchemaServiceClientHttpJsonTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SchemaServiceClientHttpJsonTest.java index a8fcaedc6..e807253ed 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SchemaServiceClientHttpJsonTest.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SchemaServiceClientHttpJsonTest.java @@ -18,6 +18,9 @@ import static com.google.cloud.pubsub.v1.SchemaServiceClient.ListSchemaRevisionsPagedResponse; import static com.google.cloud.pubsub.v1.SchemaServiceClient.ListSchemasPagedResponse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import com.google.api.gax.core.NoCredentialsProvider; import com.google.api.gax.httpjson.GaxHttpJsonProperties; @@ -56,19 +59,18 @@ import java.util.Arrays; import java.util.List; import javax.annotation.Generated; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; @Generated("by gapic-generator-java") public class SchemaServiceClientHttpJsonTest { private static MockHttpService mockService; private static SchemaServiceClient client; - @BeforeClass + @BeforeAll public static void startStaticServer() throws IOException { mockService = new MockHttpService( @@ -85,15 +87,15 @@ public static void startStaticServer() throws IOException { client = SchemaServiceClient.create(settings); } - @AfterClass + @AfterAll public static void stopServer() { client.close(); } - @Before + @BeforeEach public void setUp() {} - @After + @AfterEach public void tearDown() throws Exception { mockService.reset(); } @@ -114,10 +116,10 @@ public void createSchemaTest() throws Exception { String schemaId = "schemaId-697673060"; Schema actualResponse = client.createSchema(parent, schema, schemaId); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -125,7 +127,7 @@ public void createSchemaTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -143,7 +145,7 @@ public void createSchemaExceptionTest() throws Exception { Schema schema = Schema.newBuilder().build(); String schemaId = "schemaId-697673060"; client.createSchema(parent, schema, schemaId); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -165,10 +167,10 @@ public void createSchemaTest2() throws Exception { String schemaId = "schemaId-697673060"; Schema actualResponse = client.createSchema(parent, schema, schemaId); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -176,7 +178,7 @@ public void createSchemaTest2() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -194,7 +196,7 @@ public void createSchemaExceptionTest2() throws Exception { Schema schema = Schema.newBuilder().build(); String schemaId = "schemaId-697673060"; client.createSchema(parent, schema, schemaId); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -214,10 +216,10 @@ public void getSchemaTest() throws Exception { SchemaName name = SchemaName.of("[PROJECT]", "[SCHEMA]"); Schema actualResponse = client.getSchema(name); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -225,7 +227,7 @@ public void getSchemaTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -241,7 +243,7 @@ public void getSchemaExceptionTest() throws Exception { try { SchemaName name = SchemaName.of("[PROJECT]", "[SCHEMA]"); client.getSchema(name); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -261,10 +263,10 @@ public void getSchemaTest2() throws Exception { String name = "projects/project-5662/schemas/schema-5662"; Schema actualResponse = client.getSchema(name); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -272,7 +274,7 @@ public void getSchemaTest2() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -288,7 +290,7 @@ public void getSchemaExceptionTest2() throws Exception { try { String name = "projects/project-5662/schemas/schema-5662"; client.getSchema(name); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -310,11 +312,11 @@ public void listSchemasTest() throws Exception { List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - Assert.assertEquals(1, resources.size()); - Assert.assertEquals(expectedResponse.getSchemasList().get(0), resources.get(0)); + assertEquals(1, resources.size()); + assertEquals(expectedResponse.getSchemasList().get(0), resources.get(0)); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -322,7 +324,7 @@ public void listSchemasTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -338,7 +340,7 @@ public void listSchemasExceptionTest() throws Exception { try { ProjectName parent = ProjectName.of("[PROJECT]"); client.listSchemas(parent); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -360,11 +362,11 @@ public void listSchemasTest2() throws Exception { List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - Assert.assertEquals(1, resources.size()); - Assert.assertEquals(expectedResponse.getSchemasList().get(0), resources.get(0)); + assertEquals(1, resources.size()); + assertEquals(expectedResponse.getSchemasList().get(0), resources.get(0)); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -372,7 +374,7 @@ public void listSchemasTest2() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -388,7 +390,7 @@ public void listSchemasExceptionTest2() throws Exception { try { String parent = "projects/project-2353"; client.listSchemas(parent); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -410,11 +412,11 @@ public void listSchemaRevisionsTest() throws Exception { List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - Assert.assertEquals(1, resources.size()); - Assert.assertEquals(expectedResponse.getSchemasList().get(0), resources.get(0)); + assertEquals(1, resources.size()); + assertEquals(expectedResponse.getSchemasList().get(0), resources.get(0)); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -422,7 +424,7 @@ public void listSchemaRevisionsTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -438,7 +440,7 @@ public void listSchemaRevisionsExceptionTest() throws Exception { try { SchemaName name = SchemaName.of("[PROJECT]", "[SCHEMA]"); client.listSchemaRevisions(name); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -460,11 +462,11 @@ public void listSchemaRevisionsTest2() throws Exception { List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - Assert.assertEquals(1, resources.size()); - Assert.assertEquals(expectedResponse.getSchemasList().get(0), resources.get(0)); + assertEquals(1, resources.size()); + assertEquals(expectedResponse.getSchemasList().get(0), resources.get(0)); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -472,7 +474,7 @@ public void listSchemaRevisionsTest2() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -488,7 +490,7 @@ public void listSchemaRevisionsExceptionTest2() throws Exception { try { String name = "projects/project-5662/schemas/schema-5662"; client.listSchemaRevisions(name); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -509,10 +511,10 @@ public void commitSchemaTest() throws Exception { Schema schema = Schema.newBuilder().build(); Schema actualResponse = client.commitSchema(name, schema); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -520,7 +522,7 @@ public void commitSchemaTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -537,7 +539,7 @@ public void commitSchemaExceptionTest() throws Exception { SchemaName name = SchemaName.of("[PROJECT]", "[SCHEMA]"); Schema schema = Schema.newBuilder().build(); client.commitSchema(name, schema); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -558,10 +560,10 @@ public void commitSchemaTest2() throws Exception { Schema schema = Schema.newBuilder().build(); Schema actualResponse = client.commitSchema(name, schema); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -569,7 +571,7 @@ public void commitSchemaTest2() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -586,7 +588,7 @@ public void commitSchemaExceptionTest2() throws Exception { String name = "projects/project-5662/schemas/schema-5662"; Schema schema = Schema.newBuilder().build(); client.commitSchema(name, schema); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -607,10 +609,10 @@ public void rollbackSchemaTest() throws Exception { String revisionId = "revisionId-1507445162"; Schema actualResponse = client.rollbackSchema(name, revisionId); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -618,7 +620,7 @@ public void rollbackSchemaTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -635,7 +637,7 @@ public void rollbackSchemaExceptionTest() throws Exception { SchemaName name = SchemaName.of("[PROJECT]", "[SCHEMA]"); String revisionId = "revisionId-1507445162"; client.rollbackSchema(name, revisionId); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -656,10 +658,10 @@ public void rollbackSchemaTest2() throws Exception { String revisionId = "revisionId-1507445162"; Schema actualResponse = client.rollbackSchema(name, revisionId); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -667,7 +669,7 @@ public void rollbackSchemaTest2() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -684,7 +686,7 @@ public void rollbackSchemaExceptionTest2() throws Exception { String name = "projects/project-5662/schemas/schema-5662"; String revisionId = "revisionId-1507445162"; client.rollbackSchema(name, revisionId); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -705,10 +707,10 @@ public void deleteSchemaRevisionTest() throws Exception { String revisionId = "revisionId-1507445162"; Schema actualResponse = client.deleteSchemaRevision(name, revisionId); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -716,7 +718,7 @@ public void deleteSchemaRevisionTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -733,7 +735,7 @@ public void deleteSchemaRevisionExceptionTest() throws Exception { SchemaName name = SchemaName.of("[PROJECT]", "[SCHEMA]"); String revisionId = "revisionId-1507445162"; client.deleteSchemaRevision(name, revisionId); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -754,10 +756,10 @@ public void deleteSchemaRevisionTest2() throws Exception { String revisionId = "revisionId-1507445162"; Schema actualResponse = client.deleteSchemaRevision(name, revisionId); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -765,7 +767,7 @@ public void deleteSchemaRevisionTest2() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -782,7 +784,7 @@ public void deleteSchemaRevisionExceptionTest2() throws Exception { String name = "projects/project-5662/schemas/schema-5662"; String revisionId = "revisionId-1507445162"; client.deleteSchemaRevision(name, revisionId); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -798,7 +800,7 @@ public void deleteSchemaTest() throws Exception { client.deleteSchema(name); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -806,7 +808,7 @@ public void deleteSchemaTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -822,7 +824,7 @@ public void deleteSchemaExceptionTest() throws Exception { try { SchemaName name = SchemaName.of("[PROJECT]", "[SCHEMA]"); client.deleteSchema(name); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -838,7 +840,7 @@ public void deleteSchemaTest2() throws Exception { client.deleteSchema(name); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -846,7 +848,7 @@ public void deleteSchemaTest2() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -862,7 +864,7 @@ public void deleteSchemaExceptionTest2() throws Exception { try { String name = "projects/project-5662/schemas/schema-5662"; client.deleteSchema(name); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -877,10 +879,10 @@ public void validateSchemaTest() throws Exception { Schema schema = Schema.newBuilder().build(); ValidateSchemaResponse actualResponse = client.validateSchema(parent, schema); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -888,7 +890,7 @@ public void validateSchemaTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -905,7 +907,7 @@ public void validateSchemaExceptionTest() throws Exception { ProjectName parent = ProjectName.of("[PROJECT]"); Schema schema = Schema.newBuilder().build(); client.validateSchema(parent, schema); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -920,10 +922,10 @@ public void validateSchemaTest2() throws Exception { Schema schema = Schema.newBuilder().build(); ValidateSchemaResponse actualResponse = client.validateSchema(parent, schema); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -931,7 +933,7 @@ public void validateSchemaTest2() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -948,7 +950,7 @@ public void validateSchemaExceptionTest2() throws Exception { String parent = "projects/project-2353"; Schema schema = Schema.newBuilder().build(); client.validateSchema(parent, schema); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -967,10 +969,10 @@ public void validateMessageTest() throws Exception { .build(); ValidateMessageResponse actualResponse = client.validateMessage(request); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -978,7 +980,7 @@ public void validateMessageTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -999,7 +1001,7 @@ public void validateMessageExceptionTest() throws Exception { .setEncoding(Encoding.forNumber(0)) .build(); client.validateMessage(request); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1024,10 +1026,10 @@ public void setIamPolicyTest() throws Exception { .build(); Policy actualResponse = client.setIamPolicy(request); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -1035,7 +1037,7 @@ public void setIamPolicyTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -1056,7 +1058,7 @@ public void setIamPolicyExceptionTest() throws Exception { .setUpdateMask(FieldMask.newBuilder().build()) .build(); client.setIamPolicy(request); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1080,10 +1082,10 @@ public void getIamPolicyTest() throws Exception { .build(); Policy actualResponse = client.getIamPolicy(request); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -1091,7 +1093,7 @@ public void getIamPolicyTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -1111,7 +1113,7 @@ public void getIamPolicyExceptionTest() throws Exception { .setOptions(GetPolicyOptions.newBuilder().build()) .build(); client.getIamPolicy(request); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1130,10 +1132,10 @@ public void testIamPermissionsTest() throws Exception { .build(); TestIamPermissionsResponse actualResponse = client.testIamPermissions(request); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -1141,7 +1143,7 @@ public void testIamPermissionsTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -1161,7 +1163,7 @@ public void testIamPermissionsExceptionTest() throws Exception { .addAllPermissions(new ArrayList()) .build(); client.testIamPermissions(request); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SchemaServiceClientTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SchemaServiceClientTest.java index 7e354bf49..5d8d7cba2 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SchemaServiceClientTest.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SchemaServiceClientTest.java @@ -18,6 +18,9 @@ import static com.google.cloud.pubsub.v1.SchemaServiceClient.ListSchemaRevisionsPagedResponse; import static com.google.cloud.pubsub.v1.SchemaServiceClient.ListSchemasPagedResponse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import com.google.api.gax.core.NoCredentialsProvider; import com.google.api.gax.grpc.GaxGrpcProperties; @@ -65,12 +68,11 @@ import java.util.List; import java.util.UUID; import javax.annotation.Generated; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; @Generated("by gapic-generator-java") public class SchemaServiceClientTest { @@ -80,7 +82,7 @@ public class SchemaServiceClientTest { private LocalChannelProvider channelProvider; private SchemaServiceClient client; - @BeforeClass + @BeforeAll public static void startStaticServer() { mockSchemaService = new MockSchemaService(); mockIAMPolicy = new MockIAMPolicy(); @@ -91,12 +93,12 @@ public static void startStaticServer() { mockServiceHelper.start(); } - @AfterClass + @AfterAll public static void stopServer() { mockServiceHelper.stop(); } - @Before + @BeforeEach public void setUp() throws IOException { mockServiceHelper.reset(); channelProvider = mockServiceHelper.createChannelProvider(); @@ -108,7 +110,7 @@ public void setUp() throws IOException { client = SchemaServiceClient.create(settings); } - @After + @AfterEach public void tearDown() throws Exception { client.close(); } @@ -129,16 +131,16 @@ public void createSchemaTest() throws Exception { String schemaId = "schemaId-697673060"; Schema actualResponse = client.createSchema(parent, schema, schemaId); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSchemaService.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); CreateSchemaRequest actualRequest = ((CreateSchemaRequest) actualRequests.get(0)); - Assert.assertEquals(parent.toString(), actualRequest.getParent()); - Assert.assertEquals(schema, actualRequest.getSchema()); - Assert.assertEquals(schemaId, actualRequest.getSchemaId()); - Assert.assertTrue( + assertEquals(parent.toString(), actualRequest.getParent()); + assertEquals(schema, actualRequest.getSchema()); + assertEquals(schemaId, actualRequest.getSchemaId()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -154,7 +156,7 @@ public void createSchemaExceptionTest() throws Exception { Schema schema = Schema.newBuilder().build(); String schemaId = "schemaId-697673060"; client.createSchema(parent, schema, schemaId); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -176,16 +178,16 @@ public void createSchemaTest2() throws Exception { String schemaId = "schemaId-697673060"; Schema actualResponse = client.createSchema(parent, schema, schemaId); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSchemaService.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); CreateSchemaRequest actualRequest = ((CreateSchemaRequest) actualRequests.get(0)); - Assert.assertEquals(parent, actualRequest.getParent()); - Assert.assertEquals(schema, actualRequest.getSchema()); - Assert.assertEquals(schemaId, actualRequest.getSchemaId()); - Assert.assertTrue( + assertEquals(parent, actualRequest.getParent()); + assertEquals(schema, actualRequest.getSchema()); + assertEquals(schemaId, actualRequest.getSchemaId()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -201,7 +203,7 @@ public void createSchemaExceptionTest2() throws Exception { Schema schema = Schema.newBuilder().build(); String schemaId = "schemaId-697673060"; client.createSchema(parent, schema, schemaId); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -221,14 +223,14 @@ public void getSchemaTest() throws Exception { SchemaName name = SchemaName.of("[PROJECT]", "[SCHEMA]"); Schema actualResponse = client.getSchema(name); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSchemaService.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); GetSchemaRequest actualRequest = ((GetSchemaRequest) actualRequests.get(0)); - Assert.assertEquals(name.toString(), actualRequest.getName()); - Assert.assertTrue( + assertEquals(name.toString(), actualRequest.getName()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -242,7 +244,7 @@ public void getSchemaExceptionTest() throws Exception { try { SchemaName name = SchemaName.of("[PROJECT]", "[SCHEMA]"); client.getSchema(name); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -262,14 +264,14 @@ public void getSchemaTest2() throws Exception { String name = "name3373707"; Schema actualResponse = client.getSchema(name); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSchemaService.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); GetSchemaRequest actualRequest = ((GetSchemaRequest) actualRequests.get(0)); - Assert.assertEquals(name, actualRequest.getName()); - Assert.assertTrue( + assertEquals(name, actualRequest.getName()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -283,7 +285,7 @@ public void getSchemaExceptionTest2() throws Exception { try { String name = "name3373707"; client.getSchema(name); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -305,15 +307,15 @@ public void listSchemasTest() throws Exception { List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - Assert.assertEquals(1, resources.size()); - Assert.assertEquals(expectedResponse.getSchemasList().get(0), resources.get(0)); + assertEquals(1, resources.size()); + assertEquals(expectedResponse.getSchemasList().get(0), resources.get(0)); List actualRequests = mockSchemaService.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); ListSchemasRequest actualRequest = ((ListSchemasRequest) actualRequests.get(0)); - Assert.assertEquals(parent.toString(), actualRequest.getParent()); - Assert.assertTrue( + assertEquals(parent.toString(), actualRequest.getParent()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -327,7 +329,7 @@ public void listSchemasExceptionTest() throws Exception { try { ProjectName parent = ProjectName.of("[PROJECT]"); client.listSchemas(parent); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -349,15 +351,15 @@ public void listSchemasTest2() throws Exception { List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - Assert.assertEquals(1, resources.size()); - Assert.assertEquals(expectedResponse.getSchemasList().get(0), resources.get(0)); + assertEquals(1, resources.size()); + assertEquals(expectedResponse.getSchemasList().get(0), resources.get(0)); List actualRequests = mockSchemaService.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); ListSchemasRequest actualRequest = ((ListSchemasRequest) actualRequests.get(0)); - Assert.assertEquals(parent, actualRequest.getParent()); - Assert.assertTrue( + assertEquals(parent, actualRequest.getParent()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -371,7 +373,7 @@ public void listSchemasExceptionTest2() throws Exception { try { String parent = "parent-995424086"; client.listSchemas(parent); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -393,15 +395,15 @@ public void listSchemaRevisionsTest() throws Exception { List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - Assert.assertEquals(1, resources.size()); - Assert.assertEquals(expectedResponse.getSchemasList().get(0), resources.get(0)); + assertEquals(1, resources.size()); + assertEquals(expectedResponse.getSchemasList().get(0), resources.get(0)); List actualRequests = mockSchemaService.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); ListSchemaRevisionsRequest actualRequest = ((ListSchemaRevisionsRequest) actualRequests.get(0)); - Assert.assertEquals(name.toString(), actualRequest.getName()); - Assert.assertTrue( + assertEquals(name.toString(), actualRequest.getName()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -415,7 +417,7 @@ public void listSchemaRevisionsExceptionTest() throws Exception { try { SchemaName name = SchemaName.of("[PROJECT]", "[SCHEMA]"); client.listSchemaRevisions(name); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -437,15 +439,15 @@ public void listSchemaRevisionsTest2() throws Exception { List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - Assert.assertEquals(1, resources.size()); - Assert.assertEquals(expectedResponse.getSchemasList().get(0), resources.get(0)); + assertEquals(1, resources.size()); + assertEquals(expectedResponse.getSchemasList().get(0), resources.get(0)); List actualRequests = mockSchemaService.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); ListSchemaRevisionsRequest actualRequest = ((ListSchemaRevisionsRequest) actualRequests.get(0)); - Assert.assertEquals(name, actualRequest.getName()); - Assert.assertTrue( + assertEquals(name, actualRequest.getName()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -459,7 +461,7 @@ public void listSchemaRevisionsExceptionTest2() throws Exception { try { String name = "name3373707"; client.listSchemaRevisions(name); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -480,15 +482,15 @@ public void commitSchemaTest() throws Exception { Schema schema = Schema.newBuilder().build(); Schema actualResponse = client.commitSchema(name, schema); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSchemaService.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); CommitSchemaRequest actualRequest = ((CommitSchemaRequest) actualRequests.get(0)); - Assert.assertEquals(name.toString(), actualRequest.getName()); - Assert.assertEquals(schema, actualRequest.getSchema()); - Assert.assertTrue( + assertEquals(name.toString(), actualRequest.getName()); + assertEquals(schema, actualRequest.getSchema()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -503,7 +505,7 @@ public void commitSchemaExceptionTest() throws Exception { SchemaName name = SchemaName.of("[PROJECT]", "[SCHEMA]"); Schema schema = Schema.newBuilder().build(); client.commitSchema(name, schema); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -524,15 +526,15 @@ public void commitSchemaTest2() throws Exception { Schema schema = Schema.newBuilder().build(); Schema actualResponse = client.commitSchema(name, schema); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSchemaService.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); CommitSchemaRequest actualRequest = ((CommitSchemaRequest) actualRequests.get(0)); - Assert.assertEquals(name, actualRequest.getName()); - Assert.assertEquals(schema, actualRequest.getSchema()); - Assert.assertTrue( + assertEquals(name, actualRequest.getName()); + assertEquals(schema, actualRequest.getSchema()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -547,7 +549,7 @@ public void commitSchemaExceptionTest2() throws Exception { String name = "name3373707"; Schema schema = Schema.newBuilder().build(); client.commitSchema(name, schema); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -568,15 +570,15 @@ public void rollbackSchemaTest() throws Exception { String revisionId = "revisionId-1507445162"; Schema actualResponse = client.rollbackSchema(name, revisionId); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSchemaService.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); RollbackSchemaRequest actualRequest = ((RollbackSchemaRequest) actualRequests.get(0)); - Assert.assertEquals(name.toString(), actualRequest.getName()); - Assert.assertEquals(revisionId, actualRequest.getRevisionId()); - Assert.assertTrue( + assertEquals(name.toString(), actualRequest.getName()); + assertEquals(revisionId, actualRequest.getRevisionId()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -591,7 +593,7 @@ public void rollbackSchemaExceptionTest() throws Exception { SchemaName name = SchemaName.of("[PROJECT]", "[SCHEMA]"); String revisionId = "revisionId-1507445162"; client.rollbackSchema(name, revisionId); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -612,15 +614,15 @@ public void rollbackSchemaTest2() throws Exception { String revisionId = "revisionId-1507445162"; Schema actualResponse = client.rollbackSchema(name, revisionId); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSchemaService.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); RollbackSchemaRequest actualRequest = ((RollbackSchemaRequest) actualRequests.get(0)); - Assert.assertEquals(name, actualRequest.getName()); - Assert.assertEquals(revisionId, actualRequest.getRevisionId()); - Assert.assertTrue( + assertEquals(name, actualRequest.getName()); + assertEquals(revisionId, actualRequest.getRevisionId()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -635,7 +637,7 @@ public void rollbackSchemaExceptionTest2() throws Exception { String name = "name3373707"; String revisionId = "revisionId-1507445162"; client.rollbackSchema(name, revisionId); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -656,16 +658,16 @@ public void deleteSchemaRevisionTest() throws Exception { String revisionId = "revisionId-1507445162"; Schema actualResponse = client.deleteSchemaRevision(name, revisionId); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSchemaService.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); DeleteSchemaRevisionRequest actualRequest = ((DeleteSchemaRevisionRequest) actualRequests.get(0)); - Assert.assertEquals(name.toString(), actualRequest.getName()); - Assert.assertEquals(revisionId, actualRequest.getRevisionId()); - Assert.assertTrue( + assertEquals(name.toString(), actualRequest.getName()); + assertEquals(revisionId, actualRequest.getRevisionId()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -680,7 +682,7 @@ public void deleteSchemaRevisionExceptionTest() throws Exception { SchemaName name = SchemaName.of("[PROJECT]", "[SCHEMA]"); String revisionId = "revisionId-1507445162"; client.deleteSchemaRevision(name, revisionId); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -701,16 +703,16 @@ public void deleteSchemaRevisionTest2() throws Exception { String revisionId = "revisionId-1507445162"; Schema actualResponse = client.deleteSchemaRevision(name, revisionId); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSchemaService.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); DeleteSchemaRevisionRequest actualRequest = ((DeleteSchemaRevisionRequest) actualRequests.get(0)); - Assert.assertEquals(name, actualRequest.getName()); - Assert.assertEquals(revisionId, actualRequest.getRevisionId()); - Assert.assertTrue( + assertEquals(name, actualRequest.getName()); + assertEquals(revisionId, actualRequest.getRevisionId()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -725,7 +727,7 @@ public void deleteSchemaRevisionExceptionTest2() throws Exception { String name = "name3373707"; String revisionId = "revisionId-1507445162"; client.deleteSchemaRevision(name, revisionId); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -741,11 +743,11 @@ public void deleteSchemaTest() throws Exception { client.deleteSchema(name); List actualRequests = mockSchemaService.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); DeleteSchemaRequest actualRequest = ((DeleteSchemaRequest) actualRequests.get(0)); - Assert.assertEquals(name.toString(), actualRequest.getName()); - Assert.assertTrue( + assertEquals(name.toString(), actualRequest.getName()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -759,7 +761,7 @@ public void deleteSchemaExceptionTest() throws Exception { try { SchemaName name = SchemaName.of("[PROJECT]", "[SCHEMA]"); client.deleteSchema(name); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -775,11 +777,11 @@ public void deleteSchemaTest2() throws Exception { client.deleteSchema(name); List actualRequests = mockSchemaService.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); DeleteSchemaRequest actualRequest = ((DeleteSchemaRequest) actualRequests.get(0)); - Assert.assertEquals(name, actualRequest.getName()); - Assert.assertTrue( + assertEquals(name, actualRequest.getName()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -793,7 +795,7 @@ public void deleteSchemaExceptionTest2() throws Exception { try { String name = "name3373707"; client.deleteSchema(name); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -808,15 +810,15 @@ public void validateSchemaTest() throws Exception { Schema schema = Schema.newBuilder().build(); ValidateSchemaResponse actualResponse = client.validateSchema(parent, schema); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSchemaService.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); ValidateSchemaRequest actualRequest = ((ValidateSchemaRequest) actualRequests.get(0)); - Assert.assertEquals(parent.toString(), actualRequest.getParent()); - Assert.assertEquals(schema, actualRequest.getSchema()); - Assert.assertTrue( + assertEquals(parent.toString(), actualRequest.getParent()); + assertEquals(schema, actualRequest.getSchema()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -831,7 +833,7 @@ public void validateSchemaExceptionTest() throws Exception { ProjectName parent = ProjectName.of("[PROJECT]"); Schema schema = Schema.newBuilder().build(); client.validateSchema(parent, schema); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -846,15 +848,15 @@ public void validateSchemaTest2() throws Exception { Schema schema = Schema.newBuilder().build(); ValidateSchemaResponse actualResponse = client.validateSchema(parent, schema); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSchemaService.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); ValidateSchemaRequest actualRequest = ((ValidateSchemaRequest) actualRequests.get(0)); - Assert.assertEquals(parent, actualRequest.getParent()); - Assert.assertEquals(schema, actualRequest.getSchema()); - Assert.assertTrue( + assertEquals(parent, actualRequest.getParent()); + assertEquals(schema, actualRequest.getSchema()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -869,7 +871,7 @@ public void validateSchemaExceptionTest2() throws Exception { String parent = "parent-995424086"; Schema schema = Schema.newBuilder().build(); client.validateSchema(parent, schema); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -888,18 +890,18 @@ public void validateMessageTest() throws Exception { .build(); ValidateMessageResponse actualResponse = client.validateMessage(request); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSchemaService.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); ValidateMessageRequest actualRequest = ((ValidateMessageRequest) actualRequests.get(0)); - Assert.assertEquals(request.getParent(), actualRequest.getParent()); - Assert.assertEquals(request.getName(), actualRequest.getName()); - Assert.assertEquals(request.getSchema(), actualRequest.getSchema()); - Assert.assertEquals(request.getMessage(), actualRequest.getMessage()); - Assert.assertEquals(request.getEncoding(), actualRequest.getEncoding()); - Assert.assertTrue( + assertEquals(request.getParent(), actualRequest.getParent()); + assertEquals(request.getName(), actualRequest.getName()); + assertEquals(request.getSchema(), actualRequest.getSchema()); + assertEquals(request.getMessage(), actualRequest.getMessage()); + assertEquals(request.getEncoding(), actualRequest.getEncoding()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -918,7 +920,7 @@ public void validateMessageExceptionTest() throws Exception { .setEncoding(Encoding.forNumber(0)) .build(); client.validateMessage(request); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -943,16 +945,16 @@ public void setIamPolicyTest() throws Exception { .build(); Policy actualResponse = client.setIamPolicy(request); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockIAMPolicy.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); SetIamPolicyRequest actualRequest = ((SetIamPolicyRequest) actualRequests.get(0)); - Assert.assertEquals(request.getResource(), actualRequest.getResource()); - Assert.assertEquals(request.getPolicy(), actualRequest.getPolicy()); - Assert.assertEquals(request.getUpdateMask(), actualRequest.getUpdateMask()); - Assert.assertTrue( + assertEquals(request.getResource(), actualRequest.getResource()); + assertEquals(request.getPolicy(), actualRequest.getPolicy()); + assertEquals(request.getUpdateMask(), actualRequest.getUpdateMask()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -971,7 +973,7 @@ public void setIamPolicyExceptionTest() throws Exception { .setUpdateMask(FieldMask.newBuilder().build()) .build(); client.setIamPolicy(request); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -995,15 +997,15 @@ public void getIamPolicyTest() throws Exception { .build(); Policy actualResponse = client.getIamPolicy(request); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockIAMPolicy.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); GetIamPolicyRequest actualRequest = ((GetIamPolicyRequest) actualRequests.get(0)); - Assert.assertEquals(request.getResource(), actualRequest.getResource()); - Assert.assertEquals(request.getOptions(), actualRequest.getOptions()); - Assert.assertTrue( + assertEquals(request.getResource(), actualRequest.getResource()); + assertEquals(request.getOptions(), actualRequest.getOptions()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -1021,7 +1023,7 @@ public void getIamPolicyExceptionTest() throws Exception { .setOptions(GetPolicyOptions.newBuilder().build()) .build(); client.getIamPolicy(request); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1040,15 +1042,15 @@ public void testIamPermissionsTest() throws Exception { .build(); TestIamPermissionsResponse actualResponse = client.testIamPermissions(request); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockIAMPolicy.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); TestIamPermissionsRequest actualRequest = ((TestIamPermissionsRequest) actualRequests.get(0)); - Assert.assertEquals(request.getResource(), actualRequest.getResource()); - Assert.assertEquals(request.getPermissionsList(), actualRequest.getPermissionsList()); - Assert.assertTrue( + assertEquals(request.getResource(), actualRequest.getResource()); + assertEquals(request.getPermissionsList(), actualRequest.getPermissionsList()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -1066,7 +1068,7 @@ public void testIamPermissionsExceptionTest() throws Exception { .addAllPermissions(new ArrayList()) .build(); client.testIamPermissions(request); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SequentialExecutorServiceTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SequentialExecutorServiceTest.java index 3788bd3c0..4d0ee06ba 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SequentialExecutorServiceTest.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SequentialExecutorServiceTest.java @@ -17,10 +17,10 @@ package com.google.cloud.pubsub.v1; import static com.google.common.truth.Truth.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import com.google.api.core.ApiFuture; import com.google.api.core.SettableApiFuture; @@ -35,11 +35,8 @@ import java.util.concurrent.CancellationException; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; +import org.junit.jupiter.api.Test; -@RunWith(JUnit4.class) public final class SequentialExecutorServiceTest { private final ExecutorProvider executorProvider = InstantiatingExecutorProvider.newBuilder() diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StatusUtilTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StatusUtilTest.java index d1eb63b27..fbd06b2ba 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StatusUtilTest.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StatusUtilTest.java @@ -20,7 +20,7 @@ import com.google.api.gax.grpc.GrpcStatusCode; import com.google.api.gax.rpc.ApiException; import io.grpc.Status.Code; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class StatusUtilTest { diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnectionTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnectionTest.java index 6979963a5..e3dcf5f87 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnectionTest.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnectionTest.java @@ -16,7 +16,9 @@ package com.google.cloud.pubsub.v1; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.*; @@ -51,16 +53,13 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TestName; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; /** Tests for {@link StreamingSubscriberConnection}. */ public class StreamingSubscriberConnectionTest { - @Rule public TestName testName = new TestName(); private FakeScheduledExecutorService systemExecutor; private FakeScheduledExecutorService executor; @@ -98,14 +97,14 @@ public class StreamingSubscriberConnectionTest { private static final Duration CLIENT_PING_INTERVAL = Duration.ofSeconds(30); private static final Duration MAX_ACK_EXTENSION_PERIOD = Duration.ofMinutes(60); - @Before + @BeforeEach public void setUp() { systemExecutor = new FakeScheduledExecutorService(); clock = systemExecutor.getClock(); mockSubscriberStub = mock(SubscriberStub.class, RETURNS_DEEP_STUBS); } - @After + @AfterEach public void tearDown() { systemExecutor.shutdown(); } diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriberShutdownSettingsTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriberShutdownSettingsTest.java index f82937582..b0dc3f7fe 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriberShutdownSettingsTest.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriberShutdownSettingsTest.java @@ -16,13 +16,14 @@ package com.google.cloud.pubsub.v1; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import com.google.cloud.pubsub.v1.SubscriberShutdownSettings.ShutdownMode; import java.time.Duration; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SubscriberShutdownSettingsTest { @@ -88,13 +89,17 @@ public void testZeroTimeout() { assertTrue(settings.getTimeout().isZero()); } - @Test(expected = NullPointerException.class) + @Test public void testNullModeThrowsException() { - SubscriberShutdownSettings.newBuilder().setMode(null).build(); + assertThrows( + NullPointerException.class, + () -> SubscriberShutdownSettings.newBuilder().setMode(null).build()); } - @Test(expected = NullPointerException.class) + @Test public void testNullTimeoutThrowsException() { - SubscriberShutdownSettings.newBuilder().setTimeout(null).build(); + assertThrows( + NullPointerException.class, + () -> SubscriberShutdownSettings.newBuilder().setTimeout(null).build()); } } diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriberTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriberTest.java index 649769d1c..ae37f3427 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriberTest.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriberTest.java @@ -16,7 +16,10 @@ package com.google.cloud.pubsub.v1; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import com.google.api.gax.batching.FlowControlSettings; import com.google.api.gax.core.ExecutorProvider; @@ -35,13 +38,13 @@ import io.grpc.StatusException; import io.grpc.inprocess.InProcessChannelBuilder; import io.grpc.inprocess.InProcessServerBuilder; +import java.lang.reflect.Method; import java.time.Duration; import java.util.concurrent.*; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TestName; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInfo; /** Tests for {@link Subscriber}. */ public class SubscriberTest { @@ -64,15 +67,20 @@ public void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) { } }; - @Rule public TestName testName = new TestName(); - - @Before - public void setUp() throws Exception { + @BeforeEach + public void setUp(TestInfo testInfo) throws Exception { consumersWithResponse = new LinkedBlockingQueue<>(); - InProcessServerBuilder serverBuilder = InProcessServerBuilder.forName(testName.getMethodName()); + + String methodName = + testInfo + .getTestMethod() + .map(Method::getName) + .orElseThrow(() -> new IllegalStateException("Test method not available")); + + InProcessServerBuilder serverBuilder = InProcessServerBuilder.forName(methodName); fakeSubscriberServiceImpl = new FakeSubscriberServiceImpl(); fakeExecutor = new FakeScheduledExecutorService(); - testChannel = InProcessChannelBuilder.forName(testName.getMethodName()).build(); + testChannel = InProcessChannelBuilder.forName(methodName).build(); serverBuilder.addService(fakeSubscriberServiceImpl); testServer = serverBuilder.build(); testServer.start(); @@ -88,7 +96,7 @@ public void receiveMessage( }; } - @After + @AfterEach public void tearDown() throws Exception { testServer.shutdownNow().awaitTermination(); testChannel.shutdown(); @@ -172,7 +180,7 @@ public ScheduledExecutorService getExecutor() { } } - @Test(expected = IllegalStateException.class) + @Test public void testFailedChannel_fatalError_subscriberFails() throws Exception { Subscriber subscriber = startSubscriber( @@ -184,7 +192,7 @@ public void testFailedChannel_fatalError_subscriberFails() throws Exception { fakeSubscriberServiceImpl.sendError(new StatusException(Status.INVALID_ARGUMENT)); try { - subscriber.awaitTerminated(); + assertThrows(IllegalStateException.class, () -> subscriber.awaitTerminated()); } finally { // The subscriber must finish with an state error because its FAILED status. assertEquals(Subscriber.State.FAILED, subscriber.state()); @@ -200,7 +208,7 @@ public void testFailedChannel_fatalError_subscriberFails() throws Exception { } } - @Test(expected = IllegalStateException.class) + @Test public void testFailedChannel_shutdownBackgroundResources() throws Exception { ExecutorProvider provider = new ExecutorProvider() { @@ -222,7 +230,7 @@ public ScheduledExecutorService getExecutor() { fakeSubscriberServiceImpl.sendError(new StatusException(Status.INVALID_ARGUMENT)); try { - subscriber.awaitTerminated(); + assertThrows(IllegalStateException.class, () -> subscriber.awaitTerminated()); } finally { // The subscriber must finish with an state error because its FAILED status. assertEquals(Subscriber.State.FAILED, subscriber.state()); diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriptionAdminClientHttpJsonTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriptionAdminClientHttpJsonTest.java index 860eb95ce..d6c4f998f 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriptionAdminClientHttpJsonTest.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriptionAdminClientHttpJsonTest.java @@ -18,6 +18,9 @@ import static com.google.cloud.pubsub.v1.SubscriptionAdminClient.ListSnapshotsPagedResponse; import static com.google.cloud.pubsub.v1.SubscriptionAdminClient.ListSubscriptionsPagedResponse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import com.google.api.gax.core.NoCredentialsProvider; import com.google.api.gax.httpjson.GaxHttpJsonProperties; @@ -69,19 +72,18 @@ import java.util.HashMap; import java.util.List; import javax.annotation.Generated; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; @Generated("by gapic-generator-java") public class SubscriptionAdminClientHttpJsonTest { private static MockHttpService mockService; private static SubscriptionAdminClient client; - @BeforeClass + @BeforeAll public static void startStaticServer() throws IOException { mockService = new MockHttpService( @@ -98,15 +100,15 @@ public static void startStaticServer() throws IOException { client = SubscriptionAdminClient.create(settings); } - @AfterClass + @AfterAll public static void stopServer() { client.close(); } - @Before + @BeforeEach public void setUp() {} - @After + @AfterEach public void tearDown() throws Exception { mockService.reset(); } @@ -146,10 +148,10 @@ public void createSubscriptionTest() throws Exception { Subscription actualResponse = client.createSubscription(name, topic, pushConfig, ackDeadlineSeconds); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -157,7 +159,7 @@ public void createSubscriptionTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -176,7 +178,7 @@ public void createSubscriptionExceptionTest() throws Exception { PushConfig pushConfig = PushConfig.newBuilder().build(); int ackDeadlineSeconds = 2135351438; client.createSubscription(name, topic, pushConfig, ackDeadlineSeconds); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -217,10 +219,10 @@ public void createSubscriptionTest2() throws Exception { Subscription actualResponse = client.createSubscription(name, topic, pushConfig, ackDeadlineSeconds); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -228,7 +230,7 @@ public void createSubscriptionTest2() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -247,7 +249,7 @@ public void createSubscriptionExceptionTest2() throws Exception { PushConfig pushConfig = PushConfig.newBuilder().build(); int ackDeadlineSeconds = 2135351438; client.createSubscription(name, topic, pushConfig, ackDeadlineSeconds); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -288,10 +290,10 @@ public void createSubscriptionTest3() throws Exception { Subscription actualResponse = client.createSubscription(name, topic, pushConfig, ackDeadlineSeconds); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -299,7 +301,7 @@ public void createSubscriptionTest3() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -318,7 +320,7 @@ public void createSubscriptionExceptionTest3() throws Exception { PushConfig pushConfig = PushConfig.newBuilder().build(); int ackDeadlineSeconds = 2135351438; client.createSubscription(name, topic, pushConfig, ackDeadlineSeconds); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -359,10 +361,10 @@ public void createSubscriptionTest4() throws Exception { Subscription actualResponse = client.createSubscription(name, topic, pushConfig, ackDeadlineSeconds); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -370,7 +372,7 @@ public void createSubscriptionTest4() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -389,7 +391,7 @@ public void createSubscriptionExceptionTest4() throws Exception { PushConfig pushConfig = PushConfig.newBuilder().build(); int ackDeadlineSeconds = 2135351438; client.createSubscription(name, topic, pushConfig, ackDeadlineSeconds); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -426,10 +428,10 @@ public void getSubscriptionTest() throws Exception { SubscriptionName subscription = SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]"); Subscription actualResponse = client.getSubscription(subscription); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -437,7 +439,7 @@ public void getSubscriptionTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -453,7 +455,7 @@ public void getSubscriptionExceptionTest() throws Exception { try { SubscriptionName subscription = SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]"); client.getSubscription(subscription); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -490,10 +492,10 @@ public void getSubscriptionTest2() throws Exception { String subscription = "projects/project-1980/subscriptions/subscription-1980"; Subscription actualResponse = client.getSubscription(subscription); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -501,7 +503,7 @@ public void getSubscriptionTest2() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -517,7 +519,7 @@ public void getSubscriptionExceptionTest2() throws Exception { try { String subscription = "projects/project-1980/subscriptions/subscription-1980"; client.getSubscription(subscription); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -578,10 +580,10 @@ public void updateSubscriptionTest() throws Exception { FieldMask updateMask = FieldMask.newBuilder().build(); Subscription actualResponse = client.updateSubscription(subscription, updateMask); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -589,7 +591,7 @@ public void updateSubscriptionTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -629,7 +631,7 @@ public void updateSubscriptionExceptionTest() throws Exception { .build(); FieldMask updateMask = FieldMask.newBuilder().build(); client.updateSubscription(subscription, updateMask); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -651,11 +653,11 @@ public void listSubscriptionsTest() throws Exception { List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - Assert.assertEquals(1, resources.size()); - Assert.assertEquals(expectedResponse.getSubscriptionsList().get(0), resources.get(0)); + assertEquals(1, resources.size()); + assertEquals(expectedResponse.getSubscriptionsList().get(0), resources.get(0)); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -663,7 +665,7 @@ public void listSubscriptionsTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -679,7 +681,7 @@ public void listSubscriptionsExceptionTest() throws Exception { try { ProjectName project = ProjectName.of("[PROJECT]"); client.listSubscriptions(project); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -701,11 +703,11 @@ public void listSubscriptionsTest2() throws Exception { List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - Assert.assertEquals(1, resources.size()); - Assert.assertEquals(expectedResponse.getSubscriptionsList().get(0), resources.get(0)); + assertEquals(1, resources.size()); + assertEquals(expectedResponse.getSubscriptionsList().get(0), resources.get(0)); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -713,7 +715,7 @@ public void listSubscriptionsTest2() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -729,7 +731,7 @@ public void listSubscriptionsExceptionTest2() throws Exception { try { String project = "projects/project-7934"; client.listSubscriptions(project); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -745,7 +747,7 @@ public void deleteSubscriptionTest() throws Exception { client.deleteSubscription(subscription); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -753,7 +755,7 @@ public void deleteSubscriptionTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -769,7 +771,7 @@ public void deleteSubscriptionExceptionTest() throws Exception { try { SubscriptionName subscription = SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]"); client.deleteSubscription(subscription); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -785,7 +787,7 @@ public void deleteSubscriptionTest2() throws Exception { client.deleteSubscription(subscription); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -793,7 +795,7 @@ public void deleteSubscriptionTest2() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -809,7 +811,7 @@ public void deleteSubscriptionExceptionTest2() throws Exception { try { String subscription = "projects/project-1980/subscriptions/subscription-1980"; client.deleteSubscription(subscription); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -827,7 +829,7 @@ public void modifyAckDeadlineTest() throws Exception { client.modifyAckDeadline(subscription, ackIds, ackDeadlineSeconds); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -835,7 +837,7 @@ public void modifyAckDeadlineTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -853,7 +855,7 @@ public void modifyAckDeadlineExceptionTest() throws Exception { List ackIds = new ArrayList<>(); int ackDeadlineSeconds = 2135351438; client.modifyAckDeadline(subscription, ackIds, ackDeadlineSeconds); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -871,7 +873,7 @@ public void modifyAckDeadlineTest2() throws Exception { client.modifyAckDeadline(subscription, ackIds, ackDeadlineSeconds); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -879,7 +881,7 @@ public void modifyAckDeadlineTest2() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -897,7 +899,7 @@ public void modifyAckDeadlineExceptionTest2() throws Exception { List ackIds = new ArrayList<>(); int ackDeadlineSeconds = 2135351438; client.modifyAckDeadline(subscription, ackIds, ackDeadlineSeconds); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -914,7 +916,7 @@ public void acknowledgeTest() throws Exception { client.acknowledge(subscription, ackIds); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -922,7 +924,7 @@ public void acknowledgeTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -939,7 +941,7 @@ public void acknowledgeExceptionTest() throws Exception { SubscriptionName subscription = SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]"); List ackIds = new ArrayList<>(); client.acknowledge(subscription, ackIds); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -956,7 +958,7 @@ public void acknowledgeTest2() throws Exception { client.acknowledge(subscription, ackIds); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -964,7 +966,7 @@ public void acknowledgeTest2() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -981,7 +983,7 @@ public void acknowledgeExceptionTest2() throws Exception { String subscription = "projects/project-1980/subscriptions/subscription-1980"; List ackIds = new ArrayList<>(); client.acknowledge(subscription, ackIds); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -997,10 +999,10 @@ public void pullTest() throws Exception { int maxMessages = 496131527; PullResponse actualResponse = client.pull(subscription, maxMessages); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -1008,7 +1010,7 @@ public void pullTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -1025,7 +1027,7 @@ public void pullExceptionTest() throws Exception { SubscriptionName subscription = SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]"); int maxMessages = 496131527; client.pull(subscription, maxMessages); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1041,10 +1043,10 @@ public void pullTest2() throws Exception { int maxMessages = 496131527; PullResponse actualResponse = client.pull(subscription, maxMessages); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -1052,7 +1054,7 @@ public void pullTest2() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -1069,7 +1071,7 @@ public void pullExceptionTest2() throws Exception { String subscription = "projects/project-1980/subscriptions/subscription-1980"; int maxMessages = 496131527; client.pull(subscription, maxMessages); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1086,10 +1088,10 @@ public void pullTest3() throws Exception { int maxMessages = 496131527; PullResponse actualResponse = client.pull(subscription, returnImmediately, maxMessages); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -1097,7 +1099,7 @@ public void pullTest3() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -1115,7 +1117,7 @@ public void pullExceptionTest3() throws Exception { boolean returnImmediately = true; int maxMessages = 496131527; client.pull(subscription, returnImmediately, maxMessages); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1132,10 +1134,10 @@ public void pullTest4() throws Exception { int maxMessages = 496131527; PullResponse actualResponse = client.pull(subscription, returnImmediately, maxMessages); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -1143,7 +1145,7 @@ public void pullTest4() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -1161,7 +1163,7 @@ public void pullExceptionTest4() throws Exception { boolean returnImmediately = true; int maxMessages = 496131527; client.pull(subscription, returnImmediately, maxMessages); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1184,7 +1186,7 @@ public void modifyPushConfigTest() throws Exception { client.modifyPushConfig(subscription, pushConfig); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -1192,7 +1194,7 @@ public void modifyPushConfigTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -1209,7 +1211,7 @@ public void modifyPushConfigExceptionTest() throws Exception { SubscriptionName subscription = SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]"); PushConfig pushConfig = PushConfig.newBuilder().build(); client.modifyPushConfig(subscription, pushConfig); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1226,7 +1228,7 @@ public void modifyPushConfigTest2() throws Exception { client.modifyPushConfig(subscription, pushConfig); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -1234,7 +1236,7 @@ public void modifyPushConfigTest2() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -1251,7 +1253,7 @@ public void modifyPushConfigExceptionTest2() throws Exception { String subscription = "projects/project-1980/subscriptions/subscription-1980"; PushConfig pushConfig = PushConfig.newBuilder().build(); client.modifyPushConfig(subscription, pushConfig); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1271,10 +1273,10 @@ public void getSnapshotTest() throws Exception { SnapshotName snapshot = SnapshotName.of("[PROJECT]", "[SNAPSHOT]"); Snapshot actualResponse = client.getSnapshot(snapshot); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -1282,7 +1284,7 @@ public void getSnapshotTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -1298,7 +1300,7 @@ public void getSnapshotExceptionTest() throws Exception { try { SnapshotName snapshot = SnapshotName.of("[PROJECT]", "[SNAPSHOT]"); client.getSnapshot(snapshot); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1318,10 +1320,10 @@ public void getSnapshotTest2() throws Exception { String snapshot = "projects/project-2020/snapshots/snapshot-2020"; Snapshot actualResponse = client.getSnapshot(snapshot); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -1329,7 +1331,7 @@ public void getSnapshotTest2() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -1345,7 +1347,7 @@ public void getSnapshotExceptionTest2() throws Exception { try { String snapshot = "projects/project-2020/snapshots/snapshot-2020"; client.getSnapshot(snapshot); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1367,11 +1369,11 @@ public void listSnapshotsTest() throws Exception { List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - Assert.assertEquals(1, resources.size()); - Assert.assertEquals(expectedResponse.getSnapshotsList().get(0), resources.get(0)); + assertEquals(1, resources.size()); + assertEquals(expectedResponse.getSnapshotsList().get(0), resources.get(0)); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -1379,7 +1381,7 @@ public void listSnapshotsTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -1395,7 +1397,7 @@ public void listSnapshotsExceptionTest() throws Exception { try { ProjectName project = ProjectName.of("[PROJECT]"); client.listSnapshots(project); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1417,11 +1419,11 @@ public void listSnapshotsTest2() throws Exception { List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - Assert.assertEquals(1, resources.size()); - Assert.assertEquals(expectedResponse.getSnapshotsList().get(0), resources.get(0)); + assertEquals(1, resources.size()); + assertEquals(expectedResponse.getSnapshotsList().get(0), resources.get(0)); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -1429,7 +1431,7 @@ public void listSnapshotsTest2() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -1445,7 +1447,7 @@ public void listSnapshotsExceptionTest2() throws Exception { try { String project = "projects/project-7934"; client.listSnapshots(project); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1466,10 +1468,10 @@ public void createSnapshotTest() throws Exception { SubscriptionName subscription = SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]"); Snapshot actualResponse = client.createSnapshot(name, subscription); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -1477,7 +1479,7 @@ public void createSnapshotTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -1494,7 +1496,7 @@ public void createSnapshotExceptionTest() throws Exception { SnapshotName name = SnapshotName.of("[PROJECT]", "[SNAPSHOT]"); SubscriptionName subscription = SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]"); client.createSnapshot(name, subscription); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1515,10 +1517,10 @@ public void createSnapshotTest2() throws Exception { String subscription = "subscription341203229"; Snapshot actualResponse = client.createSnapshot(name, subscription); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -1526,7 +1528,7 @@ public void createSnapshotTest2() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -1543,7 +1545,7 @@ public void createSnapshotExceptionTest2() throws Exception { SnapshotName name = SnapshotName.of("[PROJECT]", "[SNAPSHOT]"); String subscription = "subscription341203229"; client.createSnapshot(name, subscription); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1564,10 +1566,10 @@ public void createSnapshotTest3() throws Exception { SubscriptionName subscription = SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]"); Snapshot actualResponse = client.createSnapshot(name, subscription); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -1575,7 +1577,7 @@ public void createSnapshotTest3() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -1592,7 +1594,7 @@ public void createSnapshotExceptionTest3() throws Exception { String name = "projects/project-4389/snapshots/snapshot-4389"; SubscriptionName subscription = SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]"); client.createSnapshot(name, subscription); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1613,10 +1615,10 @@ public void createSnapshotTest4() throws Exception { String subscription = "subscription341203229"; Snapshot actualResponse = client.createSnapshot(name, subscription); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -1624,7 +1626,7 @@ public void createSnapshotTest4() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -1641,7 +1643,7 @@ public void createSnapshotExceptionTest4() throws Exception { String name = "projects/project-4389/snapshots/snapshot-4389"; String subscription = "subscription341203229"; client.createSnapshot(name, subscription); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1668,10 +1670,10 @@ public void updateSnapshotTest() throws Exception { FieldMask updateMask = FieldMask.newBuilder().build(); Snapshot actualResponse = client.updateSnapshot(snapshot, updateMask); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -1679,7 +1681,7 @@ public void updateSnapshotTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -1702,7 +1704,7 @@ public void updateSnapshotExceptionTest() throws Exception { .build(); FieldMask updateMask = FieldMask.newBuilder().build(); client.updateSnapshot(snapshot, updateMask); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1718,7 +1720,7 @@ public void deleteSnapshotTest() throws Exception { client.deleteSnapshot(snapshot); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -1726,7 +1728,7 @@ public void deleteSnapshotTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -1742,7 +1744,7 @@ public void deleteSnapshotExceptionTest() throws Exception { try { SnapshotName snapshot = SnapshotName.of("[PROJECT]", "[SNAPSHOT]"); client.deleteSnapshot(snapshot); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1758,7 +1760,7 @@ public void deleteSnapshotTest2() throws Exception { client.deleteSnapshot(snapshot); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -1766,7 +1768,7 @@ public void deleteSnapshotTest2() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -1782,7 +1784,7 @@ public void deleteSnapshotExceptionTest2() throws Exception { try { String snapshot = "projects/project-2020/snapshots/snapshot-2020"; client.deleteSnapshot(snapshot); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1799,10 +1801,10 @@ public void seekTest() throws Exception { .build(); SeekResponse actualResponse = client.seek(request); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -1810,7 +1812,7 @@ public void seekTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -1829,7 +1831,7 @@ public void seekExceptionTest() throws Exception { .setSubscription(SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]").toString()) .build(); client.seek(request); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1854,10 +1856,10 @@ public void setIamPolicyTest() throws Exception { .build(); Policy actualResponse = client.setIamPolicy(request); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -1865,7 +1867,7 @@ public void setIamPolicyTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -1886,7 +1888,7 @@ public void setIamPolicyExceptionTest() throws Exception { .setUpdateMask(FieldMask.newBuilder().build()) .build(); client.setIamPolicy(request); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1910,10 +1912,10 @@ public void getIamPolicyTest() throws Exception { .build(); Policy actualResponse = client.getIamPolicy(request); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -1921,7 +1923,7 @@ public void getIamPolicyTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -1941,7 +1943,7 @@ public void getIamPolicyExceptionTest() throws Exception { .setOptions(GetPolicyOptions.newBuilder().build()) .build(); client.getIamPolicy(request); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1960,10 +1962,10 @@ public void testIamPermissionsTest() throws Exception { .build(); TestIamPermissionsResponse actualResponse = client.testIamPermissions(request); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -1971,7 +1973,7 @@ public void testIamPermissionsTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -1991,7 +1993,7 @@ public void testIamPermissionsExceptionTest() throws Exception { .addAllPermissions(new ArrayList()) .build(); client.testIamPermissions(request); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriptionAdminClientTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriptionAdminClientTest.java index 480e7ceaa..55f1a7fee 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriptionAdminClientTest.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriptionAdminClientTest.java @@ -18,6 +18,9 @@ import static com.google.cloud.pubsub.v1.SubscriptionAdminClient.ListSnapshotsPagedResponse; import static com.google.cloud.pubsub.v1.SubscriptionAdminClient.ListSubscriptionsPagedResponse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import com.google.api.gax.core.NoCredentialsProvider; import com.google.api.gax.grpc.GaxGrpcProperties; @@ -89,12 +92,11 @@ import java.util.UUID; import java.util.concurrent.ExecutionException; import javax.annotation.Generated; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; @Generated("by gapic-generator-java") public class SubscriptionAdminClientTest { @@ -104,7 +106,7 @@ public class SubscriptionAdminClientTest { private LocalChannelProvider channelProvider; private SubscriptionAdminClient client; - @BeforeClass + @BeforeAll public static void startStaticServer() { mockSubscriber = new MockSubscriber(); mockIAMPolicy = new MockIAMPolicy(); @@ -115,12 +117,12 @@ public static void startStaticServer() { mockServiceHelper.start(); } - @AfterClass + @AfterAll public static void stopServer() { mockServiceHelper.stop(); } - @Before + @BeforeEach public void setUp() throws IOException { mockServiceHelper.reset(); channelProvider = mockServiceHelper.createChannelProvider(); @@ -132,7 +134,7 @@ public void setUp() throws IOException { client = SubscriptionAdminClient.create(settings); } - @After + @AfterEach public void tearDown() throws Exception { client.close(); } @@ -172,17 +174,17 @@ public void createSubscriptionTest() throws Exception { Subscription actualResponse = client.createSubscription(name, topic, pushConfig, ackDeadlineSeconds); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); Subscription actualRequest = ((Subscription) actualRequests.get(0)); - Assert.assertEquals(name.toString(), actualRequest.getName()); - Assert.assertEquals(topic.toString(), actualRequest.getTopic()); - Assert.assertEquals(pushConfig, actualRequest.getPushConfig()); - Assert.assertEquals(ackDeadlineSeconds, actualRequest.getAckDeadlineSeconds()); - Assert.assertTrue( + assertEquals(name.toString(), actualRequest.getName()); + assertEquals(topic.toString(), actualRequest.getTopic()); + assertEquals(pushConfig, actualRequest.getPushConfig()); + assertEquals(ackDeadlineSeconds, actualRequest.getAckDeadlineSeconds()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -199,7 +201,7 @@ public void createSubscriptionExceptionTest() throws Exception { PushConfig pushConfig = PushConfig.newBuilder().build(); int ackDeadlineSeconds = 2135351438; client.createSubscription(name, topic, pushConfig, ackDeadlineSeconds); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -240,17 +242,17 @@ public void createSubscriptionTest2() throws Exception { Subscription actualResponse = client.createSubscription(name, topic, pushConfig, ackDeadlineSeconds); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); Subscription actualRequest = ((Subscription) actualRequests.get(0)); - Assert.assertEquals(name.toString(), actualRequest.getName()); - Assert.assertEquals(topic, actualRequest.getTopic()); - Assert.assertEquals(pushConfig, actualRequest.getPushConfig()); - Assert.assertEquals(ackDeadlineSeconds, actualRequest.getAckDeadlineSeconds()); - Assert.assertTrue( + assertEquals(name.toString(), actualRequest.getName()); + assertEquals(topic, actualRequest.getTopic()); + assertEquals(pushConfig, actualRequest.getPushConfig()); + assertEquals(ackDeadlineSeconds, actualRequest.getAckDeadlineSeconds()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -267,7 +269,7 @@ public void createSubscriptionExceptionTest2() throws Exception { PushConfig pushConfig = PushConfig.newBuilder().build(); int ackDeadlineSeconds = 2135351438; client.createSubscription(name, topic, pushConfig, ackDeadlineSeconds); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -308,17 +310,17 @@ public void createSubscriptionTest3() throws Exception { Subscription actualResponse = client.createSubscription(name, topic, pushConfig, ackDeadlineSeconds); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); Subscription actualRequest = ((Subscription) actualRequests.get(0)); - Assert.assertEquals(name, actualRequest.getName()); - Assert.assertEquals(topic.toString(), actualRequest.getTopic()); - Assert.assertEquals(pushConfig, actualRequest.getPushConfig()); - Assert.assertEquals(ackDeadlineSeconds, actualRequest.getAckDeadlineSeconds()); - Assert.assertTrue( + assertEquals(name, actualRequest.getName()); + assertEquals(topic.toString(), actualRequest.getTopic()); + assertEquals(pushConfig, actualRequest.getPushConfig()); + assertEquals(ackDeadlineSeconds, actualRequest.getAckDeadlineSeconds()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -335,7 +337,7 @@ public void createSubscriptionExceptionTest3() throws Exception { PushConfig pushConfig = PushConfig.newBuilder().build(); int ackDeadlineSeconds = 2135351438; client.createSubscription(name, topic, pushConfig, ackDeadlineSeconds); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -376,17 +378,17 @@ public void createSubscriptionTest4() throws Exception { Subscription actualResponse = client.createSubscription(name, topic, pushConfig, ackDeadlineSeconds); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); Subscription actualRequest = ((Subscription) actualRequests.get(0)); - Assert.assertEquals(name, actualRequest.getName()); - Assert.assertEquals(topic, actualRequest.getTopic()); - Assert.assertEquals(pushConfig, actualRequest.getPushConfig()); - Assert.assertEquals(ackDeadlineSeconds, actualRequest.getAckDeadlineSeconds()); - Assert.assertTrue( + assertEquals(name, actualRequest.getName()); + assertEquals(topic, actualRequest.getTopic()); + assertEquals(pushConfig, actualRequest.getPushConfig()); + assertEquals(ackDeadlineSeconds, actualRequest.getAckDeadlineSeconds()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -403,7 +405,7 @@ public void createSubscriptionExceptionTest4() throws Exception { PushConfig pushConfig = PushConfig.newBuilder().build(); int ackDeadlineSeconds = 2135351438; client.createSubscription(name, topic, pushConfig, ackDeadlineSeconds); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -440,14 +442,14 @@ public void getSubscriptionTest() throws Exception { SubscriptionName subscription = SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]"); Subscription actualResponse = client.getSubscription(subscription); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); GetSubscriptionRequest actualRequest = ((GetSubscriptionRequest) actualRequests.get(0)); - Assert.assertEquals(subscription.toString(), actualRequest.getSubscription()); - Assert.assertTrue( + assertEquals(subscription.toString(), actualRequest.getSubscription()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -461,7 +463,7 @@ public void getSubscriptionExceptionTest() throws Exception { try { SubscriptionName subscription = SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]"); client.getSubscription(subscription); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -498,14 +500,14 @@ public void getSubscriptionTest2() throws Exception { String subscription = "subscription341203229"; Subscription actualResponse = client.getSubscription(subscription); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); GetSubscriptionRequest actualRequest = ((GetSubscriptionRequest) actualRequests.get(0)); - Assert.assertEquals(subscription, actualRequest.getSubscription()); - Assert.assertTrue( + assertEquals(subscription, actualRequest.getSubscription()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -519,7 +521,7 @@ public void getSubscriptionExceptionTest2() throws Exception { try { String subscription = "subscription341203229"; client.getSubscription(subscription); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -557,15 +559,15 @@ public void updateSubscriptionTest() throws Exception { FieldMask updateMask = FieldMask.newBuilder().build(); Subscription actualResponse = client.updateSubscription(subscription, updateMask); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); UpdateSubscriptionRequest actualRequest = ((UpdateSubscriptionRequest) actualRequests.get(0)); - Assert.assertEquals(subscription, actualRequest.getSubscription()); - Assert.assertEquals(updateMask, actualRequest.getUpdateMask()); - Assert.assertTrue( + assertEquals(subscription, actualRequest.getSubscription()); + assertEquals(updateMask, actualRequest.getUpdateMask()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -580,7 +582,7 @@ public void updateSubscriptionExceptionTest() throws Exception { Subscription subscription = Subscription.newBuilder().build(); FieldMask updateMask = FieldMask.newBuilder().build(); client.updateSubscription(subscription, updateMask); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -602,15 +604,15 @@ public void listSubscriptionsTest() throws Exception { List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - Assert.assertEquals(1, resources.size()); - Assert.assertEquals(expectedResponse.getSubscriptionsList().get(0), resources.get(0)); + assertEquals(1, resources.size()); + assertEquals(expectedResponse.getSubscriptionsList().get(0), resources.get(0)); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); ListSubscriptionsRequest actualRequest = ((ListSubscriptionsRequest) actualRequests.get(0)); - Assert.assertEquals(project.toString(), actualRequest.getProject()); - Assert.assertTrue( + assertEquals(project.toString(), actualRequest.getProject()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -624,7 +626,7 @@ public void listSubscriptionsExceptionTest() throws Exception { try { ProjectName project = ProjectName.of("[PROJECT]"); client.listSubscriptions(project); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -646,15 +648,15 @@ public void listSubscriptionsTest2() throws Exception { List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - Assert.assertEquals(1, resources.size()); - Assert.assertEquals(expectedResponse.getSubscriptionsList().get(0), resources.get(0)); + assertEquals(1, resources.size()); + assertEquals(expectedResponse.getSubscriptionsList().get(0), resources.get(0)); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); ListSubscriptionsRequest actualRequest = ((ListSubscriptionsRequest) actualRequests.get(0)); - Assert.assertEquals(project, actualRequest.getProject()); - Assert.assertTrue( + assertEquals(project, actualRequest.getProject()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -668,7 +670,7 @@ public void listSubscriptionsExceptionTest2() throws Exception { try { String project = "project-309310695"; client.listSubscriptions(project); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -684,11 +686,11 @@ public void deleteSubscriptionTest() throws Exception { client.deleteSubscription(subscription); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); DeleteSubscriptionRequest actualRequest = ((DeleteSubscriptionRequest) actualRequests.get(0)); - Assert.assertEquals(subscription.toString(), actualRequest.getSubscription()); - Assert.assertTrue( + assertEquals(subscription.toString(), actualRequest.getSubscription()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -702,7 +704,7 @@ public void deleteSubscriptionExceptionTest() throws Exception { try { SubscriptionName subscription = SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]"); client.deleteSubscription(subscription); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -718,11 +720,11 @@ public void deleteSubscriptionTest2() throws Exception { client.deleteSubscription(subscription); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); DeleteSubscriptionRequest actualRequest = ((DeleteSubscriptionRequest) actualRequests.get(0)); - Assert.assertEquals(subscription, actualRequest.getSubscription()); - Assert.assertTrue( + assertEquals(subscription, actualRequest.getSubscription()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -736,7 +738,7 @@ public void deleteSubscriptionExceptionTest2() throws Exception { try { String subscription = "subscription341203229"; client.deleteSubscription(subscription); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -754,13 +756,13 @@ public void modifyAckDeadlineTest() throws Exception { client.modifyAckDeadline(subscription, ackIds, ackDeadlineSeconds); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); ModifyAckDeadlineRequest actualRequest = ((ModifyAckDeadlineRequest) actualRequests.get(0)); - Assert.assertEquals(subscription.toString(), actualRequest.getSubscription()); - Assert.assertEquals(ackIds, actualRequest.getAckIdsList()); - Assert.assertEquals(ackDeadlineSeconds, actualRequest.getAckDeadlineSeconds()); - Assert.assertTrue( + assertEquals(subscription.toString(), actualRequest.getSubscription()); + assertEquals(ackIds, actualRequest.getAckIdsList()); + assertEquals(ackDeadlineSeconds, actualRequest.getAckDeadlineSeconds()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -776,7 +778,7 @@ public void modifyAckDeadlineExceptionTest() throws Exception { List ackIds = new ArrayList<>(); int ackDeadlineSeconds = 2135351438; client.modifyAckDeadline(subscription, ackIds, ackDeadlineSeconds); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -794,13 +796,13 @@ public void modifyAckDeadlineTest2() throws Exception { client.modifyAckDeadline(subscription, ackIds, ackDeadlineSeconds); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); ModifyAckDeadlineRequest actualRequest = ((ModifyAckDeadlineRequest) actualRequests.get(0)); - Assert.assertEquals(subscription, actualRequest.getSubscription()); - Assert.assertEquals(ackIds, actualRequest.getAckIdsList()); - Assert.assertEquals(ackDeadlineSeconds, actualRequest.getAckDeadlineSeconds()); - Assert.assertTrue( + assertEquals(subscription, actualRequest.getSubscription()); + assertEquals(ackIds, actualRequest.getAckIdsList()); + assertEquals(ackDeadlineSeconds, actualRequest.getAckDeadlineSeconds()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -816,7 +818,7 @@ public void modifyAckDeadlineExceptionTest2() throws Exception { List ackIds = new ArrayList<>(); int ackDeadlineSeconds = 2135351438; client.modifyAckDeadline(subscription, ackIds, ackDeadlineSeconds); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -833,12 +835,12 @@ public void acknowledgeTest() throws Exception { client.acknowledge(subscription, ackIds); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); AcknowledgeRequest actualRequest = ((AcknowledgeRequest) actualRequests.get(0)); - Assert.assertEquals(subscription.toString(), actualRequest.getSubscription()); - Assert.assertEquals(ackIds, actualRequest.getAckIdsList()); - Assert.assertTrue( + assertEquals(subscription.toString(), actualRequest.getSubscription()); + assertEquals(ackIds, actualRequest.getAckIdsList()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -853,7 +855,7 @@ public void acknowledgeExceptionTest() throws Exception { SubscriptionName subscription = SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]"); List ackIds = new ArrayList<>(); client.acknowledge(subscription, ackIds); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -870,12 +872,12 @@ public void acknowledgeTest2() throws Exception { client.acknowledge(subscription, ackIds); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); AcknowledgeRequest actualRequest = ((AcknowledgeRequest) actualRequests.get(0)); - Assert.assertEquals(subscription, actualRequest.getSubscription()); - Assert.assertEquals(ackIds, actualRequest.getAckIdsList()); - Assert.assertTrue( + assertEquals(subscription, actualRequest.getSubscription()); + assertEquals(ackIds, actualRequest.getAckIdsList()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -890,7 +892,7 @@ public void acknowledgeExceptionTest2() throws Exception { String subscription = "subscription341203229"; List ackIds = new ArrayList<>(); client.acknowledge(subscription, ackIds); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -906,15 +908,15 @@ public void pullTest() throws Exception { int maxMessages = 496131527; PullResponse actualResponse = client.pull(subscription, maxMessages); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); PullRequest actualRequest = ((PullRequest) actualRequests.get(0)); - Assert.assertEquals(subscription.toString(), actualRequest.getSubscription()); - Assert.assertEquals(maxMessages, actualRequest.getMaxMessages()); - Assert.assertTrue( + assertEquals(subscription.toString(), actualRequest.getSubscription()); + assertEquals(maxMessages, actualRequest.getMaxMessages()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -929,7 +931,7 @@ public void pullExceptionTest() throws Exception { SubscriptionName subscription = SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]"); int maxMessages = 496131527; client.pull(subscription, maxMessages); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -945,15 +947,15 @@ public void pullTest2() throws Exception { int maxMessages = 496131527; PullResponse actualResponse = client.pull(subscription, maxMessages); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); PullRequest actualRequest = ((PullRequest) actualRequests.get(0)); - Assert.assertEquals(subscription, actualRequest.getSubscription()); - Assert.assertEquals(maxMessages, actualRequest.getMaxMessages()); - Assert.assertTrue( + assertEquals(subscription, actualRequest.getSubscription()); + assertEquals(maxMessages, actualRequest.getMaxMessages()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -968,7 +970,7 @@ public void pullExceptionTest2() throws Exception { String subscription = "subscription341203229"; int maxMessages = 496131527; client.pull(subscription, maxMessages); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -985,16 +987,16 @@ public void pullTest3() throws Exception { int maxMessages = 496131527; PullResponse actualResponse = client.pull(subscription, returnImmediately, maxMessages); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); PullRequest actualRequest = ((PullRequest) actualRequests.get(0)); - Assert.assertEquals(subscription.toString(), actualRequest.getSubscription()); - Assert.assertEquals(returnImmediately, actualRequest.getReturnImmediately()); - Assert.assertEquals(maxMessages, actualRequest.getMaxMessages()); - Assert.assertTrue( + assertEquals(subscription.toString(), actualRequest.getSubscription()); + assertEquals(returnImmediately, actualRequest.getReturnImmediately()); + assertEquals(maxMessages, actualRequest.getMaxMessages()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -1010,7 +1012,7 @@ public void pullExceptionTest3() throws Exception { boolean returnImmediately = true; int maxMessages = 496131527; client.pull(subscription, returnImmediately, maxMessages); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1027,16 +1029,16 @@ public void pullTest4() throws Exception { int maxMessages = 496131527; PullResponse actualResponse = client.pull(subscription, returnImmediately, maxMessages); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); PullRequest actualRequest = ((PullRequest) actualRequests.get(0)); - Assert.assertEquals(subscription, actualRequest.getSubscription()); - Assert.assertEquals(returnImmediately, actualRequest.getReturnImmediately()); - Assert.assertEquals(maxMessages, actualRequest.getMaxMessages()); - Assert.assertTrue( + assertEquals(subscription, actualRequest.getSubscription()); + assertEquals(returnImmediately, actualRequest.getReturnImmediately()); + assertEquals(maxMessages, actualRequest.getMaxMessages()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -1052,7 +1054,7 @@ public void pullExceptionTest4() throws Exception { boolean returnImmediately = true; int maxMessages = 496131527; client.pull(subscription, returnImmediately, maxMessages); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1095,8 +1097,8 @@ public void streamingPullTest() throws Exception { requestObserver.onCompleted(); List actualResponses = responseObserver.future().get(); - Assert.assertEquals(1, actualResponses.size()); - Assert.assertEquals(expectedResponse, actualResponses.get(0)); + assertEquals(1, actualResponses.size()); + assertEquals(expectedResponse, actualResponses.get(0)); } @Test @@ -1127,11 +1129,11 @@ public void streamingPullExceptionTest() throws Exception { try { List actualResponses = responseObserver.future().get(); - Assert.fail("No exception thrown"); + fail("No exception thrown"); } catch (ExecutionException e) { - Assert.assertTrue(e.getCause() instanceof InvalidArgumentException); + assertTrue(e.getCause() instanceof InvalidArgumentException); InvalidArgumentException apiException = ((InvalidArgumentException) e.getCause()); - Assert.assertEquals(StatusCode.Code.INVALID_ARGUMENT, apiException.getStatusCode().getCode()); + assertEquals(StatusCode.Code.INVALID_ARGUMENT, apiException.getStatusCode().getCode()); } } @@ -1146,12 +1148,12 @@ public void modifyPushConfigTest() throws Exception { client.modifyPushConfig(subscription, pushConfig); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); ModifyPushConfigRequest actualRequest = ((ModifyPushConfigRequest) actualRequests.get(0)); - Assert.assertEquals(subscription.toString(), actualRequest.getSubscription()); - Assert.assertEquals(pushConfig, actualRequest.getPushConfig()); - Assert.assertTrue( + assertEquals(subscription.toString(), actualRequest.getSubscription()); + assertEquals(pushConfig, actualRequest.getPushConfig()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -1166,7 +1168,7 @@ public void modifyPushConfigExceptionTest() throws Exception { SubscriptionName subscription = SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]"); PushConfig pushConfig = PushConfig.newBuilder().build(); client.modifyPushConfig(subscription, pushConfig); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1183,12 +1185,12 @@ public void modifyPushConfigTest2() throws Exception { client.modifyPushConfig(subscription, pushConfig); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); ModifyPushConfigRequest actualRequest = ((ModifyPushConfigRequest) actualRequests.get(0)); - Assert.assertEquals(subscription, actualRequest.getSubscription()); - Assert.assertEquals(pushConfig, actualRequest.getPushConfig()); - Assert.assertTrue( + assertEquals(subscription, actualRequest.getSubscription()); + assertEquals(pushConfig, actualRequest.getPushConfig()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -1203,7 +1205,7 @@ public void modifyPushConfigExceptionTest2() throws Exception { String subscription = "subscription341203229"; PushConfig pushConfig = PushConfig.newBuilder().build(); client.modifyPushConfig(subscription, pushConfig); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1223,14 +1225,14 @@ public void getSnapshotTest() throws Exception { SnapshotName snapshot = SnapshotName.of("[PROJECT]", "[SNAPSHOT]"); Snapshot actualResponse = client.getSnapshot(snapshot); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); GetSnapshotRequest actualRequest = ((GetSnapshotRequest) actualRequests.get(0)); - Assert.assertEquals(snapshot.toString(), actualRequest.getSnapshot()); - Assert.assertTrue( + assertEquals(snapshot.toString(), actualRequest.getSnapshot()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -1244,7 +1246,7 @@ public void getSnapshotExceptionTest() throws Exception { try { SnapshotName snapshot = SnapshotName.of("[PROJECT]", "[SNAPSHOT]"); client.getSnapshot(snapshot); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1264,14 +1266,14 @@ public void getSnapshotTest2() throws Exception { String snapshot = "snapshot284874180"; Snapshot actualResponse = client.getSnapshot(snapshot); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); GetSnapshotRequest actualRequest = ((GetSnapshotRequest) actualRequests.get(0)); - Assert.assertEquals(snapshot, actualRequest.getSnapshot()); - Assert.assertTrue( + assertEquals(snapshot, actualRequest.getSnapshot()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -1285,7 +1287,7 @@ public void getSnapshotExceptionTest2() throws Exception { try { String snapshot = "snapshot284874180"; client.getSnapshot(snapshot); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1307,15 +1309,15 @@ public void listSnapshotsTest() throws Exception { List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - Assert.assertEquals(1, resources.size()); - Assert.assertEquals(expectedResponse.getSnapshotsList().get(0), resources.get(0)); + assertEquals(1, resources.size()); + assertEquals(expectedResponse.getSnapshotsList().get(0), resources.get(0)); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); ListSnapshotsRequest actualRequest = ((ListSnapshotsRequest) actualRequests.get(0)); - Assert.assertEquals(project.toString(), actualRequest.getProject()); - Assert.assertTrue( + assertEquals(project.toString(), actualRequest.getProject()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -1329,7 +1331,7 @@ public void listSnapshotsExceptionTest() throws Exception { try { ProjectName project = ProjectName.of("[PROJECT]"); client.listSnapshots(project); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1351,15 +1353,15 @@ public void listSnapshotsTest2() throws Exception { List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - Assert.assertEquals(1, resources.size()); - Assert.assertEquals(expectedResponse.getSnapshotsList().get(0), resources.get(0)); + assertEquals(1, resources.size()); + assertEquals(expectedResponse.getSnapshotsList().get(0), resources.get(0)); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); ListSnapshotsRequest actualRequest = ((ListSnapshotsRequest) actualRequests.get(0)); - Assert.assertEquals(project, actualRequest.getProject()); - Assert.assertTrue( + assertEquals(project, actualRequest.getProject()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -1373,7 +1375,7 @@ public void listSnapshotsExceptionTest2() throws Exception { try { String project = "project-309310695"; client.listSnapshots(project); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1394,15 +1396,15 @@ public void createSnapshotTest() throws Exception { SubscriptionName subscription = SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]"); Snapshot actualResponse = client.createSnapshot(name, subscription); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); CreateSnapshotRequest actualRequest = ((CreateSnapshotRequest) actualRequests.get(0)); - Assert.assertEquals(name.toString(), actualRequest.getName()); - Assert.assertEquals(subscription.toString(), actualRequest.getSubscription()); - Assert.assertTrue( + assertEquals(name.toString(), actualRequest.getName()); + assertEquals(subscription.toString(), actualRequest.getSubscription()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -1417,7 +1419,7 @@ public void createSnapshotExceptionTest() throws Exception { SnapshotName name = SnapshotName.of("[PROJECT]", "[SNAPSHOT]"); SubscriptionName subscription = SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]"); client.createSnapshot(name, subscription); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1438,15 +1440,15 @@ public void createSnapshotTest2() throws Exception { String subscription = "subscription341203229"; Snapshot actualResponse = client.createSnapshot(name, subscription); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); CreateSnapshotRequest actualRequest = ((CreateSnapshotRequest) actualRequests.get(0)); - Assert.assertEquals(name.toString(), actualRequest.getName()); - Assert.assertEquals(subscription, actualRequest.getSubscription()); - Assert.assertTrue( + assertEquals(name.toString(), actualRequest.getName()); + assertEquals(subscription, actualRequest.getSubscription()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -1461,7 +1463,7 @@ public void createSnapshotExceptionTest2() throws Exception { SnapshotName name = SnapshotName.of("[PROJECT]", "[SNAPSHOT]"); String subscription = "subscription341203229"; client.createSnapshot(name, subscription); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1482,15 +1484,15 @@ public void createSnapshotTest3() throws Exception { SubscriptionName subscription = SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]"); Snapshot actualResponse = client.createSnapshot(name, subscription); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); CreateSnapshotRequest actualRequest = ((CreateSnapshotRequest) actualRequests.get(0)); - Assert.assertEquals(name, actualRequest.getName()); - Assert.assertEquals(subscription.toString(), actualRequest.getSubscription()); - Assert.assertTrue( + assertEquals(name, actualRequest.getName()); + assertEquals(subscription.toString(), actualRequest.getSubscription()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -1505,7 +1507,7 @@ public void createSnapshotExceptionTest3() throws Exception { String name = "name3373707"; SubscriptionName subscription = SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]"); client.createSnapshot(name, subscription); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1526,15 +1528,15 @@ public void createSnapshotTest4() throws Exception { String subscription = "subscription341203229"; Snapshot actualResponse = client.createSnapshot(name, subscription); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); CreateSnapshotRequest actualRequest = ((CreateSnapshotRequest) actualRequests.get(0)); - Assert.assertEquals(name, actualRequest.getName()); - Assert.assertEquals(subscription, actualRequest.getSubscription()); - Assert.assertTrue( + assertEquals(name, actualRequest.getName()); + assertEquals(subscription, actualRequest.getSubscription()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -1549,7 +1551,7 @@ public void createSnapshotExceptionTest4() throws Exception { String name = "name3373707"; String subscription = "subscription341203229"; client.createSnapshot(name, subscription); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1570,15 +1572,15 @@ public void updateSnapshotTest() throws Exception { FieldMask updateMask = FieldMask.newBuilder().build(); Snapshot actualResponse = client.updateSnapshot(snapshot, updateMask); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); UpdateSnapshotRequest actualRequest = ((UpdateSnapshotRequest) actualRequests.get(0)); - Assert.assertEquals(snapshot, actualRequest.getSnapshot()); - Assert.assertEquals(updateMask, actualRequest.getUpdateMask()); - Assert.assertTrue( + assertEquals(snapshot, actualRequest.getSnapshot()); + assertEquals(updateMask, actualRequest.getUpdateMask()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -1593,7 +1595,7 @@ public void updateSnapshotExceptionTest() throws Exception { Snapshot snapshot = Snapshot.newBuilder().build(); FieldMask updateMask = FieldMask.newBuilder().build(); client.updateSnapshot(snapshot, updateMask); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1609,11 +1611,11 @@ public void deleteSnapshotTest() throws Exception { client.deleteSnapshot(snapshot); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); DeleteSnapshotRequest actualRequest = ((DeleteSnapshotRequest) actualRequests.get(0)); - Assert.assertEquals(snapshot.toString(), actualRequest.getSnapshot()); - Assert.assertTrue( + assertEquals(snapshot.toString(), actualRequest.getSnapshot()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -1627,7 +1629,7 @@ public void deleteSnapshotExceptionTest() throws Exception { try { SnapshotName snapshot = SnapshotName.of("[PROJECT]", "[SNAPSHOT]"); client.deleteSnapshot(snapshot); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1643,11 +1645,11 @@ public void deleteSnapshotTest2() throws Exception { client.deleteSnapshot(snapshot); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); DeleteSnapshotRequest actualRequest = ((DeleteSnapshotRequest) actualRequests.get(0)); - Assert.assertEquals(snapshot, actualRequest.getSnapshot()); - Assert.assertTrue( + assertEquals(snapshot, actualRequest.getSnapshot()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -1661,7 +1663,7 @@ public void deleteSnapshotExceptionTest2() throws Exception { try { String snapshot = "snapshot284874180"; client.deleteSnapshot(snapshot); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1678,16 +1680,16 @@ public void seekTest() throws Exception { .build(); SeekResponse actualResponse = client.seek(request); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockSubscriber.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); SeekRequest actualRequest = ((SeekRequest) actualRequests.get(0)); - Assert.assertEquals(request.getSubscription(), actualRequest.getSubscription()); - Assert.assertEquals(request.getTime(), actualRequest.getTime()); - Assert.assertEquals(request.getSnapshot(), actualRequest.getSnapshot()); - Assert.assertTrue( + assertEquals(request.getSubscription(), actualRequest.getSubscription()); + assertEquals(request.getTime(), actualRequest.getTime()); + assertEquals(request.getSnapshot(), actualRequest.getSnapshot()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -1704,7 +1706,7 @@ public void seekExceptionTest() throws Exception { .setSubscription(SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]").toString()) .build(); client.seek(request); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1729,16 +1731,16 @@ public void setIamPolicyTest() throws Exception { .build(); Policy actualResponse = client.setIamPolicy(request); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockIAMPolicy.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); SetIamPolicyRequest actualRequest = ((SetIamPolicyRequest) actualRequests.get(0)); - Assert.assertEquals(request.getResource(), actualRequest.getResource()); - Assert.assertEquals(request.getPolicy(), actualRequest.getPolicy()); - Assert.assertEquals(request.getUpdateMask(), actualRequest.getUpdateMask()); - Assert.assertTrue( + assertEquals(request.getResource(), actualRequest.getResource()); + assertEquals(request.getPolicy(), actualRequest.getPolicy()); + assertEquals(request.getUpdateMask(), actualRequest.getUpdateMask()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -1757,7 +1759,7 @@ public void setIamPolicyExceptionTest() throws Exception { .setUpdateMask(FieldMask.newBuilder().build()) .build(); client.setIamPolicy(request); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1781,15 +1783,15 @@ public void getIamPolicyTest() throws Exception { .build(); Policy actualResponse = client.getIamPolicy(request); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockIAMPolicy.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); GetIamPolicyRequest actualRequest = ((GetIamPolicyRequest) actualRequests.get(0)); - Assert.assertEquals(request.getResource(), actualRequest.getResource()); - Assert.assertEquals(request.getOptions(), actualRequest.getOptions()); - Assert.assertTrue( + assertEquals(request.getResource(), actualRequest.getResource()); + assertEquals(request.getOptions(), actualRequest.getOptions()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -1807,7 +1809,7 @@ public void getIamPolicyExceptionTest() throws Exception { .setOptions(GetPolicyOptions.newBuilder().build()) .build(); client.getIamPolicy(request); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1826,15 +1828,15 @@ public void testIamPermissionsTest() throws Exception { .build(); TestIamPermissionsResponse actualResponse = client.testIamPermissions(request); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockIAMPolicy.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); TestIamPermissionsRequest actualRequest = ((TestIamPermissionsRequest) actualRequests.get(0)); - Assert.assertEquals(request.getResource(), actualRequest.getResource()); - Assert.assertEquals(request.getPermissionsList(), actualRequest.getPermissionsList()); - Assert.assertTrue( + assertEquals(request.getResource(), actualRequest.getResource()); + assertEquals(request.getPermissionsList(), actualRequest.getPermissionsList()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -1852,7 +1854,7 @@ public void testIamPermissionsExceptionTest() throws Exception { .addAllPermissions(new ArrayList()) .build(); client.testIamPermissions(request); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminClientHttpJsonTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminClientHttpJsonTest.java index 44488abc6..e3cf70224 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminClientHttpJsonTest.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminClientHttpJsonTest.java @@ -19,6 +19,9 @@ import static com.google.cloud.pubsub.v1.TopicAdminClient.ListTopicSnapshotsPagedResponse; import static com.google.cloud.pubsub.v1.TopicAdminClient.ListTopicSubscriptionsPagedResponse; import static com.google.cloud.pubsub.v1.TopicAdminClient.ListTopicsPagedResponse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import com.google.api.gax.core.NoCredentialsProvider; import com.google.api.gax.httpjson.GaxHttpJsonProperties; @@ -66,19 +69,18 @@ import java.util.HashMap; import java.util.List; import javax.annotation.Generated; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; @Generated("by gapic-generator-java") public class TopicAdminClientHttpJsonTest { private static MockHttpService mockService; private static TopicAdminClient client; - @BeforeClass + @BeforeAll public static void startStaticServer() throws IOException { mockService = new MockHttpService( @@ -94,15 +96,15 @@ public static void startStaticServer() throws IOException { client = TopicAdminClient.create(settings); } - @AfterClass + @AfterAll public static void stopServer() { client.close(); } - @Before + @BeforeEach public void setUp() {} - @After + @AfterEach public void tearDown() throws Exception { mockService.reset(); } @@ -129,10 +131,10 @@ public void createTopicTest() throws Exception { TopicName name = TopicName.ofProjectTopicName("[PROJECT]", "[TOPIC]"); Topic actualResponse = client.createTopic(name); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -140,7 +142,7 @@ public void createTopicTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -156,7 +158,7 @@ public void createTopicExceptionTest() throws Exception { try { TopicName name = TopicName.ofProjectTopicName("[PROJECT]", "[TOPIC]"); client.createTopic(name); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -184,10 +186,10 @@ public void createTopicTest2() throws Exception { String name = "projects/project-7550/topics/topic-7550"; Topic actualResponse = client.createTopic(name); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -195,7 +197,7 @@ public void createTopicTest2() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -211,7 +213,7 @@ public void createTopicExceptionTest2() throws Exception { try { String name = "projects/project-7550/topics/topic-7550"; client.createTopic(name); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -254,10 +256,10 @@ public void updateTopicTest() throws Exception { FieldMask updateMask = FieldMask.newBuilder().build(); Topic actualResponse = client.updateTopic(topic, updateMask); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -265,7 +267,7 @@ public void updateTopicTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -296,7 +298,7 @@ public void updateTopicExceptionTest() throws Exception { .build(); FieldMask updateMask = FieldMask.newBuilder().build(); client.updateTopic(topic, updateMask); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -312,10 +314,10 @@ public void publishTest() throws Exception { List messages = new ArrayList<>(); PublishResponse actualResponse = client.publish(topic, messages); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -323,7 +325,7 @@ public void publishTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -340,7 +342,7 @@ public void publishExceptionTest() throws Exception { TopicName topic = TopicName.ofProjectTopicName("[PROJECT]", "[TOPIC]"); List messages = new ArrayList<>(); client.publish(topic, messages); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -356,10 +358,10 @@ public void publishTest2() throws Exception { List messages = new ArrayList<>(); PublishResponse actualResponse = client.publish(topic, messages); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -367,7 +369,7 @@ public void publishTest2() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -384,7 +386,7 @@ public void publishExceptionTest2() throws Exception { String topic = "projects/project-2486/topics/topic-2486"; List messages = new ArrayList<>(); client.publish(topic, messages); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -412,10 +414,10 @@ public void getTopicTest() throws Exception { TopicName topic = TopicName.ofProjectTopicName("[PROJECT]", "[TOPIC]"); Topic actualResponse = client.getTopic(topic); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -423,7 +425,7 @@ public void getTopicTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -439,7 +441,7 @@ public void getTopicExceptionTest() throws Exception { try { TopicName topic = TopicName.ofProjectTopicName("[PROJECT]", "[TOPIC]"); client.getTopic(topic); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -467,10 +469,10 @@ public void getTopicTest2() throws Exception { String topic = "projects/project-2486/topics/topic-2486"; Topic actualResponse = client.getTopic(topic); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -478,7 +480,7 @@ public void getTopicTest2() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -494,7 +496,7 @@ public void getTopicExceptionTest2() throws Exception { try { String topic = "projects/project-2486/topics/topic-2486"; client.getTopic(topic); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -516,11 +518,11 @@ public void listTopicsTest() throws Exception { List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - Assert.assertEquals(1, resources.size()); - Assert.assertEquals(expectedResponse.getTopicsList().get(0), resources.get(0)); + assertEquals(1, resources.size()); + assertEquals(expectedResponse.getTopicsList().get(0), resources.get(0)); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -528,7 +530,7 @@ public void listTopicsTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -544,7 +546,7 @@ public void listTopicsExceptionTest() throws Exception { try { ProjectName project = ProjectName.of("[PROJECT]"); client.listTopics(project); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -566,11 +568,11 @@ public void listTopicsTest2() throws Exception { List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - Assert.assertEquals(1, resources.size()); - Assert.assertEquals(expectedResponse.getTopicsList().get(0), resources.get(0)); + assertEquals(1, resources.size()); + assertEquals(expectedResponse.getTopicsList().get(0), resources.get(0)); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -578,7 +580,7 @@ public void listTopicsTest2() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -594,7 +596,7 @@ public void listTopicsExceptionTest2() throws Exception { try { String project = "projects/project-7934"; client.listTopics(project); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -616,11 +618,11 @@ public void listTopicSubscriptionsTest() throws Exception { List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - Assert.assertEquals(1, resources.size()); - Assert.assertEquals(expectedResponse.getSubscriptionsList().get(0), resources.get(0)); + assertEquals(1, resources.size()); + assertEquals(expectedResponse.getSubscriptionsList().get(0), resources.get(0)); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -628,7 +630,7 @@ public void listTopicSubscriptionsTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -644,7 +646,7 @@ public void listTopicSubscriptionsExceptionTest() throws Exception { try { TopicName topic = TopicName.ofProjectTopicName("[PROJECT]", "[TOPIC]"); client.listTopicSubscriptions(topic); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -666,11 +668,11 @@ public void listTopicSubscriptionsTest2() throws Exception { List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - Assert.assertEquals(1, resources.size()); - Assert.assertEquals(expectedResponse.getSubscriptionsList().get(0), resources.get(0)); + assertEquals(1, resources.size()); + assertEquals(expectedResponse.getSubscriptionsList().get(0), resources.get(0)); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -678,7 +680,7 @@ public void listTopicSubscriptionsTest2() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -694,7 +696,7 @@ public void listTopicSubscriptionsExceptionTest2() throws Exception { try { String topic = "projects/project-2486/topics/topic-2486"; client.listTopicSubscriptions(topic); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -716,11 +718,11 @@ public void listTopicSnapshotsTest() throws Exception { List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - Assert.assertEquals(1, resources.size()); - Assert.assertEquals(expectedResponse.getSnapshotsList().get(0), resources.get(0)); + assertEquals(1, resources.size()); + assertEquals(expectedResponse.getSnapshotsList().get(0), resources.get(0)); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -728,7 +730,7 @@ public void listTopicSnapshotsTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -744,7 +746,7 @@ public void listTopicSnapshotsExceptionTest() throws Exception { try { TopicName topic = TopicName.ofProjectTopicName("[PROJECT]", "[TOPIC]"); client.listTopicSnapshots(topic); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -766,11 +768,11 @@ public void listTopicSnapshotsTest2() throws Exception { List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - Assert.assertEquals(1, resources.size()); - Assert.assertEquals(expectedResponse.getSnapshotsList().get(0), resources.get(0)); + assertEquals(1, resources.size()); + assertEquals(expectedResponse.getSnapshotsList().get(0), resources.get(0)); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -778,7 +780,7 @@ public void listTopicSnapshotsTest2() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -794,7 +796,7 @@ public void listTopicSnapshotsExceptionTest2() throws Exception { try { String topic = "projects/project-2486/topics/topic-2486"; client.listTopicSnapshots(topic); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -810,7 +812,7 @@ public void deleteTopicTest() throws Exception { client.deleteTopic(topic); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -818,7 +820,7 @@ public void deleteTopicTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -834,7 +836,7 @@ public void deleteTopicExceptionTest() throws Exception { try { TopicName topic = TopicName.ofProjectTopicName("[PROJECT]", "[TOPIC]"); client.deleteTopic(topic); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -850,7 +852,7 @@ public void deleteTopicTest2() throws Exception { client.deleteTopic(topic); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -858,7 +860,7 @@ public void deleteTopicTest2() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -874,7 +876,7 @@ public void deleteTopicExceptionTest2() throws Exception { try { String topic = "projects/project-2486/topics/topic-2486"; client.deleteTopic(topic); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -891,10 +893,10 @@ public void detachSubscriptionTest() throws Exception { .build(); DetachSubscriptionResponse actualResponse = client.detachSubscription(request); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -902,7 +904,7 @@ public void detachSubscriptionTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -921,7 +923,7 @@ public void detachSubscriptionExceptionTest() throws Exception { .setSubscription(SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]").toString()) .build(); client.detachSubscription(request); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -946,10 +948,10 @@ public void setIamPolicyTest() throws Exception { .build(); Policy actualResponse = client.setIamPolicy(request); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -957,7 +959,7 @@ public void setIamPolicyTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -978,7 +980,7 @@ public void setIamPolicyExceptionTest() throws Exception { .setUpdateMask(FieldMask.newBuilder().build()) .build(); client.setIamPolicy(request); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1002,10 +1004,10 @@ public void getIamPolicyTest() throws Exception { .build(); Policy actualResponse = client.getIamPolicy(request); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -1013,7 +1015,7 @@ public void getIamPolicyTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -1033,7 +1035,7 @@ public void getIamPolicyExceptionTest() throws Exception { .setOptions(GetPolicyOptions.newBuilder().build()) .build(); client.getIamPolicy(request); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -1052,10 +1054,10 @@ public void testIamPermissionsTest() throws Exception { .build(); TestIamPermissionsResponse actualResponse = client.testIamPermissions(request); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockService.getRequestPaths(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); String apiClientHeaderKey = mockService @@ -1063,7 +1065,7 @@ public void testIamPermissionsTest() throws Exception { .get(ApiClientHeaderProvider.getDefaultApiClientHeaderKey()) .iterator() .next(); - Assert.assertTrue( + assertTrue( GaxHttpJsonProperties.getDefaultApiClientHeaderPattern() .matcher(apiClientHeaderKey) .matches()); @@ -1083,7 +1085,7 @@ public void testIamPermissionsExceptionTest() throws Exception { .addAllPermissions(new ArrayList()) .build(); client.testIamPermissions(request); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminClientTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminClientTest.java index 2ad693de3..bed1c0a51 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminClientTest.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminClientTest.java @@ -19,6 +19,9 @@ import static com.google.cloud.pubsub.v1.TopicAdminClient.ListTopicSnapshotsPagedResponse; import static com.google.cloud.pubsub.v1.TopicAdminClient.ListTopicSubscriptionsPagedResponse; import static com.google.cloud.pubsub.v1.TopicAdminClient.ListTopicsPagedResponse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import com.google.api.gax.core.NoCredentialsProvider; import com.google.api.gax.grpc.GaxGrpcProperties; @@ -73,12 +76,11 @@ import java.util.List; import java.util.UUID; import javax.annotation.Generated; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; @Generated("by gapic-generator-java") public class TopicAdminClientTest { @@ -88,7 +90,7 @@ public class TopicAdminClientTest { private LocalChannelProvider channelProvider; private TopicAdminClient client; - @BeforeClass + @BeforeAll public static void startStaticServer() { mockPublisher = new MockPublisher(); mockIAMPolicy = new MockIAMPolicy(); @@ -99,12 +101,12 @@ public static void startStaticServer() { mockServiceHelper.start(); } - @AfterClass + @AfterAll public static void stopServer() { mockServiceHelper.stop(); } - @Before + @BeforeEach public void setUp() throws IOException { mockServiceHelper.reset(); channelProvider = mockServiceHelper.createChannelProvider(); @@ -116,7 +118,7 @@ public void setUp() throws IOException { client = TopicAdminClient.create(settings); } - @After + @AfterEach public void tearDown() throws Exception { client.close(); } @@ -143,14 +145,14 @@ public void createTopicTest() throws Exception { TopicName name = TopicName.ofProjectTopicName("[PROJECT]", "[TOPIC]"); Topic actualResponse = client.createTopic(name); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockPublisher.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); Topic actualRequest = ((Topic) actualRequests.get(0)); - Assert.assertEquals(name.toString(), actualRequest.getName()); - Assert.assertTrue( + assertEquals(name.toString(), actualRequest.getName()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -164,7 +166,7 @@ public void createTopicExceptionTest() throws Exception { try { TopicName name = TopicName.ofProjectTopicName("[PROJECT]", "[TOPIC]"); client.createTopic(name); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -192,14 +194,14 @@ public void createTopicTest2() throws Exception { String name = "name3373707"; Topic actualResponse = client.createTopic(name); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockPublisher.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); Topic actualRequest = ((Topic) actualRequests.get(0)); - Assert.assertEquals(name, actualRequest.getName()); - Assert.assertTrue( + assertEquals(name, actualRequest.getName()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -213,7 +215,7 @@ public void createTopicExceptionTest2() throws Exception { try { String name = "name3373707"; client.createTopic(name); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -242,15 +244,15 @@ public void updateTopicTest() throws Exception { FieldMask updateMask = FieldMask.newBuilder().build(); Topic actualResponse = client.updateTopic(topic, updateMask); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockPublisher.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); UpdateTopicRequest actualRequest = ((UpdateTopicRequest) actualRequests.get(0)); - Assert.assertEquals(topic, actualRequest.getTopic()); - Assert.assertEquals(updateMask, actualRequest.getUpdateMask()); - Assert.assertTrue( + assertEquals(topic, actualRequest.getTopic()); + assertEquals(updateMask, actualRequest.getUpdateMask()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -265,7 +267,7 @@ public void updateTopicExceptionTest() throws Exception { Topic topic = Topic.newBuilder().build(); FieldMask updateMask = FieldMask.newBuilder().build(); client.updateTopic(topic, updateMask); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -281,15 +283,15 @@ public void publishTest() throws Exception { List messages = new ArrayList<>(); PublishResponse actualResponse = client.publish(topic, messages); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockPublisher.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); PublishRequest actualRequest = ((PublishRequest) actualRequests.get(0)); - Assert.assertEquals(topic.toString(), actualRequest.getTopic()); - Assert.assertEquals(messages, actualRequest.getMessagesList()); - Assert.assertTrue( + assertEquals(topic.toString(), actualRequest.getTopic()); + assertEquals(messages, actualRequest.getMessagesList()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -304,7 +306,7 @@ public void publishExceptionTest() throws Exception { TopicName topic = TopicName.ofProjectTopicName("[PROJECT]", "[TOPIC]"); List messages = new ArrayList<>(); client.publish(topic, messages); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -320,15 +322,15 @@ public void publishTest2() throws Exception { List messages = new ArrayList<>(); PublishResponse actualResponse = client.publish(topic, messages); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockPublisher.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); PublishRequest actualRequest = ((PublishRequest) actualRequests.get(0)); - Assert.assertEquals(topic, actualRequest.getTopic()); - Assert.assertEquals(messages, actualRequest.getMessagesList()); - Assert.assertTrue( + assertEquals(topic, actualRequest.getTopic()); + assertEquals(messages, actualRequest.getMessagesList()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -343,7 +345,7 @@ public void publishExceptionTest2() throws Exception { String topic = "topic110546223"; List messages = new ArrayList<>(); client.publish(topic, messages); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -371,14 +373,14 @@ public void getTopicTest() throws Exception { TopicName topic = TopicName.ofProjectTopicName("[PROJECT]", "[TOPIC]"); Topic actualResponse = client.getTopic(topic); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockPublisher.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); GetTopicRequest actualRequest = ((GetTopicRequest) actualRequests.get(0)); - Assert.assertEquals(topic.toString(), actualRequest.getTopic()); - Assert.assertTrue( + assertEquals(topic.toString(), actualRequest.getTopic()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -392,7 +394,7 @@ public void getTopicExceptionTest() throws Exception { try { TopicName topic = TopicName.ofProjectTopicName("[PROJECT]", "[TOPIC]"); client.getTopic(topic); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -420,14 +422,14 @@ public void getTopicTest2() throws Exception { String topic = "topic110546223"; Topic actualResponse = client.getTopic(topic); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockPublisher.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); GetTopicRequest actualRequest = ((GetTopicRequest) actualRequests.get(0)); - Assert.assertEquals(topic, actualRequest.getTopic()); - Assert.assertTrue( + assertEquals(topic, actualRequest.getTopic()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -441,7 +443,7 @@ public void getTopicExceptionTest2() throws Exception { try { String topic = "topic110546223"; client.getTopic(topic); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -463,15 +465,15 @@ public void listTopicsTest() throws Exception { List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - Assert.assertEquals(1, resources.size()); - Assert.assertEquals(expectedResponse.getTopicsList().get(0), resources.get(0)); + assertEquals(1, resources.size()); + assertEquals(expectedResponse.getTopicsList().get(0), resources.get(0)); List actualRequests = mockPublisher.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); ListTopicsRequest actualRequest = ((ListTopicsRequest) actualRequests.get(0)); - Assert.assertEquals(project.toString(), actualRequest.getProject()); - Assert.assertTrue( + assertEquals(project.toString(), actualRequest.getProject()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -485,7 +487,7 @@ public void listTopicsExceptionTest() throws Exception { try { ProjectName project = ProjectName.of("[PROJECT]"); client.listTopics(project); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -507,15 +509,15 @@ public void listTopicsTest2() throws Exception { List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - Assert.assertEquals(1, resources.size()); - Assert.assertEquals(expectedResponse.getTopicsList().get(0), resources.get(0)); + assertEquals(1, resources.size()); + assertEquals(expectedResponse.getTopicsList().get(0), resources.get(0)); List actualRequests = mockPublisher.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); ListTopicsRequest actualRequest = ((ListTopicsRequest) actualRequests.get(0)); - Assert.assertEquals(project, actualRequest.getProject()); - Assert.assertTrue( + assertEquals(project, actualRequest.getProject()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -529,7 +531,7 @@ public void listTopicsExceptionTest2() throws Exception { try { String project = "project-309310695"; client.listTopics(project); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -551,16 +553,16 @@ public void listTopicSubscriptionsTest() throws Exception { List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - Assert.assertEquals(1, resources.size()); - Assert.assertEquals(expectedResponse.getSubscriptionsList().get(0), resources.get(0)); + assertEquals(1, resources.size()); + assertEquals(expectedResponse.getSubscriptionsList().get(0), resources.get(0)); List actualRequests = mockPublisher.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); ListTopicSubscriptionsRequest actualRequest = ((ListTopicSubscriptionsRequest) actualRequests.get(0)); - Assert.assertEquals(topic.toString(), actualRequest.getTopic()); - Assert.assertTrue( + assertEquals(topic.toString(), actualRequest.getTopic()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -574,7 +576,7 @@ public void listTopicSubscriptionsExceptionTest() throws Exception { try { TopicName topic = TopicName.ofProjectTopicName("[PROJECT]", "[TOPIC]"); client.listTopicSubscriptions(topic); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -596,16 +598,16 @@ public void listTopicSubscriptionsTest2() throws Exception { List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - Assert.assertEquals(1, resources.size()); - Assert.assertEquals(expectedResponse.getSubscriptionsList().get(0), resources.get(0)); + assertEquals(1, resources.size()); + assertEquals(expectedResponse.getSubscriptionsList().get(0), resources.get(0)); List actualRequests = mockPublisher.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); ListTopicSubscriptionsRequest actualRequest = ((ListTopicSubscriptionsRequest) actualRequests.get(0)); - Assert.assertEquals(topic, actualRequest.getTopic()); - Assert.assertTrue( + assertEquals(topic, actualRequest.getTopic()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -619,7 +621,7 @@ public void listTopicSubscriptionsExceptionTest2() throws Exception { try { String topic = "topic110546223"; client.listTopicSubscriptions(topic); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -641,15 +643,15 @@ public void listTopicSnapshotsTest() throws Exception { List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - Assert.assertEquals(1, resources.size()); - Assert.assertEquals(expectedResponse.getSnapshotsList().get(0), resources.get(0)); + assertEquals(1, resources.size()); + assertEquals(expectedResponse.getSnapshotsList().get(0), resources.get(0)); List actualRequests = mockPublisher.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); ListTopicSnapshotsRequest actualRequest = ((ListTopicSnapshotsRequest) actualRequests.get(0)); - Assert.assertEquals(topic.toString(), actualRequest.getTopic()); - Assert.assertTrue( + assertEquals(topic.toString(), actualRequest.getTopic()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -663,7 +665,7 @@ public void listTopicSnapshotsExceptionTest() throws Exception { try { TopicName topic = TopicName.ofProjectTopicName("[PROJECT]", "[TOPIC]"); client.listTopicSnapshots(topic); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -685,15 +687,15 @@ public void listTopicSnapshotsTest2() throws Exception { List resources = Lists.newArrayList(pagedListResponse.iterateAll()); - Assert.assertEquals(1, resources.size()); - Assert.assertEquals(expectedResponse.getSnapshotsList().get(0), resources.get(0)); + assertEquals(1, resources.size()); + assertEquals(expectedResponse.getSnapshotsList().get(0), resources.get(0)); List actualRequests = mockPublisher.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); ListTopicSnapshotsRequest actualRequest = ((ListTopicSnapshotsRequest) actualRequests.get(0)); - Assert.assertEquals(topic, actualRequest.getTopic()); - Assert.assertTrue( + assertEquals(topic, actualRequest.getTopic()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -707,7 +709,7 @@ public void listTopicSnapshotsExceptionTest2() throws Exception { try { String topic = "topic110546223"; client.listTopicSnapshots(topic); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -723,11 +725,11 @@ public void deleteTopicTest() throws Exception { client.deleteTopic(topic); List actualRequests = mockPublisher.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); DeleteTopicRequest actualRequest = ((DeleteTopicRequest) actualRequests.get(0)); - Assert.assertEquals(topic.toString(), actualRequest.getTopic()); - Assert.assertTrue( + assertEquals(topic.toString(), actualRequest.getTopic()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -741,7 +743,7 @@ public void deleteTopicExceptionTest() throws Exception { try { TopicName topic = TopicName.ofProjectTopicName("[PROJECT]", "[TOPIC]"); client.deleteTopic(topic); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -757,11 +759,11 @@ public void deleteTopicTest2() throws Exception { client.deleteTopic(topic); List actualRequests = mockPublisher.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); DeleteTopicRequest actualRequest = ((DeleteTopicRequest) actualRequests.get(0)); - Assert.assertEquals(topic, actualRequest.getTopic()); - Assert.assertTrue( + assertEquals(topic, actualRequest.getTopic()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -775,7 +777,7 @@ public void deleteTopicExceptionTest2() throws Exception { try { String topic = "topic110546223"; client.deleteTopic(topic); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -792,14 +794,14 @@ public void detachSubscriptionTest() throws Exception { .build(); DetachSubscriptionResponse actualResponse = client.detachSubscription(request); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockPublisher.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); DetachSubscriptionRequest actualRequest = ((DetachSubscriptionRequest) actualRequests.get(0)); - Assert.assertEquals(request.getSubscription(), actualRequest.getSubscription()); - Assert.assertTrue( + assertEquals(request.getSubscription(), actualRequest.getSubscription()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -816,7 +818,7 @@ public void detachSubscriptionExceptionTest() throws Exception { .setSubscription(SubscriptionName.of("[PROJECT]", "[SUBSCRIPTION]").toString()) .build(); client.detachSubscription(request); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -841,16 +843,16 @@ public void setIamPolicyTest() throws Exception { .build(); Policy actualResponse = client.setIamPolicy(request); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockIAMPolicy.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); SetIamPolicyRequest actualRequest = ((SetIamPolicyRequest) actualRequests.get(0)); - Assert.assertEquals(request.getResource(), actualRequest.getResource()); - Assert.assertEquals(request.getPolicy(), actualRequest.getPolicy()); - Assert.assertEquals(request.getUpdateMask(), actualRequest.getUpdateMask()); - Assert.assertTrue( + assertEquals(request.getResource(), actualRequest.getResource()); + assertEquals(request.getPolicy(), actualRequest.getPolicy()); + assertEquals(request.getUpdateMask(), actualRequest.getUpdateMask()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -869,7 +871,7 @@ public void setIamPolicyExceptionTest() throws Exception { .setUpdateMask(FieldMask.newBuilder().build()) .build(); client.setIamPolicy(request); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -893,15 +895,15 @@ public void getIamPolicyTest() throws Exception { .build(); Policy actualResponse = client.getIamPolicy(request); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockIAMPolicy.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); GetIamPolicyRequest actualRequest = ((GetIamPolicyRequest) actualRequests.get(0)); - Assert.assertEquals(request.getResource(), actualRequest.getResource()); - Assert.assertEquals(request.getOptions(), actualRequest.getOptions()); - Assert.assertTrue( + assertEquals(request.getResource(), actualRequest.getResource()); + assertEquals(request.getOptions(), actualRequest.getOptions()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -919,7 +921,7 @@ public void getIamPolicyExceptionTest() throws Exception { .setOptions(GetPolicyOptions.newBuilder().build()) .build(); client.getIamPolicy(request); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } @@ -938,15 +940,15 @@ public void testIamPermissionsTest() throws Exception { .build(); TestIamPermissionsResponse actualResponse = client.testIamPermissions(request); - Assert.assertEquals(expectedResponse, actualResponse); + assertEquals(expectedResponse, actualResponse); List actualRequests = mockIAMPolicy.getRequests(); - Assert.assertEquals(1, actualRequests.size()); + assertEquals(1, actualRequests.size()); TestIamPermissionsRequest actualRequest = ((TestIamPermissionsRequest) actualRequests.get(0)); - Assert.assertEquals(request.getResource(), actualRequest.getResource()); - Assert.assertEquals(request.getPermissionsList(), actualRequest.getPermissionsList()); - Assert.assertTrue( + assertEquals(request.getResource(), actualRequest.getResource()); + assertEquals(request.getPermissionsList(), actualRequest.getPermissionsList()); + assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), GaxGrpcProperties.getDefaultApiClientHeaderPattern())); @@ -964,7 +966,7 @@ public void testIamPermissionsExceptionTest() throws Exception { .addAllPermissions(new ArrayList()) .build(); client.testIamPermissions(request); - Assert.fail("No exception raised"); + fail("No exception raised"); } catch (InvalidArgumentException e) { // Expected exception. } diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminSmokeTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminSmokeTest.java index eb257958f..297177265 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminSmokeTest.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminSmokeTest.java @@ -21,7 +21,7 @@ import com.google.pubsub.v1.ProjectName; import java.util.logging.Level; import java.util.logging.Logger; -import org.junit.Test; +import org.junit.jupiter.api.Test; @javax.annotation.Generated("by GAPIC") public class TopicAdminSmokeTest { diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/WaiterTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/WaiterTest.java index aaa396690..f5a353127 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/WaiterTest.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/WaiterTest.java @@ -16,17 +16,14 @@ package com.google.cloud.pubsub.v1; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -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.assertTrue; import java.util.concurrent.TimeUnit; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; +import org.junit.jupiter.api.Test; /** Tests for {@link Waiter}. */ -@RunWith(JUnit4.class) public class WaiterTest { @Test diff --git a/google-cloud-pubsub/src/test/resources/META-INF/native-image/com.google.cloud/google-cloud-pubsub/native-image.properties b/google-cloud-pubsub/src/test/resources/META-INF/native-image/com.google.cloud/google-cloud-pubsub/native-image.properties deleted file mode 100644 index b77dd433a..000000000 --- a/google-cloud-pubsub/src/test/resources/META-INF/native-image/com.google.cloud/google-cloud-pubsub/native-image.properties +++ /dev/null @@ -1 +0,0 @@ -Args=--initialize-at-build-time=org.junit.runners.model.FrameworkField \ No newline at end of file diff --git a/pom.xml b/pom.xml index 321d61450..162df84d0 100644 --- a/pom.xml +++ b/pom.xml @@ -90,9 +90,15 @@ test - junit - junit - 4.13.2 + org.mockito + mockito-junit-jupiter + 5.21.0 + test + + + org.junit.jupiter + junit-jupiter + ${junit-vintage-engine.version} test