From ee5e3a72e8e86cf58bb9f958875f366e31f3ed85 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 20 Jun 2018 11:35:59 +0200 Subject: [PATCH] #2 - Refactor R2dbc test support code into R2dbcIntegrationTestSupport. --- .../DatabaseClientIntegrationTests.java | 27 ++----- .../ExternalDatabase.java | 4 +- .../testing/R2dbcIntegrationTestSupport.java | 70 +++++++++++++++++++ 3 files changed, 76 insertions(+), 25 deletions(-) rename src/test/java/org/springframework/data/jdbc/{core/function => testing}/ExternalDatabase.java (96%) create mode 100644 src/test/java/org/springframework/data/jdbc/testing/R2dbcIntegrationTestSupport.java diff --git a/src/test/java/org/springframework/data/jdbc/core/function/DatabaseClientIntegrationTests.java b/src/test/java/org/springframework/data/jdbc/core/function/DatabaseClientIntegrationTests.java index 9acba55c..bcd0c499 100644 --- a/src/test/java/org/springframework/data/jdbc/core/function/DatabaseClientIntegrationTests.java +++ b/src/test/java/org/springframework/data/jdbc/core/function/DatabaseClientIntegrationTests.java @@ -18,21 +18,17 @@ package org.springframework.data.jdbc.core.function; import static org.assertj.core.api.Assertions.*; import static org.springframework.data.domain.Sort.Order.*; -import io.r2dbc.postgresql.PostgresqlConnectionConfiguration; -import io.r2dbc.postgresql.PostgresqlConnectionFactory; import io.r2dbc.spi.ConnectionFactory; import lombok.Data; import reactor.core.publisher.Hooks; import reactor.test.StepVerifier; import org.junit.Before; -import org.junit.ClassRule; import org.junit.Test; -import org.postgresql.ds.PGSimpleDataSource; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; -import org.springframework.data.jdbc.core.function.ExternalDatabase.ProvidedDatabase; import org.springframework.data.jdbc.core.mapping.Table; +import org.springframework.data.jdbc.testing.R2dbcIntegrationTestSupport; import org.springframework.jdbc.core.JdbcTemplate; /** @@ -40,13 +36,7 @@ import org.springframework.jdbc.core.JdbcTemplate; * * @author Mark Paluch */ -public class DatabaseClientIntegrationTests { - - /** - * Local test database at {@code postgres:@localhost:5432/postgres}. - */ - @ClassRule public static final ExternalDatabase database = ProvidedDatabase.builder().hostname("localhost").port(5432) - .database("postgres").username("postgres").password("").build(); +public class DatabaseClientIntegrationTests extends R2dbcIntegrationTestSupport { private ConnectionFactory connectionFactory; @@ -57,22 +47,13 @@ public class DatabaseClientIntegrationTests { Hooks.onOperatorDebug(); - connectionFactory = new PostgresqlConnectionFactory( - PostgresqlConnectionConfiguration.builder().host(database.getHostname()).database(database.getDatabase()) - .username(database.getUsername()).password(database.getPassword()).build()); - - PGSimpleDataSource dataSource = new PGSimpleDataSource(); - dataSource.setUser(database.getUsername()); - dataSource.setPassword(database.getPassword()); - dataSource.setDatabaseName(database.getDatabase()); - dataSource.setServerName(database.getHostname()); - dataSource.setPortNumber(database.getPort()); + connectionFactory = createConnectionFactory(); String tableToCreate = "CREATE TABLE IF NOT EXISTS legoset (\n" + " id integer CONSTRAINT id PRIMARY KEY,\n" + " name varchar(255) NOT NULL,\n" + " manual integer NULL\n" + ");"; - jdbc = new JdbcTemplate(dataSource); + jdbc = createJdbcTemplate(createDataSource()); jdbc.execute(tableToCreate); jdbc.execute("DELETE FROM legoset"); } diff --git a/src/test/java/org/springframework/data/jdbc/core/function/ExternalDatabase.java b/src/test/java/org/springframework/data/jdbc/testing/ExternalDatabase.java similarity index 96% rename from src/test/java/org/springframework/data/jdbc/core/function/ExternalDatabase.java rename to src/test/java/org/springframework/data/jdbc/testing/ExternalDatabase.java index c2e84932..2c6ebe39 100644 --- a/src/test/java/org/springframework/data/jdbc/core/function/ExternalDatabase.java +++ b/src/test/java/org/springframework/data/jdbc/testing/ExternalDatabase.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jdbc.core.function; +package org.springframework.data.jdbc.testing; import lombok.Builder; @@ -75,7 +75,7 @@ public abstract class ExternalDatabase extends ExternalResource { * Provided (unmanaged resource) database connection coordinates. */ @Builder - static class ProvidedDatabase extends ExternalDatabase { + public static class ProvidedDatabase extends ExternalDatabase { private final int port; private final String hostname; diff --git a/src/test/java/org/springframework/data/jdbc/testing/R2dbcIntegrationTestSupport.java b/src/test/java/org/springframework/data/jdbc/testing/R2dbcIntegrationTestSupport.java new file mode 100644 index 00000000..ea99ac4c --- /dev/null +++ b/src/test/java/org/springframework/data/jdbc/testing/R2dbcIntegrationTestSupport.java @@ -0,0 +1,70 @@ +/* + * Copyright 2018 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 + * + * http://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.jdbc.testing; + +import io.r2dbc.postgresql.PostgresqlConnectionConfiguration; +import io.r2dbc.postgresql.PostgresqlConnectionFactory; +import io.r2dbc.spi.ConnectionFactory; + +import javax.sql.DataSource; + +import org.junit.ClassRule; +import org.postgresql.ds.PGSimpleDataSource; +import org.springframework.data.jdbc.testing.ExternalDatabase.ProvidedDatabase; +import org.springframework.jdbc.core.JdbcTemplate; + +/** + * Base class for R2DBC integration tests. + * + * @author Mark Paluch + */ +public abstract class R2dbcIntegrationTestSupport { + + /** + * Local test database at {@code postgres:@localhost:5432/postgres}. + */ + @ClassRule public static final ExternalDatabase database = ProvidedDatabase.builder().hostname("localhost").port(5432) + .database("postgres").username("postgres").password("").build(); + + /** + * Creates a new {@link ConnectionFactory} configured from the {@link ExternalDatabase}.. + */ + protected static ConnectionFactory createConnectionFactory() { + return new PostgresqlConnectionFactory(PostgresqlConnectionConfiguration.builder().host(database.getHostname()) + .database(database.getDatabase()).username(database.getUsername()).password(database.getPassword()).build()); + } + + /** + * Creates a new {@link DataSource} configured from the {@link ExternalDatabase}. + */ + protected static DataSource createDataSource() { + + PGSimpleDataSource dataSource = new PGSimpleDataSource(); + dataSource.setUser(database.getUsername()); + dataSource.setPassword(database.getPassword()); + dataSource.setDatabaseName(database.getDatabase()); + dataSource.setServerName(database.getHostname()); + dataSource.setPortNumber(database.getPort()); + return dataSource; + } + + /** + * Creates a new {@link JdbcTemplate} for a {@link DataSource}. + */ + protected JdbcTemplate createJdbcTemplate(DataSource dataSource) { + return new JdbcTemplate(dataSource); + } +}