Rebase cleanup, update to response codes

opendcs · Feb 20, 2025 · 88ba624 · 88ba624
1 parent 52f111f
commit 88ba624
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/opendcs-rest-api/src/test/java/org/opendcs/odcsapi/fixtures/DatabaseSetupExtension.java b/opendcs-rest-api/src/test/java/org/opendcs/odcsapi/fixtures/DatabaseSetupExtension.java
@@ -68,11 +68,6 @@ public static TomcatServer getCurrentTomcat()
 		return currentTomcat;
 	}
 
-	public static Configuration getCurrentConfig()
-	{
-		return currentConfig;
-	}
-
 	@Override
 	public void beforeEach(ExtensionContext context) throws Exception
 	{

diff --git a/opendcs-rest-api/src/test/java/org/opendcs/odcsapi/res/it/BaseIT.java b/opendcs-rest-api/src/test/java/org/opendcs/odcsapi/res/it/BaseIT.java
@@ -50,7 +50,7 @@
 import static java.util.stream.Collectors.joining;
 import static org.hamcrest.Matchers.is;
 
-class BaseIT
+public class BaseIT
 {
 	protected static String authHeader = null;
 

diff --git a/opendcs-rest-api/src/test/java/org/opendcs/odcsapi/res/it/RoutingResourcesIT.java b/opendcs-rest-api/src/test/java/org/opendcs/odcsapi/res/it/RoutingResourcesIT.java
@@ -31,7 +31,6 @@
 import org.opendcs.odcsapi.fixtures.DatabaseContextProvider;
 
 import static io.restassured.RestAssured.given;
-import static org.hamcrest.CoreMatchers.anyOf;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -108,7 +107,7 @@ void setUp() throws Exception
 		.then()
 			.log().ifValidationFails(LogDetail.ALL, true)
 		.assertThat()
-			.statusCode(is(HttpServletResponse.SC_OK))
+			.statusCode(is(HttpServletResponse.SC_CREATED))
 			.extract()
 		;
 
@@ -299,7 +298,7 @@ void tearDown() throws Exception
 		.then()
 			.log().ifValidationFails(LogDetail.ALL, true)
 		.assertThat()
-			.statusCode(is(HttpServletResponse.SC_OK))
+			.statusCode(is(HttpServletResponse.SC_NO_CONTENT))
 		;
 
 		// Delete the application
@@ -874,7 +873,7 @@ private Long storeSite(String jsonPath) throws Exception
 		.then()
 			.log().ifValidationFails(LogDetail.ALL, true)
 		.assertThat()
-			.statusCode(is(HttpServletResponse.SC_OK))
+			.statusCode(is(HttpServletResponse.SC_CREATED))
 			.extract()
 		;
 
@@ -896,7 +895,7 @@ private void tearDownSite(Long siteId)
 		.then()
 			.log().ifValidationFails(LogDetail.ALL, true)
 		.assertThat()
-			.statusCode(is(HttpServletResponse.SC_OK))
+			.statusCode(is(HttpServletResponse.SC_NO_CONTENT))
 		;
 
 		given()
@@ -937,7 +936,7 @@ private Long storePlatform(String jsonPath, Long siteId) throws Exception
 		.then()
 			.log().ifValidationFails(LogDetail.ALL, true)
 		.assertThat()
-			.statusCode(is(HttpServletResponse.SC_OK))
+			.statusCode(is(HttpServletResponse.SC_CREATED))
 			.extract()
 		;
 
@@ -959,7 +958,7 @@ private void tearDownPlatform(Long platformId)
 		.then()
 			.log().ifValidationFails(LogDetail.ALL, true)
 		.assertThat()
-			.statusCode(is(HttpServletResponse.SC_OK))
+			.statusCode(is(HttpServletResponse.SC_NO_CONTENT))
 		;
 
 		given()
@@ -975,9 +974,7 @@ private void tearDownPlatform(Long platformId)
 		.then()
 			.log().ifValidationFails(LogDetail.ALL, true)
 		.assertThat()
-			// TODO: This is here to support older implementations of the PlatformResources controller and should be removed
-			.statusCode(anyOf(is(HttpServletResponse.SC_NOT_FOUND),
-					is(HttpServletResponse.SC_GONE)))
+			.statusCode(is(HttpServletResponse.SC_NOT_FOUND))
 		;
 	}
 }