From cd1f307f48b67489789b79c3128aa4b9a71cdffd Mon Sep 17 00:00:00 2001
From: Jens Schauder <jschauder@pivotal.io>
Date: Fri, 20 Mar 2020 08:59:42 +0100
Subject: [PATCH] #225 - Polishing.

Moved clean up of the test environment to an `@After` annotated method.

Fixing some code styling.

Original pull request: #226.
---
 .../support/RepositoryIntegrationTests.java   | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/test/java/org/springframework/data/envers/repository/support/RepositoryIntegrationTests.java b/src/test/java/org/springframework/data/envers/repository/support/RepositoryIntegrationTests.java
index 7d4204f..a7a2229 100755
--- a/src/test/java/org/springframework/data/envers/repository/support/RepositoryIntegrationTests.java
+++ b/src/test/java/org/springframework/data/envers/repository/support/RepositoryIntegrationTests.java
@@ -22,6 +22,7 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Optional;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -56,6 +57,14 @@ public class RepositoryIntegrationTests {
 
 	@Before
 	public void setUp() {
+
+		licenseRepository.deleteAll();
+		countryRepository.deleteAll();
+	}
+
+	@After
+	public void tearDown() {
+
 		licenseRepository.deleteAll();
 		countryRepository.deleteAll();
 	}
@@ -80,7 +89,7 @@ public class RepositoryIntegrationTests {
 
 		countryRepository.save(se);
 
-		license.laender = new HashSet<Country>();
+		license.laender = new HashSet<>();
 		license.laender.addAll(Arrays.asList(de, se));
 
 		licenseRepository.save(license);
@@ -97,7 +106,6 @@ public class RepositoryIntegrationTests {
 			Revisions<Integer, License> revisions = Revisions.of(page.getContent());
 			assertThat(revisions.getLatestRevision()).isEqualTo(it);
 		});
-		licenseRepository.deleteAll();
 	}
 
 	@Test // #1
@@ -126,13 +134,11 @@ public class RepositoryIntegrationTests {
 		Revision<Integer, Country> first = iterator.next();
 		Revision<Integer, Country> second = iterator.next();
 
-		assertThat(countryRepository.findRevision(de.id, first.getRequiredRevisionNumber())).hasValueSatisfying(it -> {
-			assertThat(it.getEntity().name).isEqualTo("Deutschland");
-		});
+		assertThat(countryRepository.findRevision(de.id, first.getRequiredRevisionNumber()))
+				.hasValueSatisfying(it -> assertThat(it.getEntity().name).isEqualTo("Deutschland"));
 
-		assertThat(countryRepository.findRevision(de.id, second.getRequiredRevisionNumber())).hasValueSatisfying(it -> {
-			assertThat(it.getEntity().name).isEqualTo("Germany");
-		});
+		assertThat(countryRepository.findRevision(de.id, second.getRequiredRevisionNumber()))
+				.hasValueSatisfying(it -> assertThat(it.getEntity().name).isEqualTo("Germany"));
 	}
 
 	@Test // #55
@@ -193,7 +199,7 @@ public class RepositoryIntegrationTests {
 
 	void check(Country de, int page, int expectedSize) {
 
-		Page<Revision<Integer, Country>> revisions = countryRepository.findRevisions(de.id, PageRequest.of(page,1));
+		Page<Revision<Integer, Country>> revisions = countryRepository.findRevisions(de.id, PageRequest.of(page, 1));
 		assertThat(revisions).hasSize(expectedSize);
 	}
 }