summaryrefslogtreecommitdiffstats
path: root/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/VfVerificator.java
diff options
context:
space:
mode:
Diffstat (limited to 'ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/VfVerificator.java')
-rw-r--r--ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/VfVerificator.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/VfVerificator.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/VfVerificator.java
index e877146256..38fb351179 100644
--- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/VfVerificator.java
+++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/VfVerificator.java
@@ -124,18 +124,21 @@ public final class VfVerificator {
}
public static void verifyVFLifecycle(ResourceReqDetails vf, User user, LifecycleStateEnum expectedLifecycleState) {
+ SetupCDTest.getExtendTest().log(Status.INFO, String.format("Verfiying that object %s version is %s", vf.getName(),expectedLifecycleState));
String responseAfterDrag = RestCDUtils.getResource(vf, user).getResponse();
JSONObject jsonResource = (JSONObject) JSONValue.parse(responseAfterDrag);
String actualLifecycleState = jsonResource.get("lifecycleState").toString();
assertTrue(expectedLifecycleState.name().equals(actualLifecycleState), "actual: " + actualLifecycleState + "-- expected: " + expectedLifecycleState);
}
-
+
public static void verifyVfLifecycleInUI(LifeCycleStateEnum lifecycleState){
+ SetupCDTest.getExtendTest().log(Status.INFO, String.format("Verfiying that object version is %s", lifecycleState.getValue()));
GeneralUIUtils.ultimateWait();
assertTrue(ResourceGeneralPage.getLifeCycleState().equals(lifecycleState.getValue()));
}
public static void verifyInstanceVersion(ResourceReqDetails vf, User user, String instanceName, String instanceVersion){
+ SetupCDTest.getExtendTest().log(Status.INFO, String.format("Verfiying that instance %s version is %s", instanceName,instanceVersion));
String responseAfterDrag = RestCDUtils.getResource(vf, user).getResponse();
JSONObject jsonResource = (JSONObject) JSONValue.parse(responseAfterDrag);
JSONArray jsonArrayResource = (JSONArray) jsonResource.get("componentInstances");
@@ -157,6 +160,7 @@ public final class VfVerificator {
}
public static void verifyVfDeleted(ResourceReqDetails vf, User user){
+ SetupCDTest.getExtendTest().log(Status.INFO, String.format("Validating resource %s was deleted", vf.getName()));
RestResponse response = RestCDUtils.getResource(vf, user);
assertTrue(response.getErrorCode().intValue() == 404);
}
@@ -182,6 +186,7 @@ public final class VfVerificator {
}
public static void verifyToscaArtifactsInfo(ResourceReqDetails vf, User user){
+ SetupCDTest.getExtendTest().log(Status.INFO, String.format("Validating Tosca Aritfact Info of resource %s", vf.getName()));
String responseAfterDrag = RestCDUtils.getResource(vf, user).getResponse();
JSONObject jsonResource = (JSONObject) JSONValue.parse(responseAfterDrag);
JSONObject toscaArtifacts = (JSONObject) jsonResource.get("toscaArtifacts");
@@ -216,7 +221,7 @@ public final class VfVerificator {
SetupCDTest.getExtendTest().log(Status.INFO, "Verifying metadata");
assertTrue(vspName.equals(ResourceGeneralPage.getNameText()), "VSP name is not valid.");
assertTrue(vspMetadata.get("description").equals(ResourceGeneralPage.getDescriptionText()), "VSP description is not valid.");
- assertTrue(vspMetadata.get("subCategory").equals(GeneralUIUtils.getSelectedElementFromDropDown(ResourceGeneralPage.getCategoryDataTestsIdAttribute()).getText().toLowerCase().trim()), "VSP category is not valid.");
+ assertTrue(vspMetadata.get("subCategory").equals(GeneralUIUtils.getSelectedElementFromDropDown(ResourceGeneralPage.getCategoryDataTestsIdAttribute()).getText().trim()), "VSP category is not valid.");
assertTrue(vspMetadata.get("vendorName").equals(ResourceGeneralPage.getVendorNameText()), "VSP vendor name is not valid.");
assertTrue("1.0".equals(ResourceGeneralPage.getVendorReleaseText()), "VSP version is not valid.");
List<WebElement> tagsList = ResourceGeneralPage.getElementsFromTagsTable();
@@ -236,7 +241,6 @@ public final class VfVerificator {
String expectedMd5OfFile = FileHandling.getMD5OfFile(expected);
Assert.assertEquals(expectedMd5OfFile, actualMd5OfFile, "File does not exist");
} catch (IOException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}