From a55efc25f0ec1cca1a1accedb2bb7fce66d597a9 Mon Sep 17 00:00:00 2001 From: kurczews Date: Tue, 14 Aug 2018 11:18:43 +0200 Subject: Renaming vid-automation #5 Change-Id: I600b92565ba63356fa1fb4f86408f98fb3129bb2 Issue-ID: VID-205 Signed-off-by: kurczews --- .../automation/test/services/BulkRegistration.java | 20 +++++++++++++---- .../vid/automation/test/services/SimulatorApi.java | 4 ++-- .../vid/automation/test/test/BrowseASDCTest.java | 12 +++++------ .../vid/automation/test/test/HealthStatusTest.java | 6 +++--- .../test/test/NewServiceInstanceTest.java | 6 +++--- .../test/test/PreviousVersionsPopupTest.java | 19 ++++++++++------ .../vid/automation/test/test/ReadOnlyTest.java | 2 +- .../vid/automation/test/test/SubInterfaceTest.java | 12 +++++------ .../vid/automation/test/test/VidBaseTestCase.java | 25 +++++++++++++++------- .../test/test/ViewEditServiceInstanceTest.java | 2 +- 10 files changed, 66 insertions(+), 42 deletions(-) (limited to 'vid-automation/src') diff --git a/vid-automation/src/main/java/vid/automation/test/services/BulkRegistration.java b/vid-automation/src/main/java/vid/automation/test/services/BulkRegistration.java index b142195e5..c6de040ea 100644 --- a/vid-automation/src/main/java/vid/automation/test/services/BulkRegistration.java +++ b/vid-automation/src/main/java/vid/automation/test/services/BulkRegistration.java @@ -2,10 +2,22 @@ package vid.automation.test.services; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import org.opencomp.simulator.presetGenerator.presets.aai.*; -import org.opencomp.simulator.presetGenerator.presets.mso.*; -import org.opencomp.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceMetadataGet; -import org.opencomp.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceToscaModelGet; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAICloudRegionAndSourceFromConfigurationPut; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetModelsByOwningEntity; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetModelsByProject; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetPortMirroringSourcePorts; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetTenants; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIPostNamedQueryForViewEdit; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVfModuleInstancePost; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeleteInstanceOrchestrationRequestGet; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeleteNetwork; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeleteService; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeleteVfModule; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeleteVnf; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeleteVolumeGroup; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet; +import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceMetadataGet; +import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceToscaModelGet; import vid.automation.test.Constants; import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND; diff --git a/vid-automation/src/main/java/vid/automation/test/services/SimulatorApi.java b/vid-automation/src/main/java/vid/automation/test/services/SimulatorApi.java index 74cda7990..29f6eae7c 100644 --- a/vid-automation/src/main/java/vid/automation/test/services/SimulatorApi.java +++ b/vid-automation/src/main/java/vid/automation/test/services/SimulatorApi.java @@ -6,8 +6,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import org.glassfish.jersey.client.ClientProperties; import org.glassfish.jersey.uri.internal.JerseyUriBuilder; -import org.opencomp.simulator.presetGenerator.presets.BasePresets.BasePreset; -import org.opencomp.simulator.presetGenerator.presets.model.RegistrationRequest; +import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; +import org.onap.simulator.presetGenerator.presets.model.RegistrationRequest; import org.springframework.http.HttpStatus; import vid.automation.test.utils.ReadFile; diff --git a/vid-automation/src/main/java/vid/automation/test/test/BrowseASDCTest.java b/vid-automation/src/main/java/vid/automation/test/test/BrowseASDCTest.java index 3843d6a98..4f055fe29 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/BrowseASDCTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/BrowseASDCTest.java @@ -3,12 +3,12 @@ package vid.automation.test.test; import com.google.common.collect.ImmutableList; import org.glassfish.jersey.uri.internal.JerseyUriBuilder; import org.hamcrest.Matchers; -import org.opencomp.simulator.presetGenerator.presets.BasePresets.BasePreset; -import org.opencomp.simulator.presetGenerator.presets.aai.PresetAAIGetServiceModelList; -import org.opencomp.simulator.presetGenerator.presets.aai.PresetAAIGetServicesGet; -import org.opencomp.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; -import org.opencomp.simulator.presetGenerator.presets.aai.PresetAAIServiceDesignAndCreationPut; -import org.opencomp.simulator.presetGenerator.presets.ecompportal_att.PresetGetSessionSlotCheckIntervalGet; +import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetServiceModelList; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetServicesGet; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIServiceDesignAndCreationPut; +import org.onap.simulator.presetGenerator.presets.ecompportal_att.PresetGetSessionSlotCheckIntervalGet; import org.openecomp.sdc.ci.tests.datatypes.UserCredentials; import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.By; diff --git a/vid-automation/src/main/java/vid/automation/test/test/HealthStatusTest.java b/vid-automation/src/main/java/vid/automation/test/test/HealthStatusTest.java index cf1717e47..184592188 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/HealthStatusTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/HealthStatusTest.java @@ -2,9 +2,9 @@ package vid.automation.test.test; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; -import org.opencomp.simulator.presetGenerator.presets.BasePresets.BasePreset; -import org.opencomp.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; -import org.opencomp.simulator.presetGenerator.presets.ecompportal_att.PresetGetSessionSlotCheckIntervalGet; +import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; +import org.onap.simulator.presetGenerator.presets.ecompportal_att.PresetGetSessionSlotCheckIntervalGet; import org.openqa.selenium.remote.RemoteWebElement; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; 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 fba260c9e..f4d3796ae 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 @@ -2,9 +2,9 @@ package vid.automation.test.test; import com.google.common.collect.*; import org.apache.commons.lang3.RandomStringUtils; -import org.opencomp.simulator.presetGenerator.presets.mso.PresetMSOBaseCreateServiceInstancePost; -import org.opencomp.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstanceGen2; -import org.opencomp.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOBaseCreateServiceInstancePost; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstanceGen2; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet; import org.openecomp.sdc.ci.tests.datatypes.UserCredentials; import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.By; diff --git a/vid-automation/src/main/java/vid/automation/test/test/PreviousVersionsPopupTest.java b/vid-automation/src/main/java/vid/automation/test/test/PreviousVersionsPopupTest.java index 0dc20baa9..aefef20e2 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/PreviousVersionsPopupTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/PreviousVersionsPopupTest.java @@ -2,13 +2,18 @@ package vid.automation.test.test; import com.google.common.collect.ImmutableList; import org.junit.Assert; -import org.opencomp.simulator.presetGenerator.presets.BasePresets.BasePreset; -import org.opencomp.simulator.presetGenerator.presets.aai.*; -import org.opencomp.simulator.presetGenerator.presets.ecompportal_att.PresetGetSessionSlotCheckIntervalGet; -import org.opencomp.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstancePost; -import org.opencomp.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet; -import org.opencomp.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceMetadataGet; -import org.opencomp.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceToscaModelGet; +import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetMultipleVersion; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetNetworkZones; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetOneVersion; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetServicesGet; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubDetailsGet; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; +import org.onap.simulator.presetGenerator.presets.ecompportal_att.PresetGetSessionSlotCheckIntervalGet; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstancePost; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet; +import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceMetadataGet; +import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceToscaModelGet; import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/vid-automation/src/main/java/vid/automation/test/test/ReadOnlyTest.java b/vid-automation/src/main/java/vid/automation/test/test/ReadOnlyTest.java index e788b7051..c3ddd406b 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/ReadOnlyTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/ReadOnlyTest.java @@ -1,7 +1,7 @@ package vid.automation.test.test; import org.junit.Assert; -import org.opencomp.simulator.presetGenerator.presets.aai.PresetAAIGetNetworkCollectionDetails; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetNetworkCollectionDetails; import org.openecomp.sdc.ci.tests.datatypes.UserCredentials; import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.By; diff --git a/vid-automation/src/main/java/vid/automation/test/test/SubInterfaceTest.java b/vid-automation/src/main/java/vid/automation/test/test/SubInterfaceTest.java index 9c8c0e749..59baaf776 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/SubInterfaceTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/SubInterfaceTest.java @@ -1,11 +1,11 @@ package vid.automation.test.test; import com.google.common.collect.ImmutableList; -import org.opencomp.simulator.presetGenerator.presets.aai.PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest; -import org.opencomp.simulator.presetGenerator.presets.aai.PresetAAIGetRelatedInstanceGroupsByVnfId; -import org.opencomp.simulator.presetGenerator.presets.aai.PresetAAIGetTenants; -import org.opencomp.simulator.presetGenerator.presets.mso.PresetMSOCreateVNFInstancePost; -import org.opencomp.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetRelatedInstanceGroupsByVnfId; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetTenants; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVNFInstancePost; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet; import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.ui.Select; @@ -18,7 +18,6 @@ import vid.automation.test.infra.Click; import vid.automation.test.infra.FeatureTogglingTest; import vid.automation.test.infra.Get; import vid.automation.test.infra.SelectOption; -import vid.automation.test.sections.DrawingBoardPage; import vid.automation.test.sections.SearchExistingPage; import vid.automation.test.sections.ViewEditPage; import vid.automation.test.services.BulkRegistration; @@ -36,7 +35,6 @@ import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertNull; import static vid.automation.test.infra.Features.FLAG_COLLECTION_RESOURCE_SUPPORT; import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND; -import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET; @FeatureTogglingTest(FLAG_COLLECTION_RESOURCE_SUPPORT) public class SubInterfaceTest extends CreateInstanceDialogBaseTest { 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 bcdb73d3e..5c0206c06 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 @@ -7,14 +7,23 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import org.apache.commons.lang3.StringUtils; import org.junit.Assert; -import org.opencomp.simulator.presetGenerator.presets.BasePresets.BasePreset; -import org.opencomp.simulator.presetGenerator.presets.aai.*; -import org.opencomp.simulator.presetGenerator.presets.ecompportal_att.PresetGetSessionSlotCheckIntervalGet; -import org.opencomp.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstanceGen2; -import org.opencomp.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstancePost; -import org.opencomp.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet; -import org.opencomp.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceMetadataGet; -import org.opencomp.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceToscaModelGet; +import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAICloudRegionAndSourceFromConfigurationPut; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetNetworkZones; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetPortMirroringSourcePorts; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetServicesGet; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubDetailsGet; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetTenants; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIPostNamedQueryForViewEdit; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAISearchNodeQueryEmptyResult; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIServiceDesignAndCreationPut; +import org.onap.simulator.presetGenerator.presets.ecompportal_att.PresetGetSessionSlotCheckIntervalGet; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstanceGen2; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstancePost; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet; +import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceMetadataGet; +import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceToscaModelGet; import org.openecomp.sdc.ci.tests.datatypes.UserCredentials; import org.openecomp.sdc.ci.tests.execute.setup.SetupCDTest; import org.openecomp.sdc.ci.tests.utilities.FileHandling; diff --git a/vid-automation/src/main/java/vid/automation/test/test/ViewEditServiceInstanceTest.java b/vid-automation/src/main/java/vid/automation/test/test/ViewEditServiceInstanceTest.java index d64b6b18c..e07acc3ac 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/ViewEditServiceInstanceTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/ViewEditServiceInstanceTest.java @@ -4,7 +4,7 @@ import com.google.common.collect.ImmutableMap; import org.hamcrest.MatcherAssert; import org.junit.Assert; import org.junit.Before; -import org.opencomp.simulator.presetGenerator.presets.aai.PresetAAIGetNetworkCollectionDetails; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetNetworkCollectionDetails; import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -- cgit 1.2.3-korg