test(trip-history): clean up otpuser after each test

src/test/java/org/opentripplanner/middleware/persistence/PersistenceTest.java

@@ -4,6 +4,8 @@
 import org.junit.jupiter.api.Test;
 import org.opentripplanner.middleware.OtpMiddlewareTest;
 import org.opentripplanner.middleware.models.OtpUser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -16,6 +18,7 @@
  */
 public class PersistenceTest extends OtpMiddlewareTest {
     private static final String TEST_EMAIL = "[email protected]";
+    private static final Logger LOG = LoggerFactory.getLogger(PersistenceTest.class);
 
     OtpUser user = null;
 
@@ -49,6 +52,7 @@ public void canDeleteUser() {
     @AfterEach
     public void remove() {
         if (user != null) {
+            LOG.info("Deleting user {}", user.id);
             Persistence.otpUsers.removeById(user.id);
         }
     }

src/test/java/org/opentripplanner/middleware/persistence/TripHistoryPersistenceTest.java

@@ -31,6 +31,7 @@
 public class TripHistoryPersistenceTest extends OtpMiddlewareTest {
     private static final String TEST_EMAIL = "[email protected]";
 
+    OtpUser user = null;
     TripRequest tripRequest = null;
     TripSummary tripSummary = null;
     List<TripRequest> tripRequests = null;
@@ -86,7 +87,7 @@ public void canGetFilteredTripRequestsWithFromAndToDate() {
         String TRIP_REQUEST_DATE_CREATED_FIELD_NAME = "dateCreated";
         String TRIP_REQUEST_USER_ID_FIELD_NAME = "userId";
 
-        OtpUser user = createUser(TEST_EMAIL);
+        user = createUser(TEST_EMAIL);
 
         List<TripRequest> tripRequests = createTripRequests(limit, user.id);
 
@@ -114,7 +115,7 @@ public void canGetFilteredTripRequestsFromDate() {
         String TRIP_REQUEST_DATE_CREATED_FIELD_NAME = "dateCreated";
         String TRIP_REQUEST_USER_ID_FIELD_NAME = "userId";
 
-        OtpUser user = createUser(TEST_EMAIL);
+        user = createUser(TEST_EMAIL);
 
         List<TripRequest> tripRequests = createTripRequests(limit, user.id);
 
@@ -137,7 +138,7 @@ public void canGetFilteredTripRequestsToDate() {
         String TRIP_REQUEST_DATE_CREATED_FIELD_NAME = "dateCreated";
         String TRIP_REQUEST_USER_ID_FIELD_NAME = "userId";
 
-        OtpUser user = createUser(TEST_EMAIL);
+        user = createUser(TEST_EMAIL);
 
         tripRequests = createTripRequests(limit, user.id);
 
@@ -159,7 +160,7 @@ public void canGetFilteredTripRequestsForUser() {
         int limit = 3;
         String TRIP_REQUEST_USER_ID_FIELD_NAME = "userId";
 
-        OtpUser user = createUser(TEST_EMAIL);
+        user = createUser(TEST_EMAIL);
 
         tripRequests = createTripRequests(limit, user.id);
 
@@ -175,7 +176,7 @@ public void canGetFilteredTripRequestsForUserWithMaxLimit() {
         int max = 5;
         String TRIP_REQUEST_USER_ID_FIELD_NAME = "userId";
 
-        OtpUser user = createUser(TEST_EMAIL);
+        user = createUser(TEST_EMAIL);
 
         tripRequests = createTripRequests(limit, user.id);
 
@@ -187,16 +188,9 @@ public void canGetFilteredTripRequestsForUserWithMaxLimit() {
 
     @AfterEach
     public void remove() {
-        if (tripRequest != null) {
-            Persistence.tripRequests.removeById(tripRequest.id);
-        }
-
-        if (tripSummary != null) {
-            Persistence.tripSummaries.removeById(tripSummary.id);
-        }
-
-        if (tripRequests != null) {
-            deleteTripRequests(tripRequests);
-        }
+        if (user != null) Persistence.otpUsers.removeById(user.id);
+        if (tripRequest != null) Persistence.tripRequests.removeById(tripRequest.id);
+        if (tripSummary != null) Persistence.tripSummaries.removeById(tripSummary.id);
+        if (tripRequests != null) deleteTripRequests(tripRequests);
     }
 }