diff --git a/galasa-parent/dev.galasa.framework.api.ras/src/test/java/dev/galasa/framework/api/ras/internal/routes/TestRunQuery.java b/galasa-parent/dev.galasa.framework.api.ras/src/test/java/dev/galasa/framework/api/ras/internal/routes/TestRunQuery.java index d5e61af5e..f296a8773 100644 --- a/galasa-parent/dev.galasa.framework.api.ras/src/test/java/dev/galasa/framework/api/ras/internal/routes/TestRunQuery.java +++ b/galasa-parent/dev.galasa.framework.api.ras/src/test/java/dev/galasa/framework/api/ras/internal/routes/TestRunQuery.java @@ -68,7 +68,14 @@ private Map addQueryTimeParameter ( Map map, return map; } - private Map setQueryParameter (Integer size,String sort, String runname, String requestor, Integer agemin, Integer agemax){ + private Map setQueryParameters( + Integer size, + String sort, + String runname, + String requestor, + Integer agemin, + Integer agemax + ) { Map parameterMap = new HashMap(); parameterMap = addQueryIntParameter(parameterMap, "size", size); parameterMap = addQueryParameter(parameterMap, "sort", sort); @@ -382,7 +389,7 @@ public void TestPathRegexMultipleForwardSlashPathReturnsFalse(){ @Test public void testQueryWithRequestorNotSortedButNoDBServiceReturnsError() throws Exception { // Given... - Map parameterMap = setQueryParameter(100,null, null,"mickey", 72, null); + Map parameterMap = setQueryParameters(100,null, null,"mickey", 72, null); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap,"/runs"); MockRasServletEnvironment mockServletEnvironment = new MockRasServletEnvironment(null,mockRequest); @@ -470,7 +477,7 @@ public void testNoQueryNotSortedWithDBServiceReturnsOK() throws Exception { @Test public void testQueryWithRequestorNotSortedWithEmptyDBServiceReturnsOK() throws Exception { // Given... - Map parameterMap = setQueryParameter(100,null, null,"mickey", 72, null); + Map parameterMap = setQueryParameters(100,null, null,"mickey", 72, null); List mockInputRunResults= new ArrayList(); @@ -490,9 +497,7 @@ public void testQueryWithRequestorNotSortedWithEmptyDBServiceReturnsOK() throws //Then... // Expecting: // { - // "pageNum": 1, // "pageSize": 100, - // "numPages": 1, // "amountOfRuns": 0, // "runs": [ // ] @@ -508,7 +513,7 @@ public void testQueryWithRequestorNotSortedWithDBServiceWithOneRecordReturnsOK() //Given.. List mockInputRunResults = generateTestDataAscendingTime(1,1,1); //Build Http query parameters - Map parameterMap = setQueryParameter(100,null, null,null, 72, null); + Map parameterMap = setQueryParameters(100,null, null,null, 72, null); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); MockRasServletEnvironment mockServletEnvironment = new MockRasServletEnvironment( mockInputRunResults,mockRequest); @@ -526,9 +531,7 @@ public void testQueryWithRequestorNotSortedWithDBServiceWithOneRecordReturnsOK() //Then... // Expecting: // { - // "pageNum": 1, // "pageSize": 100, - // "numPages": 1, // "amountOfRuns": 1, // "runs": [ // { @@ -551,7 +554,7 @@ public void testQueryWithRequestorNotSortedWithDBServiceTenRecordsReturnsOK() th //Given.. List mockInputRunResults = generateTestDataAscendingTime(10,2,1); //Build Http query parameters - Map parameterMap = setQueryParameter(100,null, null,null, 72, null); + Map parameterMap = setQueryParameters(100,null, null,null, 72, null); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); MockRasServletEnvironment mockServletEnvironment = new MockRasServletEnvironment( mockInputRunResults,mockRequest); @@ -568,9 +571,7 @@ public void testQueryWithRequestorNotSortedWithDBServiceTenRecordsReturnsOK() th //Then... // Expecting: // { - // "pageNum": 1, // "pageSize": 100, - // "numPages": 1, // "amountOfRuns": 10, // "runs": [ // { @@ -605,7 +606,7 @@ public void testQueryWithFromDateNotSortedWithDBServiceWithOneRecordReturnsOK() //Given.. List mockInputRunResults = generateTestDataAscendingTime(1,1,1); //Build Http query parameters - Map parameterMap = setQueryParameter(100,null, null,null, 72, null); + Map parameterMap = setQueryParameters(100,null, null,null, 72, null); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); MockRasServletEnvironment mockServletEnvironment = new MockRasServletEnvironment( mockInputRunResults,mockRequest); @@ -623,9 +624,7 @@ public void testQueryWithFromDateNotSortedWithDBServiceWithOneRecordReturnsOK() //Then... // Expecting: // { - // "pageNum": 1, // "pageSize": 100, - // "numPages": 1, // "amountOfRuns": 1, // "runs": [ // { @@ -648,7 +647,7 @@ public void testQueryWithoutFromDateOrRunNameNotSortedWithDBServiceTenRecordsRet //Given.. List mockInputRunResults = generateTestDataAscendingTime(10,2, 48); //Build Http query parameters - Map parameterMap = setQueryParameter(100,null, null ,null, null, null); + Map parameterMap = setQueryParameters(100,null, null ,null, null, null); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); MockRasServletEnvironment mockServletEnvironment = new MockRasServletEnvironment( mockInputRunResults,mockRequest); @@ -662,9 +661,6 @@ public void testQueryWithoutFromDateOrRunNameNotSortedWithDBServiceTenRecordsRet servlet.init(); servlet.doGet(req,resp); - //Then... - // Expecting: - //Then... assertThat(resp.getStatus()).isEqualTo(400); assertThat(outStream.toString()).contains("GAL5010E: Error parsing the query parameters. from time is a mandatory field if no runname is supplied."); @@ -676,7 +672,7 @@ public void testNoQueryWithDBServiceTenRecordsReturnsOK() throws Exception { //Given.. List mockInputRunResults = generateTestDataAscendingTime(10,2, 15); //Build Http query parameters - Map parameterMap = setQueryParameter(null,null, null ,null, null, null); + Map parameterMap = setQueryParameters(null,null, null ,null, null, null); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); MockRasServletEnvironment mockServletEnvironment = new MockRasServletEnvironment( mockInputRunResults,mockRequest); @@ -690,9 +686,6 @@ public void testNoQueryWithDBServiceTenRecordsReturnsOK() throws Exception { servlet.init(); servlet.doGet(req,resp); - //Then... - // Expecting: - //Then... List expectedRunNames = generateExpectedRunNames(mockInputRunResults); String actualOutput = outStream.toString(); @@ -713,7 +706,7 @@ public void testQueryWithoutFromDateWithRunNameNotSortedWithDBServiceTenRecordsR IRunResult run = mockInputRunResults.get(1); int pageSize = 100; - Map parameterMap = setQueryParameter(pageSize,null,run.getTestStructure().getRunName(),null, 72, null); + Map parameterMap = setQueryParameters(pageSize,null,run.getTestStructure().getRunName(),null, 72, null); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); MockRasServletEnvironment mockServletEnvironment = new MockRasServletEnvironment( mockInputRunResults,mockRequest); @@ -732,9 +725,7 @@ public void testQueryWithoutFromDateWithRunNameNotSortedWithDBServiceTenRecordsR //Then... // Expecting: // { - // "pageNum": 1, // "pageSize": 100, - // "numPages": 1, // "amountOfRuns": 0, // "runs": [] // } @@ -752,7 +743,7 @@ public void testQueryWithFromDateAndRunnameNotSortedWithDBServiceTenRecordsRetur IRunResult run = mockInputRunResults.get(5); int pageSize = 100; - Map parameterMap = setQueryParameter(pageSize,null,run.getTestStructure().getRunName(),null, 72, null); + Map parameterMap = setQueryParameters(pageSize,null,run.getTestStructure().getRunName(),null, 72, null); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); MockRasServletEnvironment mockServletEnvironment = new MockRasServletEnvironment( mockInputRunResults,mockRequest); @@ -771,9 +762,7 @@ public void testQueryWithFromDateAndRunnameNotSortedWithDBServiceTenRecordsRetur //Then... // Expecting: // { - // "pageNum": 1, // "pageSize": 100, - // "numPages": 1, // "amountOfRuns": 0, // "runs": [] // } @@ -791,7 +780,7 @@ public void testQueryWithFromDateAndRunnameOutsideNotSortedWithDBServiceTenRecor IRunResult run = mockInputRunResults.get(5); int pageSize = 100; - Map parameterMap = setQueryParameter(pageSize,null,run.getTestStructure().getRunName(),null, 24, null); + Map parameterMap = setQueryParameters(pageSize,null,run.getTestStructure().getRunName(),null, 24, null); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); MockRasServletEnvironment mockServletEnvironment = new MockRasServletEnvironment( mockInputRunResults,mockRequest); @@ -809,9 +798,7 @@ public void testQueryWithFromDateAndRunnameOutsideNotSortedWithDBServiceTenRecor //Then... // Expecting: // { - // "pageNum": 1, // "pageSize": 100, - // "numPages": 1, // "amountOfRuns": 0, // "runs": [] // } @@ -827,7 +814,7 @@ public void testQueryWithRequestorNotSortedWithDBServiceTenRecordsPageSizeFiveRe List mockInputRunResults = generateTestDataAscendingTime(10,5,1); //Build Http query parameters String requestor = mockInputRunResults.get(0).getTestStructure().getRequestor(); - Map parameterMap = setQueryParameter(100,null,null,requestor, 72, null); + Map parameterMap = setQueryParameters(100,null,null,requestor, 72, null); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); MockRasServletEnvironment mockServletEnvironment = new MockRasServletEnvironment( mockInputRunResults,mockRequest); @@ -844,9 +831,7 @@ public void testQueryWithRequestorNotSortedWithDBServiceTenRecordsPageSizeFiveRe //Then... // Expecting: // { - // "pageNum": 1, // "pageSize": 5, - // "numPages": 2, // "amountOfRuns": 10, // "runs": [ // { @@ -885,7 +870,7 @@ public void testQueryWithRequestorNotSortedWithDBServiceTenRecordsPageSizeFivePa List mockInputRunResults = generateTestDataAscendingTime(10,5,2); //Build Http query parameters - Map parameterMap = setQueryParameter(5,null,null,null, 72, null); + Map parameterMap = setQueryParameters(5,null,null,null, 72, null); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); MockRasServletEnvironment mockServletEnvironment = new MockRasServletEnvironment( mockInputRunResults,mockRequest); @@ -902,9 +887,7 @@ public void testQueryWithRequestorNotSortedWithDBServiceTenRecordsPageSizeFivePa //Then... // Expecting: // { - // "pageNum": 2, // "pageSize": 5, - // "numPages": 2, // "amountOfRuns": 10, // "runs": [ // { @@ -946,7 +929,7 @@ public void testQueryWithRequestorNotSortedWithDBServiceTwentyRecordsPageSizeFiv List mockInputRunResults = generateTestDataAscendingTime(20,5,1); //Build Http query parameters int pageSize = 5; - Map parameterMap = setQueryParameter(pageSize,null,null,null, 72, null); + Map parameterMap = setQueryParameters(pageSize,null,null,null, 72, null); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); MockRasServletEnvironment mockServletEnvironment = new MockRasServletEnvironment( mockInputRunResults,mockRequest); @@ -963,9 +946,7 @@ public void testQueryWithRequestorNotSortedWithDBServiceTwentyRecordsPageSizeFiv //Then... // Expecting: // { - // "pageNum": 3, // "pageSize": 5, - // "numPages": 4, // "amountOfRuns": 20, // "runs": [ // { @@ -996,7 +977,7 @@ public void testQueryWithResultsSortedWithDBServiceTenRecordsPageSize100FalseFro List mockInputRunResults = generateTestDataAscendingTime(20,10,1); //Build Http query parameters String requestor = mockInputRunResults.get(0).getTestStructure().getRequestor(); - Map parameterMap = setQueryParameter(100,"result:asc",null,requestor, null, null); + Map parameterMap = setQueryParameters(100,"result:asc",null,requestor, null, null); String[] fromTime = {"erroneousValue"}; parameterMap.put("from", fromTime); @@ -1030,7 +1011,7 @@ public void testQueryWithResultsSortedWithDBServiceTenRecordsPageSize100FalseToD List mockInputRunResults = generateTestDataAscendingTime(20,10,1); //Build Http query parameters String requestor = mockInputRunResults.get(0).getTestStructure().getRequestor(); - Map parameterMap = setQueryParameter(100,null,null,requestor, null, null); + Map parameterMap = setQueryParameters(100,null,null,requestor, null, null); String[] toTime = {"erroneousValue"}; parameterMap.put("to", toTime); @@ -1072,7 +1053,7 @@ public IRunResult getRunById(@NotNull String runId) throws ResultArchiveStoreExc //Build Http query parameters String requestor = mockInputRunResults.get(0).getTestStructure().getRequestor(); - Map parameterMap = setQueryParameter(100,null,null,requestor, 72, null); + Map parameterMap = setQueryParameters(100,null,null,requestor, 72, null); String[] runId = {"erroneousrunId"}; parameterMap.put("runId", runId); @@ -1158,7 +1139,7 @@ public void testQueryWithMultipleResultsReturnsOK () throws Exception { //Given... //Build Http query parameters - Map parameterMap = setQueryParameter(null,"result:asc",null, null, 72, null); + Map parameterMap = setQueryParameters(null,"result:asc",null, null, 72, null); // Two results should return all the results String[] results = new String[] {"Passed,Failed"}; parameterMap.put("result", results); @@ -1191,7 +1172,7 @@ public void testQueryWithMultipleStatusesReturnsOK () throws Exception { //Given... //Build Http query parameters - Map parameterMap = setQueryParameter(null,"result:asc",null, null, 72, null); + Map parameterMap = setQueryParameters(null,"result:asc",null, null, 72, null); // Two results should return all the results String[] statuses = new String[] {"building,running"}; parameterMap.put("status", statuses); @@ -1282,7 +1263,7 @@ public void testQueryWithFromDateAndToDateNotSortedWithDBServiceTenRecordsReturn excludedRuns.addAll(mockInputRunResults); mockInputRunResults.addAll(expectedInputRunResults); //Build Http query parameters - Map parameterMap = setQueryParameter(100,null,null, null, 72, 36); + Map parameterMap = setQueryParameters(100,null,null, null, 72, 36); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); MockRasServletEnvironment mockServletEnvironment = new MockRasServletEnvironment( mockInputRunResults,mockRequest); @@ -1299,9 +1280,7 @@ public void testQueryWithFromDateAndToDateNotSortedWithDBServiceTenRecordsReturn //Then... // Expecting: // { - // "pageNum": 1, // "pageSize": 100, - // "numPages": 1, // "amountOfRuns": 10, // "runs": [...] // } @@ -1325,7 +1304,7 @@ public void testQueryWithFromDateAndToDatetSortedToDescendingWithDBServiceTenRec excludedRuns.addAll(mockInputRunResults); mockInputRunResults.addAll(expectedInputRunResults); //Build Http query parameters - Map parameterMap = setQueryParameter(100,"to:desc",null, null, 72, 36); + Map parameterMap = setQueryParameters(100,"to:desc",null, null, 72, 36); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); MockRasServletEnvironment mockServletEnvironment = new MockRasServletEnvironment( mockInputRunResults,mockRequest); @@ -1342,9 +1321,7 @@ public void testQueryWithFromDateAndToDatetSortedToDescendingWithDBServiceTenRec //Then... // Expecting: // { - // "pageNum": 1, // "pageSize": 100, - // "numPages": 1, // "amountOfRuns": 10, // "runs": [...] // } @@ -1370,7 +1347,7 @@ public void testQueryWithFromDateAndToDatetSortedToAscendingWithDBServiceTenReco excludedRuns.addAll(mockInputRunResults); mockInputRunResults.addAll(expectedInputRunResults); //Build Http query parameters - Map parameterMap = setQueryParameter(100,"to:asc",null, null, 72, 36); + Map parameterMap = setQueryParameters(100,"to:asc",null, null, 72, 36); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); MockRasServletEnvironment mockServletEnvironment = new MockRasServletEnvironment( mockInputRunResults,mockRequest); @@ -1387,9 +1364,7 @@ public void testQueryWithFromDateAndToDatetSortedToAscendingWithDBServiceTenReco //Then... // Expecting: // { - // "pageNum": 1, // "pageSize": 100, - // "numPages": 1, // "amountOfRuns": 10, // "runs": [...] // } @@ -1415,7 +1390,7 @@ public void testQueryWithFromDateAndToDatetSortedResultDescendingWithDBServiceTe excludedRuns.addAll(mockInputRunResults); mockInputRunResults.addAll(expectedInputRunResults); //Build Http query parameters - Map parameterMap = setQueryParameter(100,"result:desc",null, null, 72, 36); + Map parameterMap = setQueryParameters(100,"result:desc",null, null, 72, 36); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); MockRasServletEnvironment mockServletEnvironment = new MockRasServletEnvironment( mockInputRunResults,mockRequest); @@ -1432,9 +1407,7 @@ public void testQueryWithFromDateAndToDatetSortedResultDescendingWithDBServiceTe //Then... // Expecting: // { - // "pageNum": 1, // "pageSize": 100, - // "numPages": 1, // "amountOfRuns": 10, // "runs": [...] // } @@ -1460,7 +1433,7 @@ public void testQueryWithFromDateAndToDateResultSortedResultAscendingWithDBServi excludedRuns.addAll(mockInputRunResults); mockInputRunResults.addAll(expectedInputRunResults); //Build Http query parameters - Map parameterMap = setQueryParameter(100,"result:asc",null, null, 72, 36); + Map parameterMap = setQueryParameters(100,"result:asc",null, null, 72, 36); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); MockRasServletEnvironment mockServletEnvironment = new MockRasServletEnvironment( mockInputRunResults,mockRequest); @@ -1477,9 +1450,7 @@ public void testQueryWithFromDateAndToDateResultSortedResultAscendingWithDBServi //Then... // Expecting: // { - // "pageNum": 1, // "pageSize": 100, - // "numPages": 1, // "amountOfRuns": 10, // "runs": [...] // } @@ -1501,7 +1472,7 @@ public void testQueryWithFromDateSortedTestclassDescendingWithDBServiceTenRecord List expectedInputRunResults = generateTestDataAscendingTime(10,2, 48); mockInputRunResults.addAll(expectedInputRunResults); //Build Http query parameters - Map parameterMap = setQueryParameter(100,"testclass:desc",null, null, 72, null); + Map parameterMap = setQueryParameters(100,"testclass:desc",null, null, 72, null); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); MockRasServletEnvironment mockServletEnvironment = new MockRasServletEnvironment( mockInputRunResults,mockRequest); @@ -1518,9 +1489,7 @@ public void testQueryWithFromDateSortedTestclassDescendingWithDBServiceTenRecord //Then... // Expecting: // { - // "pageNum": 1, // "pageSize": 100, - // "numPages": 1, // "amountOfRuns": 10, // "runs": [...] // } @@ -1545,7 +1514,7 @@ public void testQueryWithFromDateAndToDateResultSortedTestclassAscendingWithDBSe excludedRuns.addAll(mockInputRunResults); mockInputRunResults.addAll(expectedInputRunResults); //Build Http query parameters - Map parameterMap = setQueryParameter(100,"testclass:asc",null, null, 72, 36); + Map parameterMap = setQueryParameters(100,"testclass:asc",null, null, 72, 36); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); MockRasServletEnvironment mockServletEnvironment = new MockRasServletEnvironment( mockInputRunResults,mockRequest); @@ -1562,9 +1531,7 @@ public void testQueryWithFromDateAndToDateResultSortedTestclassAscendingWithDBSe //Then... // Expecting: // { - // "pageNum": 1, // "pageSize": 100, - // "numPages": 1, // "amountOfRuns": 10, // "runs": [...] // } @@ -1585,7 +1552,7 @@ public void testQueryWithFromDateAndToDateBadSortWithDBServiceTenRecordsReturnsE List mockInputRunResults = generateTestDataAscendingTime(10,2, 48); //Build Http query parameters - Map parameterMap = setQueryParameter(100,"badsort",null, null, 72, 36); + Map parameterMap = setQueryParameters(100,"badsort",null, null, 72, 36); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); MockRasServletEnvironment mockServletEnvironment = new MockRasServletEnvironment( mockInputRunResults,mockRequest); @@ -1602,9 +1569,7 @@ public void testQueryWithFromDateAndToDateBadSortWithDBServiceTenRecordsReturnsE //Then... // Expecting: // { - // "pageNum": 1, // "pageSize": 100, - // "numPages": 1, // "amountOfRuns": 10, // "runs": [...] // } @@ -1619,7 +1584,7 @@ public void testQueryWithFromDateBadSortValueWithDBServiceTenRecordsReturnsError List mockInputRunResults = generateTestDataAscendingTime(10,2, 48); //Build Http query parameters - Map parameterMap = setQueryParameter(100,"to:erroneoussort",null, null, 72, null); + Map parameterMap = setQueryParameters(100,"to:erroneoussort",null, null, 72, null); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); MockRasServletEnvironment mockServletEnvironment = new MockRasServletEnvironment( mockInputRunResults,mockRequest); @@ -1645,7 +1610,7 @@ public void testQueryWithFromDateBadSortKeyWithDBServiceTenRecordsReturnsOkUnsor List mockInputRunResults = generateTestDataAscendingTime(10,2, 48); //Build Http query parameters - Map parameterMap = setQueryParameter(100,"erroneoussort:desc",null, null, 72, null); + Map parameterMap = setQueryParameters(100,"erroneoussort:desc",null, null, 72, null); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); MockRasServletEnvironment mockServletEnvironment = new MockRasServletEnvironment( mockInputRunResults,mockRequest); @@ -1662,9 +1627,7 @@ public void testQueryWithFromDateBadSortKeyWithDBServiceTenRecordsReturnsOkUnsor //Then... // Expecting: // { - // "pageNum": 1, // "pageSize": 100, - // "numPages": 1, // "amountOfRuns": 10, // "runs": [...] // } @@ -1688,7 +1651,7 @@ public void testQueryWithFromResultNotSortedWithDBServiceTenRecordsReturnsOK() t excludedRuns.addAll(mockInputRunResults); mockInputRunResults.addAll(expectedInputRunResults); //Build Http query parameters - Map parameterMap = setQueryParameter(100,"to:asc",null, null, 72, null); + Map parameterMap = setQueryParameters(100,"to:asc",null, null, 72, null); parameterMap.put("result", new String[] {"Passed"}); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); @@ -1706,9 +1669,7 @@ public void testQueryWithFromResultNotSortedWithDBServiceTenRecordsReturnsOK() t //Then... // Expecting: // { - // "pageNum": 1, // "pageSize": 100, - // "numPages": 1, // "amountOfRuns": 10, // "runs": [...] // } @@ -1732,7 +1693,7 @@ public void testQueryWithFromtestNameNotSortedWithDBServiceTenRecordsReturnsOK() IRunResult run = expectedInputRunResults.get(0); String testName = run.getTestStructure().getTestName().toString(); //Build Http query parameters - Map parameterMap = setQueryParameter(100,"to:asc",null, null, 72, null); + Map parameterMap = setQueryParameters(100,"to:asc",null, null, 72, null); parameterMap.put("testname", new String[] {testName}); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); @@ -1750,9 +1711,7 @@ public void testQueryWithFromtestNameNotSortedWithDBServiceTenRecordsReturnsOK() //Then... // Expecting: // { - // "pageNum": 1, // "pageSize": 100, - // "numPages": 1, // "amountOfRuns": 10, // "runs": [...] // } @@ -1776,7 +1735,7 @@ public void testQueryWithFromBundleNotSortedWithDBServiceTenRecordsReturnsOK() t IRunResult run = expectedInputRunResults.get(0); String bundle = run.getTestStructure().getBundle(); //Build Http query parameters - Map parameterMap = setQueryParameter(100,"to:asc",null, null, 72, null); + Map parameterMap = setQueryParameters(100,"to:asc",null, null, 72, null); parameterMap.put("bundle", new String[] {bundle}); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); @@ -1794,9 +1753,7 @@ public void testQueryWithFromBundleNotSortedWithDBServiceTenRecordsReturnsOK() t //Then... // Expecting: // { - // "pageNum": 1, // "pageSize": 100, - // "numPages": 1, // "amountOfRuns": 10, // "runs": [...] // } @@ -1820,7 +1777,7 @@ public void testQueryWithFromRunIdNotSortedWithDBServiceTenRecordsReturnsOK() th // Build query parameters int pageSize = 100; - Map parameterMap = setQueryParameter(pageSize,"to:asc",null, null, 72, null); + Map parameterMap = setQueryParameters(pageSize,"to:asc",null, null, 72, null); parameterMap.put("runId", new String[] {runid}); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); @@ -1838,9 +1795,7 @@ public void testQueryWithFromRunIdNotSortedWithDBServiceTenRecordsReturnsOK() th //Then... // Expecting: // { - // "pageNum": 1, // "pageSize": 100, - // "numPages": 1, // "amountOfRuns": 10, // "runs": [...] // } @@ -1863,7 +1818,7 @@ public void testQueryWithFromRunIdsNotSortedWithDBServiceTenRecordsReturnsOK() t //Build query parameters int pageSize = 100; - Map parameterMap = setQueryParameter(pageSize, null, null, null, 72, null); + Map parameterMap = setQueryParameters(pageSize, null, null, null, 72, null); parameterMap.put("runId", new String[] {runid+","+runid1}); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); @@ -1881,9 +1836,7 @@ public void testQueryWithFromRunIdsNotSortedWithDBServiceTenRecordsReturnsOK() t //Then... // Expecting: // { - // "pageNum": 1, // "pageSize": 100, - // "numPages": 1, // "amountOfRuns": 10, // "runs": [...] // } @@ -1906,7 +1859,7 @@ public void testQueryWithRunIdsNotSortedWithDBServiceTenRecordsReturnsOK() throw String runid1 = run1.getRunId(); int pageSize = 100; - Map parameterMap = setQueryParameter(pageSize, null, null, null, null, null); + Map parameterMap = setQueryParameters(pageSize, null, null, null, null, null); parameterMap.put("runId", new String[] {runid+","+runid1}); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); @@ -1924,9 +1877,7 @@ public void testQueryWithRunIdsNotSortedWithDBServiceTenRecordsReturnsOK() throw //Then... // Expecting: // { - // "pageNum": 1, // "pageSize": 100, - // "numPages": 1, // "amountOfRuns": 10, // "runs": [...] // } @@ -2049,7 +2000,7 @@ public void testQueryWithIncludeCursorReturnsResultsWithNextTokenOK() throws Exc // Build query parameters int pageSize = 100; - Map parameterMap = setQueryParameter(pageSize,null, null,null, 72, null); + Map parameterMap = setQueryParameters(pageSize,null, null,null, 72, null); parameterMap = addQueryParameter(parameterMap, "includeCursor", "true"); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); @@ -2082,7 +2033,7 @@ public void testQueryWithCursorReturnsResultsWithNextTokenOK() throws Exception // Build query parameters int pageSize = 100; - Map parameterMap = setQueryParameter(pageSize,null, null,null, 72, null); + Map parameterMap = setQueryParameters(pageSize,null, null,null, 72, null); parameterMap = addQueryParameter(parameterMap, "cursor", "iwantthispage"); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); @@ -2115,7 +2066,7 @@ public void testQueryWithBadCursorThrowsError() throws Exception { // Build query parameters int pageSize = 100; - Map parameterMap = setQueryParameter(pageSize,null, null,null, 72, null); + Map parameterMap = setQueryParameters(pageSize,null, null,null, 72, null); parameterMap = addQueryParameter(parameterMap, "cursor", "error"); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs"); @@ -2155,7 +2106,7 @@ public void testQueryWithUnknownSortReturnsRunsInDefaultSortOrder() throws Excep // Build query parameters int pageSize = 100; String unknownSort = "unknown:desc"; - Map parameterMap = setQueryParameter(pageSize,unknownSort, null,null, 72, null); + Map parameterMap = setQueryParameters(pageSize,unknownSort, null,null, 72, null); parameterMap.put("runId", new String[] { runId1 + "," + runId2 + "," + runId3 }); MockHttpServletRequest mockRequest = new MockHttpServletRequest(parameterMap, "/runs");