From cefd3fc52784fb62624ae5ae36b117f8cda4bcad Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 13 Sep 2019 17:22:21 +0200 Subject: [PATCH] #185 - Re-enable Postgres integration tests. --- .../r2dbc/core/AbstractDatabaseClientIntegrationTests.java | 2 +- .../PostgresTransactionalDatabaseClientIntegrationTests.java | 2 -- .../repository/PostgresR2dbcRepositoryIntegrationTests.java | 2 -- .../support/PostgresSimpleR2dbcRepositoryIntegrationTests.java | 3 +-- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/test/java/org/springframework/data/r2dbc/core/AbstractDatabaseClientIntegrationTests.java b/src/test/java/org/springframework/data/r2dbc/core/AbstractDatabaseClientIntegrationTests.java index 27101497..16e3e692 100644 --- a/src/test/java/org/springframework/data/r2dbc/core/AbstractDatabaseClientIntegrationTests.java +++ b/src/test/java/org/springframework/data/r2dbc/core/AbstractDatabaseClientIntegrationTests.java @@ -234,8 +234,8 @@ public abstract class AbstractDatabaseClientIntegrationTests extends R2dbcIntegr .using(legoSet) // .fetch() // .rowsUpdated() // + .then() .as(StepVerifier::create) // - .expectNext(1) // .verifyComplete(); databaseClient.select().from(LegoSet.class) // diff --git a/src/test/java/org/springframework/data/r2dbc/core/PostgresTransactionalDatabaseClientIntegrationTests.java b/src/test/java/org/springframework/data/r2dbc/core/PostgresTransactionalDatabaseClientIntegrationTests.java index ac0a15d7..0a164c03 100644 --- a/src/test/java/org/springframework/data/r2dbc/core/PostgresTransactionalDatabaseClientIntegrationTests.java +++ b/src/test/java/org/springframework/data/r2dbc/core/PostgresTransactionalDatabaseClientIntegrationTests.java @@ -5,7 +5,6 @@ import io.r2dbc.spi.ConnectionFactory; import javax.sql.DataSource; import org.junit.ClassRule; -import org.junit.Ignore; import org.springframework.data.r2dbc.testing.ExternalDatabase; import org.springframework.data.r2dbc.testing.PostgresTestSupport; @@ -15,7 +14,6 @@ import org.springframework.data.r2dbc.testing.PostgresTestSupport; * * @author Mark Paluch */ -@Ignore("https://github.com/r2dbc/r2dbc-postgresql/issues/151") public class PostgresTransactionalDatabaseClientIntegrationTests extends AbstractTransactionalDatabaseClientIntegrationTests { diff --git a/src/test/java/org/springframework/data/r2dbc/repository/PostgresR2dbcRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/r2dbc/repository/PostgresR2dbcRepositoryIntegrationTests.java index 5f20e7d2..3c70489f 100644 --- a/src/test/java/org/springframework/data/r2dbc/repository/PostgresR2dbcRepositoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/r2dbc/repository/PostgresR2dbcRepositoryIntegrationTests.java @@ -22,7 +22,6 @@ import reactor.core.publisher.Mono; import javax.sql.DataSource; import org.junit.ClassRule; -import org.junit.Ignore; import org.junit.runner.RunWith; import org.springframework.context.annotation.Bean; @@ -45,7 +44,6 @@ import org.springframework.test.context.junit4.SpringRunner; */ @RunWith(SpringRunner.class) @ContextConfiguration -@Ignore("https://github.com/r2dbc/r2dbc-postgresql/issues/151") public class PostgresR2dbcRepositoryIntegrationTests extends AbstractR2dbcRepositoryIntegrationTests { @ClassRule public static final ExternalDatabase database = PostgresTestSupport.database(); diff --git a/src/test/java/org/springframework/data/r2dbc/repository/support/PostgresSimpleR2dbcRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/r2dbc/repository/support/PostgresSimpleR2dbcRepositoryIntegrationTests.java index e633069d..03c98568 100644 --- a/src/test/java/org/springframework/data/r2dbc/repository/support/PostgresSimpleR2dbcRepositoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/r2dbc/repository/support/PostgresSimpleR2dbcRepositoryIntegrationTests.java @@ -20,8 +20,8 @@ import io.r2dbc.spi.ConnectionFactory; import javax.sql.DataSource; import org.junit.ClassRule; -import org.junit.Ignore; import org.junit.runner.RunWith; + import org.springframework.context.annotation.Configuration; import org.springframework.data.r2dbc.config.AbstractR2dbcConfiguration; import org.springframework.data.r2dbc.testing.ExternalDatabase; @@ -36,7 +36,6 @@ import org.springframework.test.context.junit4.SpringRunner; */ @RunWith(SpringRunner.class) @ContextConfiguration -@Ignore("https://github.com/r2dbc/r2dbc-postgresql/issues/151") public class PostgresSimpleR2dbcRepositoryIntegrationTests extends AbstractSimpleR2dbcRepositoryIntegrationTests { @ClassRule public static final ExternalDatabase database = PostgresTestSupport.database();