diff --git a/opendcs-rest-api/src/test/java/org/opendcs/odcsapi/res/it/OdcsapiResourceIT.java b/opendcs-rest-api/src/test/java/org/opendcs/odcsapi/res/it/OdcsapiResourceIT.java index fdc44fde6..9c81001b6 100644 --- a/opendcs-rest-api/src/test/java/org/opendcs/odcsapi/res/it/OdcsapiResourceIT.java +++ b/opendcs-rest-api/src/test/java/org/opendcs/odcsapi/res/it/OdcsapiResourceIT.java @@ -42,7 +42,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -@Tag("integration-opentsdb-only") +@Tag("integration") @ExtendWith(DatabaseContextProvider.class) final class OdcsapiResourceIT extends BaseIT { @@ -231,11 +231,34 @@ private Long storePlatform() throws Exception ApiPlatform platform = getDtoFromResource("odcsapi_platform_dto.json", ApiPlatform.class); siteId = storeSite(); + + String configJson = getJsonFromResource("config_input_data.json"); + + ExtractableResponse response = given() + .log().ifValidationFails(LogDetail.ALL, true) + .accept(MediaType.APPLICATION_JSON) + .contentType(MediaType.APPLICATION_JSON) + .header("Authorization", authHeader) + .filter(sessionFilter) + .body(configJson) + .when() + .redirects().follow(true) + .redirects().max(3) + .post("config") + .then() + .log().ifValidationFails(LogDetail.ALL, true) + .assertThat() + .statusCode(is(HttpServletResponse.SC_CREATED)) + .extract() + ; + + long configId = response.body().jsonPath().getLong("configId"); + platform.setConfigId(configId); platform.setSiteId(siteId); String platformJson = MAPPER.writeValueAsString(platform); - ExtractableResponse response = given() + response = given() .log().ifValidationFails(LogDetail.ALL, true) .accept(MediaType.APPLICATION_JSON) .contentType(MediaType.APPLICATION_JSON) diff --git a/opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/OPEN_TSDB/odcsapi_decode_request_dto.json b/opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/DEFAULT/odcsapi_decode_request_dto.json similarity index 100% rename from opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/OPEN_TSDB/odcsapi_decode_request_dto.json rename to opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/DEFAULT/odcsapi_decode_request_dto.json diff --git a/opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/OPEN_TSDB/odcsapi_decode_response.json b/opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/DEFAULT/odcsapi_decode_response.json similarity index 100% rename from opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/OPEN_TSDB/odcsapi_decode_response.json rename to opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/DEFAULT/odcsapi_decode_response.json diff --git a/opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/OPEN_TSDB/odcsapi_platform_dto.json b/opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/DEFAULT/odcsapi_platform_dto.json similarity index 100% rename from opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/OPEN_TSDB/odcsapi_platform_dto.json rename to opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/DEFAULT/odcsapi_platform_dto.json diff --git a/opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/OPEN_TSDB/odcsapi_property_specs.json b/opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/DEFAULT/odcsapi_property_specs.json similarity index 100% rename from opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/OPEN_TSDB/odcsapi_property_specs.json rename to opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/DEFAULT/odcsapi_property_specs.json diff --git a/opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/OPEN_TSDB/odcsapi_site_dto.json b/opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/DEFAULT/odcsapi_site_dto.json similarity index 100% rename from opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/OPEN_TSDB/odcsapi_site_dto.json rename to opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/DEFAULT/odcsapi_site_dto.json