diff options
Diffstat (limited to 'vid-automation/src/main/java/vid/automation/test')
3 files changed, 3 insertions, 24 deletions
diff --git a/vid-automation/src/main/java/vid/automation/test/infra/Features.java b/vid-automation/src/main/java/vid/automation/test/infra/Features.java index ba7ebdf0e..b6afed582 100644 --- a/vid-automation/src/main/java/vid/automation/test/infra/Features.java +++ b/vid-automation/src/main/java/vid/automation/test/infra/Features.java @@ -72,6 +72,7 @@ public enum Features implements Feature { FLAG_2008_PAUSE_INSTANTIATION_ON_VFMODULE_POPUP, FLAG_2008_REMOVE_PAUSE_INSTANTIATION, FLAG_2008_PAUSE_VFMODULE_INSTANTIATION_FAILURE, + FLAG_2011_EXPORT_MSO_STATUS, ; public boolean isActive() { return FeatureContext.getFeatureManager().isActive(this); diff --git a/vid-automation/src/main/java/vid/automation/test/test/InstantiationStatusTest.java b/vid-automation/src/main/java/vid/automation/test/test/InstantiationStatusTest.java index 70fe620fa..18d8a0453 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/InstantiationStatusTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/InstantiationStatusTest.java @@ -131,11 +131,8 @@ public class InstantiationStatusTest extends VidBaseTestCase { private void checkFailedAuditInfoOnRetry(String instanceName, String requestId, String message) { GeneralUIUtils.ultimateWait(); - WebElement webElement = Get.byTestId("model-item-value-instance_name"); - assertEquals(webElement.getText(), instanceName, "Instance Name must be equal"); - WebElement msoTableElement = Get.byId("service-instantiation-audit-info-mso"); - assertEquals(3, msoTableElement.findElement(By.tagName("thead")).findElements(By.tagName("th")).size(), "Audit info MSO table must contain 3 columns"); + assertEquals(7, msoTableElement.findElement(By.tagName("thead")).findElements(By.tagName("th")).size(), "Audit info MSO table must contain 7 columns"); assertEquals(requestId, msoTableElement.findElement(By.id("msoRequestId")).getText(), "Audit info Request Id is not equal"); assertEquals("Failed", msoTableElement.findElement(By.id("msoJobStatus")).getText(), "Audit info Job Status is not equal"); assertEquals(message, msoTableElement.findElement(By.id("msoAdditionalInfo")).getText(), "Audit info AdditionalInfo is not equal"); 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 07fd37826..32649c118 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 @@ -872,27 +872,8 @@ public class NewServiceInstanceTest extends ModernUITestBase { private void checkAuditInfoModal(String actualInstanceName, Integer i, String[] statuses) { - Wait.waitByTestId("vidJobStatus", 10); - - WebElement webElement = Get.byTestId("model-item-value-serviceInstanceName"); - assertEquals(webElement.getText(), actualInstanceName, "Service Instance Name must be equal"); - - WebElement vidTableElement = Get.byId("service-instantiation-audit-info-vid"); - assertEquals(3, vidTableElement.findElement(By.tagName("thead")).findElements(By.tagName("th")).size(), "VID table must contain 3 columns"); - - List<WebElement> vidStatusesElements = vidTableElement.findElements(By.id("vidJobStatus")); - List<String> vidStatuses = vidStatusesElements.stream() - .map(s -> - convertUITextCapitalizeAndFormatPipe(s.getText())) - .collect(Collectors.toList()); - - List<String> serviceStatus = Arrays.asList(Arrays.copyOfRange(statuses, i, statuses.length)); - assertThat("statuses for " + actualInstanceName + " must be as expected", vidStatuses, containsInAnyOrder(serviceStatus.toArray())); - String dateString = vidTableElement.findElements(By.id("vidStatusTime")).get(0).getText(); - assertTrue("vid Status Time column must contains valid date in format : MMM dd, yyyy HH:mm", isDateValid(dateString, "MMM dd, yyyy HH:mm")); - WebElement MSOTableElement = Get.byId("service-instantiation-audit-info-mso"); - assertEquals(3, MSOTableElement.findElement(By.tagName("thead")).findElements(By.tagName("th")).size(), "MSO table must contain 3 columns"); + assertEquals(7, MSOTableElement.findElement(By.tagName("thead")).findElements(By.tagName("th")).size(), "MSO table must contain 7 columns"); if (statuses[i].equals(PENDING)) { assertEquals(0, MSOTableElement.findElement(By.tagName("tbody")).findElements(By.tagName("tr")).size(), "When status is PENDING MSO table is empty"); |