From dd48a8a5083e3a65c8b47ce45ce7517afc47c1ff Mon Sep 17 00:00:00 2001 From: "Smokowski, Kevin (ks6305)" Date: Fri, 26 Jul 2019 20:24:59 +0000 Subject: Improve code coverage in sli adaptors increase code coverage in message router in sli adaptors Issue-ID: CCSDK-1548 Signed-off-by: Smokowski, Kevin (ks6305) Change-Id: I64f0e025a759b219ce4c7e017b500952d1c7f30b --- .../publisher/provider/impl/PublisherApiImpl.java | 23 ++++++---- .../provider/impl/PublisherApiImplTest.java | 51 ++++++++++++++++++++++ .../publisher/client/impl/ClientImplTest.java | 29 ++++++++++++ 3 files changed, 95 insertions(+), 8 deletions(-) create mode 100644 message-router/publisher/provider/src/test/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/provider/impl/PublisherApiImplTest.java create mode 100644 message-router/publisher/sample.client/src/test/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/client/impl/ClientImplTest.java (limited to 'message-router/publisher') diff --git a/message-router/publisher/provider/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/provider/impl/PublisherApiImpl.java b/message-router/publisher/provider/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/provider/impl/PublisherApiImpl.java index d88dc66b..58d0bc9f 100755 --- a/message-router/publisher/provider/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/provider/impl/PublisherApiImpl.java +++ b/message-router/publisher/provider/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/provider/impl/PublisherApiImpl.java @@ -28,12 +28,12 @@ public class PublisherApiImpl implements PublisherApi { public void setUsername(String username) { this.username = username; - buildAuthorizationString(); + setAuthorizationString(); } public void setPassword(String password) { this.password = password; - buildAuthorizationString(); + setAuthorizationString(); } public void setHost(String hostString) { @@ -51,10 +51,10 @@ public class PublisherApiImpl implements PublisherApi { } public void init() { - buildAuthorizationString(); + setAuthorizationString(); } - private String buildUrlString(Integer hostIndex, String topic) { + protected String buildUrlString(Integer hostIndex, String topic) { return hosts[hostIndex] + "/events/" + topic; } @@ -116,15 +116,22 @@ public class PublisherApiImpl implements PublisherApi { return false; } - private void buildAuthorizationString() { - String basicAuthString = username + ":" + password; - basicAuthString = Base64.getEncoder().encodeToString(basicAuthString.getBytes()); - this.authorizationString = "Basic " + basicAuthString; + protected void setAuthorizationString() { + String str = buildAuthorizationString(this.username, this.password); + this.authorizationString = str; + //System.out.println(this.authorizationString); } + + protected String buildAuthorizationString(String username, String password) { + String basicAuthString = username + ":" + password; + basicAuthString = Base64.getEncoder().encodeToString(basicAuthString.getBytes()); + return "Basic " + basicAuthString; + } protected HttpURLConnection buildHttpURLConnection(URL url) throws IOException { HttpURLConnection httpUrlConnection = (HttpURLConnection) url.openConnection(); if (authorizationString != null) { + System.out.println(authorizationString); httpUrlConnection.setRequestProperty("Authorization", authorizationString); } httpUrlConnection.setRequestProperty("Accept", "application/json"); diff --git a/message-router/publisher/provider/src/test/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/provider/impl/PublisherApiImplTest.java b/message-router/publisher/provider/src/test/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/provider/impl/PublisherApiImplTest.java new file mode 100644 index 00000000..53744f73 --- /dev/null +++ b/message-router/publisher/provider/src/test/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/provider/impl/PublisherApiImplTest.java @@ -0,0 +1,51 @@ +package org.onap.ccsdk.sli.adaptors.messagerouter.publisher.provider.impl; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.net.HttpURLConnection; +import java.net.URL; + +import org.junit.Test; + +public class PublisherApiImplTest { + @Test + public void verifyDefaultTimeouts() { + PublisherApiImpl pub = new PublisherApiImpl(); + assertEquals(pub.DEFAULT_CONNECT_TIMEOUT, pub.connectTimeout); + assertEquals(pub.DEFAULT_READ_TIMEOUT, pub.readTimeout); + } + + @Test + public void buildHttpURLConnection() throws Exception { + PublisherApiImpl pub = new PublisherApiImpl(); + pub.init(); + + String myUserName = "Batman"; + pub.setUsername(myUserName); + assertEquals(myUserName, pub.username); + String password = "P@$$"; + pub.setPassword(password); + + HttpURLConnection httpUrlConnection = pub.buildHttpURLConnection(new URL("http://localhost:7001")); + assertNotNull(httpUrlConnection.getReadTimeout()); + assertNotNull(httpUrlConnection.getConnectTimeout()); + assertEquals("application/json", httpUrlConnection.getRequestProperty("Content-Type")); + assertEquals("application/json", httpUrlConnection.getRequestProperty("Accept")); + } + + @Test + public void testMultipleHosts() { + PublisherApiImpl pub = new PublisherApiImpl(); + String myTopic = "worldNews"; + String hostOne = "http://localhost:7001"; + String hostTwo = "http://localhost:7002"; + String hostThree = "http://localhost:7003"; + + pub.setHost(hostOne + "," + hostTwo + "," + hostThree); + + assertEquals("http://localhost:7001/events/worldNews", pub.buildUrlString(0, myTopic)); + assertEquals("http://localhost:7002/events/worldNews", pub.buildUrlString(1, myTopic)); + assertEquals("http://localhost:7003/events/worldNews", pub.buildUrlString(2, myTopic)); + } +} \ No newline at end of file diff --git a/message-router/publisher/sample.client/src/test/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/client/impl/ClientImplTest.java b/message-router/publisher/sample.client/src/test/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/client/impl/ClientImplTest.java new file mode 100644 index 00000000..82a1566c --- /dev/null +++ b/message-router/publisher/sample.client/src/test/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/client/impl/ClientImplTest.java @@ -0,0 +1,29 @@ +package org.onap.ccsdk.sli.adaptors.messagerouter.publisher.client.impl; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.onap.ccsdk.sli.adaptors.messagerouter.publisher.api.PublisherApi; + +public class ClientImplTest { + + @Test + public void testSetTopic() { + ClientImpl impl = new ClientImpl(); + String myTopic = "stock updates"; + impl.setTopic(myTopic); + + PublisherApi publisherImpl = new PublisherApi() { + + @Override + public Boolean publish(String topic, String body) { + assertEquals(myTopic,topic); + return true; + } + + }; + impl.setPublisher(publisherImpl); + impl.init(); + } + +} -- cgit 1.2.3-korg