[#487] Clean tables after every test

In preparation of having a single factory per test class

Author: DavideD

hibernate-reactive-core/src/test/java/org/hibernate/reactive/BatchFetchTest.java

@@ -10,6 +10,8 @@
 import org.hibernate.LockMode;
 import org.hibernate.annotations.BatchSize;
 import org.hibernate.cfg.Configuration;
+
+import org.junit.After;
 import org.junit.Test;
 
 import javax.persistence.CascadeType;
@@ -45,6 +47,13 @@ protected Configuration constructConfiguration() {
 		return configuration;
 	}
 
+	@After
+	public void cleanDb(TestContext context) {
+		test( context, getSessionFactory()
+				.withTransaction( (s, t) -> s.createQuery( "delete from Element" ).executeUpdate()
+						.thenCompose( v -> s.createQuery( "delete from Node" ).executeUpdate() ) ) );
+	}
+
 	@Test
 	public void testQuery(TestContext context) {
 

hibernate-reactive-core/src/test/java/org/hibernate/reactive/BatchQueryOnConnectionTest.java

@@ -15,6 +15,7 @@
 import org.hibernate.cfg.Configuration;
 import org.hibernate.reactive.pool.ReactiveConnection;
 
+import org.junit.After;
 import org.junit.Test;
 
 import io.vertx.ext.unit.TestContext;
@@ -24,6 +25,11 @@
 public class BatchQueryOnConnectionTest extends BaseReactiveTest {
 	private static final int BATCH_SIZE = 20;
 
+	@After
+	public void cleanDb(TestContext context) {
+		test( context, deleteEntities( "DataPoint" ) );
+	}
+
 	@Test
 	public void testBatchInsertSizeEqMultiple(TestContext context) {
 		final List<List<Object[]>> paramsBatches = doBatchInserts( context, 50, BATCH_SIZE );

hibernate-reactive-core/src/test/java/org/hibernate/reactive/EagerElementCollectionForBasicTypeListTest.java

@@ -20,6 +20,7 @@
 import org.hibernate.reactive.mutiny.Mutiny;
 import org.hibernate.reactive.stage.Stage;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -61,6 +62,11 @@ public void populateDb(TestContext context) {
 		test( context, session.persist( thePerson ).call( session::flush ) );
 	}
 
+	@After
+	public void cleanDb(TestContext context) {
+		test( context, deleteEntities( "Person" ) );
+	}
+
 	@Test
 	public void persistWithMutinyAPI(TestContext context) {
 		Mutiny.Session session = openMutinySession();

hibernate-reactive-core/src/test/java/org/hibernate/reactive/EagerElementCollectionForBasicTypeMapTest.java

@@ -20,6 +20,7 @@
 import org.hibernate.reactive.mutiny.Mutiny;
 import org.hibernate.reactive.stage.Stage;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -59,6 +60,11 @@ public void populateDb(TestContext context) {
 		test( context, session.persist( thePerson ).call( session::flush ) );
 	}
 
+	@After
+	public void cleanDb(TestContext context) {
+		test( context, deleteEntities( "Person" ) );
+	}
+
 	@Test
 	public void persistWithMutinyAPI(TestContext context) {
 		Mutiny.Session session = openMutinySession();

hibernate-reactive-core/src/test/java/org/hibernate/reactive/EagerElementCollectionForBasicTypeSetTest.java

@@ -23,6 +23,7 @@
 import org.hibernate.reactive.mutiny.Mutiny;
 import org.hibernate.reactive.stage.Stage;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -64,6 +65,11 @@ public void populateDb(TestContext context) {
 		test( context, session.persist( thePerson ).call( session::flush ) );
 	}
 
+	@After
+	public void cleanDb(TestContext context) {
+		test( context, deleteEntities( "Person" ) );
+	}
+
 	@Test
 	public void persistWithMutinyAPI(TestContext context) {
 		Mutiny.Session session = openMutinySession();

hibernate-reactive-core/src/test/java/org/hibernate/reactive/EagerElementCollectionForEmbeddableEntityTypeMapTest.java

@@ -21,6 +21,7 @@
 import org.hibernate.reactive.mutiny.Mutiny;
 import org.hibernate.reactive.stage.Stage;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -47,6 +48,11 @@ public void populateDb(TestContext context) {
 		test( context, session.persist( thePerson ).call( session::flush ) );
 	}
 
+	@After
+	public void cleanDb(TestContext context) {
+		test( context, deleteEntities( "Person" ) );
+	}
+
 	@Test
 	public void persistWithMutinyAPI(TestContext context) {
 		Mutiny.Session session = openMutinySession();

hibernate-reactive-core/src/test/java/org/hibernate/reactive/EagerElementCollectionForEmbeddableTypeListTest.java

@@ -20,6 +20,7 @@
 import org.hibernate.reactive.mutiny.Mutiny;
 import org.hibernate.reactive.stage.Stage;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -71,6 +72,11 @@ public void populateDb(TestContext context) {
 		);
 	}
 
+	@After
+	public void cleanDb(TestContext context) {
+		test( context, deleteEntities( "Person" ) );
+	}
+
 	@Test
 	public void persistWithMutinyAPI(TestContext context) {
 		Mutiny.Session session = openMutinySession();

hibernate-reactive-core/src/test/java/org/hibernate/reactive/EagerElementCollectionForEmbeddedEmbeddableMapTest.java

@@ -21,6 +21,7 @@
 import org.hibernate.reactive.mutiny.Mutiny;
 import org.hibernate.reactive.stage.Stage;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -48,6 +49,11 @@ public void populateDb(TestContext context) {
 		test( context, session.persist( thePerson ).call( session::flush ) );
 	}
 
+	@After
+	public void cleanDb(TestContext context) {
+		test( context, deleteEntities( "Person" ) );
+	}
+
 	@Test
 	public void persistWithMutinyAPI(TestContext context) {
 		Mutiny.Session session = openMutinySession();

hibernate-reactive-core/src/test/java/org/hibernate/reactive/EagerElementCollectionForEmbeddedEmbeddableTest.java

@@ -21,6 +21,7 @@
 import org.hibernate.reactive.mutiny.Mutiny;
 import org.hibernate.reactive.stage.Stage;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -71,6 +72,11 @@ public void populateDb(TestContext context) {
 		);
 	}
 
+	@After
+	public void cleanDb(TestContext context) {
+		test( context, deleteEntities( "Person" ) );
+	}
+
 	@Test
 	public void persistWithMutinyAPI(TestContext context) {
 		Mutiny.Session session = openMutinySession();

hibernate-reactive-core/src/test/java/org/hibernate/reactive/EagerManyToOneAssociationTest.java

@@ -7,6 +7,8 @@
 
 import io.vertx.ext.unit.TestContext;
 import org.hibernate.cfg.Configuration;
+
+import org.junit.After;
 import org.junit.Test;
 
 import javax.persistence.*;
@@ -25,6 +27,11 @@ protected Configuration constructConfiguration() {
 		return configuration;
 	}
 
+	@After
+	public void cleanDb(TestContext context) {
+		test( context, deleteEntities( Book.class, Author.class ) );
+	}
+
 	@Test
 	public void persistOneBook(TestContext context) {
 		final Book book = new Book( 6, "The Boy, The Mole, The Fox and The Horse" );

hibernate-reactive-core/src/test/java/org/hibernate/reactive/EagerOneToManyAssociationTest.java

@@ -5,7 +5,6 @@
  */
 package org.hibernate.reactive;
 
-import io.vertx.ext.unit.TestContext;
 import org.hibernate.cfg.Configuration;
 import org.junit.Test;
 
@@ -14,6 +13,10 @@
 import java.util.List;
 import java.util.Objects;
 
+import org.junit.After;
+
+import io.vertx.ext.unit.TestContext;
+
 import static org.hibernate.reactive.util.impl.CompletionStages.completedFuture;
 import static org.hibernate.reactive.util.impl.CompletionStages.voidFuture;
 
@@ -25,6 +28,11 @@ protected Configuration constructConfiguration() {
 		configuration.addAnnotatedClass( Author.class );
 		return configuration;
 	}
+
+	@After
+	public void cleanDb(TestContext context) {
+		test( context, deleteEntities( Author.class, Book.class ) );
+	}
 //
 //	private CompletionStage<Integer> populateDB(Book... books) {
 //		StringBuilder authorQueryBuilder = new StringBuilder();

hibernate-reactive-core/src/test/java/org/hibernate/reactive/EagerOneToOneAssociationTest.java

@@ -7,6 +7,8 @@
 
 import io.vertx.ext.unit.TestContext;
 import org.hibernate.cfg.Configuration;
+
+import org.junit.After;
 import org.junit.Test;
 
 import javax.persistence.*;
@@ -24,6 +26,11 @@ protected Configuration constructConfiguration() {
 		return configuration;
 	}
 
+	@After
+	public void cleanDb(TestContext context) {
+		test( context, deleteEntities( Book.class, Author.class ) );
+	}
+
 	@Test
 	public void testPersist(TestContext context) {
 		final Book mostPopularBook = new Book( 5, "The Boy, The Mole, The Fox and The Horse" );

hibernate-reactive-core/src/test/java/org/hibernate/reactive/EagerOrderedElementCollectionForEmbeddableTypeListTest.java

@@ -10,6 +10,8 @@
 import org.hibernate.cfg.Configuration;
 import org.hibernate.reactive.mutiny.Mutiny;
 import org.hibernate.reactive.stage.Stage;
+
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -70,6 +72,11 @@ public void populateDb(TestContext context) {
 		);
 	}
 
+	@After
+	public void cleanDb(TestContext context) {
+		test( context, deleteEntities( "Person" ) );
+	}
+
 	@Test
 	public void persistWithMutinyAPI(TestContext context) {
 		Mutiny.Session session = openMutinySession();

hibernate-reactive-core/src/test/java/org/hibernate/reactive/EagerTest.java

@@ -10,6 +10,8 @@
 import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
 import org.hibernate.cfg.Configuration;
+
+import org.junit.After;
 import org.junit.Test;
 
 import javax.persistence.CascadeType;
@@ -46,6 +48,13 @@ protected Configuration constructConfiguration() {
 		return configuration;
 	}
 
+	@After
+	public void cleanDb(TestContext context) {
+		test( context, getSessionFactory()
+				.withTransaction( (s, t) -> s.createQuery( "delete from Element" ).executeUpdate()
+						.thenCompose( v -> s.createQuery( "delete from Node" ).executeUpdate() ) ) );
+	}
+
 	@Test
 	public void testEagerCollectionFetch(TestContext context) {
 

hibernate-reactive-core/src/test/java/org/hibernate/reactive/EmptyCompositeCollectionKeyTest.java

@@ -22,6 +22,7 @@
 import org.hibernate.reactive.stage.Stage;
 import org.hibernate.reactive.testing.DatabaseSelectionRule;
 
+import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -40,6 +41,11 @@ protected Configuration constructConfiguration() {
 		return configuration;
 	}
 
+	@After
+	public void cleanDb(TestContext context) {
+		test( context, deleteEntities( "Family" ) );
+	}
+
 	@Test
 	public void testGetEntityWithEmptyChildrenCollection(TestContext context) {
 		/* CASE 1:  Family has Parent + child with null names + NULL relatives */

hibernate-reactive-core/src/test/java/org/hibernate/reactive/FetchModeSubselectEagerTest.java

@@ -10,6 +10,8 @@
 import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
 import org.hibernate.cfg.Configuration;
+
+import org.junit.After;
 import org.junit.Test;
 
 import javax.persistence.*;
@@ -30,6 +32,13 @@ protected Configuration constructConfiguration() {
 		return configuration;
 	}
 
+	@After
+	public void cleanDb(TestContext context) {
+		test( context, getSessionFactory()
+				.withTransaction( (s, t) -> s.createQuery( "delete from Element" ).executeUpdate()
+						.thenCompose( v -> s.createQuery( "delete from Node" ).executeUpdate() ) ) );
+	}
+
 	@Test
 	public void testEagerCollectionFetch(TestContext context) {
 

hibernate-reactive-core/src/test/java/org/hibernate/reactive/FilterTest.java

@@ -8,6 +8,8 @@
 import io.vertx.ext.unit.TestContext;
 import org.hibernate.annotations.Filter;
 import org.hibernate.cfg.Configuration;
+
+import org.junit.After;
 import org.junit.Test;
 
 import javax.persistence.*;
@@ -30,6 +32,14 @@ protected Configuration constructConfiguration() {
 		return configuration;
 	}
 
+	@After
+	public void cleanDb(TestContext context) {
+		test( context, deleteEntities( "Element" )
+				.thenCompose( v -> getSessionFactory()
+						.withTransaction( (s, t) -> s
+								.createQuery( "delete from Node" ).executeUpdate() ) ) );
+	}
+
 	@Test
 	public void testFilter(TestContext context) {
 

hibernate-reactive-core/src/test/java/org/hibernate/reactive/GeneratedPropertyJoinedTableTest.java

@@ -23,6 +23,7 @@
 import org.hibernate.cfg.Configuration;
 import org.hibernate.reactive.testing.DatabaseSelectionRule;
 
+import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -50,6 +51,11 @@ protected Configuration constructConfiguration() {
 		return configuration;
 	}
 
+	@After
+	public void cleanDb(TestContext context) {
+		test( context, deleteEntities( "GeneratedWithIdentity", "GeneratedRegular" ) );
+	}
+
 	@Test
 	public void testWithIdentity(TestContext context) {
 		final GeneratedWithIdentity davide = new GeneratedWithIdentity( "Davide", "D'Alto" );