Skip to content

CDA-86: Added test to verify office permission bug is resolved. #1601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zack-rma wants to merge 5 commits into
base: develop
Choose a base branch
from
+22 −3
Open

CDA-86: Added test to verify office permission bug is resolved. #1601

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
57622f6
Added test to verify office permission bug is resolved.
zack-rma Feb 23, 2026
9335094
Added check for returned data not being empty
zack-rma Feb 24, 2026
5bd37b3
Updated data check to match expected rating metadata
zack-rma Feb 24, 2026
c29dca5
Merge branch 'develop' into bugfix/metadata-spec-fix
zack-rma Feb 25, 2026
cd5cdc4
Updated test case for rating metadata
zack-rma Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions cwms-data-api/src/test/java/cwms/cda/api/rating/RatingSpecControllerTestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,12 @@

import static cwms.cda.api.Controllers.METHOD;
import static cwms.cda.api.Controllers.OFFICE;
import static cwms.cda.api.Controllers.PAGE_SIZE;
import static cwms.cda.api.Controllers.RATING_ID_MASK;
import static io.restassured.RestAssured.given;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

@Tag("integration")
Expand Down Expand Up @@ -101,8 +103,26 @@ void test_empty_rating_spec() throws Exception {
.log().ifValidationFails(LogDetail.ALL,true)
.statusCode(is(HttpServletResponse.SC_CREATED));

RatingSpec ratingSpec = new RatingSpec(new RatingSpec.Builder().fromRatingSpec(new hec.data.cwmsRating.RatingSpec(specContainer)));

// Read and verify no failure on missing office ID
Response response = given()
.log().ifValidationFails(LogDetail.ALL,true)
.accept(Formats.JSONV2)
.queryParam(PAGE_SIZE, 500)
.when()
.redirects().follow(true)
.redirects().max(3)
.get("/ratings/metadata");
JsonPath noOfficePath = new JsonPath(response.asString());
assertFalse(noOfficePath.getList("rating-metadata").isEmpty());
boolean foundMatching = IntStream.range(0, noOfficePath.getInt("rating-metadata.size()"))
.mapToObj(i -> noOfficePath.getObject("rating-metadata[" + i + "].rating-spec", RatingSpec.class))
.anyMatch(s -> s.hashCode() == ratingSpec.hashCode());
assertTrue(foundMatching);

//Read
Response response =
response =
given()
.log().ifValidationFails(LogDetail.ALL,true)
.accept(Formats.JSONV2)
Expand All @@ -114,10 +134,9 @@ void test_empty_rating_spec() throws Exception {
.redirects().max(3)
.get("/ratings/metadata");
// then follows
RatingSpec ratingSpec = new RatingSpec(new RatingSpec.Builder().fromRatingSpec(new hec.data.cwmsRating.RatingSpec(specContainer)));
JsonPath path = new JsonPath(response.asString());
//get values of JSON array after getting array size
boolean foundMatching = IntStream.range(0, path.getInt("rating-metadata.size()"))
foundMatching = IntStream.range(0, path.getInt("rating-metadata.size()"))
.mapToObj(i -> path.getObject("rating-metadata[" + i + "].rating-spec", RatingSpec.class))
.anyMatch(s -> s.hashCode() == ratingSpec.hashCode());
assertTrue(foundMatching);
Expand Down
Loading