tweak tests to be more resilient

commafeed-server/src/test/java/com/commafeed/integration/WebSocketIT.java

@@ -13,6 +13,7 @@ import java.util.stream.Collectors;
 
 import org.apache.hc.core5.http.HttpStatus;
 import org.awaitility.Awaitility;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -41,6 +42,11 @@ class WebSocketIT extends BaseIT {
 		RestAssured.authentication = RestAssured.preemptive().basic("admin", "admin");
 	}
 
+	@AfterEach
+	void tearDown() {
+		RestAssured.reset();
+	}
+
 	@Test
 	void sessionClosedIfNotLoggedIn() throws DeploymentException, IOException {
 		AtomicBoolean connected = new AtomicBoolean();

commafeed-server/src/test/java/com/commafeed/integration/rest/AdminIT.java

@@ -3,6 +3,7 @@ package com.commafeed.integration.rest;
 import java.util.List;
 
 import org.apache.hc.core5.http.HttpStatus;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
@@ -25,6 +26,11 @@ class AdminIT extends BaseIT {
 		RestAssured.authentication = RestAssured.preemptive().basic("admin", "admin");
 	}
 
+	@AfterEach
+	void cleanup() {
+		RestAssured.reset();
+	}
+
 	@Nested
 	class Users {
 		@Test

commafeed-server/src/test/java/com/commafeed/integration/rest/FeedIT.java

@@ -11,6 +11,7 @@ import java.util.Objects;
 import org.apache.commons.io.IOUtils;
 import org.apache.hc.core5.http.HttpStatus;
 import org.awaitility.Awaitility;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
@@ -38,6 +39,11 @@ class FeedIT extends BaseIT {
 		RestAssured.authentication = RestAssured.preemptive().basic("admin", "admin");
 	}
 
+	@AfterEach
+	void cleanup() {
+		RestAssured.reset();
+	}
+
 	@Nested
 	class Fetch {
 		@Test

commafeed-server/src/test/java/com/commafeed/integration/rest/FeverIT.java

@@ -1,6 +1,7 @@
 package com.commafeed.integration.rest;
 
 import org.apache.hc.core5.http.HttpStatus;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -37,6 +38,11 @@ class FeverIT extends BaseIT {
 		this.userId = user.getId();
 	}
 
+	@AfterEach
+	void cleanup() {
+		RestAssured.reset();
+	}
+
 	@Test
 	void invalidApiKey() {
 		FeverResponse response = fetch("feeds", "invalid-key");

commafeed-server/src/test/java/com/commafeed/integration/rest/UserIT.java

@@ -2,6 +2,7 @@ package com.commafeed.integration.rest;
 
 import java.util.List;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -29,6 +30,11 @@ class UserIT extends BaseIT {
 		mailbox.clear();
 	}
 
+	@AfterEach
+	void cleanup() {
+		RestAssured.reset();
+	}
+
 	@Test
 	void resetPassword() {
 		PasswordResetRequest req = new PasswordResetRequest();

commafeed-server/src/test/java/com/commafeed/integration/servlet/CustomCodeIT.java

@@ -2,6 +2,7 @@ package com.commafeed.integration.servlet;
 
 import org.apache.hc.core5.http.HttpStatus;
 import org.hamcrest.CoreMatchers;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -20,6 +21,11 @@ class CustomCodeIT extends BaseIT {
 		RestAssured.authentication = RestAssured.preemptive().basic("admin", "admin");
 	}
 
+	@AfterEach
+	void cleanup() {
+		RestAssured.reset();
+	}
+
 	@Test
 	void test() {
 		// get settings

commafeed-server/src/test/java/com/commafeed/integration/servlet/NextUnreadIT.java

@@ -1,6 +1,7 @@
 package com.commafeed.integration.servlet;
 
 import org.apache.hc.core5.http.HttpStatus;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -18,6 +19,11 @@ class NextUnreadIT extends BaseIT {
 		RestAssured.authentication = RestAssured.preemptive().basic("admin", "admin");
 	}
 
+	@AfterEach
+	void cleanup() {
+		RestAssured.reset();
+	}
+
 	@Test
 	void test() {
 		subscribeAndWaitForEntries(getFeedUrl());