remove public modifier in unit tests (#309)

Sonar rule: "JUnit5 test classes and methods should have default package visibility"
GoogleCloudPlatform · Feb 11, 2021 · 501cede · 501cede
1 parent bc863db
commit 501cede
Show file tree

Hide file tree

Showing 36 changed files with 218 additions and 218 deletions.
diff --git a/...-r2dbc-samples/cloud-spanner-r2dbc-sample/src/test/java/com/example/BookExampleAppIT.java b/...-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/...spanner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerColumnMetadataTest.java b/...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/...2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerConnectionConfigurationTest.java b/...2dbc/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/...bc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerConnectionFactoryMetadataTest.java b/...bc/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/...bc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerConnectionFactoryProviderTest.java b/...bc/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,15 +97,15 @@ public void setUp() {
   }
 
   @Test
-  public void testCreate() {
+  void testCreate() {
     ConnectionFactory spannerConnectionFactory =
         this.spannerConnectionFactoryProvider.create(SPANNER_OPTIONS);
     assertThat(spannerConnectionFactory).isNotNull();
     assertThat(spannerConnectionFactory).isInstanceOf(SpannerConnectionFactory.class);
   }
 
   @Test
-  public void testCreateFactoryWithUrl() {
+  void testCreateFactoryWithUrl() {
     ConnectionFactoryOptions optionsWithUrl =
         ConnectionFactoryOptions.builder()
             .option(DRIVER, DRIVER_NAME)
@@ -121,36 +121,36 @@ public void testCreateFactoryWithUrl() {
   }
 
   @Test
-  public void testSupportsThrowsExceptionOnNullOptions() {
+  void testSupportsThrowsExceptionOnNullOptions() {
     assertThatThrownBy(() -> {
       this.spannerConnectionFactoryProvider.supports(null);
     }).isInstanceOf(IllegalArgumentException.class)
         .hasMessage("connectionFactoryOptions must not be null");
   }
 
   @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/...nner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerConnectionFactoryTest.java b/...nner-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,15 +50,15 @@ public void setupConnectionConfiguration() throws IOException {
   }
 
   @Test
-  public void getMetadataReturnsSingleton() {
+  void getMetadataReturnsSingleton() {
     Client mockClient = Mockito.mock(Client.class);
     SpannerConnectionFactory factory = new SpannerConnectionFactory(mockClient, this.config);
 
     assertThat(factory.getMetadata()).isSameAs(SpannerConnectionFactoryMetadata.INSTANCE);
   }
 
   @Test
-  public void createReturnsNewSpannerConnection() {
+  void createReturnsNewSpannerConnection() {
 
     Client mockClient = Mockito.mock(Client.class);
     Session session = Session.newBuilder().setName("jam session").build();

diff --git a/...ner-r2dbc/src/test/java/com/google/cloud/spanner/r2dbc/SpannerConnectionMetadataTest.java b/...ner-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");
   }
 }