diff --git a/opendcs-rest-api/src/test/java/org/opendcs/odcsapi/res/it/NetlistResourcesIT.java b/opendcs-rest-api/src/test/java/org/opendcs/odcsapi/res/it/NetlistResourcesIT.java index 1d540b666..0ec2ac0fb 100644 --- a/opendcs-rest-api/src/test/java/org/opendcs/odcsapi/res/it/NetlistResourcesIT.java +++ b/opendcs-rest-api/src/test/java/org/opendcs/odcsapi/res/it/NetlistResourcesIT.java @@ -1,3 +1,18 @@ +/* + * Copyright 2025 OpenDCS Consortium and its Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License") + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.opendcs.odcsapi.res.it; import java.util.List; @@ -27,7 +42,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -@Tag("integration-opentsdb-only") +@Tag("integration") @ExtendWith(DatabaseContextProvider.class) final class NetlistResourcesIT extends BaseIT { @@ -47,11 +62,33 @@ void setUp() throws Exception siteId = storeSite("netlist_site_insert_data.json"); + 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"); + ApiPlatform platform = getDtoFromResource("netlist_platform_insert_data.json", ApiPlatform.class); platform.setSiteId(siteId); + platform.setConfigId(configId); 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/CWMS/config_input_data.json b/opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/CWMS/config_input_data.json new file mode 100644 index 000000000..16c8c55d6 --- /dev/null +++ b/opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/CWMS/config_input_data.json @@ -0,0 +1,45 @@ +{ + "configId" : null, + "name" : "Test Platform", + "numPlatforms" : 0, + "description" : "Test Platform", + "configSensors" : [ + { + "sensorNumber" : 0, + "sensorName" : "Test Sensor", + "recordingMode" : "U", + "recordingInterval" : 1500, + "timeOfFirstSample" : 0, + "absoluteMin" : 0.0, + "absoluteMax" : 100.0, + "properties" : { + "site" : "Test Site" + }, + "dataTypes" : {}, + "usgsStatCode" : null + } + ], + "scripts" : [ + { + "name" : "Test Script", + "dataOrder" : "U", + "headerType" : null, + "scriptSensors" : [ { + "sensorNumber" : 0, + "unitConverter" : { + "ucId" : null, + "fromAbbr" : "C", + "toAbbr" : "F", + "algorithm" : "Linear", + "a" : 100.0, + "b" : 32.0, + "c" : null, + "d" : null, + "e" : null, + "f" : null + } + } + ], + "formatStatements" : [ ] + } ] +} \ No newline at end of file diff --git a/opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/OPEN_TSDB/netlist_cnvtanl_expected.json b/opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/DEFAULT/netlist_cnvtanl_expected.json similarity index 100% rename from opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/OPEN_TSDB/netlist_cnvtanl_expected.json rename to opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/DEFAULT/netlist_cnvtanl_expected.json diff --git a/opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/OPEN_TSDB/netlist_cnvtanl_input_data.txt b/opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/DEFAULT/netlist_cnvtanl_input_data.txt similarity index 100% rename from opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/OPEN_TSDB/netlist_cnvtanl_input_data.txt rename to opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/DEFAULT/netlist_cnvtanl_input_data.txt diff --git a/opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/OPEN_TSDB/netlist_get_expected.json b/opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/DEFAULT/netlist_get_expected.json similarity index 100% rename from opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/OPEN_TSDB/netlist_get_expected.json rename to opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/DEFAULT/netlist_get_expected.json diff --git a/opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/OPEN_TSDB/netlist_insert_data.json b/opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/DEFAULT/netlist_insert_data.json similarity index 100% rename from opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/OPEN_TSDB/netlist_insert_data.json rename to opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/DEFAULT/netlist_insert_data.json diff --git a/opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/OPEN_TSDB/netlist_platform_insert_data.json b/opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/DEFAULT/netlist_platform_insert_data.json similarity index 100% rename from opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/OPEN_TSDB/netlist_platform_insert_data.json rename to opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/DEFAULT/netlist_platform_insert_data.json diff --git a/opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/OPEN_TSDB/netlist_post_delete_insert_data.json b/opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/DEFAULT/netlist_post_delete_insert_data.json similarity index 100% rename from opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/OPEN_TSDB/netlist_post_delete_insert_data.json rename to opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/DEFAULT/netlist_post_delete_insert_data.json diff --git a/opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/OPEN_TSDB/netlist_site_insert_data.json b/opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/DEFAULT/netlist_site_insert_data.json similarity index 87% rename from opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/OPEN_TSDB/netlist_site_insert_data.json rename to opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/DEFAULT/netlist_site_insert_data.json index 5d2d40fc1..535302328 100644 --- a/opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/OPEN_TSDB/netlist_site_insert_data.json +++ b/opendcs-rest-api/src/test/resources/org/opendcs/odcsapi/res/it/DEFAULT/netlist_site_insert_data.json @@ -4,8 +4,8 @@ "Stream" : "Stream test site" }, "description" : "A stream site", - "latitude" : "76.3", - "longitude" : "-121.8", + "latitude" : "38.575764", + "longitude" : "-121.478851", "elevation" : 150.0, "elevUnits" : "ft", "nearestCity" : "Sacramento",