diff options
Diffstat (limited to 'sdc-distribution-client/src/test/java/org')
| -rw-r--r-- | sdc-distribution-client/src/test/java/org/onap/sdc/http/SdcConnectorClientTest.java (renamed from sdc-distribution-client/src/test/java/org/openecomp/sdc/http/SdcConnectorClientTest.java) | 10 | ||||
| -rw-r--r-- | sdc-distribution-client/src/test/java/org/onap/sdc/impl/DistributionClientDownloadResultTest.java (renamed from sdc-distribution-client/src/test/java/org/openecomp/sdc/impl/DistributionClientDownloadResultTest.java) | 110 | ||||
| -rw-r--r-- | sdc-distribution-client/src/test/java/org/onap/sdc/impl/DistributionClientTest.java (renamed from sdc-distribution-client/src/test/java/org/openecomp/sdc/impl/DistributionClientTest.java) | 32 | ||||
| -rw-r--r-- | sdc-distribution-client/src/test/java/org/onap/sdc/impl/HeatParserTest.java (renamed from sdc-distribution-client/src/test/java/org/openecomp/sdc/impl/HeatParserTest.java) | 8 | ||||
| -rw-r--r-- | sdc-distribution-client/src/test/java/org/onap/sdc/impl/NotificationConsumerTest.java (renamed from sdc-distribution-client/src/test/java/org/openecomp/sdc/impl/NotificationConsumerTest.java) | 18 | ||||
| -rw-r--r-- | sdc-distribution-client/src/test/java/org/onap/sdc/utils/ArtifactsUtils.java (renamed from sdc-distribution-client/src/test/java/org/openecomp/sdc/utils/ArtifactsUtils.java) | 6 | ||||
| -rw-r--r-- | sdc-distribution-client/src/test/java/org/onap/sdc/utils/TestConfiguration.java (renamed from sdc-distribution-client/src/test/java/org/openecomp/sdc/utils/TestConfiguration.java) | 4 | ||||
| -rw-r--r-- | sdc-distribution-client/src/test/java/org/onap/sdc/utils/TestNotificationCallback.java (renamed from sdc-distribution-client/src/test/java/org/openecomp/sdc/utils/TestNotificationCallback.java) | 6 |
8 files changed, 96 insertions, 98 deletions
diff --git a/sdc-distribution-client/src/test/java/org/openecomp/sdc/http/SdcConnectorClientTest.java b/sdc-distribution-client/src/test/java/org/onap/sdc/http/SdcConnectorClientTest.java index 5ddc915..7b46f33 100644 --- a/sdc-distribution-client/src/test/java/org/openecomp/sdc/http/SdcConnectorClientTest.java +++ b/sdc-distribution-client/src/test/java/org/onap/sdc/http/SdcConnectorClientTest.java @@ -1,4 +1,4 @@ -package org.openecomp.sdc.http; +package org.onap.sdc.http; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -23,10 +23,10 @@ import org.junit.Test; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.openecomp.sdc.api.asdc.RegistrationRequest; -import org.openecomp.sdc.api.consumer.IConfiguration; -import org.openecomp.sdc.impl.DistributionClientResultImpl; -import org.openecomp.sdc.utils.Pair; +import org.onap.sdc.impl.DistributionClientResultImpl; +import org.onap.sdc.api.asdc.RegistrationRequest; +import org.onap.sdc.api.consumer.IConfiguration; +import org.onap.sdc.utils.Pair; import com.att.nsa.apiClient.credentials.ApiCredential; import com.google.gson.Gson; diff --git a/sdc-distribution-client/src/test/java/org/openecomp/sdc/impl/DistributionClientDownloadResultTest.java b/sdc-distribution-client/src/test/java/org/onap/sdc/impl/DistributionClientDownloadResultTest.java index 8f8fca2..d12d828 100644 --- a/sdc-distribution-client/src/test/java/org/openecomp/sdc/impl/DistributionClientDownloadResultTest.java +++ b/sdc-distribution-client/src/test/java/org/onap/sdc/impl/DistributionClientDownloadResultTest.java @@ -1,55 +1,55 @@ -package org.openecomp.sdc.impl;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
-
-
-public class DistributionClientDownloadResultTest {
-
- public static DistributionClientDownloadResultImpl distributionClientDownloadResult;
-
- @BeforeClass
- public static void init(){
- distributionClientDownloadResult = new DistributionClientDownloadResultImpl(DistributionActionResultEnum.SUCCESS, "");
- }
-
- @Test
- public void testNonHeaderFilename(){
- distributionClientDownloadResult.setArtifactName("service-BkPerformanceSrvs-csar.csar");
- assertEquals("service-BkPerformanceSrvs-csar.csar", distributionClientDownloadResult.getArtifactFilename());
- }
-
- @Test
- public void testNullFilename(){
- distributionClientDownloadResult.setArtifactName(null);
- assertNull(distributionClientDownloadResult.getArtifactFilename());
- }
-
- @Test
- public void testFilenameFromHeaderNoSpace(){
- distributionClientDownloadResult.setArtifactName("attachment;filename=\"service-BkPerformanceSrvs-csar.csar\"");
- assertEquals("service-BkPerformanceSrvs-csar.csar", distributionClientDownloadResult.getArtifactFilename());
- }
-
- @Test
- public void testFilenameFromHeaderOneSpace(){
- distributionClientDownloadResult.setArtifactName("attachment; filename=\"service-BkPerformanceSrvs-csar.csar\"");
- assertEquals("service-BkPerformanceSrvs-csar.csar", distributionClientDownloadResult.getArtifactFilename());
- }
-
- @Test
- public void testFilenameFromHeaderManySpaces(){
- distributionClientDownloadResult.setArtifactName("attachment; filename=\"service-BkPerformanceSrvs-csar.csar\"");
- assertEquals("service-BkPerformanceSrvs-csar.csar", distributionClientDownloadResult.getArtifactFilename());
- }
-
- @Test
- public void testFilenameEmpty(){
- distributionClientDownloadResult.setArtifactName("attachment; filename=\"\"");
- assertEquals("", distributionClientDownloadResult.getArtifactFilename());
- }
-}
+package org.onap.sdc.impl; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +import org.junit.BeforeClass; +import org.junit.Test; +import org.onap.sdc.utils.DistributionActionResultEnum; + + +public class DistributionClientDownloadResultTest { + + public static DistributionClientDownloadResultImpl distributionClientDownloadResult; + + @BeforeClass + public static void init(){ + distributionClientDownloadResult = new DistributionClientDownloadResultImpl(DistributionActionResultEnum.SUCCESS, ""); + } + + @Test + public void testNonHeaderFilename(){ + distributionClientDownloadResult.setArtifactName("service-BkPerformanceSrvs-csar.csar"); + assertEquals("service-BkPerformanceSrvs-csar.csar", distributionClientDownloadResult.getArtifactFilename()); + } + + @Test + public void testNullFilename(){ + distributionClientDownloadResult.setArtifactName(null); + assertNull(distributionClientDownloadResult.getArtifactFilename()); + } + + @Test + public void testFilenameFromHeaderNoSpace(){ + distributionClientDownloadResult.setArtifactName("attachment;filename=\"service-BkPerformanceSrvs-csar.csar\""); + assertEquals("service-BkPerformanceSrvs-csar.csar", distributionClientDownloadResult.getArtifactFilename()); + } + + @Test + public void testFilenameFromHeaderOneSpace(){ + distributionClientDownloadResult.setArtifactName("attachment; filename=\"service-BkPerformanceSrvs-csar.csar\""); + assertEquals("service-BkPerformanceSrvs-csar.csar", distributionClientDownloadResult.getArtifactFilename()); + } + + @Test + public void testFilenameFromHeaderManySpaces(){ + distributionClientDownloadResult.setArtifactName("attachment; filename=\"service-BkPerformanceSrvs-csar.csar\""); + assertEquals("service-BkPerformanceSrvs-csar.csar", distributionClientDownloadResult.getArtifactFilename()); + } + + @Test + public void testFilenameEmpty(){ + distributionClientDownloadResult.setArtifactName("attachment; filename=\"\""); + assertEquals("", distributionClientDownloadResult.getArtifactFilename()); + } +} diff --git a/sdc-distribution-client/src/test/java/org/openecomp/sdc/impl/DistributionClientTest.java b/sdc-distribution-client/src/test/java/org/onap/sdc/impl/DistributionClientTest.java index 81f9a17..e2bad5a 100644 --- a/sdc-distribution-client/src/test/java/org/openecomp/sdc/impl/DistributionClientTest.java +++ b/sdc-distribution-client/src/test/java/org/onap/sdc/impl/DistributionClientTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.impl; +package org.onap.sdc.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -32,19 +32,19 @@ import org.junit.After; import org.junit.Assert; import org.junit.Test; import org.mockito.Mockito; -import org.openecomp.sdc.api.IDistributionClient; -import org.openecomp.sdc.api.consumer.IConfiguration; -import org.openecomp.sdc.api.notification.IArtifactInfo; -import org.openecomp.sdc.api.notification.IVfModuleMetadata; -import org.openecomp.sdc.api.results.IDistributionClientResult; -import org.openecomp.sdc.http.SdcConnectorClient; -import org.openecomp.sdc.http.TopicRegistrationResponse; -import org.openecomp.sdc.utils.ArtifactTypeEnum; -import org.openecomp.sdc.utils.ArtifactsUtils; -import org.openecomp.sdc.utils.DistributionActionResultEnum; -import org.openecomp.sdc.utils.TestConfiguration; -import org.openecomp.sdc.utils.TestNotificationCallback; -import org.openecomp.sdc.utils.Wrapper; +import org.onap.sdc.utils.TestConfiguration; +import org.onap.sdc.api.IDistributionClient; +import org.onap.sdc.api.consumer.IConfiguration; +import org.onap.sdc.api.notification.IArtifactInfo; +import org.onap.sdc.api.notification.IVfModuleMetadata; +import org.onap.sdc.api.results.IDistributionClientResult; +import org.onap.sdc.http.SdcConnectorClient; +import org.onap.sdc.http.TopicRegistrationResponse; +import org.onap.sdc.utils.ArtifactTypeEnum; +import org.onap.sdc.utils.ArtifactsUtils; +import org.onap.sdc.utils.DistributionActionResultEnum; +import org.onap.sdc.utils.TestNotificationCallback; +import org.onap.sdc.utils.Wrapper; import com.att.nsa.apiClient.credentials.ApiCredential; import com.att.nsa.apiClient.http.HttpException; @@ -81,8 +81,8 @@ public class DistributionClientTest { userConfig.setPollingTimeout(2); DistributionActionResultEnum validationResult = client.validateAndInitConfiguration(new Wrapper<IDistributionClientResult>(), userConfig); Assert.assertEquals(DistributionActionResultEnum.SUCCESS, validationResult); - Assert.assertEquals(15, client.configuration.getPollingInterval()); - Assert.assertEquals(15, client.configuration.getPollingTimeout()); + assertEquals(15, client.configuration.getPollingInterval()); + assertEquals(15, client.configuration.getPollingTimeout()); } @Test diff --git a/sdc-distribution-client/src/test/java/org/openecomp/sdc/impl/HeatParserTest.java b/sdc-distribution-client/src/test/java/org/onap/sdc/impl/HeatParserTest.java index 3b5b1a1..815d749 100644 --- a/sdc-distribution-client/src/test/java/org/openecomp/sdc/impl/HeatParserTest.java +++ b/sdc-distribution-client/src/test/java/org/onap/sdc/impl/HeatParserTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.impl; +package org.onap.sdc.impl; import static org.junit.Assert.*; @@ -30,9 +30,9 @@ import java.util.List; import java.util.Map; import org.junit.Test; -import org.openecomp.sdc.utils.heat.HeatParameter; -import org.openecomp.sdc.utils.heat.HeatParameterConstraint; -import org.openecomp.sdc.utils.heat.HeatParser; +import org.onap.sdc.utils.heat.HeatParser; +import org.onap.sdc.utils.heat.HeatParameter; +import org.onap.sdc.utils.heat.HeatParameterConstraint; import com.google.common.base.Charsets; import com.google.common.io.Resources; diff --git a/sdc-distribution-client/src/test/java/org/openecomp/sdc/impl/NotificationConsumerTest.java b/sdc-distribution-client/src/test/java/org/onap/sdc/impl/NotificationConsumerTest.java index 7fe125b..7603d0c 100644 --- a/sdc-distribution-client/src/test/java/org/openecomp/sdc/impl/NotificationConsumerTest.java +++ b/sdc-distribution-client/src/test/java/org/onap/sdc/impl/NotificationConsumerTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.impl; +package org.onap.sdc.impl; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -41,13 +41,13 @@ import org.junit.Test; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.openecomp.sdc.api.consumer.INotificationCallback; -import org.openecomp.sdc.api.notification.INotificationData; -import org.openecomp.sdc.api.results.IDistributionClientResult; -import org.openecomp.sdc.utils.ArtifactTypeEnum; -import org.openecomp.sdc.utils.DistributionActionResultEnum; -import org.openecomp.sdc.utils.DistributionClientConstants; -import org.openecomp.sdc.utils.TestConfiguration; +import org.onap.sdc.utils.TestConfiguration; +import org.onap.sdc.api.consumer.INotificationCallback; +import org.onap.sdc.api.notification.INotificationData; +import org.onap.sdc.api.results.IDistributionClientResult; +import org.onap.sdc.utils.ArtifactTypeEnum; +import org.onap.sdc.utils.DistributionActionResultEnum; +import org.onap.sdc.utils.DistributionClientConstants; import com.att.nsa.cambria.client.CambriaConsumer; import com.google.gson.Gson; @@ -57,7 +57,7 @@ public class NotificationConsumerTest { private CambriaConsumer cambriaConsumer = mock(CambriaConsumer.class); private INotificationCallback clientCallback = spy(INotificationCallback.class); private Queue<Iterable<String>> notificationsQueue = new ArrayQueue<>(100); - private DistributionClientImpl distributionClient = spy(DistributionClientImpl.class); + private DistributionClientImpl distributionClient = Mockito.spy(DistributionClientImpl.class); private List<String> artifactsTypes = Arrays.asList(ArtifactTypeEnum.HEAT.name()); private List<Boolean> notificationStatusResults = new ArrayList<>(); final static IDistributionClientResult DISTRIBUTION_SUCCESS_RESULT = buildSuccessResult(); diff --git a/sdc-distribution-client/src/test/java/org/openecomp/sdc/utils/ArtifactsUtils.java b/sdc-distribution-client/src/test/java/org/onap/sdc/utils/ArtifactsUtils.java index 5a24849..b562ab7 100644 --- a/sdc-distribution-client/src/test/java/org/openecomp/sdc/utils/ArtifactsUtils.java +++ b/sdc-distribution-client/src/test/java/org/onap/sdc/utils/ArtifactsUtils.java @@ -18,14 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.utils; +package org.onap.sdc.utils; import org.apache.commons.codec.binary.Base64; -import org.openecomp.sdc.impl.mock.DistributionClientDownloadResultStubImpl; -import org.openecomp.sdc.utils.GeneralUtils; - +import org.onap.sdc.impl.mock.DistributionClientDownloadResultStubImpl; public class ArtifactsUtils { diff --git a/sdc-distribution-client/src/test/java/org/openecomp/sdc/utils/TestConfiguration.java b/sdc-distribution-client/src/test/java/org/onap/sdc/utils/TestConfiguration.java index 22814f4..0aa314e 100644 --- a/sdc-distribution-client/src/test/java/org/openecomp/sdc/utils/TestConfiguration.java +++ b/sdc-distribution-client/src/test/java/org/onap/sdc/utils/TestConfiguration.java @@ -18,12 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.utils; +package org.onap.sdc.utils; import java.util.ArrayList; import java.util.List; -import org.openecomp.sdc.api.consumer.IConfiguration; +import org.onap.sdc.api.consumer.IConfiguration; public class TestConfiguration implements IConfiguration { diff --git a/sdc-distribution-client/src/test/java/org/openecomp/sdc/utils/TestNotificationCallback.java b/sdc-distribution-client/src/test/java/org/onap/sdc/utils/TestNotificationCallback.java index bef643a..32ce405 100644 --- a/sdc-distribution-client/src/test/java/org/openecomp/sdc/utils/TestNotificationCallback.java +++ b/sdc-distribution-client/src/test/java/org/onap/sdc/utils/TestNotificationCallback.java @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdc.utils; +package org.onap.sdc.utils; -import org.openecomp.sdc.api.consumer.INotificationCallback; -import org.openecomp.sdc.api.notification.INotificationData; +import org.onap.sdc.api.consumer.INotificationCallback; +import org.onap.sdc.api.notification.INotificationData; public class TestNotificationCallback implements INotificationCallback{ |