diff --git a/tests/Portal-Backend-soapui-project.xml b/tests/Portal-Backend-soapui-project.xml
index 59b7303880eb13de489252560fec4ede52fc1bd2..cb5039629a29e487371270cdfbceab0258daba0b 100644
--- a/tests/Portal-Backend-soapui-project.xml
+++ b/tests/Portal-Backend-soapui-project.xml
@@ -2,7 +2,7 @@
<con:soapui-project id="346a0e38-3821-4f4f-85b1-9334f79bc2ad" activeEnvironment="Default" name="Portal Backend" resourceRoot="" soapui-version="5.2.1" abortOnError="false" runType="SEQUENTIAL" xmlns:con="http://eviware.com/soapui/config"><con:description>MIP Portal backend Tests</con:description><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.actions.iface.tools.soapui.TestRunnerAction@values-local"><![CDATA[<xml-fragment xmlns:con="http://eviware.com/soapui/config">
<con:entry key="Environment" value="Default"/>
<con:entry key="Global Properties" value=""/>
- <con:entry key="TestSuite" value="http://localhost:65434/services TestSuite"/>
+ <con:entry key="TestSuite" value="http://localhost:65440/services TestSuite"/>
<con:entry key="Password" value=""/>
<con:entry key="TestRunner Path" value=""/>
<con:entry key="Tool Args" value=""/>
@@ -30,7 +30,7 @@
<con:entry key="Save After" value="false"/>
<con:entry key="Add Settings" value="false"/>
<con:entry key="Endpoint" value=""/>
-</xml-fragment>]]></con:setting></con:settings><con:interface xsi:type="con:RestService" id="0f9c1f77-d46f-4296-a7ac-6313de20e79c" wadlVersion="http://wadl.dev.java.net/2009/02" name="http://localhost:65434/services" type="rest" basePath="/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart=""/><con:endpoints><con:endpoint>http://localhost:65434</con:endpoint></con:endpoints><con:resource name="Services" path="/groups" id="9c244ad4-7ea5-419c-b113-2844b0c2d9f2"><con:settings/><con:parameters/><con:method name="GET Groups" id="69301736-64fd-4367-af05-713f2310ac9e" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/json;charset=UTF-8</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:gro="http://localhost/services/groups">gro:Response</con:element></con:representation><con:request name="GET Groups" id="b83c0631-8c59-4e01-b10f-f7f273ada95a" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65434</con:endpoint><con:request/><con:originalUri>http://localhost/services/groups</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="variables" path="variables" id="ede43090-7108-4909-859b-1eac3cea607e"><con:settings/><con:parameters/><con:resource name="hierarchy" path="hierarchy" id="634676d4-7938-4f7d-acdf-9b540f49b86b"><con:settings/><con:parameters/><con:method name="Variables Hierarchy" id="f4c87a21-4664-4b3d-8cff-f2afce496b08" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>application/json;charset=UTF-8</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:hier="http://localhost/services/variables/hierarchy">hier:Response</con:element></con:representation><con:request name="GET Variables Hierarchy" id="1bc51a21-1529-4574-b760-4ac46353af9a" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65434</con:endpoint><con:request/><con:originalUri>http://localhost/services/variables/hierarchy</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:method name="GET Variables" id="43095ea1-ec72-4d6a-9845-f713e9cdf31d" method="GET"><con:settings/><con:parameters/><con:request name="GET Variables" id="0de4abb8-a25b-4556-9577-fad18c579242" mediaType="application/json"><con:settings/><con:endpoint>http://localhost:65434</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="stats" path="stats" id="ebb46b5a-ed33-4e5b-92a3-662e624b434d"><con:settings/><con:parameters/><con:method name="GET Stats" id="9367c943-5e1f-467d-9bfc-fae18fd660d3" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>application/json;charset=UTF-8</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:stat="http://localhost/services/stats">stat:Response</con:element></con:representation><con:request name="GET Stats" id="3cabf6a5-1f65-46cf-afef-37d1d9f33356" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65434</con:endpoint><con:request/><con:originalUri>http://localhost/services/stats</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="requests" path="queries/requests" id="86f21403-5236-4e78-ac1a-a3fcabbe5372"><con:settings/><con:parameters/><con:method name="POST Requests" id="37523efd-c188-4eff-b3ce-59c8013a5037" method="POST"><con:settings/><con:parameters/><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="RESPONSE"><con:mediaType>application/json;charset=UTF-8</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:req="http://localhost/services/queries/requests">req:Response</con:element></con:representation><con:request name="POST Requests" id="a2c0a5bb-16cc-4679-aba1-ece38fc752e4" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65434</con:endpoint><con:request>{
+</xml-fragment>]]></con:setting></con:settings><con:interface xsi:type="con:RestService" id="0f9c1f77-d46f-4296-a7ac-6313de20e79c" wadlVersion="http://wadl.dev.java.net/2009/02" name="http://localhost:65440/services" type="rest" basePath="/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart=""/><con:endpoints><con:endpoint>http://localhost:65440</con:endpoint></con:endpoints><con:resource name="Services" path="/groups" id="9c244ad4-7ea5-419c-b113-2844b0c2d9f2"><con:settings/><con:parameters/><con:method name="GET Groups" id="69301736-64fd-4367-af05-713f2310ac9e" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>0</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/json;charset=UTF-8</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:gro="http://localhost/services/groups">gro:Response</con:element></con:representation><con:request name="GET Groups" id="b83c0631-8c59-4e01-b10f-f7f273ada95a" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65440</con:endpoint><con:request/><con:originalUri>http://localhost/services/groups</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="variables" path="variables" id="ede43090-7108-4909-859b-1eac3cea607e"><con:settings/><con:parameters/><con:resource name="hierarchy" path="hierarchy" id="634676d4-7938-4f7d-acdf-9b540f49b86b"><con:settings/><con:parameters/><con:method name="Variables Hierarchy" id="f4c87a21-4664-4b3d-8cff-f2afce496b08" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>application/json;charset=UTF-8</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:hier="http://localhost/services/variables/hierarchy">hier:Response</con:element></con:representation><con:request name="GET Variables Hierarchy" id="1bc51a21-1529-4574-b760-4ac46353af9a" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65440</con:endpoint><con:request/><con:originalUri>http://localhost/services/variables/hierarchy</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:method name="GET Variables" id="43095ea1-ec72-4d6a-9845-f713e9cdf31d" method="GET"><con:settings/><con:parameters/><con:request name="GET Variables" id="0de4abb8-a25b-4556-9577-fad18c579242" mediaType="application/json"><con:settings/><con:endpoint>http://localhost:65440</con:endpoint><con:request/><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="stats" path="stats" id="ebb46b5a-ed33-4e5b-92a3-662e624b434d"><con:settings/><con:parameters/><con:method name="GET Stats" id="9367c943-5e1f-467d-9bfc-fae18fd660d3" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>application/json;charset=UTF-8</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:stat="http://localhost/services/stats">stat:Response</con:element></con:representation><con:request name="GET Stats" id="3cabf6a5-1f65-46cf-afef-37d1d9f33356" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65440</con:endpoint><con:request/><con:originalUri>http://localhost/services/stats</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="requests" path="queries/requests" id="86f21403-5236-4e78-ac1a-a3fcabbe5372"><con:settings/><con:parameters/><con:method name="POST Requests" id="37523efd-c188-4eff-b3ce-59c8013a5037" method="POST"><con:settings/><con:parameters/><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="RESPONSE"><con:mediaType>application/json;charset=UTF-8</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:req="http://localhost/services/queries/requests">req:Response</con:element></con:representation><con:request name="POST Requests" id="a2c0a5bb-16cc-4679-aba1-ece38fc752e4" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65440</con:endpoint><con:request>{
"variables": [{
"code": "tv1"
}],
@@ -41,12 +41,12 @@
"code": "tv3"
}],
"filters": []
-}</con:request><con:originalUri>http://localhost/services/queries/requests</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="articles" path="articles" id="2a3d6b15-3a36-4fe2-af53-f357e51b6706"><con:settings/><con:parameters/><con:method name="GET Articles" id="2bb213be-acc6-47fa-8fdf-5c37238dd2b6" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>application/json;charset=UTF-8</con:mediaType><con:status>200</con:status><con:params/><con:element>Response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>201</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>201</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="GET Articles" id="3b7e2978-2a05-4256-8c17-be4d4ac7c8ed" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65434</con:endpoint><con:request/><con:originalUri>http://localhost/services/articles</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method><con:method name="POST Articles" id="1de518c3-8427-4e9f-9b1a-322a9620f4dc" method="POST"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>201</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:request name="POST Articles" id="de805279-423b-4a5f-a87d-8637991097f3" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65434</con:endpoint><con:request>{
+}</con:request><con:originalUri>http://localhost/services/queries/requests</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="articles" path="articles" id="2a3d6b15-3a36-4fe2-af53-f357e51b6706"><con:settings/><con:parameters/><con:method name="GET Articles" id="2bb213be-acc6-47fa-8fdf-5c37238dd2b6" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>application/json;charset=UTF-8</con:mediaType><con:status>200</con:status><con:params/><con:element>Response</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>201</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>201</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="GET Articles" id="3b7e2978-2a05-4256-8c17-be4d4ac7c8ed" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65440</con:endpoint><con:request/><con:originalUri>http://localhost/services/articles</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method><con:method name="POST Articles" id="1de518c3-8427-4e9f-9b1a-322a9620f4dc" method="POST"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType xsi:nil="true"/><con:status>201</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:request name="POST Articles" id="de805279-423b-4a5f-a87d-8637991097f3" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65440</con:endpoint><con:request>{
"status": "closed",
"content": "test",
"title": "Test",
"abstract": "test"
-}</con:request><con:originalUri>http://localhost/services/articles</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="models" path="models" id="e21204f6-3a39-447a-9d79-8945e076cf71"><con:settings/><con:parameters/><con:method name="GET Models" id="c5ffc3e9-d8df-473d-8d35-4769edaed22a" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>application/json;charset=UTF-8</con:mediaType><con:status>200</con:status><con:params/><con:element>Response</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:request name="GET Models" id="61d3e2b1-9464-405d-ace2-7219dfc25bfa" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65434</con:endpoint><con:request/><con:originalUri>http://localhost/services/models</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method><con:method name="POST Models" id="93869b1e-0bed-4f02-861b-b37584f7ff73" method="POST"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>application/json;charset=UTF-8</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:mod="http://localhost/services/models">mod:Response</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:request name="POST Models" id="815c84e8-7579-4c8a-adc2-879a413c3a2e" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65434</con:endpoint><con:request>{
+}</con:request><con:originalUri>http://localhost/services/articles</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource><con:resource name="models" path="models" id="e21204f6-3a39-447a-9d79-8945e076cf71"><con:settings/><con:parameters/><con:method name="GET Models" id="c5ffc3e9-d8df-473d-8d35-4769edaed22a" method="GET"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>application/json;charset=UTF-8</con:mediaType><con:status>200</con:status><con:params/><con:element>Response</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:request name="GET Models" id="61d3e2b1-9464-405d-ace2-7219dfc25bfa" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65440</con:endpoint><con:request/><con:originalUri>http://localhost/services/models</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method><con:method name="POST Models" id="93869b1e-0bed-4f02-861b-b37584f7ff73" method="POST"><con:settings/><con:parameters/><con:representation type="RESPONSE"><con:mediaType>application/json;charset=UTF-8</con:mediaType><con:status>200</con:status><con:params/><con:element xmlns:mod="http://localhost/services/models">mod:Response</con:element></con:representation><con:representation type="REQUEST"><con:mediaType>application/json</con:mediaType><con:params/></con:representation><con:request name="POST Models" id="815c84e8-7579-4c8a-adc2-879a413c3a2e" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65440</con:endpoint><con:request>{
"slug": "test",
"title": "Test",
"valid": false,
@@ -88,7 +88,7 @@
"agreeNDA": true,
"votedApps": []
}
-}</con:request><con:originalUri>http://localhost/services/models</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource></con:interface><con:testSuite id="089d4caf-10f2-4001-b282-21dab4cb8910" name="http://localhost:65434/services TestSuite"><con:description>TestSuite generated for REST Service [http://localhost:65434/services]</con:description><con:settings/><con:runType>SEQUENTIAL</con:runType><con:testCase id="48850601-2531-4245-86f3-8ca7dc21560c" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="Services TestCase" searchProperties="true"><con:description>TestCase generated for REST Resource [Services] located at [/groups]</con:description><con:settings/><con:testStep type="restrequest" name="GET Groups" id="cf84e939-d28a-4022-90b6-72144f4b814c"><con:settings/><con:config service="http://localhost:65434/services" resourcePath="/services/groups" methodName="GET Groups" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GET Groups" id="b83c0631-8c59-4e01-b10f-f7f273ada95a" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65434</con:endpoint><con:request/><con:originalUri>http://localhost/services/groups</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="6893bd56-5c6d-4f34-b306-4011e00a6868" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="7798436f-d62c-480d-818f-90365c0b8e64" name="JsonPath Match"><con:configuration><path>$</path><content>{"code":"root","groups":[{"code":"tg1","label":"Test Group 1","groups":[{"code":"tg3","label":"Test Group 3","groups":[]}]},{"code":"tg2","label":"Test Group 2","groups":[{"code":"tg4","label":"Test Group 4","groups":[]}]}]}</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:properties/></con:testCase><con:testCase id="fe17aec0-13b2-40df-8770-c676b059fe8a" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="variables TestCase" searchProperties="true"><con:description>TestCase generated for REST Resource [variables] located at [/variables]</con:description><con:settings/><con:testStep type="restrequest" name="GET Variables" id="a8c6886b-140f-49e2-b02b-5f0d295fbaff"><con:settings/><con:config service="http://localhost:65434/services" resourcePath="/services/variables" methodName="GET Variables" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GET Variables" id="0de4abb8-a25b-4556-9577-fad18c579242" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65434</con:endpoint><con:request/><con:originalUri>http://localhost/services/variables</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="ce7c49da-1391-4473-a037-483edd8a9556" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="d5ddf208-1f80-4c5c-b65a-05e71cc935fa" name="JsonPath Match"><con:configuration><path>$</path><content>[{"code":"tv1","label":"Test Variable 1","type":"text","group":{"code":"tg3","label":"Test Group 3"},"isVariable":true},{"code":"tv2","label":"Test Variable 2","type":"integer","group":{"code":"tg4","label":"Test Group 4"},"isVariable":true},{"code":"tv3","label":"Test Variable 3","type":"real","group":{"code":"tg4","label":"Test Group 4"},"isVariable":true}]</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:properties/></con:testCase><con:testCase id="0cc3239b-4b56-4aaa-badb-adf1ce319ea8" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="hierarchy TestCase" searchProperties="true"><con:description>TestCase generated for REST Resource [hierarchy] located at [/variables/hierarchy]</con:description><con:settings/><con:testStep type="restrequest" name="GET Variables Hierarchy" id="607108aa-0e00-42f3-bd96-4e08fe4aaa17"><con:settings/><con:config service="http://localhost:65434/services" resourcePath="/services/variables/hierarchy" methodName="Variables Hierarchy" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GET Variables Hierarchy" id="1bc51a21-1529-4574-b760-4ac46353af9a" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65434</con:endpoint><con:request/><con:originalUri>http://localhost/services/variables/hierarchy</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="f9c13d03-951c-48ed-9177-551bab6f9cfe" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="f59c455a-4227-466d-9b72-89b361ab2d72" name="JsonPath Match"><con:configuration><path>$</path><content>{"code":"root","groups":[{"code":"tg1","label":"Test Group 1","groups":[{"code":"tg3","label":"Test Group 3","variables":[{"code":"tv1","label":"Test Variable 1","type":"text"}]}]},{"code":"tg2","label":"Test Group 2","groups":[{"code":"tg4","label":"Test Group 4","variables":[{"code":"tv2","label":"Test Variable 2","type":"integer"},{"code":"tv3","label":"Test Variable 3","type":"real"}]}]}]}</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:properties/></con:testCase><con:testCase id="c4015c47-e968-48c2-adaf-4ff3ec92d960" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="stats TestCase" searchProperties="true"><con:settings/><con:testStep type="restrequest" name="GET Stats - GET Stats" id="f7cfd058-3850-4090-822b-66713afbe20c"><con:settings/><con:config service="http://localhost:65434/services" resourcePath="/services/stats" methodName="GET Stats" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GET Stats - GET Stats" id="3cabf6a5-1f65-46cf-afef-37d1d9f33356" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65434</con:endpoint><con:request/><con:originalUri>http://localhost/services/stats</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="b290cbb2-79a2-4205-8526-31710e9cbdb5" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="857cec88-eaae-4eb2-bf0c-eb93a3defa1f" name="JsonPath Match"><con:configuration><path>$.variables</path><content>3</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:properties/></con:testCase><con:testCase id="a04024d4-a9ad-4a37-89a0-14c319e20529" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="requests TestCase" searchProperties="true"><con:settings/><con:testStep type="restrequest" name="POST Requests - POST Requests" id="7a6a900b-b323-499c-a23e-0ac89df77053"><con:settings/><con:config service="http://localhost:65434/services" resourcePath="/services/queries/requests" methodName="POST Requests" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="POST Requests - POST Requests" id="a2c0a5bb-16cc-4679-aba1-ece38fc752e4" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65434</con:endpoint><con:request>{
+}</con:request><con:originalUri>http://localhost/services/models</con:originalUri><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:request></con:method></con:resource></con:interface><con:testSuite id="089d4caf-10f2-4001-b282-21dab4cb8910" name="http://localhost:65440/services TestSuite"><con:description>TestSuite generated for REST Service [http://localhost:65440/services]</con:description><con:settings/><con:runType>SEQUENTIAL</con:runType><con:testCase id="48850601-2531-4245-86f3-8ca7dc21560c" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="Services TestCase" searchProperties="true"><con:description>TestCase generated for REST Resource [Services] located at [/groups]</con:description><con:settings/><con:testStep type="restrequest" name="GET Groups" id="cf84e939-d28a-4022-90b6-72144f4b814c"><con:settings/><con:config service="http://localhost:65440/services" resourcePath="/services/groups" methodName="GET Groups" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GET Groups" id="b83c0631-8c59-4e01-b10f-f7f273ada95a" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65440</con:endpoint><con:request/><con:originalUri>http://localhost/services/groups</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="6893bd56-5c6d-4f34-b306-4011e00a6868" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="7798436f-d62c-480d-818f-90365c0b8e64" name="JsonPath Match"><con:configuration><path>$</path><content>{"code":"root","groups":[{"code":"tg1","label":"Test Group 1","groups":[{"code":"tg3","label":"Test Group 3","groups":[]}]},{"code":"tg2","label":"Test Group 2","groups":[{"code":"tg4","label":"Test Group 4","groups":[]}]}]}</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:properties/></con:testCase><con:testCase id="fe17aec0-13b2-40df-8770-c676b059fe8a" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="variables TestCase" searchProperties="true"><con:description>TestCase generated for REST Resource [variables] located at [/variables]</con:description><con:settings/><con:testStep type="restrequest" name="GET Variables" id="a8c6886b-140f-49e2-b02b-5f0d295fbaff"><con:settings/><con:config service="http://localhost:65440/services" resourcePath="/services/variables" methodName="GET Variables" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GET Variables" id="0de4abb8-a25b-4556-9577-fad18c579242" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65440</con:endpoint><con:request/><con:originalUri>http://localhost/services/variables</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="ce7c49da-1391-4473-a037-483edd8a9556" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="d5ddf208-1f80-4c5c-b65a-05e71cc935fa" name="JsonPath Match"><con:configuration><path>$</path><content>[{"code":"tv1","label":"Test Variable 1","type":"text","group":{"code":"tg3","label":"Test Group 3"},"isVariable":true},{"code":"tv2","label":"Test Variable 2","type":"integer","group":{"code":"tg4","label":"Test Group 4"},"isVariable":true},{"code":"tv3","label":"Test Variable 3","type":"real","group":{"code":"tg4","label":"Test Group 4"},"isVariable":true}]</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:properties/></con:testCase><con:testCase id="0cc3239b-4b56-4aaa-badb-adf1ce319ea8" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="hierarchy TestCase" searchProperties="true"><con:description>TestCase generated for REST Resource [hierarchy] located at [/variables/hierarchy]</con:description><con:settings/><con:testStep type="restrequest" name="GET Variables Hierarchy" id="607108aa-0e00-42f3-bd96-4e08fe4aaa17"><con:settings/><con:config service="http://localhost:65440/services" resourcePath="/services/variables/hierarchy" methodName="Variables Hierarchy" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GET Variables Hierarchy" id="1bc51a21-1529-4574-b760-4ac46353af9a" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65440</con:endpoint><con:request/><con:originalUri>http://localhost/services/variables/hierarchy</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="f9c13d03-951c-48ed-9177-551bab6f9cfe" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="f59c455a-4227-466d-9b72-89b361ab2d72" name="JsonPath Match"><con:configuration><path>$</path><content>{"code":"root","groups":[{"code":"tg1","label":"Test Group 1","groups":[{"code":"tg3","label":"Test Group 3","variables":[{"code":"tv1","label":"Test Variable 1","type":"text"}]}]},{"code":"tg2","label":"Test Group 2","groups":[{"code":"tg4","label":"Test Group 4","variables":[{"code":"tv2","label":"Test Variable 2","type":"integer"},{"code":"tv3","label":"Test Variable 3","type":"real"}]}]}]}</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:properties/></con:testCase><con:testCase id="c4015c47-e968-48c2-adaf-4ff3ec92d960" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="stats TestCase" searchProperties="true"><con:settings/><con:testStep type="restrequest" name="GET Stats - GET Stats" id="f7cfd058-3850-4090-822b-66713afbe20c"><con:settings/><con:config service="http://localhost:65440/services" resourcePath="/services/stats" methodName="GET Stats" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="GET Stats - GET Stats" id="3cabf6a5-1f65-46cf-afef-37d1d9f33356" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65440</con:endpoint><con:request/><con:originalUri>http://localhost/services/stats</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="b290cbb2-79a2-4205-8526-31710e9cbdb5" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="857cec88-eaae-4eb2-bf0c-eb93a3defa1f" name="JsonPath Match"><con:configuration><path>$.variables</path><content>3</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:properties/></con:testCase><con:testCase id="a04024d4-a9ad-4a37-89a0-14c319e20529" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="requests TestCase" searchProperties="true"><con:settings/><con:testStep type="restrequest" name="POST Requests - POST Requests" id="7a6a900b-b323-499c-a23e-0ac89df77053"><con:settings/><con:config service="http://localhost:65440/services" resourcePath="/services/queries/requests" methodName="POST Requests" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="POST Requests - POST Requests" id="a2c0a5bb-16cc-4679-aba1-ece38fc752e4" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65440</con:endpoint><con:request>{
"variables": [{
"code": "tv1"
}],
@@ -99,12 +99,12 @@
"code": "tv3"
}],
"filters": []
-}</con:request><con:originalUri>http://localhost/services/queries/requests</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="ba261d1d-ad63-40d3-9a23-d3e9357eefe2" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="ebcaa44d-69c6-4835-8319-2127362de861" name="JsonPath Match - variable"><con:configuration><path>$.variable</path><content>["tv1"]</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="ebcaa44d-69c6-4835-8319-2127362de861" name="JsonPath Match - grouping"><con:configuration><path>$.grouping</path><content>[]</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="ebcaa44d-69c6-4835-8319-2127362de861" name="JsonPath Match - header"><con:configuration><path>$.header</path><content>["tv2","tv3"]</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="ebcaa44d-69c6-4835-8319-2127362de861" name="JsonPath Match - data"><con:configuration><path>$.data</path><content>{"tv1":["val676 ","val677 ","val678 ","val679 ","val680 ","val681 ","val682 ","val683 ","val684 ","val685 ","val686 ","val687 ","val688 ","val689 ","val690 ","val691 ","val692 ","val693 ","val694 ","val695 ","val696 ","val697 ","val698 ","val699 ","val700 ","val701 ","val702 ","val1081 ","val1082 ","val1083 ","val1084 ","val1085 ","val1086 ","val1087 ","val1088 ","val1089 ","val1090 ","val1091 ","val1092 ","val1093 ","val1094 ","val1095 ","val1096 ","val1097 ","val1098 ","val1099 ","val1100 ","val1101 ","val1102 ","val1103 ","val1104 ","val1105 ","val1106 ","val1107 ","val1162 ","val1163 ","val1164 ","val1165 ","val1166 ","val1167 ","val1168 ","val1169 ","val1170 ","val1171 ","val1172 ","val1173 ","val1174 ","val1175 ","val1176 ","val1177 ","val1178 ","val1179 ","val1180 ","val1181 ","val1182 ","val1183 ","val1184 ","val1185 ","val1186 ","val1187 ","val1188 ","val1189 ","val1190 ","val1191 ","val1192 ","val1193 ","val1194 ","val1195 ","val1196 ","val1197 ","val1198 ","val1199 ","val1200 ","val1201 ","val1202 ","val1203 ","val1204 ","val1205 ","val1206 ","val1207 ","val1208 ","val1209 ","val1210 ","val1211 ","val1212 ","val1213 ","val1214 ","val1215 ","val1567 ","val1568 ","val1569 ","val1570 ","val1571 ","val1572 ","val1573 ","val1574 ","val1575 ","val1576 ","val1577 ","val1578 ","val1579 ","val1580 ","val1581 ","val1582 ","val1583 ","val1584 ","val1585 ","val1586 ","val1587 ","val1588 ","val1589 ","val1590 ","val1591 ","val1592 ","val1593 ","val1702 ","val1703 ","val1704 ","val1705 ","val1706 ","val1707 ","val1708 ","val1709 ","val1710 ","val1711 ","val1712 ","val1713 ","val1714 ","val1715 ","val1716 ","val1717 ","val1718 ","val1719 ","val1720 ","val1721 ","val1722 ","val1723 ","val1724 ","val1725 ","val1726 ","val1727 ","val1728 ","val1837 ","val1838 ","val1839 ","val1840 ","val1841 ","val1842 ","val1843 ","val1844 ","val1845 ","val1846 ","val1847 ","val1848 ","val1849 ","val1850 ","val1851 ","val1852 ","val1853 ","val1854 ","val1855 ","val1856 ","val1857 ","val1858 ","val1859 ","val1860 ","val1861 ","val1862 ","val1863 "],"tv2":[676,677,678,679,680,681,682,683,684,685,686,687,688,689,690,691,692,693,694,695,696,697,698,699,700,701,702,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,1104,1105,1106,1107,1162,1163,1164,1165,1166,1167,1168,1169,1170,1171,1172,1173,1174,1175,1176,1177,1178,1179,1180,1181,1182,1183,1184,1185,1186,1187,1188,1189,1190,1191,1192,1193,1194,1195,1196,1197,1198,1199,1200,1201,1202,1203,1204,1205,1206,1207,1208,1209,1210,1211,1212,1213,1214,1215,1567,1568,1569,1570,1571,1572,1573,1574,1575,1576,1577,1578,1579,1580,1581,1582,1583,1584,1585,1586,1587,1588,1589,1590,1591,1592,1593,1702,1703,1704,1705,1706,1707,1708,1709,1710,1711,1712,1713,1714,1715,1716,1717,1718,1719,1720,1721,1722,1723,1724,1725,1726,1727,1728,1837,1838,1839,1840,1841,1842,1843,1844,1845,1846,1847,1848,1849,1850,1851,1852,1853,1854,1855,1856,1857,1858,1859,1860,1861,1862,1863],"tv3":[67.6,67.7,67.8,67.9,68,68.1,68.2,68.3,68.4,68.5,68.6,68.7,68.8,68.9,69,69.1,69.2,69.3,69.4,69.5,69.6,69.7,69.8,69.9,70,70.1,70.2,108.1,108.2,108.3,108.4,108.5,108.6,108.7,108.8,108.9,109,109.1,109.2,109.3,109.4,109.5,109.6,109.7,109.8,109.9,110,110.1,110.2,110.3,110.4,110.5,110.6,110.7,116.2,116.3,116.4,116.5,116.6,116.7,116.8,116.9,117,117.1,117.2,117.3,117.4,117.5,117.6,117.7,117.8,117.9,118,118.1,118.2,118.3,118.4,118.5,118.6,118.7,118.8,118.9,119,119.1,119.2,119.3,119.4,119.5,119.6,119.7,119.8,119.9,120,120.1,120.2,120.3,120.4,120.5,120.6,120.7,120.8,120.9,121,121.1,121.2,121.3,121.4,121.5,156.7,156.8,156.9,157,157.1,157.2,157.3,157.4,157.5,157.6,157.7,157.8,157.9,158,158.1,158.2,158.3,158.4,158.5,158.6,158.7,158.8,158.9,159,159.1,159.2,159.3,170.2,170.3,170.4,170.5,170.6,170.7,170.8,170.9,171,171.1,171.2,171.3,171.4,171.5,171.6,171.7,171.8,171.9,172,172.1,172.2,172.3,172.4,172.5,172.6,172.7,172.8,183.7,183.8,183.9,184,184.1,184.2,184.3,184.4,184.5,184.6,184.7,184.8,184.9,185,185.1,185.2,185.3,185.4,185.5,185.6,185.7,185.8,185.9,186,186.1,186.2,186.3]}</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:properties/></con:testCase><con:testCase id="24044d0d-ac99-418a-a729-317c7ae6893a" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="articles TestCase" searchProperties="true"><con:settings/><con:testStep type="restrequest" name="Articles - POST Articles" id="b10c87aa-b51d-4dec-a069-82cbe55074c2"><con:settings/><con:config service="http://localhost:65434/services" resourcePath="/services/articles" methodName="POST Articles" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Articles - POST Articles" id="de805279-423b-4a5f-a87d-8637991097f3" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65434</con:endpoint><con:request>{
+}</con:request><con:originalUri>http://localhost/services/queries/requests</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="ba261d1d-ad63-40d3-9a23-d3e9357eefe2" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="ebcaa44d-69c6-4835-8319-2127362de861" name="JsonPath Match - variable"><con:configuration><path>$.variable</path><content>["tv1"]</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="ebcaa44d-69c6-4835-8319-2127362de861" name="JsonPath Match - grouping"><con:configuration><path>$.grouping</path><content>[]</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="ebcaa44d-69c6-4835-8319-2127362de861" name="JsonPath Match - header"><con:configuration><path>$.header</path><content>["tv2","tv3"]</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="ebcaa44d-69c6-4835-8319-2127362de861" name="JsonPath Match - data"><con:configuration><path>$.data</path><content>{"tv1":["val676 ","val677 ","val678 ","val679 ","val680 ","val681 ","val682 ","val683 ","val684 ","val685 ","val686 ","val687 ","val688 ","val689 ","val690 ","val691 ","val692 ","val693 ","val694 ","val695 ","val696 ","val697 ","val698 ","val699 ","val700 ","val701 ","val702 ","val1081 ","val1082 ","val1083 ","val1084 ","val1085 ","val1086 ","val1087 ","val1088 ","val1089 ","val1090 ","val1091 ","val1092 ","val1093 ","val1094 ","val1095 ","val1096 ","val1097 ","val1098 ","val1099 ","val1100 ","val1101 ","val1102 ","val1103 ","val1104 ","val1105 ","val1106 ","val1107 ","val1162 ","val1163 ","val1164 ","val1165 ","val1166 ","val1167 ","val1168 ","val1169 ","val1170 ","val1171 ","val1172 ","val1173 ","val1174 ","val1175 ","val1176 ","val1177 ","val1178 ","val1179 ","val1180 ","val1181 ","val1182 ","val1183 ","val1184 ","val1185 ","val1186 ","val1187 ","val1188 ","val1189 ","val1190 ","val1191 ","val1192 ","val1193 ","val1194 ","val1195 ","val1196 ","val1197 ","val1198 ","val1199 ","val1200 ","val1201 ","val1202 ","val1203 ","val1204 ","val1205 ","val1206 ","val1207 ","val1208 ","val1209 ","val1210 ","val1211 ","val1212 ","val1213 ","val1214 ","val1215 ","val1567 ","val1568 ","val1569 ","val1570 ","val1571 ","val1572 ","val1573 ","val1574 ","val1575 ","val1576 ","val1577 ","val1578 ","val1579 ","val1580 ","val1581 ","val1582 ","val1583 ","val1584 ","val1585 ","val1586 ","val1587 ","val1588 ","val1589 ","val1590 ","val1591 ","val1592 ","val1593 ","val1702 ","val1703 ","val1704 ","val1705 ","val1706 ","val1707 ","val1708 ","val1709 ","val1710 ","val1711 ","val1712 ","val1713 ","val1714 ","val1715 ","val1716 ","val1717 ","val1718 ","val1719 ","val1720 ","val1721 ","val1722 ","val1723 ","val1724 ","val1725 ","val1726 ","val1727 ","val1728 ","val1837 ","val1838 ","val1839 ","val1840 ","val1841 ","val1842 ","val1843 ","val1844 ","val1845 ","val1846 ","val1847 ","val1848 ","val1849 ","val1850 ","val1851 ","val1852 ","val1853 ","val1854 ","val1855 ","val1856 ","val1857 ","val1858 ","val1859 ","val1860 ","val1861 ","val1862 ","val1863 "],"tv2":[676,677,678,679,680,681,682,683,684,685,686,687,688,689,690,691,692,693,694,695,696,697,698,699,700,701,702,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,1104,1105,1106,1107,1162,1163,1164,1165,1166,1167,1168,1169,1170,1171,1172,1173,1174,1175,1176,1177,1178,1179,1180,1181,1182,1183,1184,1185,1186,1187,1188,1189,1190,1191,1192,1193,1194,1195,1196,1197,1198,1199,1200,1201,1202,1203,1204,1205,1206,1207,1208,1209,1210,1211,1212,1213,1214,1215,1567,1568,1569,1570,1571,1572,1573,1574,1575,1576,1577,1578,1579,1580,1581,1582,1583,1584,1585,1586,1587,1588,1589,1590,1591,1592,1593,1702,1703,1704,1705,1706,1707,1708,1709,1710,1711,1712,1713,1714,1715,1716,1717,1718,1719,1720,1721,1722,1723,1724,1725,1726,1727,1728,1837,1838,1839,1840,1841,1842,1843,1844,1845,1846,1847,1848,1849,1850,1851,1852,1853,1854,1855,1856,1857,1858,1859,1860,1861,1862,1863],"tv3":[67.6,67.7,67.8,67.9,68,68.1,68.2,68.3,68.4,68.5,68.6,68.7,68.8,68.9,69,69.1,69.2,69.3,69.4,69.5,69.6,69.7,69.8,69.9,70,70.1,70.2,108.1,108.2,108.3,108.4,108.5,108.6,108.7,108.8,108.9,109,109.1,109.2,109.3,109.4,109.5,109.6,109.7,109.8,109.9,110,110.1,110.2,110.3,110.4,110.5,110.6,110.7,116.2,116.3,116.4,116.5,116.6,116.7,116.8,116.9,117,117.1,117.2,117.3,117.4,117.5,117.6,117.7,117.8,117.9,118,118.1,118.2,118.3,118.4,118.5,118.6,118.7,118.8,118.9,119,119.1,119.2,119.3,119.4,119.5,119.6,119.7,119.8,119.9,120,120.1,120.2,120.3,120.4,120.5,120.6,120.7,120.8,120.9,121,121.1,121.2,121.3,121.4,121.5,156.7,156.8,156.9,157,157.1,157.2,157.3,157.4,157.5,157.6,157.7,157.8,157.9,158,158.1,158.2,158.3,158.4,158.5,158.6,158.7,158.8,158.9,159,159.1,159.2,159.3,170.2,170.3,170.4,170.5,170.6,170.7,170.8,170.9,171,171.1,171.2,171.3,171.4,171.5,171.6,171.7,171.8,171.9,172,172.1,172.2,172.3,172.4,172.5,172.6,172.7,172.8,183.7,183.8,183.9,184,184.1,184.2,184.3,184.4,184.5,184.6,184.7,184.8,184.9,185,185.1,185.2,185.3,185.4,185.5,185.6,185.7,185.8,185.9,186,186.1,186.2,186.3]}</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:properties/></con:testCase><con:testCase id="24044d0d-ac99-418a-a729-317c7ae6893a" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="articles TestCase" searchProperties="true"><con:settings/><con:testStep type="restrequest" name="Articles - POST Articles" id="b10c87aa-b51d-4dec-a069-82cbe55074c2"><con:settings/><con:config service="http://localhost:65440/services" resourcePath="/services/articles" methodName="POST Articles" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Articles - POST Articles" id="de805279-423b-4a5f-a87d-8637991097f3" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65440</con:endpoint><con:request>{
"status": "closed",
"content": "test",
"title": "Test",
"abstract": "test"
-}</con:request><con:originalUri>http://localhost/services/articles</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="e6b6da38-f109-4c70-ae32-7589a134e6f8" name="Valid HTTP Status Codes"><con:configuration><codes>201</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Articles - GET Articles" id="b350a22a-9a7b-4f20-a9f1-5a8f48a376a0"><con:settings/><con:config service="http://localhost:65434/services" resourcePath="/services/articles" methodName="GET Articles" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Articles - GET Articles" id="3b7e2978-2a05-4256-8c17-be4d4ac7c8ed" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65434</con:endpoint><con:request/><con:originalUri>http://localhost/services/articles</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="8b0c6113-e31b-4551-ab07-0e905b8d9e33" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="0c1d6c89-9fcc-4a80-a79a-3e51091a1335" name="JsonPath Match - slug"><con:configuration><path>$[0].slug</path><content>test</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="0c1d6c89-9fcc-4a80-a79a-3e51091a1335" name="JsonPath Match - title"><con:configuration><path>$[0].title</path><content>Test</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="0c1d6c89-9fcc-4a80-a79a-3e51091a1335" name="JsonPath Match - status"><con:configuration><path>$[0].status</path><content>closed</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="0c1d6c89-9fcc-4a80-a79a-3e51091a1335" name="JsonPath Match - content"><con:configuration><path>$[0].content</path><content>test</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="0c1d6c89-9fcc-4a80-a79a-3e51091a1335" name="JsonPath Match - createdBy"><con:configuration><path>$[0].createdBy</path><content>{"username":"Anonymous","fullname":"Anonymous","languages":[],"roles":[],"agreeNDA":true,"votedApps":[]}</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="0c1d6c89-9fcc-4a80-a79a-3e51091a1335" name="JsonPath Match - tags"><con:configuration><path>$[0].tags</path><content>[]</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="0c1d6c89-9fcc-4a80-a79a-3e51091a1335" name="JsonPath Match - abstract"><con:configuration><path>$[0].abstract</path><content>test</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:properties/></con:testCase><con:testCase id="1b3c305d-e074-4459-8949-f18dd5f745cc" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="models TestCase" searchProperties="true"><con:settings/><con:testStep type="restrequest" name="Models - POST Models" id="c28d5289-ad9a-4767-94fa-98c18eafba04"><con:settings/><con:config service="http://localhost:65434/services" resourcePath="/services/models" methodName="POST Models" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Models - POST Models" id="815c84e8-7579-4c8a-adc2-879a413c3a2e" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65434</con:endpoint><con:request>{
+}</con:request><con:originalUri>http://localhost/services/articles</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="e6b6da38-f109-4c70-ae32-7589a134e6f8" name="Valid HTTP Status Codes"><con:configuration><codes>201</codes></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Articles - GET Articles" id="b350a22a-9a7b-4f20-a9f1-5a8f48a376a0"><con:settings/><con:config service="http://localhost:65440/services" resourcePath="/services/articles" methodName="GET Articles" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Articles - GET Articles" id="3b7e2978-2a05-4256-8c17-be4d4ac7c8ed" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65440</con:endpoint><con:request/><con:originalUri>http://localhost/services/articles</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="8b0c6113-e31b-4551-ab07-0e905b8d9e33" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="0c1d6c89-9fcc-4a80-a79a-3e51091a1335" name="JsonPath Match - slug"><con:configuration><path>$[0].slug</path><content>test</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="0c1d6c89-9fcc-4a80-a79a-3e51091a1335" name="JsonPath Match - title"><con:configuration><path>$[0].title</path><content>Test</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="0c1d6c89-9fcc-4a80-a79a-3e51091a1335" name="JsonPath Match - status"><con:configuration><path>$[0].status</path><content>closed</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="0c1d6c89-9fcc-4a80-a79a-3e51091a1335" name="JsonPath Match - content"><con:configuration><path>$[0].content</path><content>test</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="0c1d6c89-9fcc-4a80-a79a-3e51091a1335" name="JsonPath Match - createdBy"><con:configuration><path>$[0].createdBy</path><content>{"username":"Anonymous","fullname":"Anonymous","languages":[],"roles":[],"agreeNDA":true,"votedApps":[]}</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="0c1d6c89-9fcc-4a80-a79a-3e51091a1335" name="JsonPath Match - tags"><con:configuration><path>$[0].tags</path><content>[]</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="0c1d6c89-9fcc-4a80-a79a-3e51091a1335" name="JsonPath Match - abstract"><con:configuration><path>$[0].abstract</path><content>test</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:properties/></con:testCase><con:testCase id="1b3c305d-e074-4459-8949-f18dd5f745cc" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="models TestCase" searchProperties="true"><con:settings/><con:testStep type="restrequest" name="Models - POST Models" id="c28d5289-ad9a-4767-94fa-98c18eafba04"><con:settings/><con:config service="http://localhost:65440/services" resourcePath="/services/models" methodName="POST Models" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Models - POST Models" id="815c84e8-7579-4c8a-adc2-879a413c3a2e" mediaType="application/json" postQueryString="false"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65440</con:endpoint><con:request>{
"slug": "test",
"title": "Test",
"valid": false,
@@ -146,4 +146,4 @@
"agreeNDA": true,
"votedApps": []
}
-}</con:request><con:originalUri>http://localhost/services/models</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="06412c39-9813-4c51-81b5-314821077afc" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="bea49cac-eb54-4e50-bf02-53182fd8cb81" name="JsonPath Match - valid"><con:configuration><path>$.valid</path><content>false</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="bea49cac-eb54-4e50-bf02-53182fd8cb81" name="JsonPath Match - query"><con:configuration><path>$.query</path><content>{"variables":[{"code":"tv1"}],"filters":[],"coVariables":[{"code":"tv2"},{"code":"tv3"}],"groupings":[]}</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="bea49cac-eb54-4e50-bf02-53182fd8cb81" name="JsonPath Match - dataset"><con:configuration><path>$.dataset</path><content>{"code":"XXXX","date":1234567,"header":["tv2","tv3"],"grouping":[],"variable":["tv1"]}</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="bea49cac-eb54-4e50-bf02-53182fd8cb81" name="JsonPath Match - createdBy"><con:configuration><path>$.createdBy</path><content>{"username":"Anonymous","fullname":"Anonymous","languages":[],"roles":[],"agreeNDA":true,"votedApps":[]}</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Models - GET Models" id="6269030f-99ed-4d34-ad15-9282305bd987"><con:settings/><con:config service="http://localhost:65434/services" resourcePath="/services/models" methodName="GET Models" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Models - GET Models" id="61d3e2b1-9464-405d-ace2-7219dfc25bfa" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65434</con:endpoint><con:request/><con:originalUri>http://localhost/services/models</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="aa591750-13ab-416c-8a51-d82cd7599a00" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="851e6dad-ed94-46ab-951a-0e5912b8f67c" name="JsonPath Match - slug"><con:configuration><path>$[0].slug</path><content>test</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="851e6dad-ed94-46ab-951a-0e5912b8f67c" name="JsonPath Match - title"><con:configuration><path>$[0].title</path><content>Test</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="851e6dad-ed94-46ab-951a-0e5912b8f67c" name="JsonPath Match - valid"><con:configuration><path>$[0].valid</path><content>false</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="851e6dad-ed94-46ab-951a-0e5912b8f67c" name="JsonPath Match - query"><con:configuration><path>$[0].query</path><content>{"variables":[{"code":"tv1"}],"filters":[],"coVariables":[{"code":"tv2"},{"code":"tv3"}],"groupings":[]}</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="851e6dad-ed94-46ab-951a-0e5912b8f67c" name="JsonPath Match - dataset"><con:configuration><path>$[0].dataset</path><content>{"code":"XXXX","date":1234000,"header":["tv2","tv3"],"grouping":[],"variable":["tv1"],"data":{"tv1":["val676 ","val677 ","val678 ","val679 ","val680 ","val681 ","val682 ","val683 ","val684 ","val685 ","val686 ","val687 ","val688 ","val689 ","val690 ","val691 ","val692 ","val693 ","val694 ","val695 ","val696 ","val697 ","val698 ","val699 ","val700 ","val701 ","val702 ","val1081 ","val1082 ","val1083 ","val1084 ","val1085 ","val1086 ","val1087 ","val1088 ","val1089 ","val1090 ","val1091 ","val1092 ","val1093 ","val1094 ","val1095 ","val1096 ","val1097 ","val1098 ","val1099 ","val1100 ","val1101 ","val1102 ","val1103 ","val1104 ","val1105 ","val1106 ","val1107 ","val1162 ","val1163 ","val1164 ","val1165 ","val1166 ","val1167 ","val1168 ","val1169 ","val1170 ","val1171 ","val1172 ","val1173 ","val1174 ","val1175 ","val1176 ","val1177 ","val1178 ","val1179 ","val1180 ","val1181 ","val1182 ","val1183 ","val1184 ","val1185 ","val1186 ","val1187 ","val1188 ","val1189 ","val1190 ","val1191 ","val1192 ","val1193 ","val1194 ","val1195 ","val1196 ","val1197 ","val1198 ","val1199 ","val1200 ","val1201 ","val1202 ","val1203 ","val1204 ","val1205 ","val1206 ","val1207 ","val1208 ","val1209 ","val1210 ","val1211 ","val1212 ","val1213 ","val1214 ","val1215 ","val1567 ","val1568 ","val1569 ","val1570 ","val1571 ","val1572 ","val1573 ","val1574 ","val1575 ","val1576 ","val1577 ","val1578 ","val1579 ","val1580 ","val1581 ","val1582 ","val1583 ","val1584 ","val1585 ","val1586 ","val1587 ","val1588 ","val1589 ","val1590 ","val1591 ","val1592 ","val1593 ","val1702 ","val1703 ","val1704 ","val1705 ","val1706 ","val1707 ","val1708 ","val1709 ","val1710 ","val1711 ","val1712 ","val1713 ","val1714 ","val1715 ","val1716 ","val1717 ","val1718 ","val1719 ","val1720 ","val1721 ","val1722 ","val1723 ","val1724 ","val1725 ","val1726 ","val1727 ","val1728 ","val1837 ","val1838 ","val1839 ","val1840 ","val1841 ","val1842 ","val1843 ","val1844 ","val1845 ","val1846 ","val1847 ","val1848 ","val1849 ","val1850 ","val1851 ","val1852 ","val1853 ","val1854 ","val1855 ","val1856 ","val1857 ","val1858 ","val1859 ","val1860 ","val1861 ","val1862 ","val1863 "],"tv2":[676,677,678,679,680,681,682,683,684,685,686,687,688,689,690,691,692,693,694,695,696,697,698,699,700,701,702,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,1104,1105,1106,1107,1162,1163,1164,1165,1166,1167,1168,1169,1170,1171,1172,1173,1174,1175,1176,1177,1178,1179,1180,1181,1182,1183,1184,1185,1186,1187,1188,1189,1190,1191,1192,1193,1194,1195,1196,1197,1198,1199,1200,1201,1202,1203,1204,1205,1206,1207,1208,1209,1210,1211,1212,1213,1214,1215,1567,1568,1569,1570,1571,1572,1573,1574,1575,1576,1577,1578,1579,1580,1581,1582,1583,1584,1585,1586,1587,1588,1589,1590,1591,1592,1593,1702,1703,1704,1705,1706,1707,1708,1709,1710,1711,1712,1713,1714,1715,1716,1717,1718,1719,1720,1721,1722,1723,1724,1725,1726,1727,1728,1837,1838,1839,1840,1841,1842,1843,1844,1845,1846,1847,1848,1849,1850,1851,1852,1853,1854,1855,1856,1857,1858,1859,1860,1861,1862,1863],"tv3":[67.6,67.7,67.8,67.9,68,68.1,68.2,68.3,68.4,68.5,68.6,68.7,68.8,68.9,69,69.1,69.2,69.3,69.4,69.5,69.6,69.7,69.8,69.9,70,70.1,70.2,108.1,108.2,108.3,108.4,108.5,108.6,108.7,108.8,108.9,109,109.1,109.2,109.3,109.4,109.5,109.6,109.7,109.8,109.9,110,110.1,110.2,110.3,110.4,110.5,110.6,110.7,116.2,116.3,116.4,116.5,116.6,116.7,116.8,116.9,117,117.1,117.2,117.3,117.4,117.5,117.6,117.7,117.8,117.9,118,118.1,118.2,118.3,118.4,118.5,118.6,118.7,118.8,118.9,119,119.1,119.2,119.3,119.4,119.5,119.6,119.7,119.8,119.9,120,120.1,120.2,120.3,120.4,120.5,120.6,120.7,120.8,120.9,121,121.1,121.2,121.3,121.4,121.5,156.7,156.8,156.9,157,157.1,157.2,157.3,157.4,157.5,157.6,157.7,157.8,157.9,158,158.1,158.2,158.3,158.4,158.5,158.6,158.7,158.8,158.9,159,159.1,159.2,159.3,170.2,170.3,170.4,170.5,170.6,170.7,170.8,170.9,171,171.1,171.2,171.3,171.4,171.5,171.6,171.7,171.8,171.9,172,172.1,172.2,172.3,172.4,172.5,172.6,172.7,172.8,183.7,183.8,183.9,184,184.1,184.2,184.3,184.4,184.5,184.6,184.7,184.8,184.9,185,185.1,185.2,185.3,185.4,185.5,185.6,185.7,185.8,185.9,186,186.1,186.2,186.3]}}</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="851e6dad-ed94-46ab-951a-0e5912b8f67c" name="JsonPath Match - config"><con:configuration><path>$[0].config</path><content>{"type":"line","height":480,"yAxisVariables":["tv2","tv3"],"xAxisVariable":null,"hasXAxis":true,"title":{"text":"Test"}}</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="851e6dad-ed94-46ab-951a-0e5912b8f67c" name="JsonPath Match - createdBy"><con:configuration><path>$[0].createdBy</path><content>{"username":"Anonymous","fullname":"Anonymous","languages":[],"roles":[],"agreeNDA":true,"votedApps":[]}</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:properties/></con:testCase><con:properties/></con:testSuite><con:properties/><con:wssContainer/><con:oAuth2ProfileContainer/><con:sensitiveInformation/></con:soapui-project>
\ No newline at end of file
+}</con:request><con:originalUri>http://localhost/services/models</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="06412c39-9813-4c51-81b5-314821077afc" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="bea49cac-eb54-4e50-bf02-53182fd8cb81" name="JsonPath Match - valid"><con:configuration><path>$.valid</path><content>false</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="bea49cac-eb54-4e50-bf02-53182fd8cb81" name="JsonPath Match - query"><con:configuration><path>$.query</path><content>{"variables":[{"code":"tv1"}],"filters":[],"coVariables":[{"code":"tv2"},{"code":"tv3"}],"groupings":[]}</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="bea49cac-eb54-4e50-bf02-53182fd8cb81" name="JsonPath Match - dataset"><con:configuration><path>$.dataset</path><content>{"code":"XXXX","date":1234567,"header":["tv2","tv3"],"grouping":[],"variable":["tv1"]}</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="bea49cac-eb54-4e50-bf02-53182fd8cb81" name="JsonPath Match - createdBy"><con:configuration><path>$.createdBy</path><content>{"username":"Anonymous","fullname":"Anonymous","languages":[],"roles":[],"agreeNDA":true,"votedApps":[]}</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Models - GET Models" id="6269030f-99ed-4d34-ad15-9282305bd987"><con:settings/><con:config service="http://localhost:65440/services" resourcePath="/services/models" methodName="GET Models" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Models - GET Models" id="61d3e2b1-9464-405d-ace2-7219dfc25bfa" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:65440</con:endpoint><con:request/><con:originalUri>http://localhost/services/models</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="aa591750-13ab-416c-8a51-d82cd7599a00" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="851e6dad-ed94-46ab-951a-0e5912b8f67c" name="JsonPath Match - slug"><con:configuration><path>$[0].slug</path><content>test</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="851e6dad-ed94-46ab-951a-0e5912b8f67c" name="JsonPath Match - title"><con:configuration><path>$[0].title</path><content>Test</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="851e6dad-ed94-46ab-951a-0e5912b8f67c" name="JsonPath Match - valid"><con:configuration><path>$[0].valid</path><content>false</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="851e6dad-ed94-46ab-951a-0e5912b8f67c" name="JsonPath Match - query"><con:configuration><path>$[0].query</path><content>{"variables":[{"code":"tv1"}],"filters":[],"coVariables":[{"code":"tv2"},{"code":"tv3"}],"groupings":[]}</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="851e6dad-ed94-46ab-951a-0e5912b8f67c" name="JsonPath Match - dataset"><con:configuration><path>$[0].dataset</path><content>{"code":"XXXX","date":1234000,"header":["tv2","tv3"],"grouping":[],"variable":["tv1"],"data":{"tv1":["val676 ","val677 ","val678 ","val679 ","val680 ","val681 ","val682 ","val683 ","val684 ","val685 ","val686 ","val687 ","val688 ","val689 ","val690 ","val691 ","val692 ","val693 ","val694 ","val695 ","val696 ","val697 ","val698 ","val699 ","val700 ","val701 ","val702 ","val1081 ","val1082 ","val1083 ","val1084 ","val1085 ","val1086 ","val1087 ","val1088 ","val1089 ","val1090 ","val1091 ","val1092 ","val1093 ","val1094 ","val1095 ","val1096 ","val1097 ","val1098 ","val1099 ","val1100 ","val1101 ","val1102 ","val1103 ","val1104 ","val1105 ","val1106 ","val1107 ","val1162 ","val1163 ","val1164 ","val1165 ","val1166 ","val1167 ","val1168 ","val1169 ","val1170 ","val1171 ","val1172 ","val1173 ","val1174 ","val1175 ","val1176 ","val1177 ","val1178 ","val1179 ","val1180 ","val1181 ","val1182 ","val1183 ","val1184 ","val1185 ","val1186 ","val1187 ","val1188 ","val1189 ","val1190 ","val1191 ","val1192 ","val1193 ","val1194 ","val1195 ","val1196 ","val1197 ","val1198 ","val1199 ","val1200 ","val1201 ","val1202 ","val1203 ","val1204 ","val1205 ","val1206 ","val1207 ","val1208 ","val1209 ","val1210 ","val1211 ","val1212 ","val1213 ","val1214 ","val1215 ","val1567 ","val1568 ","val1569 ","val1570 ","val1571 ","val1572 ","val1573 ","val1574 ","val1575 ","val1576 ","val1577 ","val1578 ","val1579 ","val1580 ","val1581 ","val1582 ","val1583 ","val1584 ","val1585 ","val1586 ","val1587 ","val1588 ","val1589 ","val1590 ","val1591 ","val1592 ","val1593 ","val1702 ","val1703 ","val1704 ","val1705 ","val1706 ","val1707 ","val1708 ","val1709 ","val1710 ","val1711 ","val1712 ","val1713 ","val1714 ","val1715 ","val1716 ","val1717 ","val1718 ","val1719 ","val1720 ","val1721 ","val1722 ","val1723 ","val1724 ","val1725 ","val1726 ","val1727 ","val1728 ","val1837 ","val1838 ","val1839 ","val1840 ","val1841 ","val1842 ","val1843 ","val1844 ","val1845 ","val1846 ","val1847 ","val1848 ","val1849 ","val1850 ","val1851 ","val1852 ","val1853 ","val1854 ","val1855 ","val1856 ","val1857 ","val1858 ","val1859 ","val1860 ","val1861 ","val1862 ","val1863 "],"tv2":[676,677,678,679,680,681,682,683,684,685,686,687,688,689,690,691,692,693,694,695,696,697,698,699,700,701,702,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,1104,1105,1106,1107,1162,1163,1164,1165,1166,1167,1168,1169,1170,1171,1172,1173,1174,1175,1176,1177,1178,1179,1180,1181,1182,1183,1184,1185,1186,1187,1188,1189,1190,1191,1192,1193,1194,1195,1196,1197,1198,1199,1200,1201,1202,1203,1204,1205,1206,1207,1208,1209,1210,1211,1212,1213,1214,1215,1567,1568,1569,1570,1571,1572,1573,1574,1575,1576,1577,1578,1579,1580,1581,1582,1583,1584,1585,1586,1587,1588,1589,1590,1591,1592,1593,1702,1703,1704,1705,1706,1707,1708,1709,1710,1711,1712,1713,1714,1715,1716,1717,1718,1719,1720,1721,1722,1723,1724,1725,1726,1727,1728,1837,1838,1839,1840,1841,1842,1843,1844,1845,1846,1847,1848,1849,1850,1851,1852,1853,1854,1855,1856,1857,1858,1859,1860,1861,1862,1863],"tv3":[67.6,67.7,67.8,67.9,68,68.1,68.2,68.3,68.4,68.5,68.6,68.7,68.8,68.9,69,69.1,69.2,69.3,69.4,69.5,69.6,69.7,69.8,69.9,70,70.1,70.2,108.1,108.2,108.3,108.4,108.5,108.6,108.7,108.8,108.9,109,109.1,109.2,109.3,109.4,109.5,109.6,109.7,109.8,109.9,110,110.1,110.2,110.3,110.4,110.5,110.6,110.7,116.2,116.3,116.4,116.5,116.6,116.7,116.8,116.9,117,117.1,117.2,117.3,117.4,117.5,117.6,117.7,117.8,117.9,118,118.1,118.2,118.3,118.4,118.5,118.6,118.7,118.8,118.9,119,119.1,119.2,119.3,119.4,119.5,119.6,119.7,119.8,119.9,120,120.1,120.2,120.3,120.4,120.5,120.6,120.7,120.8,120.9,121,121.1,121.2,121.3,121.4,121.5,156.7,156.8,156.9,157,157.1,157.2,157.3,157.4,157.5,157.6,157.7,157.8,157.9,158,158.1,158.2,158.3,158.4,158.5,158.6,158.7,158.8,158.9,159,159.1,159.2,159.3,170.2,170.3,170.4,170.5,170.6,170.7,170.8,170.9,171,171.1,171.2,171.3,171.4,171.5,171.6,171.7,171.8,171.9,172,172.1,172.2,172.3,172.4,172.5,172.6,172.7,172.8,183.7,183.8,183.9,184,184.1,184.2,184.3,184.4,184.5,184.6,184.7,184.8,184.9,185,185.1,185.2,185.3,185.4,185.5,185.6,185.7,185.8,185.9,186,186.1,186.2,186.3]}}</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="851e6dad-ed94-46ab-951a-0e5912b8f67c" name="JsonPath Match - config"><con:configuration><path>$[0].config</path><content>{"type":"line","height":480,"yAxisVariables":["tv2","tv3"],"xAxisVariable":null,"hasXAxis":true,"title":{"text":"Test"}}</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:assertion type="JsonPath Match" id="851e6dad-ed94-46ab-951a-0e5912b8f67c" name="JsonPath Match - createdBy"><con:configuration><path>$[0].createdBy</path><content>{"username":"Anonymous","fullname":"Anonymous","languages":[],"roles":[],"agreeNDA":true,"votedApps":[]}</content><allowWildcards>false</allowWildcards><ignoreNamspaceDifferences>false</ignoreNamspaceDifferences><ignoreComments>false</ignoreComments></con:configuration></con:assertion><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:properties/></con:testCase><con:properties/></con:testSuite><con:properties/><con:wssContainer/><con:oAuth2ProfileContainer/><con:sensitiveInformation/></con:soapui-project>
\ No newline at end of file
diff --git a/tests/pre-test-run.sh b/tests/pre-test-run.sh
index e323d19c3eb71fbe1690809a8bcf9c812f67d039..d327608260eae38cbb5cb74de82a7fb8d6a171b1 100755
--- a/tests/pre-test-run.sh
+++ b/tests/pre-test-run.sh
@@ -33,7 +33,8 @@ fi
echo "Running databases containers..."
docker run --name science-db-test -p 65432:5432 -v $(pwd)/tests/science-db/sql:/docker-entrypoint-initdb.d/ -e POSTGRES_USER=postgres -d postgres:9.5.3
-docker run --name portal-db-test -p 65433:5432 -v $(pwd)/tests/meta-db/sql:/docker-entrypoint-initdb.d/ -e POSTGRES_USER=postgres -d postgres:9.5.3
+docker run --name meta-db-test -p 65433:5432 -v $(pwd)/tests/meta-db/sql:/docker-entrypoint-initdb.d/ -e POSTGRES_USER=postgres -d postgres:9.5.3
+docker run --name portal-db-test -p 65434:5432 -e POSTGRES_USER=portal -d postgres:9.5.3
# Get gateway IP
@@ -53,6 +54,14 @@ until [ $(docker exec science-db-test psql -U postgres -c "\q" 2>&1 | wc -l) -eq
done
echo ""
+echo "Waiting for meta-db to start..."
+sleep 3
+until [ $(docker exec meta-db-test psql -U postgres -c "\q" 2>&1 | wc -l) -eq 0 ]; do
+ printf '.'
+ sleep 1
+done
+echo ""
+
echo "Waiting for portal-db to start..."
sleep 3
until [ $(docker exec portal-db-test psql -U postgres -c "\q" 2>&1 | wc -l) -eq 0 ]; do
@@ -65,9 +74,9 @@ echo ""
# Run backend container
echo "Running backend container..."
-docker run --name backend-test -p 65434:8080 \
--e "PORTAL_DB_URL=jdbc:postgresql://$GATEWAY_IP:65433/portal" \
--e "PORTAL_DB_SERVER=$GATEWAY_IP:65433/portal" \
+docker run --name backend-test -p 65440:8080 \
+-e "PORTAL_DB_URL=jdbc:postgresql://$GATEWAY_IP:65434/portal" \
+-e "PORTAL_DB_SERVER=$GATEWAY_IP:65434/portal" \
-e "PORTAL_DB_USER=postgres" \
-e "META_DB_URL=jdbc:postgresql://$GATEWAY_IP:65433/meta" \
-e "META_DB_SERVER=$GATEWAY_IP:65433/meta" \
diff --git a/tests/test-run.sh b/tests/test-run.sh
index 79d5f7574f169238cfdfc5757896b8b16c85bfe7..a7843a0f134009cf6cd221cb070e73102faef0d3 100755
--- a/tests/test-run.sh
+++ b/tests/test-run.sh
@@ -29,7 +29,7 @@ GATEWAY_IP=$(docker inspect backend-test | grep \"Gateway\":\ \" | sed 's/.*Gate
# Test - GET groups
echo "Testing groups API..."
-if [ "$(curl -s ${GATEWAY_IP}:65434/services/groups)" != "$GROUPS_REF" ]; then
+if [ "$(curl -s ${GATEWAY_IP}:65440/services/groups)" != "$GROUPS_REF" ]; then
echo "Tests failed - failed to load groups"
exit 1
fi
@@ -38,7 +38,7 @@ fi
# Test - GET variables
echo "Testing variables API..."
-if [ "$(curl -s ${GATEWAY_IP}:65434/services/variables)" != "$VARIABLES_REF" ]; then
+if [ "$(curl -s ${GATEWAY_IP}:65440/services/variables)" != "$VARIABLES_REF" ]; then
echo "Tests failed - failed to load variables"
exit 1
fi
@@ -46,7 +46,7 @@ fi
# Test - GET variables hierarchy
-if [ "$(curl -s ${GATEWAY_IP}:65434/services/variables/hierarchy)" != "$VARIABLES_HIERARCHY_REF" ]; then
+if [ "$(curl -s ${GATEWAY_IP}:65440/services/variables/hierarchy)" != "$VARIABLES_HIERARCHY_REF" ]; then
echo "Tests failed - failed to load variables hierarchy"
exit 1
fi
@@ -55,7 +55,7 @@ fi
# Test - GET stats
echo "Testing stats API..."
-if [ "$(curl -s ${GATEWAY_IP}:65434/services/stats)" != "$STATS_REF" ]; then
+if [ "$(curl -s ${GATEWAY_IP}:65440/services/stats)" != "$STATS_REF" ]; then
echo "Tests failed - failed to load stats"
exit 1
fi
@@ -64,7 +64,7 @@ fi
# Test - POST requests
echo "Testing requests API..."
-response=$(curl -s -H "Content-Type: application/json" -X POST -d ${REQUEST_BODY} ${GATEWAY_IP}:65434/services/queries/requests)
+response=$(curl -s -H "Content-Type: application/json" -X POST -d ${REQUEST_BODY} ${GATEWAY_IP}:65440/services/queries/requests)
if [ "${response:52}" != "${REQUEST_REF:52}" ]; then
echo "Tests failed - failed to post requests"
exit 1
@@ -74,8 +74,8 @@ fi
# Test - POST and GET an article
echo "Testing articles API..."
-temp=$(curl -s -H "Content-Type: application/json" -X POST -d ${ARTICLE_BODY} ${GATEWAY_IP}:65434/services/articles)
-response=$(curl -s ${GATEWAY_IP}:65434/services/articles | sed "s/\"createdAt\":[0-9]*,//g")
+temp=$(curl -s -H "Content-Type: application/json" -X POST -d ${ARTICLE_BODY} ${GATEWAY_IP}:65440/services/articles)
+response=$(curl -s ${GATEWAY_IP}:65440/services/articles | sed "s/\"createdAt\":[0-9]*,//g")
response_ref=$(echo "${ARTICLE_REF}" | sed "s/\"createdAt\":[0-9]*,//g")
if [ "${response}" != "${response_ref}" ]; then
echo "Tests failed - failed to save/load article"
@@ -86,8 +86,8 @@ fi
# Test - POST and GET a model
echo "Testing models API..."
-temp=$(curl -s -H "Content-Type: application/json" -X POST -d ${MODEL_BODY} ${GATEWAY_IP}:65434/services/models)
-response=$(curl -s ${GATEWAY_IP}:65434/services/models | sed "s/\"createdAt\":[0-9]*,//g" | sed "s/\"date\":[0-9]*,//g")
+temp=$(curl -s -H "Content-Type: application/json" -X POST -d ${MODEL_BODY} ${GATEWAY_IP}:65440/services/models)
+response=$(curl -s ${GATEWAY_IP}:65440/services/models | sed "s/\"createdAt\":[0-9]*,//g" | sed "s/\"date\":[0-9]*,//g")
response_ref=$(echo "${MODEL_REF}" | sed "s/\"createdAt\":[0-9]*,//g" | sed "s/\"date\":[0-9]*,//g")
if [ "${response}" != "${response_ref}" ]; then
echo "Tests failed - failed to save/load model"