-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into release/3.0
- Loading branch information
Showing
15 changed files
with
391 additions
and
114 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,12 +3,11 @@ info: | |
| version: '1.0.0' | ||
| title: CWMS Data API | ||
| description: CWMS Data API is a generalized web service API that allows clients to retrieve data from Corps Water Management System (CWMS) databases. | ||
| termsOfService: http://10.10.10.180/terms/ | ||
| termsOfService: https://cwms-data.usace.army.mil/cwms-data | ||
| contact: | ||
| name: Support | ||
| email: [email protected] | ||
| url: https://www.hec.usace.army.mil | ||
| host: 10.10.10.180 | ||
| url: https://github.com/usace/cwms-data-api | ||
| host: https://cmws-data.usace.army.mil | ||
| url: /cwms-data/swagger-docs | ||
| basePath: /cwms-data | ||
| schemes: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
107 changes: 97 additions & 10 deletions
107
cwms-data-api/src/test/java/cwms/cda/ApiServletTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,120 @@ | ||
| package cwms.cda; | ||
|
|
||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertFalse; | ||
| import static org.junit.jupiter.api.Assertions.assertNotNull; | ||
|
|
||
| import io.javalin.http.Handler; | ||
| import io.javalin.http.HandlerEntry; | ||
| import io.javalin.http.HandlerType; | ||
| import io.javalin.http.PathMatcher; | ||
| import java.util.List; | ||
| import org.junit.jupiter.api.Disabled; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.params.ParameterizedTest; | ||
| import org.junit.jupiter.params.provider.CsvSource; | ||
| import org.junit.jupiter.params.provider.ValueSource; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.*; | ||
|
|
||
| public class ApiServletTest { | ||
|
|
||
| @Test | ||
| public void test_office_from_context_hq(){ | ||
| String office = null; | ||
| String office; | ||
|
|
||
| office = ApiServlet.officeFromContext("/cwms-data"); | ||
| assertTrue("HQ".equals(office),"failed to get HQ result cwms-data context"); | ||
|
|
||
| assertEquals("HQ", office, "failed to get HQ result cwms-data context"); | ||
|
|
||
| office = null; | ||
| office = ApiServlet.officeFromContext(""); | ||
| assertTrue("HQ".equals(office),"failed to get HQ result on root context"); | ||
|
|
||
| assertEquals("HQ", office, "failed to get HQ result on root context"); | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @CsvSource( value = { "/spk-data,SPK", "/nwdm-data,NWDM", "/nww-data,NWW", "/swt-data,SWT"} ) | ||
| void test_office_from_context_district(String context, String office) { | ||
| String returnedOffice = ApiServlet.officeFromContext(context); | ||
| assertTrue(office.equals(returnedOffice), "failed to process an office context correctly"); | ||
| assertEquals(office, returnedOffice, "failed to process an office context correctly"); | ||
| } | ||
|
|
||
| @Test | ||
| public void test_adding_two_matchers_matches_both() { | ||
|
|
||
| PathMatcher matcher = new PathMatcher(); | ||
| Handler handler = (ctx) -> {}; | ||
| matcher.add(new HandlerEntry(HandlerType.AFTER, "/offices/{office}", true, handler, handler)); | ||
| matcher.add(new HandlerEntry(HandlerType.AFTER, "/offices", true, handler, handler)); | ||
|
|
||
| String[] testPaths = new String[]{ "/offices", "/offices/", "/offices/SPK", "/offices/SPK/"}; | ||
|
|
||
| for (String testPath : testPaths) { | ||
| List<HandlerEntry> matches = matcher.findEntries(HandlerType.AFTER, testPath); | ||
| assertNotNull(matches, "did not find match " + testPath); | ||
| assertFalse(matches.isEmpty(), testPath+" should have matched"); | ||
| } | ||
|
|
||
|
|
||
| } | ||
|
|
||
| @Test | ||
| @Disabled ("can't figure out a way to have one pattern match getOne and getAll style paths") | ||
| public void test_with_pattern() { | ||
| // This is how ApiServlet might make afterPath | ||
| // String crudPath = "/offices/{office}"; | ||
| // // Lets see if we can use a regex to make something that matches | ||
| // String regex = "(.*)(\\{.*})?"; //"(.*)(\\{.*\\})"; | ||
| // String afterPath = crudPath.replaceAll(regex,"$1*"); | ||
|
|
||
| // skip trying to build the pattern from the input in the test | ||
| // and just see what inputs to javalin will match | ||
| String afterPath; | ||
| // afterPath= "/offices/{office}"; // does not match /offices or /offices/ | ||
| // afterPath= "/offices/*"; // does not match /offices | ||
| // afterPath= "/offices/{office}*"; // does not match /offices or /offices/ | ||
| // afterPath= "/offices/{office}**"; // this pattern triggers an exception | ||
| afterPath= "/offices/*"; // does not match /offices | ||
|
|
||
|
|
||
| PathMatcher matcher = new PathMatcher(); | ||
| Handler handler = (ctx) -> {}; | ||
| matcher.add(new HandlerEntry(HandlerType.AFTER, afterPath, true, handler, handler)); | ||
|
|
||
| String[] testPaths = new String[]{ | ||
| "/offices", | ||
| "/offices/", "/offices/SPK", "/offices/SPK/"}; | ||
|
|
||
| for (String testPath : testPaths) { | ||
| List<HandlerEntry> matches = matcher.findEntries(HandlerType.AFTER, testPath); | ||
| assertNotNull(matches, "did not find match " + testPath); | ||
| assertFalse(matches.isEmpty(), testPath+" should have matched"); | ||
| } | ||
|
|
||
| } | ||
|
|
||
|
|
||
| @Test | ||
| public void test_match_with_internal_resource() { | ||
| PathMatcher matcher = new PathMatcher(); | ||
| Handler handler = (ctx) -> {}; | ||
| matcher.add(new HandlerEntry(HandlerType.AFTER, "/levels/{level-id}/timeseries", true, handler, handler)); | ||
|
|
||
| List<HandlerEntry> matches = matcher.findEntries(HandlerType.AFTER, "/levels/doesthismatch/timeseries"); | ||
| assertNotNull(matches); | ||
| assertFalse(matches.isEmpty()); | ||
|
|
||
| } | ||
|
|
||
| @Test | ||
| public void test_match_with_internal_star() { | ||
| PathMatcher matcher = new PathMatcher(); | ||
| Handler handler = (ctx) -> {}; | ||
| matcher.add(new HandlerEntry(HandlerType.AFTER, "/levels/*/timeseries", true, handler, handler)); | ||
|
|
||
| List<HandlerEntry> matches = matcher.findEntries(HandlerType.AFTER, "/levels/doesthismatch/timeseries"); | ||
| assertNotNull(matches); | ||
| assertFalse(matches.isEmpty()); | ||
|
|
||
| } | ||
|
|
||
|
|
||
| } | ||
|
|
||
|
|
Oops, something went wrong.