USRealEstate
/
web-api-commander
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed up page skip comparisons

This commit is contained in:
Joshua Darnell 2020-02-27 19:06:37 -08:00
parent 6321b644a5
commit 56f6840f2b
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
generic.resoscript
View File

@ -150,11 +150,6 @@
<Parameter Name="SecondValue" Value="55" />
<Parameter Name="FractionalValue" Value="30" />
<!-- OData $select list - created from other parameterized fields -->
<Parameter Name="SelectList"
Value="*Parameter_KeyOrKeyNumericField*,*Parameter_FilterIntegerField*,*Parameter_ContainsField*,*Parameter_FilterHasField*,*Parameter_DateField*" />
<!-- REQUIRED: New Fields for WS103 Testing -->
<Parameter Name="ValueField" Value="AboveGradeFinishedArea" />
<Parameter Name="CastField" Value="AboveGradeFinishedArea" />
@ -166,6 +161,10 @@
<Parameter Name="ConcatFieldTwoValue" Value="YOUR TwoValue GOES HERE" />
<Parameter Name="ConcatFieldBothValue" Value="Your 'OneValue: TwoValue' GOES HERE" /> <!-- format 'OneValue: TwoValue' -->
<!-- OData $select list - created from other parameterized fields, you shouldn't have to touch this -->
<Parameter Name="SelectList"
Value="*Parameter_KeyOrKeyNumericField*,*Parameter_FilterIntegerField*,*Parameter_ContainsField*,*Parameter_FilterHasField*,*Parameter_DateField*" />
<!-- OPTIONAL: System Specific Additional Required Parameters for Queries. Leave Blank if none. -->
<Parameter Name="RequiredParameters" Value="" />
<Parameter Name="RequiredParametersFilter" Value="" />

18
src/main/java/org/reso/certification/stepdefs/WebAPIServer_1_0_2.java
View File

@ -1,6 +1,7 @@
package org.reso.certification.stepdefs;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.POJONode;
import io.cucumber.java8.En;
import io.restassured.response.Response;
import io.restassured.response.ValidatableResponse;
@ -274,17 +275,22 @@ public class WebAPIServer_1_0_2 implements En {
//TODO: convert to OData filter factory
URI requestUri = Commander.prepareURI(Settings.resolveParameters(settings.getRequests().get(requirementId), settings).getUrl() + "&$skip=" + skipCount);
LOG.info("Request URI: " + (requestUri != null ? requestUri.toString() : ""));
executeGetRequest.apply(requestUri);
});
And("^data in the \"([^\"]*)\" fields are different in the second request than in the first$", (String parameterUniqueId) -> {
ObjectMapper mapper = new ObjectMapper();
List<Object> l1 = from(initialResponseData.get()).getList(JSON_VALUE_PATH);
List<Object> l2 = from(responseData.get()).getList(JSON_VALUE_PATH);
List<POJONode> l1 = from(initialResponseData.get()).getJsonObject(JSON_VALUE_PATH);
List<POJONode> l2 = from(responseData.get()).getJsonObject(JSON_VALUE_PATH);
assertFalse(l1.containsAll(l2));
int combinedCount = l1.size() + l2.size();
Set<POJONode> combined = new LinkedHashSet<>();
combined.addAll(l1);
LOG.info("Response Page 1: " + new POJONode(l1));
combined.addAll(l2);
LOG.info("Response Page 2: " + new POJONode(l2));
assertEquals(combinedCount, combined.size());
});
//==================================================================================================================