diff options
author | Einat Vinouze <einat.vinouze@intl.att.com> | 2020-03-03 16:15:39 +0200 |
---|---|---|
committer | Einat Vinouze <einat.vinouze@intl.att.com> | 2020-03-08 11:43:12 +0200 |
commit | 742d6d369b761220e565f39f2fa09413141ad93f (patch) | |
tree | c3f48794abab6cedb5d698b75b2fe525a56c7958 /vid-automation/src/main/java/vid/automation | |
parent | f7c41b1c4aeea09e67c8bb88f39d15e02cd1708f (diff) |
allow platform multi-selection for network
Issue-ID: VID-785
Change-Id: I4e6a4c2f0dc8c0e11f2571eec0789ad5672a9147
Signed-off-by: Einat Vinouze <einat.vinouze@intl.att.com>
Diffstat (limited to 'vid-automation/src/main/java/vid/automation')
4 files changed, 10 insertions, 12 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 ff06bf98e..f0065869f 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 @@ -61,6 +61,8 @@ public enum Features implements Feature { FLAG_2006_USER_PERMISSIONS_BY_OWNING_ENTITY, FLAG_2006_LIMIT_OWNING_ENTITY_SELECTION_BY_ROLES, FLAG_2006_VFMODULE_TAKES_TENANT_AND_REGION_FROM_VNF, + FLAG_2006_NETWORK_PLATFORM_MULTI_SELECT, + ; public boolean isActive() { diff --git a/vid-automation/src/main/java/vid/automation/test/sections/ViewEditPage.java b/vid-automation/src/main/java/vid/automation/test/sections/ViewEditPage.java index adba6f28f..3943af0e8 100644 --- a/vid-automation/src/main/java/vid/automation/test/sections/ViewEditPage.java +++ b/vid-automation/src/main/java/vid/automation/test/sections/ViewEditPage.java @@ -1,19 +1,17 @@ package vid.automation.test.sections; +import static org.hamcrest.core.Is.is; + +import java.util.List; import org.junit.Assert; import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import vid.automation.test.Constants; -import vid.automation.test.infra.Features; import vid.automation.test.infra.Get; import vid.automation.test.infra.SelectOption; -import static org.hamcrest.core.Is.is; -/** - * Created by itzikliderman on 13/06/2017. - */ public class ViewEditPage extends VidBasePage { public ViewEditPage selectNodeInstanceToAdd(String vnfName) { selectFromDropdownByTestId(Constants.ViewEdit.VNF_OPTION_TEST_ID_PREFIX + vnfName, @@ -133,8 +131,8 @@ public class ViewEditPage extends VidBasePage { // return this; // } - public ViewEditPage selectPlatform(String platform) { - SelectOption.byValue(platform, Constants.OwningEntity.PLATFORM_SELECT_TEST_ID); + public ViewEditPage selectPlatform(List<String> platformList) { + SelectOption.selectOptionsFromMultiselectById("multi-selectPlatform", platformList); return this; } } 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 4fdf825d3..99e824086 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 @@ -1200,11 +1200,9 @@ public class NewServiceInstanceTest extends ModernUITestBase { assertSetButtonDisabled(VNF_SET_BUTTON_TEST_ID); + SelectOption.selectOptionsFromMultiselectById("multi-selectPlatform", ImmutableList.of("platform")); - if(isNetwork){ - browseASDCPage.selectPlatform("platform"); - }else { - SelectOption.selectOptionsFromMultiselectById("multi-selectPlatform", ImmutableList.of("platform")); + if(!isNetwork){ SelectOption.byTestIdAndVisibleText("TYLER SILVIA", Constants.ViewEdit.PRODUCT_FAMILY_SELECT_TESTS_ID); browseASDCPage.selectProductFamily("e433710f-9217-458d-a79d-1c7aff376d89"); } diff --git a/vid-automation/src/main/java/vid/automation/test/test/VidBaseTestCase.java b/vid-automation/src/main/java/vid/automation/test/test/VidBaseTestCase.java index 842142751..74ceec635 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/VidBaseTestCase.java +++ b/vid-automation/src/main/java/vid/automation/test/test/VidBaseTestCase.java @@ -357,7 +357,7 @@ public class VidBaseTestCase extends SetupCDTest{ viewEditPage.selectSuppressRollback(suppressRollback); if(platform != null){ - viewEditPage.selectPlatform(platform); + viewEditPage.selectPlatform(ImmutableList.of(platform)); } viewEditPage.clickConfirmButton(); viewEditPage.assertMsoRequestModal(Constants.ViewEdit.MSO_SUCCESSFULLY_TEXT); |