diff options
Diffstat (limited to 'vid-automation')
4 files changed, 9 insertions, 5 deletions
diff --git a/vid-automation/pom.xml b/vid-automation/pom.xml index a6ca977b1..81ec4a6d8 100644 --- a/vid-automation/pom.xml +++ b/vid-automation/pom.xml @@ -6,8 +6,8 @@ <artifactId>automationTest</artifactId> <version>1.0-SNAPSHOT</version> <properties> - <springframework.version>5.1.6.RELEASE</springframework.version> - <jersey.version>2.28</jersey.version> + <springframework.version>5.1.9.RELEASE</springframework.version> + <jersey.version>2.29</jersey.version> <jackson.version>2.9.9</jackson.version> <aspectj.version>1.8.10</aspectj.version> <selenium.version>3.6.0</selenium.version> diff --git a/vid-automation/src/main/java/vid/automation/test/services/SimulatorApi.java b/vid-automation/src/main/java/vid/automation/test/services/SimulatorApi.java index 087449624..4fede294d 100644 --- a/vid-automation/src/main/java/vid/automation/test/services/SimulatorApi.java +++ b/vid-automation/src/main/java/vid/automation/test/services/SimulatorApi.java @@ -130,7 +130,7 @@ public class SimulatorApi { presets.forEach( preset-> { try {registerToSimulatorAndAssertSuccess(preset.getClass().getCanonicalName(), preset.generateScenario());} - catch (RuntimeException e) { + catch (Throwable e) { throw new RuntimeException("Failed to register preset "+preset.getClass().getName(), e); } } diff --git a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/get_sdc_catalog_services_vid-test-333.json b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/get_sdc_catalog_services_vid-test-333.json index 91413a070..8bda092ba 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/get_sdc_catalog_services_vid-test-333.json +++ b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/get_sdc_catalog_services_vid-test-333.json @@ -71,4 +71,4 @@ } } } -]
\ No newline at end of file +] diff --git a/vid-automation/src/test/java/org/onap/vid/api/SdcApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/SdcApiTest.java index 329291838..8201bcfa0 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/SdcApiTest.java +++ b/vid-automation/src/test/java/org/onap/vid/api/SdcApiTest.java @@ -14,7 +14,9 @@ import org.testng.annotations.Test; import vid.automation.test.infra.FeatureTogglingTest; import vid.automation.test.infra.Features; +import static net.javacrumbs.jsonunit.JsonMatchers.jsonEquals; import static net.javacrumbs.jsonunit.JsonMatchers.jsonStringEquals; +import static net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNot.not; @@ -79,7 +81,9 @@ public class SdcApiTest extends BaseApiTest { ResponseEntity<String> response = restTemplate.getForEntity(buildUri(SDC_GET_SERVICE_MODEL + A_LA_CARTE_INSTANTIATION_TYPE_UUID), String.class); Assert.assertEquals(response.getStatusCode(), HttpStatus.OK); String aLaCarteInstantiationTypeExpectedResponse = loadResourceAsString(A_LA_CARTE_INSTANTIATION_TYPE_EXPECTED_RESPONSE); - assertThat("The response is in the format of JSON", response.getBody(), is(jsonStringEquals(turnOffInstantiationUI(aLaCarteInstantiationTypeExpectedResponse)))); + assertThat(response.getBody(), jsonEquals(aLaCarteInstantiationTypeExpectedResponse) + .when(IGNORING_ARRAY_ORDER) + .whenIgnoringPaths("service.vidNotions.instantiationUI")); } |