summaryrefslogtreecommitdiffstats
path: root/vid-automation/src/main/java
diff options
context:
space:
mode:
authorAmir Skalka <amir.skalka@intl.att.com>2019-11-18 10:29:49 +0200
committerIttay Stern <ittay.stern@att.com>2019-11-18 15:50:14 +0200
commit4c2de1c9790b3312201494462699f982f711fbd3 (patch)
tree513bb7fec5d551108584b2a17eb80c2408d4dab7 /vid-automation/src/main/java
parentf886b56f7a0a105a1d0dc8edd5539348d606eb49 (diff)
Adjust NewServiceInstanceTest by new logic + revert state-check in getDefaultVolumeGroupName
* Change expected behaviour of tests to match new business of VG naming process; See shouldVGNameBeVisible() in vfModule.control.generator.ts * Fix Cypress tests `volume group should change on instance`. Issue-ID: VID-700 Change-Id: I18faf49a4a31f4b8f389dbcda53c55a1a8066c90 Signed-off-by: Amir Skalka <amir.skalka@intl.att.com> Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-automation/src/main/java')
-rw-r--r--vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java b/vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java
index a701f1029..1d668877d 100644
--- a/vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java
+++ b/vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java
@@ -1170,12 +1170,16 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest {
Input.text("VF instance name", "instanceName");
}
- if (serviceData.vfData.vgEnabled) {
+ if (serviceData.vfData.vgEnabled && !serviceData.vnfData.isGeneratedNaming) {
browseASDCPage.setInputText("volumeGroupName", "_abc");
- Assert.assertEquals(isElementByIdRequired("volumeGroupName-label"), false, "volume Group name input should be always optional");
+ Assert.assertFalse(isElementByIdRequired("volumeGroupName-label"),
+ "volume Group name input should be always optional");
} else {
- Assert.assertNull(Get.byTestId("volumeGroupName"), "volumeGroupName input should be invisible when vgEnabled == false");
+ Assert.assertNull(Get.byTestId("volumeGroupName"), "volumeGroupName input should be invisible "
+ + "when vgEnabled is false or when vgEnabled is true and EcompGenName is true "
+ + "(was: serviceData.vfData.vgEnabled=>"+serviceData.vfData.vgEnabled+", serviceData.isGeneratedNaming=>" + IS_GENERATED_NAMING.FALSE + ")");
}
+
Wait.waitByTestId("model-item-value-subscriberName", 10);
Assert.assertEquals(Get.byTestId("model-item-value-subscriberName").getText(), "SILVIA ROBBINS", "Subscriber name should be shown in vf module");
Assert.assertEquals(Get.byTestId("model-item-value-min").getText(), Integer.toString(serviceData.vfData.vfMin), "Min should be shown");