aboutsummaryrefslogtreecommitdiffstats
path: root/sdc-distribution-client/src/test/java/org/onap/sdc
diff options
context:
space:
mode:
Diffstat (limited to 'sdc-distribution-client/src/test/java/org/onap/sdc')
-rw-r--r--sdc-distribution-client/src/test/java/org/onap/sdc/http/SdcConnectorClientTest.java41
-rw-r--r--sdc-distribution-client/src/test/java/org/onap/sdc/impl/DistributionClientTest.java52
2 files changed, 42 insertions, 51 deletions
diff --git a/sdc-distribution-client/src/test/java/org/onap/sdc/http/SdcConnectorClientTest.java b/sdc-distribution-client/src/test/java/org/onap/sdc/http/SdcConnectorClientTest.java
index d3a6ffb..c52910d 100644
--- a/sdc-distribution-client/src/test/java/org/onap/sdc/http/SdcConnectorClientTest.java
+++ b/sdc-distribution-client/src/test/java/org/onap/sdc/http/SdcConnectorClientTest.java
@@ -3,7 +3,7 @@
* SDC
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
- * Modifications copyright (C) 2019 Nokia. All rights reserved.
+ * Modifications copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -85,7 +85,7 @@ public class SdcConnectorClientTest {
Pair<HttpAsdcResponse, CloseableHttpResponse> mockPair = new Pair<>(httpAsdcResponse, null);
private HttpEntity lastHttpEntity = null;
- private static SdcConnectorClient asdcClient = Mockito.spy(new SdcConnectorClient());
+ private static SdcConnectorClient asdcClient;
private static final String ARTIFACT_URL = "http://127.0.0.1/artifact/url";
private static final String IT_JUST_DIDN_T_WORK = "It just didn't work";
@@ -97,8 +97,7 @@ public class SdcConnectorClientTest {
@BeforeClass
public static void beforeClass() {
- asdcClient.setConfiguration(configuration);
- asdcClient.setHttpClient(httpClient);
+ asdcClient = Mockito.spy(new SdcConnectorClient(configuration, httpClient));
when(apiCredential.getApiKey()).thenReturn(MOCK_API_KEY);
when(httpAsdcResponse.getStatus()).thenReturn(HttpStatus.SC_OK);
@@ -131,26 +130,12 @@ public class SdcConnectorClientTest {
when(conf.isUseHttpsWithSDC()).thenReturn(true);
when(conf.activateServerTLSAuth()).thenReturn(false);
- SdcConnectorClient client = new SdcConnectorClient();
- client.init(conf);
- assertNotNull(client.getHttpClient());
+ final HttpAsdcClient httpClient = new HttpAsdcClient(conf);
+ SdcConnectorClient client = new SdcConnectorClient(conf, httpClient);
client.close();
//check if client is really closed
- client.getHttpClient().getRequest(AsdcUrls.POST_FOR_TOPIC_REGISTRATION, new HashMap<>());
- }
-
-
- @Test
- public void getConfigurationTest() {
- IConfiguration conf = asdcClient.getConfiguration();
- assertEquals(configuration, conf);
- }
-
- @Test
- public void getHttpClientTest() {
- HttpAsdcClient httpAsdcClient = asdcClient.getHttpClient();
- assertEquals(httpClient, httpAsdcClient);
+ httpClient.getRequest(AsdcUrls.POST_FOR_TOPIC_REGISTRATION, new HashMap<>());
}
@Test
@@ -277,8 +262,6 @@ public class SdcConnectorClientTest {
when(configuration.getMsgBusAddress())
.thenReturn(Arrays.asList("http://127.0.0.1:45321/dmaap", "http://127.0.0.1:45321/dmaap"));
- doReturn(httpClient).when(asdcClient).createNewHttpClient();
-
String failMessage = "It just didn't work";
HttpAsdcResponse responseMock = mock(HttpAsdcResponse.class);
HttpEntity messageMock = mock(HttpEntity.class);
@@ -299,8 +282,6 @@ public class SdcConnectorClientTest {
when(configuration.getAsdcAddress()).thenReturn("127.0.0.1" + PORT);
when(configuration.isConsumeProduceStatusTopic()).thenReturn(false);
- doReturn(httpClient).when(asdcClient).createNewHttpClient();
-
String failMessage = "";
HttpAsdcResponse responseMock = mock(HttpAsdcResponse.class);
HttpEntity messageMock = mock(HttpEntity.class);
@@ -319,7 +300,7 @@ public class SdcConnectorClientTest {
@Test
public void downloadArtifactHappyScenarioTest() throws IOException {
Map<String, String> headers = new HashMap<>();
- headers.put(asdcClient.contentDispositionHeader, "SomeHeader");
+ headers.put(asdcClient.CONTENT_DISPOSITION_HEADER, "SomeHeader");
IArtifactInfo artifactInfo = mock(IArtifactInfo.class);
when(artifactInfo.getArtifactURL()).thenReturn(ARTIFACT_URL);
@@ -335,7 +316,7 @@ public class SdcConnectorClientTest {
when(messageMock.getContent()).thenReturn(new ByteArrayInputStream(BYTES));
doReturn(responsePair).when(httpClient).getRequest(eq(ARTIFACT_URL), any(), eq(false));
- IDistributionClientResult result = asdcClient.dowloadArtifact(artifactInfo);
+ IDistributionClientResult result = asdcClient.downloadArtifact(artifactInfo);
assertEquals(DistributionActionResultEnum.SUCCESS, result.getDistributionActionResult());
}
@@ -353,7 +334,7 @@ public class SdcConnectorClientTest {
when(messageMock.getContent()).thenReturn(new ByteArrayInputStream(BYTES));
doReturn(responsePair).when(httpClient).getRequest(eq(ARTIFACT_URL), any(), eq(false));
- IDistributionClientResult result = asdcClient.dowloadArtifact(artifactInfo);
+ IDistributionClientResult result = asdcClient.downloadArtifact(artifactInfo);
assertEquals(DistributionActionResultEnum.DATA_INTEGRITY_PROBLEM, result.getDistributionActionResult());
}
@@ -371,7 +352,7 @@ public class SdcConnectorClientTest {
when(messageMock.getContent()).thenReturn(new ThrowingInputStreamForTesting());
doReturn(responsePair).when(httpClient).getRequest(eq(ARTIFACT_URL), any(), eq(false));
- IDistributionClientResult result = asdcClient.dowloadArtifact(artifactInfo);
+ IDistributionClientResult result = asdcClient.downloadArtifact(artifactInfo);
assertEquals(DistributionActionResultEnum.GENERAL_ERROR, result.getDistributionActionResult());
}
@@ -389,7 +370,7 @@ public class SdcConnectorClientTest {
when(messageMock.getContent()).thenReturn(new ThrowingInputStreamForTesting());
doReturn(responsePair).when(httpClient).getRequest(eq(ARTIFACT_URL), any(), eq(false));
- IDistributionClientResult result = asdcClient.dowloadArtifact(artifactInfo);
+ IDistributionClientResult result = asdcClient.downloadArtifact(artifactInfo);
assertEquals(DistributionActionResultEnum.ASDC_SERVER_PROBLEM, result.getDistributionActionResult());
}
diff --git a/sdc-distribution-client/src/test/java/org/onap/sdc/impl/DistributionClientTest.java b/sdc-distribution-client/src/test/java/org/onap/sdc/impl/DistributionClientTest.java
index bb3c7bf..bc4f78e 100644
--- a/sdc-distribution-client/src/test/java/org/onap/sdc/impl/DistributionClientTest.java
+++ b/sdc-distribution-client/src/test/java/org/onap/sdc/impl/DistributionClientTest.java
@@ -3,6 +3,7 @@
* sdc-distribution-client
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Modifications copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,6 +23,7 @@ package org.onap.sdc.impl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doReturn;
import java.io.IOException;
@@ -32,6 +34,8 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;
+import org.onap.sdc.http.HttpAsdcClient;
+import org.onap.sdc.utils.Pair;
import org.onap.sdc.utils.TestConfiguration;
import org.onap.sdc.api.IDistributionClient;
import org.onap.sdc.api.consumer.IConfiguration;
@@ -68,10 +72,12 @@ public class DistributionClientTest {
@Test
public void validateConfigurationTest() {
- DistributionActionResultEnum validationResult = client.validateAndInitConfiguration(new Wrapper<IDistributionClientResult>(), testConfiguration);
+ final Pair<DistributionActionResultEnum, Configuration> distributionActionResultEnumConfigurationPair = client.validateAndInitConfiguration(new Wrapper<IDistributionClientResult>(), testConfiguration);
+ DistributionActionResultEnum validationResult = distributionActionResultEnumConfigurationPair.getFirst();
+ Configuration configuration = distributionActionResultEnumConfigurationPair.getSecond();
Assert.assertEquals(DistributionActionResultEnum.SUCCESS, validationResult);
- Assert.assertEquals(testConfiguration.getPollingInterval(), client.configuration.getPollingInterval());
- Assert.assertEquals(testConfiguration.getPollingTimeout(), client.configuration.getPollingTimeout());
+ Assert.assertEquals(testConfiguration.getPollingInterval(), configuration.getPollingInterval());
+ Assert.assertEquals(testConfiguration.getPollingTimeout(), configuration.getPollingTimeout());
}
@Test
@@ -79,10 +85,12 @@ public class DistributionClientTest {
TestConfiguration userConfig = new TestConfiguration();
userConfig.setPollingInterval(1);
userConfig.setPollingTimeout(2);
- DistributionActionResultEnum validationResult = client.validateAndInitConfiguration(new Wrapper<IDistributionClientResult>(), userConfig);
+ final Pair<DistributionActionResultEnum, Configuration> distributionActionResultEnumConfigurationPair = client.validateAndInitConfiguration(new Wrapper<IDistributionClientResult>(), userConfig);
+ DistributionActionResultEnum validationResult = distributionActionResultEnumConfigurationPair.getFirst();
+ Configuration configuration = distributionActionResultEnumConfigurationPair.getSecond();
Assert.assertEquals(DistributionActionResultEnum.SUCCESS, validationResult);
- assertEquals(15, client.configuration.getPollingInterval());
- assertEquals(15, client.configuration.getPollingTimeout());
+ assertEquals(15, configuration.getPollingInterval());
+ assertEquals(15, configuration.getPollingTimeout());
}
@Test
@@ -111,11 +119,11 @@ public class DistributionClientTest {
Wrapper<IDistributionClientResult> errorWrapper = new Wrapper<>();
TestConfiguration testPassword = new TestConfiguration();
testPassword.setPassword(null);
- DistributionActionResultEnum validationResult = client.validateAndInitConfiguration(errorWrapper, testPassword);
+ DistributionActionResultEnum validationResult = client.validateAndInitConfiguration(errorWrapper, testPassword).getFirst();
Assert.assertEquals(DistributionActionResultEnum.CONF_MISSING_PASSWORD, validationResult);
testPassword.setPassword("");
- validationResult = client.validateAndInitConfiguration(errorWrapper, testPassword);
+ validationResult = client.validateAndInitConfiguration(errorWrapper, testPassword).getFirst();
Assert.assertEquals(DistributionActionResultEnum.CONF_MISSING_PASSWORD, validationResult);
}
@@ -125,11 +133,11 @@ public class DistributionClientTest {
Wrapper<IDistributionClientResult> errorWrapper = new Wrapper<>();
TestConfiguration testUser = new TestConfiguration();
testUser.setUser(null);
- DistributionActionResultEnum validationResult = client.validateAndInitConfiguration(errorWrapper, testUser);
+ DistributionActionResultEnum validationResult = client.validateAndInitConfiguration(errorWrapper, testUser).getFirst();
Assert.assertEquals(DistributionActionResultEnum.CONF_MISSING_USERNAME, validationResult);
testUser.setUser("");
- validationResult = client.validateAndInitConfiguration(errorWrapper, testUser);
+ validationResult = client.validateAndInitConfiguration(errorWrapper, testUser).getFirst();
Assert.assertEquals(DistributionActionResultEnum.CONF_MISSING_USERNAME, validationResult);
}
@@ -144,7 +152,7 @@ public class DistributionClientTest {
Either<TopicRegistrationResponse, DistributionClientResultImpl> topicsResult = Either.left(topics);
Mockito.when(connector.registerAsdcTopics(Mockito.any(ApiCredential.class))).thenReturn(topicsResult);
- client.asdcConnector = connector;
+ reconfigureAsdcConnector(connector, client);
// cambriaMock
@@ -211,6 +219,10 @@ public class DistributionClientTest {
Mockito.verify(connector, Mockito.times(0)).registerAsdcTopics(Mockito.any(ApiCredential.class));
}
+ private void reconfigureAsdcConnector(SdcConnectorClient connector, DistributionClientImpl client) {
+ doReturn(connector).when(client).createAsdcConnector(any());
+ }
+
@Test
public void initFailedConnectAsdcTest() throws HttpException, CambriaApiException, IOException {
// cambriaMock
@@ -274,7 +286,7 @@ public class DistributionClientTest {
IDistributionClientResult success = initSuccesResult();
Mockito.when(connector.unregisterTopics(Mockito.any(ApiCredential.class))).thenReturn(success);
- client.asdcConnector = connector;
+ reconfigureAsdcConnector(connector, client);
// cambriaMock
@@ -321,7 +333,7 @@ public class DistributionClientTest {
IDistributionClientResult success = initSuccesResult();
Mockito.when(connector.unregisterTopics(Mockito.any(ApiCredential.class))).thenReturn(success);
- client.asdcConnector = connector;
+ reconfigureAsdcConnector(connector, client);
// cambriaMock
@@ -368,7 +380,7 @@ public class DistributionClientTest {
Either<TopicRegistrationResponse, DistributionClientResultImpl> topicsResult = Either.left(topics);
Mockito.when(connector.registerAsdcTopics(Mockito.any(ApiCredential.class))).thenReturn(topicsResult);
- client.asdcConnector = connector;
+ reconfigureAsdcConnector(connector, client);
// cambriaMock
@@ -398,7 +410,7 @@ public class DistributionClientTest {
Either<TopicRegistrationResponse, DistributionClientResultImpl> topicsResult = Either.left(topics);
Mockito.when(connector.registerAsdcTopics(Mockito.any(ApiCredential.class))).thenReturn(topicsResult);
- client.asdcConnector = connector;
+ reconfigureAsdcConnector(connector, client);
// cambriaMock
@@ -424,7 +436,7 @@ public class DistributionClientTest {
Either<TopicRegistrationResponse, DistributionClientResultImpl> topicsResult = Either.right(failureResult);
Mockito.when(connector.registerAsdcTopics(Mockito.any(ApiCredential.class))).thenReturn(topicsResult);
- client.asdcConnector = connector;
+ reconfigureAsdcConnector(connector, client);
// cambriaMock
@@ -513,8 +525,7 @@ public class DistributionClientTest {
public void connectorRegisterCI() {
- SdcConnectorClient connector = new SdcConnectorClient();
- connector.init(testConfiguration);
+ SdcConnectorClient connector = new SdcConnectorClient(testConfiguration, new HttpAsdcClient(testConfiguration));
ApiCredential creds = new ApiCredential("publicKey", "secretKey");
Either<TopicRegistrationResponse, DistributionClientResultImpl> topicsFromAsdc = connector.registerAsdcTopics(creds);
@@ -523,10 +534,9 @@ public class DistributionClientTest {
}
public void downloadArtifactTestCI() {
- SdcConnectorClient connector = new SdcConnectorClient();
- connector.init(testConfiguration);
+ SdcConnectorClient connector = new SdcConnectorClient(testConfiguration, new HttpAsdcClient(testConfiguration));
IArtifactInfo artifactInfo = initArtifactInfo();
- connector.dowloadArtifact(artifactInfo);
+ connector.downloadArtifact(artifactInfo);
}
// ########### TESTS TO ADD TO CI END ###########