diff options
Diffstat (limited to 'test-apis-ci/src/test/java/org/openecomp')
3 files changed, 27 insertions, 40 deletions
diff --git a/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/runners/RunTenantIsolationCucumberCI.java b/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/runners/RunTenantIsolationCucumberCI.java index d9183fc5c4..e2d324bae3 100644 --- a/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/runners/RunTenantIsolationCucumberCI.java +++ b/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/runners/RunTenantIsolationCucumberCI.java @@ -1,13 +1,12 @@ package org.openecomp.sdc.cucumber.runners; +import cucumber.api.CucumberOptions; +import cucumber.api.junit.Cucumber; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.openecomp.sdc.conf.TestAPIConfDependentTest; -import cucumber.api.CucumberOptions; -import cucumber.api.junit.Cucumber; - @RunWith(Cucumber.class) @CucumberOptions(features = "classpath:cucumber/tenantIsolation.feature", glue = "org.openecomp.sdc.cucumber.steps") diff --git a/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/PrecannedTestExpectationCallback.java b/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/PrecannedTestExpectationCallback.java index 56802ec7d4..0aec90479d 100644 --- a/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/PrecannedTestExpectationCallback.java +++ b/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/PrecannedTestExpectationCallback.java @@ -1,14 +1,13 @@ package org.openecomp.sdc.cucumber.steps; -import static org.mockserver.model.HttpResponse.response; - +import com.google.common.net.HttpHeaders; import org.apache.http.entity.ContentType; import org.mockserver.mock.action.ExpectationCallback; import org.mockserver.model.Header; import org.mockserver.model.HttpRequest; import org.mockserver.model.HttpResponse; -import com.google.common.net.HttpHeaders; +import static org.mockserver.model.HttpResponse.response; public class PrecannedTestExpectationCallback implements ExpectationCallback { private static volatile int countRequests; diff --git a/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/StepsTenantIsolationCI.java b/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/StepsTenantIsolationCI.java index 490b3e0c84..98c62912c1 100644 --- a/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/StepsTenantIsolationCI.java +++ b/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/StepsTenantIsolationCI.java @@ -1,30 +1,16 @@ package org.openecomp.sdc.cucumber.steps; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; -import static org.mockserver.model.HttpCallback.callback; -import static org.mockserver.model.HttpRequest.request; -import static org.mockserver.model.HttpResponse.response; -import static org.openecomp.sdc.common.datastructure.FunctionalInterfaces.retryMethodOnResult; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.UUID; -import java.util.function.Function; -import java.util.stream.Collectors; - +import com.google.common.base.Strings; +import com.google.common.net.HttpHeaders; +import com.google.gson.JsonElement; +import com.google.gson.JsonParser; +import cucumber.api.java.After; +import cucumber.api.java.Before; +import cucumber.api.java.en.Given; +import cucumber.api.java.en.Then; +import cucumber.api.java.en.When; +import fj.data.Either; import org.apache.commons.collections.CollectionUtils; -//import org.openecomp.sdc.dmaap.DmaapPublisher; import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpStatus; import org.apache.http.entity.ContentType; @@ -56,17 +42,20 @@ import org.openecomp.sdc.utils.DistributionActionResultEnum; import org.openecomp.sdc.utils.DistributionStatusEnum; import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import com.google.common.base.Strings; -import com.google.common.net.HttpHeaders; -import com.google.gson.JsonElement; -import com.google.gson.JsonParser; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; -import cucumber.api.java.After; -import cucumber.api.java.Before; -import cucumber.api.java.en.Given; -import cucumber.api.java.en.Then; -import cucumber.api.java.en.When; -import fj.data.Either; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.mockserver.model.HttpCallback.callback; +import static org.mockserver.model.HttpRequest.request; +import static org.mockserver.model.HttpResponse.response; +import static org.openecomp.sdc.common.datastructure.FunctionalInterfaces.retryMethodOnResult; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; + +//import org.openecomp.sdc.dmaap.DmaapPublisher; public class StepsTenantIsolationCI { |