From 501cede2c2a23906aeff49edb549dbcb1c01f634 Mon Sep 17 00:00:00 2001 From: Elena Felder <41136058+elefeint@users.noreply.github.com> Date: Thu, 11 Feb 2021 14:59:11 -0500 Subject: [PATCH] remove public modifier in unit tests (#309) Sonar rule: "JUnit5 test classes and methods should have default package visibility" --- .../java/com/example/BookExampleAppIT.java | 4 +- .../r2dbc/SpannerColumnMetadataTest.java | 6 +-- .../SpannerConnectionConfigurationTest.java | 26 +++++------ .../SpannerConnectionFactoryMetadataTest.java | 4 +- .../SpannerConnectionFactoryProviderTest.java | 34 +++++++------- .../r2dbc/SpannerConnectionFactoryTest.java | 6 +-- .../r2dbc/SpannerConnectionMetadataTest.java | 6 +-- .../spanner/r2dbc/SpannerConnectionTest.java | 44 +++++++++---------- .../spanner/r2dbc/SpannerResultTest.java | 10 ++--- .../spanner/r2dbc/SpannerRowMetadataTest.java | 14 +++--- .../cloud/spanner/r2dbc/SpannerRowTest.java | 8 ++-- .../spanner/r2dbc/SpannerStatementTest.java | 20 ++++----- .../spanner/r2dbc/client/GrpcClientTest.java | 14 +++--- .../codecs/DefaultCodecsNegativeTest.java | 6 +-- .../r2dbc/codecs/DefaultCodecsTest.java | 2 +- .../r2dbc/it/ClientLibraryBasedIT.java | 40 ++++++++--------- .../cloud/spanner/r2dbc/it/SpannerDdlIT.java | 6 +-- .../cloud/spanner/r2dbc/it/SpannerIT.java | 24 +++++----- .../result/PartialResultRowExtractorTest.java | 12 ++--- .../statement/StatementBindingsTest.java | 6 +-- .../r2dbc/statement/StatementParserTest.java | 12 ++--- .../cloud/spanner/r2dbc/util/AssertTest.java | 6 +-- .../r2dbc/util/CollectionsBuilderTest.java | 4 +- .../util/ObservableReactiveUtilTest.java | 14 +++--- .../r2dbc/util/SpannerExceptionUtilTest.java | 10 ++--- ...ractSpannerClientLibraryStatementTest.java | 12 ++--- .../v2/ClientLibraryTypeBindersTest.java | 4 +- .../v2/DatabaseClientReactiveAdapterTest.java | 10 ++--- .../DatabaseClientTransactionManagerTest.java | 12 ++--- ...nerClientLibraryConnectionFactoryTest.java | 8 ++-- .../SpannerClientLibraryConnectionTest.java | 4 +- .../SpannerClientLibraryDmlStatementTest.java | 6 +-- .../SpannerClientLibraryRowMetadataTest.java | 16 +++---- .../v2/SpannerClientLibraryStatementTest.java | 8 ++-- .../spanner/r2dbc/v2/SpannerResultTest.java | 10 ++--- .../springdata/it/SpannerR2dbcDialectIT.java | 8 ++-- 36 files changed, 218 insertions(+), 218 deletions(-) diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc-samples/cloud-spanner-r2dbc-sample/src/test/java/com/example/BookExampleAppIT.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc-samples/cloud-spanner-r2dbc-sample/src/test/java/com/example/BookExampleAppIT.java index 2f106239d9..2556eb6c20 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc-samples/cloud-spanner-r2dbc-sample/src/test/java/com/example/BookExampleAppIT.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc-samples/cloud-spanner-r2dbc-sample/src/test/java/com/example/BookExampleAppIT.java @@ -28,7 +28,7 @@ /** * Tests the sample application. */ -public class BookExampleAppIT { +class BookExampleAppIT { private static final String TEST_INSTANCE = System.getProperty("spanner.instance", "reactivetest"); @@ -52,7 +52,7 @@ public static void checkToRun() { } @Test - public void testOutput() { + void testOutput() { BookExampleApp bookExampleApp = new BookExampleApp(TEST_INSTANCE, TEST_DATABASE, ServiceOptions .getDefaultProjectId()); diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerColumnMetadataTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerColumnMetadataTest.java index b05406a2eb..20363e51ef 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerColumnMetadataTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerColumnMetadataTest.java @@ -26,16 +26,16 @@ /** * Test for {@link SpannerColumnMetadata}. */ -public class SpannerColumnMetadataTest { +class SpannerColumnMetadataTest { @Test - public void testEmptyFieldName() { + void testEmptyFieldName() { SpannerColumnMetadata metadata = new SpannerColumnMetadata(Field.getDefaultInstance()); assertThat(metadata.getName()).isEmpty(); } @Test - public void testSpannerColumnCorrectMetadata() { + void testSpannerColumnCorrectMetadata() { Field rawColumnInfo = Field.newBuilder() .setName("firstColumn") diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerConnectionConfigurationTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerConnectionConfigurationTest.java index 37c15a367e..7417b586c1 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerConnectionConfigurationTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerConnectionConfigurationTest.java @@ -29,7 +29,7 @@ /** * Test for {@link SpannerConnectionConfiguration}. */ -public class SpannerConnectionConfigurationTest { +class SpannerConnectionConfigurationTest { GoogleCredentials mockCredentials = Mockito.mock(GoogleCredentials.class); @@ -45,7 +45,7 @@ public void setUpMockCredentials() { } @Test - public void missingInstanceNameTriggersException() { + void missingInstanceNameTriggersException() { assertThatThrownBy( () -> { new SpannerConnectionConfiguration.Builder() @@ -59,7 +59,7 @@ public void missingInstanceNameTriggersException() { } @Test - public void missingDatabaseNameTriggersException() { + void missingDatabaseNameTriggersException() { assertThatThrownBy( () -> { new SpannerConnectionConfiguration.Builder() @@ -73,7 +73,7 @@ public void missingDatabaseNameTriggersException() { } @Test - public void missingProjectIdTriggersException() { + void missingProjectIdTriggersException() { assertThatThrownBy( () -> { new SpannerConnectionConfiguration.Builder() @@ -87,7 +87,7 @@ public void missingProjectIdTriggersException() { } @Test - public void passingCustomGoogleCredentials() { + void passingCustomGoogleCredentials() { SpannerConnectionConfiguration configuration = this.configurationBuilder .setProjectId("project") @@ -99,7 +99,7 @@ public void passingCustomGoogleCredentials() { } @Test - public void nonNullConstructorParametersPassPreconditions() { + void nonNullConstructorParametersPassPreconditions() { SpannerConnectionConfiguration config = this.configurationBuilder .setProjectId("project1") .setInstanceName("an-instance") @@ -110,7 +110,7 @@ public void nonNullConstructorParametersPassPreconditions() { } @Test - public void partialResultSetFetchSize() { + void partialResultSetFetchSize() { SpannerConnectionConfiguration config = this.configurationBuilder .setPartialResultSetFetchSize(42) .setProjectId("project1") @@ -121,7 +121,7 @@ public void partialResultSetFetchSize() { } @Test - public void executorThreads() { + void executorThreads() { SpannerConnectionConfiguration config = this.configurationBuilder .setThreadPoolSize(42) .setProjectId("project1") @@ -132,7 +132,7 @@ public void executorThreads() { } @Test - public void executorThreadsNotSet() { + void executorThreadsNotSet() { SpannerConnectionConfiguration config = this.configurationBuilder .setProjectId("project1") .setInstanceName("an-instance") @@ -143,7 +143,7 @@ public void executorThreadsNotSet() { } @Test - public void ddlOperationWaitSettings() { + void ddlOperationWaitSettings() { SpannerConnectionConfiguration config = this.configurationBuilder .setProjectId("project1") .setInstanceName("an-instance") @@ -157,7 +157,7 @@ public void ddlOperationWaitSettings() { } @Test - public void databaseUrlMatchesPropertyConfiguration() { + void databaseUrlMatchesPropertyConfiguration() { SpannerConnectionConfiguration urlBased = this.configurationBuilder .setUrl("r2dbc:spanner://spanner.googleapis.com:443/" @@ -174,7 +174,7 @@ public void databaseUrlMatchesPropertyConfiguration() { } @Test - public void databaseUrlExtracting() { + void databaseUrlExtracting() { SpannerConnectionConfiguration config = this.configurationBuilder .setUrl("r2dbc:spanner://spanner.googleapis.com:443/" @@ -186,7 +186,7 @@ public void databaseUrlExtracting() { } @Test - public void invalidUrlFormats() { + void invalidUrlFormats() { assertThatThrownBy(() -> this.configurationBuilder .setUrl("r2dbc:spanner://spanner.googleapis.com:443/" diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerConnectionFactoryMetadataTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerConnectionFactoryMetadataTest.java index 2bfb04c14f..f515b0dcc9 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerConnectionFactoryMetadataTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerConnectionFactoryMetadataTest.java @@ -23,10 +23,10 @@ /** * Test for {@link SpannerConnectionFactoryMetadata}. */ -public class SpannerConnectionFactoryMetadataTest { +class SpannerConnectionFactoryMetadataTest { @Test - public void getNameReturnsCorrectValue() { + void getNameReturnsCorrectValue() { assertThat(SpannerConnectionFactoryMetadata.INSTANCE.getName()).isEqualTo("Cloud Spanner"); } diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerConnectionFactoryProviderTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerConnectionFactoryProviderTest.java index 21b60cfea5..57735ad13b 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerConnectionFactoryProviderTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerConnectionFactoryProviderTest.java @@ -61,7 +61,7 @@ /** * Unit test for {@link SpannerConnectionFactoryProvider}. */ -public class SpannerConnectionFactoryProviderTest { +class SpannerConnectionFactoryProviderTest { public static final ConnectionFactoryOptions SPANNER_OPTIONS = ConnectionFactoryOptions.builder() @@ -97,7 +97,7 @@ public void setUp() { } @Test - public void testCreate() { + void testCreate() { ConnectionFactory spannerConnectionFactory = this.spannerConnectionFactoryProvider.create(SPANNER_OPTIONS); assertThat(spannerConnectionFactory).isNotNull(); @@ -105,7 +105,7 @@ public void testCreate() { } @Test - public void testCreateFactoryWithUrl() { + void testCreateFactoryWithUrl() { ConnectionFactoryOptions optionsWithUrl = ConnectionFactoryOptions.builder() .option(DRIVER, DRIVER_NAME) @@ -121,7 +121,7 @@ public void testCreateFactoryWithUrl() { } @Test - public void testSupportsThrowsExceptionOnNullOptions() { + void testSupportsThrowsExceptionOnNullOptions() { assertThatThrownBy(() -> { this.spannerConnectionFactoryProvider.supports(null); }).isInstanceOf(IllegalArgumentException.class) @@ -129,28 +129,28 @@ public void testSupportsThrowsExceptionOnNullOptions() { } @Test - public void testSupportsReturnsFalseWhenNoDriverInOptions() { + void testSupportsReturnsFalseWhenNoDriverInOptions() { assertFalse(this.spannerConnectionFactoryProvider.supports( ConnectionFactoryOptions.builder().build())); } @Test - public void testSupportsReturnsFalseWhenWrongDriverInOptions() { + void testSupportsReturnsFalseWhenWrongDriverInOptions() { assertFalse(this.spannerConnectionFactoryProvider.supports(buildOptions("not spanner"))); } @Test - public void testSupportsReturnsTrueWhenCorrectDriverInOptions() { + void testSupportsReturnsTrueWhenCorrectDriverInOptions() { assertTrue(this.spannerConnectionFactoryProvider.supports(buildOptions("spanner"))); } @Test - public void getDriverReturnsSpanner() { + void getDriverReturnsSpanner() { assertThat(this.spannerConnectionFactoryProvider.getDriver()).isEqualTo(DRIVER_NAME); } @Test - public void partialResultSetFetchSizePropagatesAsDemand() { + void partialResultSetFetchSizePropagatesAsDemand() { ConnectionFactoryOptions options = ConnectionFactoryOptions.builder() .option(PARTIAL_RESULT_SET_FETCH_SIZE, 4) @@ -197,7 +197,7 @@ public void partialResultSetFetchSizePropagatesAsDemand() { } @Test - public void testCreateFactoryWithClientLibraryClient() { + void testCreateFactoryWithClientLibraryClient() { SpannerConnectionFactoryProvider customSpannerConnectionFactoryProvider = new SpannerConnectionFactoryProvider(); @@ -219,7 +219,7 @@ public void testCreateFactoryWithClientLibraryClient() { } @Test - public void createFactoryFromUrlWithOauthCredentials() { + void createFactoryFromUrlWithOauthCredentials() { when(this.mockCredentialsHelper.getOauthCredentials(anyString())) .thenReturn(this.mockCredentials); @@ -234,7 +234,7 @@ public void createFactoryFromUrlWithOauthCredentials() { } @Test - public void createFactoryFromUrlWithGoogleCredentialsIncorrectType() { + void createFactoryFromUrlWithGoogleCredentialsIncorrectType() { ConnectionFactoryOptions options = ConnectionFactoryOptions.parse( "r2dbc:spanner://host:443/projects/p/instances/i/databases/d?google_credentials=ABC"); @@ -244,7 +244,7 @@ public void createFactoryFromUrlWithGoogleCredentialsIncorrectType() { } @Test - public void createFactoryWithGoogleCredentialsRetainsThem() { + void createFactoryWithGoogleCredentialsRetainsThem() { ConnectionFactoryOptions options = ConnectionFactoryOptions.builder() .option(DATABASE, "projects/p/instances/i/databases/d") @@ -260,7 +260,7 @@ public void createFactoryWithGoogleCredentialsRetainsThem() { } @Test - public void createFactoryWithFileCredentials() { + void createFactoryWithFileCredentials() { when(this.mockCredentialsHelper.getFileCredentials(anyString())) .thenReturn(this.mockCredentials); @@ -276,7 +276,7 @@ public void createFactoryWithFileCredentials() { } @Test - public void multipleAuthenticationMethodsDisallowed() { + void multipleAuthenticationMethodsDisallowed() { String prefix = "r2dbc:spanner://host:443/projects/p/instances/i/databases/d?"; assertThatThrownBy(() -> this.spannerConnectionFactoryProvider.createConfiguration( @@ -286,7 +286,7 @@ public void multipleAuthenticationMethodsDisallowed() { } @Test - public void multipleAuthenticationMethodsDisallowedProgrammatic() { + void multipleAuthenticationMethodsDisallowedProgrammatic() { ConnectionFactoryOptions options = ConnectionFactoryOptions.builder() .option(DATABASE, "projects/p/instances/i/databases/d") @@ -301,7 +301,7 @@ public void multipleAuthenticationMethodsDisallowedProgrammatic() { } @Test - public void passOptimizerVersion() { + void passOptimizerVersion() { ConnectionFactoryOptions options = ConnectionFactoryOptions.builder() .option(DATABASE, "projects/p/instances/i/databases/d") .option(DRIVER, "spanner") diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerConnectionFactoryTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerConnectionFactoryTest.java index cd85bdaf66..1ad6e25a0f 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerConnectionFactoryTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerConnectionFactoryTest.java @@ -32,7 +32,7 @@ /** * Test for {@link SpannerConnectionFactory}. */ -public class SpannerConnectionFactoryTest { +class SpannerConnectionFactoryTest { private SpannerConnectionConfiguration config; @@ -50,7 +50,7 @@ public void setupConnectionConfiguration() throws IOException { } @Test - public void getMetadataReturnsSingleton() { + void getMetadataReturnsSingleton() { Client mockClient = Mockito.mock(Client.class); SpannerConnectionFactory factory = new SpannerConnectionFactory(mockClient, this.config); @@ -58,7 +58,7 @@ public void getMetadataReturnsSingleton() { } @Test - public void createReturnsNewSpannerConnection() { + void createReturnsNewSpannerConnection() { Client mockClient = Mockito.mock(Client.class); Session session = Session.newBuilder().setName("jam session").build(); diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerConnectionMetadataTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerConnectionMetadataTest.java index 1e43927ae0..2d1c6aa1d6 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerConnectionMetadataTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerConnectionMetadataTest.java @@ -23,16 +23,16 @@ /** * Test for {@link SpannerConnectionMetadata}. */ -public class SpannerConnectionMetadataTest { +class SpannerConnectionMetadataTest { @Test - public void productNameIsCorrect() { + void productNameIsCorrect() { SpannerConnectionMetadata spannerConnectionMetadata = SpannerConnectionMetadata.INSTANCE; assertThat(spannerConnectionMetadata.getDatabaseProductName()).isEqualTo("Cloud Spanner"); } @Test - public void productVersionIrrelevant() { + void productVersionIrrelevant() { assertThat(SpannerConnectionMetadata.INSTANCE.getDatabaseVersion()).isEqualTo("n/a"); } } diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerConnectionTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerConnectionTest.java index 667a7e6239..5fcce5df75 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerConnectionTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerConnectionTest.java @@ -59,7 +59,7 @@ /** * Test for {@link SpannerConnection}. */ -public class SpannerConnectionTest { +class SpannerConnectionTest { static final String TEST_SESSION_NAME = "project/session/1234"; static final Session TEST_SESSION = @@ -108,7 +108,7 @@ public void setupMocks() { } @Test - public void executeStatementReturnsWorkingStatementWithCorrectQuery() { + void executeStatementReturnsWorkingStatementWithCorrectQuery() { SpannerConnection connection = new SpannerConnection(this.mockClient, TEST_SESSION, TEST_CONFIG); String sql = "select book from library"; @@ -143,7 +143,7 @@ public void executeStatementReturnsWorkingStatementWithCorrectQuery() { } @Test - public void executeDmlInTransactionStartingAfterCreationTest() { + void executeDmlInTransactionStartingAfterCreationTest() { SpannerConnection connection = new SpannerConnection(this.mockClient, TEST_SESSION, TEST_CONFIG); String sql = "insert into books values (title) @title"; @@ -160,7 +160,7 @@ public void executeDmlInTransactionStartingAfterCreationTest() { } @Test - public void noopCommitTransactionWhenTransactionNotStarted() { + void noopCommitTransactionWhenTransactionNotStarted() { SpannerConnection connection = new SpannerConnection(this.mockClient, TEST_SESSION, TEST_CONFIG); @@ -170,7 +170,7 @@ public void noopCommitTransactionWhenTransactionNotStarted() { } @Test - public void beginAndCommitTransactions() { + void beginAndCommitTransactions() { SpannerConnection connection = new SpannerConnection(this.mockClient, TEST_SESSION, TEST_CONFIG); @@ -197,7 +197,7 @@ public void beginAndCommitTransactions() { } @Test - public void rollbackTransactions() { + void rollbackTransactions() { SpannerConnection connection = new SpannerConnection(this.mockClient, TEST_SESSION, TEST_CONFIG); @@ -225,7 +225,7 @@ public void rollbackTransactions() { } @Test - public void testCustomTransactionType() { + void testCustomTransactionType() { SpannerConnection connection = new SpannerConnection( this.mockClient, TEST_SESSION, TEST_CONFIG); @@ -244,20 +244,20 @@ public void testCustomTransactionType() { } @Test - public void executionContextHasCorrectSessionName() { + void executionContextHasCorrectSessionName() { SpannerConnection connection = new SpannerConnection( this.mockClient, Session.newBuilder().setName("session-name").build(), null); assertThat(connection.getSessionName()).isEqualTo("session-name"); } @Test - public void executionContextDoesNotHaveTransactionWhenInitialized() { + void executionContextDoesNotHaveTransactionWhenInitialized() { SpannerConnection connection = new SpannerConnection(this.mockClient, TEST_SESSION, null); assertThat(connection.getTransactionId()).isNull(); } @Test - public void executionContextHasCorrectTransactionIdWhenTransactionSet() { + void executionContextHasCorrectTransactionIdWhenTransactionSet() { SpannerConnection connection = new SpannerConnection(this.mockClient, TEST_SESSION, null); ByteString transactionId = ByteString.copyFrom("transaction-id".getBytes()); @@ -274,7 +274,7 @@ public void executionContextHasCorrectTransactionIdWhenTransactionSet() { } @Test - public void nextSeqNumIsSequential() { + void nextSeqNumIsSequential() { SpannerConnection connection = new SpannerConnection(this.mockClient, TEST_SESSION, null); long prevNum = connection.nextSeqNum(); @@ -289,13 +289,13 @@ public void nextSeqNumIsSequential() { } @Test - public void autocommitOnByDefault() { + void autocommitOnByDefault() { SpannerConnection connection = new SpannerConnection(this.mockClient, TEST_SESSION, null); assertThat(connection.isAutoCommit()).isTrue(); } @Test - public void turningAutocommitOnIsNoopWhenAlreadyOn() { + void turningAutocommitOnIsNoopWhenAlreadyOn() { SpannerConnection connection = new SpannerConnection(this.mockClient, TEST_SESSION, null); StepVerifier.create(connection.setAutoCommit(true)) .verifyComplete(); @@ -304,7 +304,7 @@ public void turningAutocommitOnIsNoopWhenAlreadyOn() { } @Test - public void turningAutocommitOffIsNoopWhenAlreadyOff() { + void turningAutocommitOffIsNoopWhenAlreadyOff() { SpannerConnection connection = new SpannerConnection(this.mockClient, TEST_SESSION, null); StepVerifier.create( Mono.from(connection.setAutoCommit(false)) @@ -316,7 +316,7 @@ public void turningAutocommitOffIsNoopWhenAlreadyOff() { } @Test - public void turningAutocommitOffWorksLocally() { + void turningAutocommitOffWorksLocally() { SpannerConnection connection = new SpannerConnection(this.mockClient, TEST_SESSION, null); StepVerifier.create(connection.setAutoCommit(false)) .verifyComplete(); @@ -325,7 +325,7 @@ public void turningAutocommitOffWorksLocally() { } @Test - public void startingTransactionTurnsOffAutocommit() { + void startingTransactionTurnsOffAutocommit() { SpannerConnection connection = new SpannerConnection(this.mockClient, TEST_SESSION, null); StepVerifier.create( Mono.from(connection.beginTransaction()) @@ -336,7 +336,7 @@ public void startingTransactionTurnsOffAutocommit() { } @Test - public void turningAutocommitOnCommitsExistingTransaction() { + void turningAutocommitOnCommitsExistingTransaction() { SpannerConnection connection = new SpannerConnection(this.mockClient, TEST_SESSION, null); StepVerifier.create( Mono.from(connection.setAutoCommit(false)) @@ -350,7 +350,7 @@ public void turningAutocommitOnCommitsExistingTransaction() { } @Test - public void turningAutocommitOnDoesNotAffectNonReadwriteTransaction() { + void turningAutocommitOnDoesNotAffectNonReadwriteTransaction() { SpannerConnection connection = new SpannerConnection(this.mockClient, TEST_SESSION, null); TransactionOptions readonlyTransaction = TransactionOptions.newBuilder().setReadOnly(ReadOnly.getDefaultInstance()).build(); @@ -367,7 +367,7 @@ public void turningAutocommitOnDoesNotAffectNonReadwriteTransaction() { } @Test - public void localValidatePassesOnNewConnection() { + void localValidatePassesOnNewConnection() { SpannerConnection connection = new SpannerConnection(this.mockClient, TEST_SESSION, null); StepVerifier.create(connection.validate(ValidationDepth.LOCAL)) .expectNext(true) @@ -376,7 +376,7 @@ public void localValidatePassesOnNewConnection() { } @Test - public void localValidateFailsOnClosedConnection() { + void localValidateFailsOnClosedConnection() { when(this.mockClient.commitTransaction(any(), any())) .thenReturn(Mono.just(CommitResponse.getDefaultInstance())); when(this.mockClient.deleteSession(any())).thenReturn(Mono.empty()); @@ -392,7 +392,7 @@ public void localValidateFailsOnClosedConnection() { } @Test - public void remoteValidateCallsServerHealthcheck() { + void remoteValidateCallsServerHealthcheck() { when(this.mockClient.healthcheck(any())).thenReturn(Mono.just(true)); SpannerConnection connection = new SpannerConnection(this.mockClient, TEST_SESSION, null); @@ -403,7 +403,7 @@ public void remoteValidateCallsServerHealthcheck() { } @Test - public void getConnectionMetadata() { + void getConnectionMetadata() { SpannerConnection connection = new SpannerConnection(this.mockClient, TEST_SESSION, null); assertThat(connection.getMetadata().getDatabaseProductName()).isEqualTo("Cloud Spanner"); assertThat(connection.getMetadata().getDatabaseVersion()).isEqualTo("n/a"); diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerResultTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerResultTest.java index 6968fb4ae6..35d446026e 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerResultTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerResultTest.java @@ -34,7 +34,7 @@ /** * Test for {@link SpannerResult}. */ -public class SpannerResultTest { +class SpannerResultTest { private Flux resultSet; @@ -66,7 +66,7 @@ public void setup() { } @Test - public void getRowsUpdatedTest() { + void getRowsUpdatedTest() { StepVerifier.create( ((Mono) new SpannerResult(this.resultSet,Mono.just(2)).getRowsUpdated())) .expectNext(2) @@ -74,19 +74,19 @@ public void getRowsUpdatedTest() { } @Test - public void nullResultSetTest() { + void nullResultSetTest() { assertThatThrownBy(() -> new SpannerResult(null, Mono.empty())) .hasMessage("A non-null flux of rows is required."); } @Test - public void nullRowsTest() { + void nullRowsTest() { assertThatThrownBy(() -> new SpannerResult(Flux.empty(),null)) .hasMessage("A non-null mono of rows updated is required."); } @Test - public void mapTest() { + void mapTest() { String columnName = this.resultSetMetadata .getRowType() diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerRowMetadataTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerRowMetadataTest.java index 0e7dacfb75..3072369098 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerRowMetadataTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerRowMetadataTest.java @@ -30,10 +30,10 @@ /** * Test for {@link SpannerRowMetadata}. */ -public class SpannerRowMetadataTest { +class SpannerRowMetadataTest { @Test - public void testHandleMissingColumn() { + void testHandleMissingColumn() { SpannerRowMetadata metadata = new SpannerRowMetadata(ResultSetMetadata.newBuilder().build()); assertThatThrownBy(() -> metadata.getColumnMetadata("columnName")) .isInstanceOf(IllegalArgumentException.class) @@ -41,21 +41,21 @@ public void testHandleMissingColumn() { } @Test - public void testHandleOutOfBoundsIndex() { + void testHandleOutOfBoundsIndex() { SpannerRowMetadata metadata = new SpannerRowMetadata(ResultSetMetadata.newBuilder().build()); assertThatThrownBy(() -> metadata.getColumnMetadata(4)) .isInstanceOf(IndexOutOfBoundsException.class); } @Test - public void testEmptyResultSetMetadata() { + void testEmptyResultSetMetadata() { SpannerRowMetadata metadata = new SpannerRowMetadata(ResultSetMetadata.newBuilder().build()); assertThat(metadata.getColumnMetadatas()).isEmpty(); assertThat(metadata.getColumnNames()).isEmpty(); } @Test - public void testSpannerRowMetadataRetrieval() { + void testSpannerRowMetadataRetrieval() { ResultSetMetadata resultSetMetadata = buildResultSetMetadata( TypeCode.INT64, TypeCode.STRING, @@ -74,7 +74,7 @@ public void testSpannerRowMetadataRetrieval() { } @Test - public void getColumnNamesReturnsCorrectNamesWhenColumnsPresent() { + void getColumnNamesReturnsCorrectNamesWhenColumnsPresent() { ResultSetMetadata resultSetMetadata = buildResultSetMetadata(TypeCode.INT64, TypeCode.STRING, TypeCode.BOOL); SpannerRowMetadata metadata = new SpannerRowMetadata(resultSetMetadata); @@ -83,7 +83,7 @@ public void getColumnNamesReturnsCorrectNamesWhenColumnsPresent() { } @Test - public void getColumnNamesReturnsEmptyCollectionWhenNoColumns() { + void getColumnNamesReturnsEmptyCollectionWhenNoColumns() { SpannerRowMetadata metadata = new SpannerRowMetadata(ResultSetMetadata.getDefaultInstance()); assertThat(metadata.getColumnNames()).isEmpty(); diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerRowTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerRowTest.java index cb38d4540d..1497d6c296 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerRowTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerRowTest.java @@ -34,14 +34,14 @@ /** * Test for {@link SpannerRow}. */ -public class SpannerRowTest { +class SpannerRowTest { private static final Codecs codecs = new DefaultCodecs(); private final SpannerRowMetadata rowMetadata = new SpannerRowMetadata(ResultSetMetadata.getDefaultInstance()); @Test - public void testOutOfBoundsIndex() { + void testOutOfBoundsIndex() { SpannerRow row = new SpannerRow( new ArrayList<>(), this.rowMetadata); @@ -50,7 +50,7 @@ public void testOutOfBoundsIndex() { } @Test - public void testInvalidColumnLabel() { + void testInvalidColumnLabel() { SpannerRow row = new SpannerRow( new ArrayList<>(), this.rowMetadata); @@ -60,7 +60,7 @@ public void testInvalidColumnLabel() { } @Test - public void testIndexingIntoColumns() { + void testIndexingIntoColumns() { SpannerRowMetadata rowMetadata = createRowMetadata(TypeCode.STRING, TypeCode.INT64, TypeCode.BOOL); List rawSpannerRow = createRawSpannerRow("Hello", 25L, true); diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerStatementTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerStatementTest.java index b29019f9d6..aac0556fcf 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerStatementTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerStatementTest.java @@ -57,7 +57,7 @@ /** * Test for {@link SpannerStatement}. */ -public class SpannerStatementTest { +class SpannerStatementTest { private static final SpannerConnectionConfiguration TEST_CONFIG = new SpannerConnectionConfiguration.Builder() @@ -93,7 +93,7 @@ public void setupMocks() { } @Test - public void executeDummyImplementation() { + void executeDummyImplementation() { String sql = "select book from library"; PartialResultSet partialResultSet = PartialResultSet.newBuilder() .setMetadata(ResultSetMetadata.newBuilder().setRowType(StructType.newBuilder() @@ -121,7 +121,7 @@ public void executeDummyImplementation() { } @Test - public void executeDummyImplementationBind() { + void executeDummyImplementationBind() { //set up mock results PartialResultSet partialResultSet1 = PartialResultSet.newBuilder() .setMetadata(ResultSetMetadata.newBuilder().setRowType(StructType.newBuilder() @@ -176,7 +176,7 @@ public void executeDummyImplementationBind() { } @Test - public void readOneResultSetQueryTest() { + void readOneResultSetQueryTest() { PartialResultSet p1 = PartialResultSet.newBuilder().setMetadata( this.resultSetMetadata ).setChunkedValue(false) @@ -202,7 +202,7 @@ public void readOneResultSetQueryTest() { } @Test - public void readMultiResultSetQueryTest() { + void readMultiResultSetQueryTest() { PartialResultSet p1 = PartialResultSet.newBuilder().setMetadata( this.resultSetMetadata ).setChunkedValue(false) @@ -224,7 +224,7 @@ public void readMultiResultSetQueryTest() { } @Test - public void readDmlQueryTest() { + void readDmlQueryTest() { ResultSet resultSet = ResultSet.newBuilder() .setStats(ResultSetStats.newBuilder().setRowCountExact(555).build()) .build(); @@ -241,7 +241,7 @@ public void readDmlQueryTest() { } @Test - public void batchDmlQueryWithinTransactionTest() { + void batchDmlQueryWithinTransactionTest() { batchDmlQueryTest(ByteString.copyFromUtf8("abc"), 0, 0); } @@ -276,7 +276,7 @@ private void batchDmlQueryTest(ByteString transactionId, } @Test - public void batchDmlExceptionTest() { + void batchDmlExceptionTest() { assertThatThrownBy(() -> new SpannerBatch(this.mockClient, null) .add("select * from books")) @@ -285,7 +285,7 @@ public void batchDmlExceptionTest() { } @Test - public void runDdlQueryTest() { + void runDdlQueryTest() { when(this.mockClient.executeDdl(any(), any(), any(), any())) .thenReturn(Mono.just(Operation.getDefaultInstance())); @@ -306,7 +306,7 @@ public void runDdlQueryTest() { } @Test - public void noopMapOnUpdateQueriesWhenNoRowsAffected() { + void noopMapOnUpdateQueriesWhenNoRowsAffected() { String sql = "delete from Books where true"; ResultSet resultSet = ResultSet.newBuilder() diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/client/GrpcClientTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/client/GrpcClientTest.java index d1fd4748f4..80a756b6ad 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/client/GrpcClientTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/client/GrpcClientTest.java @@ -58,7 +58,7 @@ /** * Test for {@link GrpcClient}. */ -public class GrpcClientTest { +class GrpcClientTest { static String SESSION_NAME = "/session/1234"; @@ -77,7 +77,7 @@ public void setUp() { } @Test - public void testCreateSession() throws IOException { + void testCreateSession() throws IOException { SpannerImplBase spannerSpy = doTest(new SpannerImplBase() { @Override @@ -99,7 +99,7 @@ public void createSession(CreateSessionRequest request, } @Test - public void testExecuteStreamingSql() throws IOException { + void testExecuteStreamingSql() throws IOException { ExecuteSqlRequest request = ExecuteSqlRequest.newBuilder().build(); String sql = "select book from library"; @@ -125,7 +125,7 @@ public void executeStreamingSql(ExecuteSqlRequest request, @Test - public void testBatchDmlErrorPropagation() throws IOException { + void testBatchDmlErrorPropagation() throws IOException { ResultSet expectedResultSet = ResultSet.newBuilder() .setStats(ResultSetStats.newBuilder().setRowCountExact(20)) @@ -158,14 +158,14 @@ public void executeBatchDml( } @Test - public void testHostPortConfig() { + void testHostPortConfig() { assertEquals("spanner.googleapis.com:443", new GrpcClient(NoCredentials.getInstance()).getSpanner().getChannel() .authority()); } @Test - public void testUserAgentConfig() + void testUserAgentConfig() throws ClassNotFoundException, NoSuchFieldException, IllegalAccessException { GrpcClient grpcClient = new GrpcClient(NoCredentials.getInstance()); Channel channel = grpcClient.getSpanner().getChannel(); @@ -182,7 +182,7 @@ public void testUserAgentConfig() } @Test - public void testHealthcheck() throws IOException { + void testHealthcheck() throws IOException { String sql = "SELECT 1"; SpannerImplBase spannerSpy = doTest(new SpannerImplBase() { @Override diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/codecs/DefaultCodecsNegativeTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/codecs/DefaultCodecsNegativeTest.java index ca591cbc09..4ecef33fb6 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/codecs/DefaultCodecsNegativeTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/codecs/DefaultCodecsNegativeTest.java @@ -27,12 +27,12 @@ /** * Test for {@link DefaultCodecs}. */ -public class DefaultCodecsNegativeTest { +class DefaultCodecsNegativeTest { private Codecs codecs = new DefaultCodecs(); @Test - public void encodeException() { + void encodeException() { assertThrows(IllegalArgumentException.class, () -> this.codecs.encode(BigDecimal.valueOf(100)), @@ -40,7 +40,7 @@ public void encodeException() { } @Test - public void decodeException() { + void decodeException() { assertThrows(IllegalArgumentException.class, () -> { diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/codecs/DefaultCodecsTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/codecs/DefaultCodecsTest.java index c13f9fb214..fb6e966e94 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/codecs/DefaultCodecsTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/codecs/DefaultCodecsTest.java @@ -33,7 +33,7 @@ /** * Test for {@link DefaultCodecs}. */ -public class DefaultCodecsTest { +class DefaultCodecsTest { private Codecs codecs = new DefaultCodecs(); diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/it/ClientLibraryBasedIT.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/it/ClientLibraryBasedIT.java index 2b9a59f777..39d84c1b46 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/it/ClientLibraryBasedIT.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/it/ClientLibraryBasedIT.java @@ -54,7 +54,7 @@ import reactor.core.publisher.Mono; import reactor.test.StepVerifier; -public class ClientLibraryBasedIT { +class ClientLibraryBasedIT { private static final Logger LOGGER = LoggerFactory.getLogger(ClientLibraryBasedIT.class); @@ -128,7 +128,7 @@ public void deleteData() { } @Test - public void testValidate() { + void testValidate() { Connection conn = Mono.from(connectionFactory.create()).block(); boolean result = Mono.from(conn.validate(ValidationDepth.REMOTE)).block(); assertThat(result).isTrue(); @@ -139,7 +139,7 @@ public void testValidate() { } @Test - public void testReadQuery() { + void testReadQuery() { Connection conn = Mono.from(connectionFactory.create()).block(); @@ -156,7 +156,7 @@ public void testReadQuery() { } @Test - public void testMetadata() { + void testMetadata() { Connection conn = Mono.from(connectionFactory.create()).block(); @@ -189,7 +189,7 @@ public void testMetadata() { } @Test - public void testErrorPropagation() { + void testErrorPropagation() { Connection conn = Mono.from(connectionFactory.create()).block(); @@ -201,7 +201,7 @@ public void testErrorPropagation() { @Test - public void testDmlInsert() { + void testDmlInsert() { Connection conn = Mono.from(connectionFactory.create()).block(); String id = "abc123-" + this.random.nextInt(); @@ -239,7 +239,7 @@ public void testDmlInsert() { } @Test - public void testTransactionSingleStatementCommitted() { + void testTransactionSingleStatementCommitted() { String uuid1 = "transaction1-commit1-" + this.random.nextInt(); @@ -267,7 +267,7 @@ public void testTransactionSingleStatementCommitted() { } @Test - public void testTransactionMultipleStatementsCommitted() { + void testTransactionMultipleStatementsCommitted() { String uuid1 = "transaction1-commit1-" + this.random.nextInt(); String uuid2 = "transaction1-commit2-" + this.random.nextInt(); @@ -306,7 +306,7 @@ public void testTransactionMultipleStatementsCommitted() { } @Test - public void testTransactionFollowedByStandaloneStatementCommitted() { + void testTransactionFollowedByStandaloneStatementCommitted() { String uuid1 = "transaction1-commit1-" + this.random.nextInt(); String uuid2 = "transaction1-commit2-" + this.random.nextInt(); @@ -331,7 +331,7 @@ public void testTransactionFollowedByStandaloneStatementCommitted() { @Test - public void testTransactionRolledBack() { + void testTransactionRolledBack() { String uuid = "transaction2-abort" + this.random.nextInt(); StepVerifier.create( @@ -357,7 +357,7 @@ public void testTransactionRolledBack() { } @Test - public void selectQueryReturnsUpdatedDataDuringAndAfterTransactionCommit() { + void selectQueryReturnsUpdatedDataDuringAndAfterTransactionCommit() { String uuid1 = "transaction1-commit1-" + this.random.nextInt(); @@ -380,7 +380,7 @@ public void selectQueryReturnsUpdatedDataDuringAndAfterTransactionCommit() { } @Test - public void selectQueryReturnsUpdatedDataDuringTransactionButNotAfterTransactionRollback() { + void selectQueryReturnsUpdatedDataDuringTransactionButNotAfterTransactionRollback() { String uuid1 = "transaction1-commit1-" + this.random.nextInt(); @@ -404,7 +404,7 @@ public void selectQueryReturnsUpdatedDataDuringTransactionButNotAfterTransaction } @Test - public void ddlCreateAndDrop() { + void ddlCreateAndDrop() { String listTables = "SELECT COUNT(*) FROM information_schema.tables WHERE table_name=@table"; String tableName = "test_table_" + this.random.nextInt(100000); @@ -444,7 +444,7 @@ public void ddlCreateAndDrop() { } @Test - public void selectMultipleBoundParameterSetsNoTransaction() { + void selectMultipleBoundParameterSetsNoTransaction() { String uuid1 = "params-no-transaction-" + this.random.nextInt(); String uuid2 = "params-no-transaction-" + this.random.nextInt(); @@ -488,7 +488,7 @@ public void selectMultipleBoundParameterSetsNoTransaction() { 2) omits the final add() for the last bound row. */ @Test - public void selectMultipleBoundParameterSetsInTransaction() { + void selectMultipleBoundParameterSetsInTransaction() { String uuid1 = "params-no-transaction-" + this.random.nextInt(); String uuid2 = "params-no-transaction-" + this.random.nextInt(); @@ -533,7 +533,7 @@ public void selectMultipleBoundParameterSetsInTransaction() { } @Test - public void insertMultipleBoundParameterSetsNoTransaction() { + void insertMultipleBoundParameterSetsNoTransaction() { String uuid1 = "params-no-transaction-" + this.random.nextInt(); String uuid2 = "params-no-transaction-" + this.random.nextInt(); @@ -566,7 +566,7 @@ public void insertMultipleBoundParameterSetsNoTransaction() { } @Test - public void insertMultipleBoundParameterSetsInTransaction() { + void insertMultipleBoundParameterSetsInTransaction() { String uuid1 = "params-no-transaction-" + this.random.nextInt(); String uuid2 = "params-no-transaction-" + this.random.nextInt(); @@ -601,7 +601,7 @@ public void insertMultipleBoundParameterSetsInTransaction() { } @Test - public void testStaleRead() throws InterruptedException { + void testStaleRead() throws InterruptedException { // Prevent a stale read from 1 second ago from seeing a nonexistent table. Thread.sleep(1000); @@ -635,7 +635,7 @@ public void testStaleRead() throws InterruptedException { } @Test - public void testStrongReadFromSubclassedConnection() throws InterruptedException { + void testStrongReadFromSubclassedConnection() throws InterruptedException { String uuid1 = "transaction1-strong-read" + this.random.nextInt(); String sql = "SELECT count(*) from BOOKS WHERE UUID='" + uuid1 + "'"; @@ -666,7 +666,7 @@ public void testStrongReadFromSubclassedConnection() throws InterruptedException } @Test - public void testConnectingThroughUrl() { + void testConnectingThroughUrl() { ConnectionFactory urlBasedConnectionFactory = ConnectionFactories.get(DatabaseProperties.URL + "?client-implementation=client-library"); diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/it/SpannerDdlIT.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/it/SpannerDdlIT.java index 2d4f01bb52..cf4c9b093e 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/it/SpannerDdlIT.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/it/SpannerDdlIT.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; -public class SpannerDdlIT { +class SpannerDdlIT { private static final Logger logger = LoggerFactory.getLogger(SpannerDdlIT.class); @@ -59,7 +59,7 @@ public void setupEnvironment() { } @Test - public void testDdlErrorPropagation() { + void testDdlErrorPropagation() { assertThat(listTables()).doesNotContain("PRESIDENTS"); assertThatThrownBy(() -> @@ -71,7 +71,7 @@ public void testDdlErrorPropagation() { } @Test - public void testCreateAndDrop() { + void testCreateAndDrop() { assertThat(listTables()).doesNotContain("PRESIDENTS"); Mono.from(connectionFactory.create()) diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/it/SpannerIT.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/it/SpannerIT.java index 5fd0662114..c30fa1a83f 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/it/SpannerIT.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/it/SpannerIT.java @@ -68,7 +68,7 @@ /** * Integration test for connecting to a real Spanner instance. */ -public class SpannerIT { +class SpannerIT { private static final ConnectionFactory connectionFactory = ConnectionFactories.get(ConnectionFactoryOptions.builder() @@ -136,7 +136,7 @@ public static void setupSpannerTable() throws InterruptedException, ExecutionExc } @Test - public void testLargeReadWrite() { + void testLargeReadWrite() { // string size must be below 10 MB int maxStringLength = 100000; @@ -205,7 +205,7 @@ public void testLargeReadWrite() { } @Test - public void testSessionManagement() { + void testSessionManagement() { assertThat(this.connectionFactory).isInstanceOf(SpannerConnectionFactory.class); Mono connection = (Mono) this.connectionFactory.create(); @@ -222,7 +222,7 @@ public void testSessionManagement() { } @Test - public void testRunDmlAfterTransaction() { + void testRunDmlAfterTransaction() { SpannerConnection connection = Mono.from(this.connectionFactory.create()) .cast(SpannerConnection.class) @@ -252,7 +252,7 @@ public void testRunDmlAfterTransaction() { } @Test - public void testDmlExceptions() { + void testDmlExceptions() { StepVerifier.create( Mono.from(connectionFactory.create()) .flatMapMany(conn -> conn.createStatement("INSERT BOOKS asdfasdfasdf").execute())) @@ -261,7 +261,7 @@ public void testDmlExceptions() { } @Test - public void testMultipleDmlExceptions() { + void testMultipleDmlExceptions() { StepVerifier.create( Mono.from(connectionFactory.create()) .flatMapMany(conn -> @@ -280,7 +280,7 @@ public void testMultipleDmlExceptions() { } @Test - public void testDataIntegrityExceptions() { + void testDataIntegrityExceptions() { StepVerifier.create( Mono.from(connectionFactory.create()) .flatMapMany(conn -> @@ -298,7 +298,7 @@ public void testDataIntegrityExceptions() { @Test - public void testSingleUseDml() { + void testSingleUseDml() { long count = executeReadQuery( connectionFactory, "Select count(1) as count FROM books", @@ -348,7 +348,7 @@ public void testSingleUseDml() { } @Test - public void testQuerying() { + void testQuerying() { long count = executeReadQuery( connectionFactory, "Select count(1) as count FROM books", @@ -459,7 +459,7 @@ public void testQuerying() { } @Test - public void testNoopUpdate() { + void testNoopUpdate() { Result result = Mono.from(connectionFactory.create()) .delayUntil(c -> c.beginTransaction()) .flatMap(c -> Mono.from(c.createStatement( @@ -477,7 +477,7 @@ public void testNoopUpdate() { } @Test - public void testEmptySelect() { + void testEmptySelect() { List results = executeReadQuery( connectionFactory, "SELECT title, author FROM books where author = 'Nobody P. Smith'", @@ -487,7 +487,7 @@ public void testEmptySelect() { } @Test - public void testMultiTransactionType() { + void testMultiTransactionType() { Mono.from(this.connectionFactory.create()) .delayUntil(c -> c.beginTransaction()) .delayUntil(c -> Flux.from(c.createStatement( diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/result/PartialResultRowExtractorTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/result/PartialResultRowExtractorTest.java index 8368f48792..87f6c6cd3d 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/result/PartialResultRowExtractorTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/result/PartialResultRowExtractorTest.java @@ -36,7 +36,7 @@ /** * Tests the partial result flux converter. */ -public class PartialResultRowExtractorTest { +class PartialResultRowExtractorTest { // These are the expected final rows' values final Value a1 = Value.newBuilder().setBoolValue(false).build(); @@ -64,7 +64,7 @@ public class PartialResultRowExtractorTest { ).build(); @Test - public void assembleRowsTest() { + void assembleRowsTest() { // The values above will be split across several partial result sets. PartialResultSet p1 = PartialResultSet.newBuilder().setMetadata( this.resultSetMetadata @@ -118,7 +118,7 @@ public void assembleRowsTest() { } @Test - public void singleResultSetTest() { + void singleResultSetTest() { PartialResultSet p1 = PartialResultSet.newBuilder().setMetadata( this.resultSetMetadata ).setChunkedValue(false) @@ -136,7 +136,7 @@ public void singleResultSetTest() { } @Test - public void neatRowsResultSetTest() { + void neatRowsResultSetTest() { PartialResultSet p1 = PartialResultSet.newBuilder().setMetadata( this.resultSetMetadata ).setChunkedValue(false) @@ -159,7 +159,7 @@ public void neatRowsResultSetTest() { } @Test - public void interRowWholeChunkTest() { + void interRowWholeChunkTest() { PartialResultSet p1 = PartialResultSet.newBuilder().setMetadata( this.resultSetMetadata ).setChunkedValue(false) @@ -182,7 +182,7 @@ public void interRowWholeChunkTest() { } @Test - public void handleEmptyPartialResultSet() { + void handleEmptyPartialResultSet() { PartialResultSet emptyResultSet = PartialResultSet.newBuilder().setMetadata(this.resultSetMetadata).build(); diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/statement/StatementBindingsTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/statement/StatementBindingsTest.java index 65c083b2c6..491a679be4 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/statement/StatementBindingsTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/statement/StatementBindingsTest.java @@ -26,10 +26,10 @@ import com.google.spanner.v1.TypeCode; import org.junit.jupiter.api.Test; -public class StatementBindingsTest { +class StatementBindingsTest { @Test - public void addBasicBinding() { + void addBasicBinding() { StatementBindings statementBindings = new StatementBindings(); statementBindings.createBind("name", "John"); statementBindings.createBind("age", 50); @@ -56,7 +56,7 @@ public void addBasicBinding() { } @Test - public void testNoopAddBinding() { + void testNoopAddBinding() { StatementBindings statementBindings = new StatementBindings(); statementBindings.completeBinding(); statementBindings.completeBinding(); diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/statement/StatementParserTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/statement/StatementParserTest.java index 45220fc675..faf3ee85a8 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/statement/StatementParserTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/statement/StatementParserTest.java @@ -20,16 +20,16 @@ import org.junit.jupiter.api.Test; -public class StatementParserTest { +class StatementParserTest { @Test - public void parsesSelectQueries() { + void parsesSelectQueries() { String sql = "SELECT * from blahblahblah"; assertThat(StatementParser.getStatementType(sql)).isEqualTo(StatementType.SELECT); } @Test - public void parsesDmlQueries() { + void parsesDmlQueries() { String sql = "InSeRt INTO TABLE_NAME VALUES (value1, value2, value3,...valueN)"; assertThat(StatementParser.getStatementType(sql)).isEqualTo(StatementType.DML); @@ -43,7 +43,7 @@ public void parsesDmlQueries() { } @Test - public void parsesDdlQueries() { + void parsesDdlQueries() { String sql = "drop table Blarg"; assertThat(StatementParser.getStatementType(sql)).isEqualTo(StatementType.DDL); @@ -55,13 +55,13 @@ public void parsesDdlQueries() { } @Test - public void parseUnknownQuery() { + void parseUnknownQuery() { String sql = "int number = 5"; assertThat(StatementParser.getStatementType(sql)).isEqualTo(StatementType.UNKNOWN); } @Test - public void parseQueryWithOptionsPrefix() { + void parseQueryWithOptionsPrefix() { String sql = "@{FORCE_INDEX=index_name} @{JOIN_METHOD=HASH_JOIN} SELECT * FROM blahblah"; assertThat(StatementParser.getStatementType(sql)).isEqualTo(StatementType.SELECT); } diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/util/AssertTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/util/AssertTest.java index dc9c3122c0..12e1319b0f 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/util/AssertTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/util/AssertTest.java @@ -24,10 +24,10 @@ /** * Unit tests for {@link Assert}. */ -public class AssertTest { +class AssertTest { @Test - public void assertNotNullThrowsExceptionWhenNull() { + void assertNotNullThrowsExceptionWhenNull() { assertThatThrownBy(() -> { Assert.requireNonNull(null, "oh no"); }).isInstanceOf(IllegalArgumentException.class) @@ -35,7 +35,7 @@ public void assertNotNullThrowsExceptionWhenNull() { } @Test - public void assertNotNullNoopWhenNotNull() { + void assertNotNullNoopWhenNotNull() { String value = Assert.requireNonNull("definitely not null", "oh no"); assertThat(value).isEqualTo("definitely not null"); } diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/util/CollectionsBuilderTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/util/CollectionsBuilderTest.java index 1cc63ebaa8..087e1b3200 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/util/CollectionsBuilderTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/util/CollectionsBuilderTest.java @@ -21,10 +21,10 @@ import java.util.Set; import org.junit.jupiter.api.Test; -public class CollectionsBuilderTest { +class CollectionsBuilderTest { @Test - public void testSetCreation() { + void testSetCreation() { Set items = CollectionsBuilder.setOf("Hello", "bob", "world"); assertThat(items).containsExactlyInAnyOrder("Hello", "bob", "world"); } diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/util/ObservableReactiveUtilTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/util/ObservableReactiveUtilTest.java index d2f56ff030..e4c67b32e3 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/util/ObservableReactiveUtilTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/util/ObservableReactiveUtilTest.java @@ -31,10 +31,10 @@ /** * Test for {@link ObservableReactiveUtil}. */ -public class ObservableReactiveUtilTest { +class ObservableReactiveUtilTest { @Test - public void unaryCallReturnsSingleValue() { + void unaryCallReturnsSingleValue() { Mono mono = ObservableReactiveUtil.unaryCall(observer -> { observer.onNext(42); observer.onCompleted(); @@ -45,7 +45,7 @@ public void unaryCallReturnsSingleValue() { } @Test - public void unaryCallForwardsError() { + void unaryCallForwardsError() { Mono mono = ObservableReactiveUtil.unaryCall(observer -> { observer.onError(new IllegalArgumentException("oh no")); }); @@ -57,7 +57,7 @@ public void unaryCallForwardsError() { } @Test - public void unaryCallThrowsExceptionIfCompletedWithNoValue() { + void unaryCallThrowsExceptionIfCompletedWithNoValue() { Mono mono = ObservableReactiveUtil.unaryCall(observer -> observer.onCompleted()); StepVerifier.create(mono) @@ -68,7 +68,7 @@ public void unaryCallThrowsExceptionIfCompletedWithNoValue() { } @Test - public void propagateTransientErrorUnaryCall() { + void propagateTransientErrorUnaryCall() { StatusRuntimeException retryableException = new StatusRuntimeException( Status.INTERNAL.withDescription("HTTP/2 error code: INTERNAL_ERROR")); @@ -84,7 +84,7 @@ public void propagateTransientErrorUnaryCall() { } @Test - public void propagateNonRetryableError() { + void propagateNonRetryableError() { Mono result = ObservableReactiveUtil.unaryCall( observer -> observer.onError(new IllegalArgumentException())); @@ -97,7 +97,7 @@ public void propagateNonRetryableError() { } @Test - public void propagateTransientErrorStreamingCall() { + void propagateTransientErrorStreamingCall() { StatusRuntimeException retryableException = new StatusRuntimeException( Status.INTERNAL.withDescription("HTTP/2 error code: INTERNAL_ERROR")); diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/util/SpannerExceptionUtilTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/util/SpannerExceptionUtilTest.java index 4095416b06..df4a53c282 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/util/SpannerExceptionUtilTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/util/SpannerExceptionUtilTest.java @@ -34,10 +34,10 @@ import java.io.IOException; import org.junit.jupiter.api.Test; -public class SpannerExceptionUtilTest { +class SpannerExceptionUtilTest { @Test - public void testCreateR2dbcException() { + void testCreateR2dbcException() { R2dbcException exception = SpannerExceptionUtil.createR2dbcException( Code.ALREADY_EXISTS_VALUE, "test"); @@ -46,7 +46,7 @@ public void testCreateR2dbcException() { } @Test - public void testNonRetryableException() { + void testNonRetryableException() { assertThat(createR2dbcException(new IllegalArgumentException())) .isInstanceOf(R2dbcNonTransientResourceException.class); assertThat(createR2dbcException((new IOException()))) @@ -59,7 +59,7 @@ public void testNonRetryableException() { } @Test - public void testRetryableInternalException() { + void testRetryableInternalException() { StatusRuntimeException retryableException = new StatusRuntimeException( Status.INTERNAL.withDescription("HTTP/2 error code: INTERNAL_ERROR"), null); @@ -69,7 +69,7 @@ public void testRetryableInternalException() { } @Test - public void testRetryableExceptionWithDelay() { + void testRetryableExceptionWithDelay() { RetryInfo retryInfo = RetryInfo.newBuilder() .setRetryDelay(Duration.newBuilder().setSeconds(22L)) diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/AbstractSpannerClientLibraryStatementTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/AbstractSpannerClientLibraryStatementTest.java index 9c9db9b69c..ece4042735 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/AbstractSpannerClientLibraryStatementTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/AbstractSpannerClientLibraryStatementTest.java @@ -36,7 +36,7 @@ import reactor.core.publisher.Mono; import reactor.test.StepVerifier; -public class AbstractSpannerClientLibraryStatementTest { +class AbstractSpannerClientLibraryStatementTest { DatabaseClientReactiveAdapter mockAdapter; @@ -51,7 +51,7 @@ public void setUpAdapterResponse() { } @Test - public void noParametersSendsSingleStatement() { + void noParametersSendsSingleStatement() { String query = "SELECT * FROM tbl"; FakeStatement statement = new FakeStatement(this.mockAdapter, query); @@ -68,7 +68,7 @@ public void noParametersSendsSingleStatement() { } @Test - public void singleSetOfParametersWithNoAddSendsOneStatement() { + void singleSetOfParametersWithNoAddSendsOneStatement() { String query = "SELECT * FROM tbl WHERE col1=@one AND col2=@two AND col3=@three"; FakeStatement statement = new FakeStatement(this.mockAdapter, query); @@ -93,7 +93,7 @@ public void singleSetOfParametersWithNoAddSendsOneStatement() { } @Test - public void singleSetOfParametersWithAddTriggersBatchWithOneStatement() { + void singleSetOfParametersWithAddTriggersBatchWithOneStatement() { String query = "SELECT * FROM tbl WHERE col1=@one AND col2=@two AND col3=@three"; FakeStatement statement = new FakeStatement(this.mockAdapter, query); @@ -121,7 +121,7 @@ public void singleSetOfParametersWithAddTriggersBatchWithOneStatement() { } @Test - public void twoParameterSetsWithNoTrailingAddSendsTwoStatements() { + void twoParameterSetsWithNoTrailingAddSendsTwoStatements() { String query = "SELECT * FROM tbl WHERE col1=@one AND col2=@two AND col3=@three"; FakeStatement statement = new FakeStatement(this.mockAdapter, query); @@ -156,7 +156,7 @@ public void twoParameterSetsWithNoTrailingAddSendsTwoStatements() { } @Test - public void twoParameterSetsWithTrailingAddSendsTwoStatements() { + void twoParameterSetsWithTrailingAddSendsTwoStatements() { String query = "SELECT * FROM tbl WHERE col1=@one AND col2=@two AND col3=@three"; FakeStatement statement = new FakeStatement(this.mockAdapter, query); diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/ClientLibraryTypeBindersTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/ClientLibraryTypeBindersTest.java index 9b8894b9ad..ee6c91f57a 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/ClientLibraryTypeBindersTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/ClientLibraryTypeBindersTest.java @@ -135,7 +135,7 @@ void bigDecimalBinderTest() { } @Test - public void integerBindsAsLong() { + void integerBindsAsLong() { ClientLibraryBinder.bind(this.statementBuilder, "a", 123); verify(this.valueBinder).to((Long) 123L); @@ -143,7 +143,7 @@ public void integerBindsAsLong() { } @Test - public void integerNullBindsAsLong() { + void integerNullBindsAsLong() { ClientLibraryBinder.bind(this.statementBuilder, "b", new TypedNull(Integer.class)); verify(this.valueBinder).to((Long) null); diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/DatabaseClientReactiveAdapterTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/DatabaseClientReactiveAdapterTest.java index e059df8356..ddd1f59107 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/DatabaseClientReactiveAdapterTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/DatabaseClientReactiveAdapterTest.java @@ -47,7 +47,7 @@ import reactor.core.publisher.FluxSink; import reactor.core.publisher.Mono; -public class DatabaseClientReactiveAdapterTest { +class DatabaseClientReactiveAdapterTest { // DatabaseClientReactiveAdapter dependencies private SpannerConnectionConfiguration config; @@ -95,7 +95,7 @@ void shutdown() { } @Test - public void testChangeAutocommitCommitsCurrentTransaction() { + void testChangeAutocommitCommitsCurrentTransaction() { when(this.mockTxnManager.isInTransaction()).thenReturn(true); assertThat(this.adapter.isAutoCommit()).isTrue(); @@ -106,7 +106,7 @@ public void testChangeAutocommitCommitsCurrentTransaction() { } @Test - public void testSameAutocommitNoop() { + void testSameAutocommitNoop() { when(this.mockTxnManager.isInTransaction()).thenReturn(true); assertThat(this.adapter.isAutoCommit()).isTrue(); @@ -117,7 +117,7 @@ public void testSameAutocommitNoop() { } @Test - public void unsetQueryOptimizerResultsInDefaultQueryOptions() { + void unsetQueryOptimizerResultsInDefaultQueryOptions() { SpannerConnectionConfiguration config = new SpannerConnectionConfiguration.Builder() .setFullyQualifiedDatabaseName("projects/p/instances/i/databases/d") .setCredentials(mock(GoogleCredentials.class)) @@ -129,7 +129,7 @@ public void unsetQueryOptimizerResultsInDefaultQueryOptions() { } @Test - public void queryOptimizerPropagatesToQueryOptions() { + void queryOptimizerPropagatesToQueryOptions() { SpannerConnectionConfiguration config = new SpannerConnectionConfiguration.Builder() .setFullyQualifiedDatabaseName("projects/p/instances/i/databases/d") .setCredentials(mock(GoogleCredentials.class)) diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/DatabaseClientTransactionManagerTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/DatabaseClientTransactionManagerTest.java index 01e0369675..3061dd33a2 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/DatabaseClientTransactionManagerTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/DatabaseClientTransactionManagerTest.java @@ -35,7 +35,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class DatabaseClientTransactionManagerTest { +class DatabaseClientTransactionManagerTest { DatabaseClientTransactionManager transactionManager; DatabaseClient mockDbClient; @@ -79,7 +79,7 @@ public void setUp() { } @Test - public void testReadonlyTransactionStartedWhileReadWriteInProgressFails() { + void testReadonlyTransactionStartedWhileReadWriteInProgressFails() { this.transactionManager.beginTransaction(); assertThatThrownBy(() -> @@ -89,7 +89,7 @@ public void testReadonlyTransactionStartedWhileReadWriteInProgressFails() { } @Test - public void testReadWriteTransactionStartedWhileReadonlyInProgressFails() { + void testReadWriteTransactionStartedWhileReadonlyInProgressFails() { this.transactionManager.beginReadonlyTransaction(TimestampBound.strong()); assertThatThrownBy(() -> @@ -99,7 +99,7 @@ public void testReadWriteTransactionStartedWhileReadonlyInProgressFails() { } @Test - public void testReadonlyTransactionStartedWhileReadonlyInProgressFails() { + void testReadonlyTransactionStartedWhileReadonlyInProgressFails() { this.transactionManager.beginReadonlyTransaction(TimestampBound.strong()); assertThatThrownBy(() -> @@ -109,7 +109,7 @@ public void testReadonlyTransactionStartedWhileReadonlyInProgressFails() { } @Test - public void testReadWriteTransactionStartedWhileReadwriteInProgressFails() { + void testReadWriteTransactionStartedWhileReadwriteInProgressFails() { this.transactionManager.beginTransaction(); assertThatThrownBy(() -> @@ -119,7 +119,7 @@ public void testReadWriteTransactionStartedWhileReadwriteInProgressFails() { } @Test - public void testCommitWithNoStatementsLogsWarning() { + void testCommitWithNoStatementsLogsWarning() { this.transactionManager.beginTransaction(); this.transactionManager.commitTransaction(); assertThat(redirectedOutput.toString()) diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/SpannerClientLibraryConnectionFactoryTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/SpannerClientLibraryConnectionFactoryTest.java index 88257c23cb..bf9498ca9b 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/SpannerClientLibraryConnectionFactoryTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/SpannerClientLibraryConnectionFactoryTest.java @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; import reactor.core.publisher.Mono; -public class SpannerClientLibraryConnectionFactoryTest { +class SpannerClientLibraryConnectionFactoryTest { SpannerConnectionConfiguration.Builder configBuilder = new SpannerConnectionConfiguration.Builder() @@ -35,7 +35,7 @@ public class SpannerClientLibraryConnectionFactoryTest { .setCredentials(NoCredentials.getInstance()); @Test - public void testProjectId() { + void testProjectId() { SpannerConnectionConfiguration config = this.configBuilder .setProjectId("custom-project") @@ -46,7 +46,7 @@ public void testProjectId() { } @Test - public void testUserAgentString() { + void testUserAgentString() { SpannerConnectionConfiguration config = this.configBuilder.build(); @@ -57,7 +57,7 @@ public void testUserAgentString() { } @Test - public void testSessionCreation() { + void testSessionCreation() { SpannerClientLibraryConnectionFactory cf = new SpannerClientLibraryConnectionFactory(this.configBuilder.build()); Connection conn = Mono.from(cf.create()).block(); diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/SpannerClientLibraryConnectionTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/SpannerClientLibraryConnectionTest.java index 09cfea1724..60af3ed4bc 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/SpannerClientLibraryConnectionTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/SpannerClientLibraryConnectionTest.java @@ -28,7 +28,7 @@ import reactor.core.publisher.Mono; import reactor.test.StepVerifier; -public class SpannerClientLibraryConnectionTest { +class SpannerClientLibraryConnectionTest { SpannerConnectionConfiguration mockConfig; DatabaseClientReactiveAdapter mockAdapter; @@ -44,7 +44,7 @@ public void setUpMocks() { } @Test - public void beginReadonlyTransactionUsesStrongConsistencyByDefault() { + void beginReadonlyTransactionUsesStrongConsistencyByDefault() { when(this.mockAdapter.beginReadonlyTransaction(any())).thenReturn(Mono.empty()); diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/SpannerClientLibraryDmlStatementTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/SpannerClientLibraryDmlStatementTest.java index 03a9dd6e44..9cb8951b24 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/SpannerClientLibraryDmlStatementTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/SpannerClientLibraryDmlStatementTest.java @@ -27,7 +27,7 @@ import reactor.core.publisher.Mono; import reactor.test.StepVerifier; -public class SpannerClientLibraryDmlStatementTest { +class SpannerClientLibraryDmlStatementTest { DatabaseClientReactiveAdapter mockAdapter; @@ -37,7 +37,7 @@ public void setUpAdapterResponse() { } @Test - public void executeSingleNoRowsUpdated() { + void executeSingleNoRowsUpdated() { when(this.mockAdapter.runDmlStatement(any(Statement.class))).thenReturn(Mono.just(0L)); SpannerClientLibraryDmlStatement dmlStatement = @@ -50,7 +50,7 @@ public void executeSingleNoRowsUpdated() { } @Test - public void executeMultiple() { + void executeMultiple() { when(this.mockAdapter.runDmlStatement(any(Statement.class))).thenReturn(Mono.just(0L)); SpannerClientLibraryDmlStatement dmlStatement = diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/SpannerClientLibraryRowMetadataTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/SpannerClientLibraryRowMetadataTest.java index f176fd8b6e..80ef8710cc 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/SpannerClientLibraryRowMetadataTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/SpannerClientLibraryRowMetadataTest.java @@ -32,10 +32,10 @@ /** * Test for {@link SpannerClientLibraryRowMetadata}. */ -public class SpannerClientLibraryRowMetadataTest { +class SpannerClientLibraryRowMetadataTest { @Test - public void testHandleMissingColumn() { + void testHandleMissingColumn() { SpannerClientLibraryRowMetadata metadata = new SpannerClientLibraryRowMetadata(Collections.emptyList()); @@ -45,7 +45,7 @@ public void testHandleMissingColumn() { } @Test - public void testHandleOutOfBoundsIndex() { + void testHandleOutOfBoundsIndex() { SpannerClientLibraryRowMetadata metadata = new SpannerClientLibraryRowMetadata(Collections.emptyList()); @@ -54,7 +54,7 @@ public void testHandleOutOfBoundsIndex() { } @Test - public void testEmptyResultSetMetadata() { + void testEmptyResultSetMetadata() { SpannerClientLibraryRowMetadata metadata = new SpannerClientLibraryRowMetadata(Collections.emptyList()); @@ -63,7 +63,7 @@ public void testEmptyResultSetMetadata() { } @Test - public void testSpannerRowMetadataRetrieval() { + void testSpannerRowMetadataRetrieval() { List structFields = buildResultSetMetadata(Type.int64(), Type.string(), Type.bool()); @@ -79,7 +79,7 @@ public void testSpannerRowMetadataRetrieval() { } @Test - public void testSpannerRowMetadataCaseInsensitivity() { + void testSpannerRowMetadataCaseInsensitivity() { List structFields = buildResultSetMetadata(Type.int64(), Type.string(), Type.bool()); @@ -95,7 +95,7 @@ public void testSpannerRowMetadataCaseInsensitivity() { } @Test - public void getColumnNamesReturnsCorrectNamesWhenColumnsPresent() { + void getColumnNamesReturnsCorrectNamesWhenColumnsPresent() { SpannerClientLibraryRowMetadata metadata = new SpannerClientLibraryRowMetadata( buildResultSetMetadata(Type.int64(), Type.string(), Type.bool())); @@ -104,7 +104,7 @@ public void getColumnNamesReturnsCorrectNamesWhenColumnsPresent() { } @Test - public void getColumnNamesReturnsEmptyCollectionWhenNoColumns() { + void getColumnNamesReturnsEmptyCollectionWhenNoColumns() { SpannerRowMetadata metadata = new SpannerRowMetadata(ResultSetMetadata.getDefaultInstance()); assertThat(metadata.getColumnNames()).isEmpty(); diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/SpannerClientLibraryStatementTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/SpannerClientLibraryStatementTest.java index 9bccca03b7..a0e45a584b 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/SpannerClientLibraryStatementTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/SpannerClientLibraryStatementTest.java @@ -34,7 +34,7 @@ import reactor.core.publisher.Flux; import reactor.test.StepVerifier; -public class SpannerClientLibraryStatementTest { +class SpannerClientLibraryStatementTest { DatabaseClientReactiveAdapter mockAdapter; @@ -47,7 +47,7 @@ public void setUpAdapterResponse() { } @Test - public void executeSingleNoRowsUpdated() { + void executeSingleNoRowsUpdated() { when(this.mockAdapter.runSelectStatement(any(Statement.class))) .thenReturn(Flux.just(new SpannerClientLibraryRow(SINGLE_COLUMN_STRUCT1))); @@ -67,7 +67,7 @@ public void executeSingleNoRowsUpdated() { } @Test - public void executeMultipleReturnsExpectedValuesAndCallsAdapterForEachParameterizedSelect() { + void executeMultipleReturnsExpectedValuesAndCallsAdapterForEachParameterizedSelect() { String query = "SELECT * from table WHERE column=%col1"; Statement expectedSpannerStatement1 = Statement.newBuilder(query) @@ -98,7 +98,7 @@ public void executeMultipleReturnsExpectedValuesAndCallsAdapterForEachParameteri } @Test - public void optimizerVersionPassedThroughToQuery() { + void optimizerVersionPassedThroughToQuery() { QueryOptions queryOptions = QueryOptions.newBuilder().setOptimizerVersion("2").build(); when(this.mockAdapter.getQueryOptions()).thenReturn(queryOptions); SpannerClientLibraryRow mockRow = mock(SpannerClientLibraryRow.class); diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/SpannerResultTest.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/SpannerResultTest.java index 5efc3105fe..e2f1a1f464 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/SpannerResultTest.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/v2/SpannerResultTest.java @@ -30,7 +30,7 @@ /** * Test for {@link SpannerResult}. */ -public class SpannerResultTest { +class SpannerResultTest { private Flux resultSet; @@ -48,7 +48,7 @@ public void setup() { } @Test - public void getRowsUpdatedTest() { + void getRowsUpdatedTest() { StepVerifier.create( ((Mono) new SpannerClientLibraryResult(this.resultSet,Mono.just(2)).getRowsUpdated())) .expectNext(2) @@ -56,19 +56,19 @@ public void getRowsUpdatedTest() { } @Test - public void nullResultSetTest() { + void nullResultSetTest() { assertThatThrownBy(() -> new SpannerResult(null, Mono.empty())) .hasMessage("A non-null flux of rows is required."); } @Test - public void nullRowsTest() { + void nullRowsTest() { assertThatThrownBy(() -> new SpannerResult(Flux.empty(),null)) .hasMessage("A non-null mono of rows updated is required."); } @Test - public void mapTest() { + void mapTest() { Publisher result = new SpannerClientLibraryResult(this.resultSet, Mono.just(0)) .map((row, metadata) -> diff --git a/cloud-spanner-spring-data-r2dbc/cloud-spanner-spring-data-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/springdata/it/SpannerR2dbcDialectIT.java b/cloud-spanner-spring-data-r2dbc/cloud-spanner-spring-data-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/springdata/it/SpannerR2dbcDialectIT.java index dd457fbd10..6435193fde 100644 --- a/cloud-spanner-spring-data-r2dbc/cloud-spanner-spring-data-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/springdata/it/SpannerR2dbcDialectIT.java +++ b/cloud-spanner-spring-data-r2dbc/cloud-spanner-spring-data-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/springdata/it/SpannerR2dbcDialectIT.java @@ -45,7 +45,7 @@ * `testdb` database. This can be configured by overriding the `spanner.instance` and * `spanner.database` system properties. */ -public class SpannerR2dbcDialectIT { +class SpannerR2dbcDialectIT { private static final Logger logger = LoggerFactory.getLogger(SpannerR2dbcDialectIT.class); @@ -94,7 +94,7 @@ public void initializeTestEnvironment() { } @Test - public void testReadWrite() { + void testReadWrite() { insertPresident(new President("Bill Clinton", 1992)); this.databaseClient.select() @@ -109,7 +109,7 @@ public void testReadWrite() { } @Test - public void testLimitOffsetSupport() { + void testLimitOffsetSupport() { insertPresident(new President("Bill Clinton", 1992)); insertPresident(new President("Joe Smith", 1996)); insertPresident(new President("Bob", 2000)); @@ -130,7 +130,7 @@ public void testLimitOffsetSupport() { } @Test - public void testRowMap() { + void testRowMap() { insertPresident(new President("Bill Clinton", 1992)); insertPresident(new President("Joe Smith", 1996)); insertPresident(new President("Bob", 2000));