From b2c60183d5d654b945a24ec5564807e4f691c6e8 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Mon, 7 Aug 2017 07:05:40 +0300 Subject: [SDC] code sync Change-Id: I576dd69504722c341b0f41a1f6232ed3f4bee8df Signed-off-by: Michael Lando --- .../sdc/ci/tests/execute/sanity/ImportDCAE.java | 5 ----- .../openecomp/sdc/ci/tests/execute/sanity/Vf.java | 7 +----- .../sanity/VfDeploymentInformationalArtifacts.java | 25 +--------------------- .../sdc/ci/tests/pages/CompositionPage.java | 2 +- .../ci/tests/verificator/ServiceVerificator.java | 4 ++-- 5 files changed, 5 insertions(+), 38 deletions(-) (limited to 'ui-ci/src/main/java/org') diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/ImportDCAE.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/ImportDCAE.java index 5204c808c4..a26919ae2a 100644 --- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/ImportDCAE.java +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/ImportDCAE.java @@ -455,11 +455,6 @@ public class ImportDCAE extends SetupCDTest { @Test public void addDeploymentArtifactAndVerifyInCompositionScreenDCAEAssetTest() throws Exception{ - - if(true){ - throw new SkipException("Open bug 320081"); - } - createDCAEAsset(); ResourceGeneralPage.getLeftMenu().moveToDeploymentArtifactScreen(); diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/Vf.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/Vf.java index 17d1fa2906..126154661a 100644 --- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/Vf.java +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/Vf.java @@ -513,12 +513,7 @@ public class Vf extends SetupCDTest { } @Test - public void addDeploymentArtifactAndVerifyInCompositionScreen() throws Exception{ - - if(true){ - throw new SkipException("Open bug 320081"); - } - + public void addDeploymentArtifactAndVerifyInCompositionScreen() throws Exception{ ResourceReqDetails vfMetaData = ElementFactory.getDefaultResourceByType(ResourceTypeEnum.VF, getUser()); ResourceUIUtils.createResource(vfMetaData, getUser()); diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/VfDeploymentInformationalArtifacts.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/VfDeploymentInformationalArtifacts.java index f7e7945227..24badb3ec2 100644 --- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/VfDeploymentInformationalArtifacts.java +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/VfDeploymentInformationalArtifacts.java @@ -58,10 +58,6 @@ public class VfDeploymentInformationalArtifacts extends SetupCDTest { // TC1434241 - Import VF Artifacts - Deployment Artifacts - One Artifact, One Type @Test public void importVfArtifactsDeploymentArtifactsOneArtifactOneType() throws Exception { - - if(true){ - throw new SkipException("Open bug 320081"); - } String fileName = "TC1434241.csar"; String folder ="US825779"; @@ -77,10 +73,6 @@ public class VfDeploymentInformationalArtifacts extends SetupCDTest { // TC1434245 - Import VF Artifacts - Deployment Artifacts - Multiple Artifacts, Multiple Types @Test public void importVfArtifactsDeploymentArtifactsMultipleArtifactsMultipleTypes() throws Exception { - - if(true){ - throw new SkipException("Open bug 320081"); - } String fileName = "TC1434245.csar"; String folder ="US825779"; @@ -545,9 +537,6 @@ public class VfDeploymentInformationalArtifacts extends SetupCDTest { public void updateWithExistedDeploymentArtifactByArtifactWithDifferentType() throws Exception { String folder ="US825779"; String fileName = "ImportTC1444206.csar"; - if(true){ - throw new SkipException("Open bug 320081"); - } List deploymentArtifacts = new ArrayList(); deploymentArtifacts.add(new ArtifactInfo(null, "base_ldsa.yaml", null, "base_ldsa", ArtifactTypeEnum.HEAT.getType(), "1")); deploymentArtifacts.add(new ArtifactInfo(null, "module_1_ldsa.yaml", null, "module_1_ldsa", ArtifactTypeEnum.HEAT.getType(), "2")); @@ -604,11 +593,7 @@ public class VfDeploymentInformationalArtifacts extends SetupCDTest { // US825779 - Story: [BE] Import VSP - VF informational artifacts - Update // TC1444208 - Update With Existed Informational Artifact By Deployment Artifact With Different Type @Test - public void updateWithExistedInformationalArtifactByDeploymentArtifactWithDifferentType() throws Exception { - - if(true){ - throw new SkipException("Open bug 320081"); - } + public void updateWithExistedInformationalArtifactByDeploymentArtifactWithDifferentType() throws Exception { String folder ="US825779"; String fileName = "ImportTC1444208.csar"; @@ -733,10 +718,6 @@ public class VfDeploymentInformationalArtifacts extends SetupCDTest { @Test public void importValidInformationalArtifactInInvalidFolerTest_TC1438313() throws Exception{ - - if(true){ - throw new SkipException("Open bug 320081"); - } String fileName = "ValidArtifactNameInInvalidFolder.csar"; String folder = "US824719"; @@ -749,10 +730,6 @@ public class VfDeploymentInformationalArtifacts extends SetupCDTest { @Test public void updateValidInformationalArtifactInInvalidFolerTest_TC1444533() throws Exception{ - if(true){ - throw new SkipException("Open bug 320081"); - } - String fileName = "ImportTC1444533.csar"; String folder = "US824719"; String filePath = FileHandling.getFilePath(folder); diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/pages/CompositionPage.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/pages/CompositionPage.java index 496c537d49..264971e2d9 100644 --- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/pages/CompositionPage.java +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/pages/CompositionPage.java @@ -146,7 +146,7 @@ public class CompositionPage extends GeneralPageElements { public static List getOpenTabTitle() throws Exception{ // return GeneralUIUtils.getElementsByCSS("expand-collapse span"); - return GeneralUIUtils.getElementsByCSS("expand-collapse"); + return GeneralUIUtils.getElementsByCSS("expand-collapse ng-transclude"); } public static void clickOnTab(DataTestIdEnum.CompositionScreenEnum tabSelector) throws Exception{ diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/ServiceVerificator.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/ServiceVerificator.java index 2689849b19..4035ef9243 100644 --- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/ServiceVerificator.java +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/ServiceVerificator.java @@ -145,10 +145,10 @@ public class ServiceVerificator { public static void verifyOpenTabTitle(DataTestIdEnum.CompositionScreenEnum currentTab) throws Exception{ List expectedTitles = new ArrayList(); for(String expectedTitle: currentTab.getTitle()){ - expectedTitles.add(expectedTitle); + expectedTitles.add(expectedTitle.toLowerCase()); } for (WebElement actualTitle: CompositionPage.getOpenTabTitle()){ - int indexOfTitle = expectedTitles.indexOf(actualTitle.getText()); + int indexOfTitle = expectedTitles.indexOf(actualTitle.getText().trim().toLowerCase()); assertTrue(indexOfTitle >= 0, "Wrong title"); expectedTitles.remove(indexOfTitle); } -- cgit 1.2.3-korg