From a68f6de634b03c90a309e55c0ea3ae57912d4da4 Mon Sep 17 00:00:00 2001 From: Christian Gendreau Date: Wed, 14 Feb 2024 15:06:00 -0500 Subject: [PATCH] Fixed Checkstyle added 1 more test --- .../gc/aafc/dina/filter/QueryStringParser.java | 2 +- .../gc/aafc/dina/filter/AntlrGrammarTest.java | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dina-base-api/src/main/java/ca/gc/aafc/dina/filter/QueryStringParser.java b/dina-base-api/src/main/java/ca/gc/aafc/dina/filter/QueryStringParser.java index 1fe74d8b6..19edf093b 100644 --- a/dina-base-api/src/main/java/ca/gc/aafc/dina/filter/QueryStringParser.java +++ b/dina-base-api/src/main/java/ca/gc/aafc/dina/filter/QueryStringParser.java @@ -11,7 +11,7 @@ /** * Responsible to parse a query string into a {@link QueryComponent}. */ -public class QueryStringParser { +public final class QueryStringParser { private QueryStringParser() { // utility class diff --git a/dina-base-api/src/test/java/ca/gc/aafc/dina/filter/AntlrGrammarTest.java b/dina-base-api/src/test/java/ca/gc/aafc/dina/filter/AntlrGrammarTest.java index 8c45bdbd9..4f9cbf114 100644 --- a/dina-base-api/src/test/java/ca/gc/aafc/dina/filter/AntlrGrammarTest.java +++ b/dina-base-api/src/test/java/ca/gc/aafc/dina/filter/AntlrGrammarTest.java @@ -3,6 +3,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class AntlrGrammarTest { @@ -10,10 +11,24 @@ public class AntlrGrammarTest { public void onFilterAsString_structureReturned() { String content = "filter[name][EQ]=2&filter[position][NEQ]=manager,supervisor&sort=position,-name&page[offset]=5&page[limit]=1&include=author.name"; - String content2 = "sort=position,-name&page[offset]=5&page[limit]=1&include=author.name"; QueryComponent queryComponent = QueryStringParser.parse(content); + assertNotNull(queryComponent.getFilters()); + + assertEquals("position", queryComponent.getSorts().get(0)); + assertEquals("-name", queryComponent.getSorts().get(1)); + assertEquals("author.name", queryComponent.getIncludes().get(0)); + + assertEquals(5, queryComponent.getPageOffset()); + assertEquals(1, queryComponent.getPageLimit()); + } + + @Test + public void onNoFilterAsString_structureReturned() { + String content = "sort=position,-name&page[offset]=5&page[limit]=1&include=author.name"; + + QueryComponent queryComponent = QueryStringParser.parse(content); assertEquals("position", queryComponent.getSorts().get(0)); assertEquals("-name", queryComponent.getSorts().get(1));