diff --git a/src/test/java/org/springframework/data/r2dbc/connectionfactory/SingleConnectionConnectionFactoryUnitTests.java b/src/test/java/org/springframework/data/r2dbc/connectionfactory/SingleConnectionConnectionFactoryUnitTests.java index 13b03f8..74c725c 100644 --- a/src/test/java/org/springframework/data/r2dbc/connectionfactory/SingleConnectionConnectionFactoryUnitTests.java +++ b/src/test/java/org/springframework/data/r2dbc/connectionfactory/SingleConnectionConnectionFactoryUnitTests.java @@ -34,10 +34,10 @@ import org.junit.jupiter.api.Test; * * @author Mark Paluch */ -public class SingleConnectionConnectionFactoryUnitTests { +class SingleConnectionConnectionFactoryUnitTests { @Test // gh-204 - public void shouldAllocateSameConnection() { + void shouldAllocateSameConnection() { SingleConnectionConnectionFactory factory = new SingleConnectionConnectionFactory("r2dbc:h2:mem:///foo", false); @@ -52,7 +52,7 @@ public class SingleConnectionConnectionFactoryUnitTests { } @Test // gh-204 - public void shouldApplyAutoCommit() { + void shouldApplyAutoCommit() { SingleConnectionConnectionFactory factory = new SingleConnectionConnectionFactory("r2dbc:h2:mem:///foo", false); factory.setAutoCommit(false); @@ -71,7 +71,7 @@ public class SingleConnectionConnectionFactoryUnitTests { } @Test // gh-204 - public void shouldSuppressClose() { + void shouldSuppressClose() { SingleConnectionConnectionFactory factory = new SingleConnectionConnectionFactory("r2dbc:h2:mem:///foo", true); @@ -87,7 +87,7 @@ public class SingleConnectionConnectionFactoryUnitTests { } @Test // gh-204 - public void shouldNotSuppressClose() { + void shouldNotSuppressClose() { SingleConnectionConnectionFactory factory = new SingleConnectionConnectionFactory("r2dbc:h2:mem:///foo", false); @@ -101,7 +101,7 @@ public class SingleConnectionConnectionFactoryUnitTests { } @Test // gh-204 - public void releaseConnectionShouldCloseUnrelatedConnection() { + void releaseConnectionShouldCloseUnrelatedConnection() { Connection connectionMock = mock(Connection.class); Connection otherConnection = mock(Connection.class); diff --git a/src/test/java/org/springframework/data/r2dbc/dialect/PostgresDialectUnitTests.java b/src/test/java/org/springframework/data/r2dbc/dialect/PostgresDialectUnitTests.java index b6760ed..f94f80f 100644 --- a/src/test/java/org/springframework/data/r2dbc/dialect/PostgresDialectUnitTests.java +++ b/src/test/java/org/springframework/data/r2dbc/dialect/PostgresDialectUnitTests.java @@ -1,3 +1,18 @@ +/* + * Copyright 2019-2021 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.data.r2dbc.dialect; import static org.assertj.core.api.Assertions.*; diff --git a/src/test/java/org/springframework/data/r2dbc/dialect/SqlServerDialectUnitTests.java b/src/test/java/org/springframework/data/r2dbc/dialect/SqlServerDialectUnitTests.java index f105bc7..46e266f 100644 --- a/src/test/java/org/springframework/data/r2dbc/dialect/SqlServerDialectUnitTests.java +++ b/src/test/java/org/springframework/data/r2dbc/dialect/SqlServerDialectUnitTests.java @@ -1,3 +1,18 @@ +/* + * Copyright 2019-2021 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.data.r2dbc.dialect; import static org.assertj.core.api.Assertions.*; diff --git a/src/test/java/org/springframework/data/r2dbc/repository/AbstractR2dbcRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/r2dbc/repository/AbstractR2dbcRepositoryIntegrationTests.java index c75423d..be7d52c 100644 --- a/src/test/java/org/springframework/data/r2dbc/repository/AbstractR2dbcRepositoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/r2dbc/repository/AbstractR2dbcRepositoryIntegrationTests.java @@ -28,7 +28,6 @@ import reactor.core.publisher.Mono; import reactor.test.StepVerifier; import java.util.Arrays; -import java.util.Collections; import java.util.Map; import java.util.stream.IntStream; @@ -214,7 +213,7 @@ public abstract class AbstractR2dbcRepositoryIntegrationTests extends R2dbcInteg .verifyComplete(); Map count = jdbc.queryForMap("SELECT count(*) AS count FROM legoset"); - assertThat(count).hasEntrySatisfying("count", numberOf(1)); + assertThat(getCount(count)).satisfies(numberOf(1)); } @Test // gh-335 @@ -293,11 +292,13 @@ public abstract class AbstractR2dbcRepositoryIntegrationTests extends R2dbcInteg Mono> nonTransactional = repository.save(legoSet2) // .map(it -> jdbc.queryForMap("SELECT count(*) AS count FROM legoset")); - transactional.as(StepVerifier::create).expectNext(Collections.singletonMap("count", 0L)).verifyComplete(); - nonTransactional.as(StepVerifier::create).expectNext(Collections.singletonMap("count", 2L)).verifyComplete(); + transactional.as(StepVerifier::create).assertNext(actual -> assertThat(getCount(actual)).satisfies(numberOf(0))) + .verifyComplete(); + nonTransactional.as(StepVerifier::create).assertNext(actual -> assertThat(getCount(actual)).satisfies(numberOf(2))) + .verifyComplete(); - Map count = jdbc.queryForMap("SELECT count(*) AS count FROM legoset"); - assertThat(count).hasEntrySatisfying("count", numberOf(2)); + Map map = jdbc.queryForMap("SELECT count(*) AS count FROM legoset"); + assertThat(getCount(map)).satisfies(numberOf(2)); } @Test // gh-363 @@ -353,6 +354,10 @@ public abstract class AbstractR2dbcRepositoryIntegrationTests extends R2dbcInteg .verifyComplete(); } + private static Object getCount(Map map) { + return map.getOrDefault("count", map.get("COUNT")); + } + private Condition numberOf(int expected) { return new Condition<>(it -> { return it instanceof Number && ((Number) it).intValue() == expected; diff --git a/src/test/java/org/springframework/data/r2dbc/testing/ExternalDatabase.java b/src/test/java/org/springframework/data/r2dbc/testing/ExternalDatabase.java index b87cb50..6e3c704 100644 --- a/src/test/java/org/springframework/data/r2dbc/testing/ExternalDatabase.java +++ b/src/test/java/org/springframework/data/r2dbc/testing/ExternalDatabase.java @@ -138,7 +138,6 @@ public abstract class ExternalDatabase implements BeforeAllCallback { .port(container.getFirstMappedPort()) // .username(container.getUsername()) // .password(container.getPassword()) // - .database(container.getDatabaseName()) // .jdbcUrl(container.getJdbcUrl()); } diff --git a/src/test/java/org/springframework/data/r2dbc/testing/H2TestSupport.java b/src/test/java/org/springframework/data/r2dbc/testing/H2TestSupport.java index 4998683..dd058eb 100644 --- a/src/test/java/org/springframework/data/r2dbc/testing/H2TestSupport.java +++ b/src/test/java/org/springframework/data/r2dbc/testing/H2TestSupport.java @@ -68,6 +68,7 @@ public class H2TestSupport { dataSource.setUsername("sa"); dataSource.setPassword(""); dataSource.setUrl("jdbc:h2:mem:r2dbc;DB_CLOSE_DELAY=-1"); + dataSource.setDriverClassName("org.h2.Driver"); return dataSource; } diff --git a/src/test/java/org/springframework/data/r2dbc/testing/MariaDbTestSupport.java b/src/test/java/org/springframework/data/r2dbc/testing/MariaDbTestSupport.java index 53f3526..041c065 100644 --- a/src/test/java/org/springframework/data/r2dbc/testing/MariaDbTestSupport.java +++ b/src/test/java/org/springframework/data/r2dbc/testing/MariaDbTestSupport.java @@ -85,7 +85,7 @@ public class MariaDbTestSupport { } /** - * Returns a locally provided database at {@code postgres:@localhost:5432/postgres}. + * Returns a locally provided database . */ private static ExternalDatabase local() { @@ -112,6 +112,7 @@ public class MariaDbTestSupport { testContainerDatabase = ProvidedDatabase.builder(container) // .username("root") // + .database(container.getDatabaseName()) // .build(); } catch (IllegalStateException ise) { // docker not available. diff --git a/src/test/java/org/springframework/data/r2dbc/testing/MySqlTestSupport.java b/src/test/java/org/springframework/data/r2dbc/testing/MySqlTestSupport.java index 944a343..57b28f3 100644 --- a/src/test/java/org/springframework/data/r2dbc/testing/MySqlTestSupport.java +++ b/src/test/java/org/springframework/data/r2dbc/testing/MySqlTestSupport.java @@ -57,7 +57,7 @@ public class MySqlTestSupport { + ") ENGINE=InnoDB;"; /** - * Returns a database either hosted locally at {@code postgres:@localhost:5432/postgres} or running inside Docker. + * Returns a database either hosted locally or running inside Docker. * * @return information about the database. Guaranteed to be not {@literal null}. */ @@ -88,7 +88,7 @@ public class MySqlTestSupport { } /** - * Returns a locally provided database at {@code postgres:@localhost:5432/postgres}. + * Returns a locally provided database. */ private static ExternalDatabase local() { @@ -114,6 +114,7 @@ public class MySqlTestSupport { container.start(); testContainerDatabase = ProvidedDatabase.builder(container) // + .database(container.getDatabaseName()) // .username("root") // .build(); } catch (IllegalStateException ise) { diff --git a/src/test/java/org/springframework/data/r2dbc/testing/PostgresTestSupport.java b/src/test/java/org/springframework/data/r2dbc/testing/PostgresTestSupport.java index 26cd2d6..590a642 100644 --- a/src/test/java/org/springframework/data/r2dbc/testing/PostgresTestSupport.java +++ b/src/test/java/org/springframework/data/r2dbc/testing/PostgresTestSupport.java @@ -97,7 +97,7 @@ public class PostgresTestSupport { PostgreSQLContainer.IMAGE + ":" + PostgreSQLContainer.DEFAULT_TAG); container.start(); - testContainerDatabase = ProvidedDatabase.from(container); + testContainerDatabase = ProvidedDatabase.builder(container).database(container.getDatabaseName()).build(); } catch (IllegalStateException ise) { // docker not available.