update the package name1.1.11

Issue-ID: DMAAP-858
Change-Id: I49ae6eb9c51a261b64b911e607fcbbca46c5423c
Signed-off-by: sunil unnava <sunil.unnava@att.com>

165 files changed, 0 insertions, 15716 deletions

diff --git a/src/test/java/com/att/mr/test/dmaap/ApiKeyBean.java b/src/test/java/com/att/mr/test/dmaap/ApiKeyBean.java
deleted file mode 100644
index 3c0bb79..0000000
--- a/src/test/java/com/att/mr/test/dmaap/ApiKeyBean.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  Copyright © 2017 AT&T Intellectual Property. 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.
- *  You may obtain a copy of the License at
- *        http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
- *******************************************************************************/
-package com.att.mr.test.dmaap;
-
-import java.io.Serializable;
-
-public class ApiKeyBean implements Serializable {
-
-	/*private static final long serialVersionUID = -8219849086890567740L;
-
-	// private static final String KEY_CHARS =
-	// "ABCDEFGHJIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-
-
-	private String email;
-	private String description;
-
-	public ApiKeyBean() {
-		super();
-	}
-
-	public ApiKeyBean(String email, String description) {
-		super();
-		this.email = email;
-		this.description = description;
-	}
-
-	public String getEmail() {
-		return email;
-	}
-
-	public void setEmail(String email) {
-		this.email = email;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	/*
-	 * public String getKey() { return generateKey(16); }
-	 * 
-	 * public String getSharedSecret() { return generateKey(24); }
-	 * 
-	 * private static String generateKey ( int length ) { return
-	 * uniqueStringGenerator.createKeyUsingAlphabet ( KEY_CHARS, length ); }
-	 */
-
-}
diff --git a/src/test/java/com/att/mr/test/dmaap/DMaapPubSubTest.java b/src/test/java/com/att/mr/test/dmaap/DMaapPubSubTest.java
deleted file mode 100644
index fc91598..0000000
--- a/src/test/java/com/att/mr/test/dmaap/DMaapPubSubTest.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  Copyright © 2017 AT&T Intellectual Property. 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.
- *  You may obtain a copy of the License at
- *        http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
- *******************************************************************************/
-package com.att.mr.test.dmaap;
-
-import java.io.InputStream;
-import java.util.Scanner;
-
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.Response;
-
-import junit.framework.TestCase;
-
-import org.json.JSONObject;
-import org.apache.http.HttpStatus;
-import org.apache.log4j.Logger;
-
-import com.att.nsa.drumlin.till.data.sha1HmacSigner;
-
-public class DMaapPubSubTest {
-/*	private static final Logger LOGGER = Logger.getLogger(DMaapTopicTest.class);
-	Client client = ClientBuilder.newClient();
-	String url = LoadPropertyFile.getPropertyFileData().getProperty("url");
-	WebTarget target = client.target(url);
-	String topicapikey;
-	String topicsecretKey;
-	String serverCalculatedSignature;
-	String date = LoadPropertyFile.getPropertyFileData().getProperty("date");
-	// changes by islam
-	String topic_name = LoadPropertyFile.getPropertyFileData().getProperty("topicName");
-	DmaapApiKeyTest keyInstance = new DmaapApiKeyTest();
-
-
-	public void testProduceMessage() {
-		LOGGER.info("test case publish message");
-		// DMaapTopicTest topicCreation = new DMaapTopicTest();
-		DmaapApiKeyTest keyInstance = new DmaapApiKeyTest();
-		// creating topic
-		createTopic(topic_name);
-
-		target = client.target(url);
-		target = target.path("/events/");
-		target = target.path(topic_name);
-		Response response2 = target.request().header("X-CambriaAuth", topicapikey + ":" + serverCalculatedSignature)
-				.header("X-CambriaDate", date).post(Entity.json("{message:producing first message}"));
-		keyInstance.assertStatus(response2);
-		LOGGER.info("successfully published message");
-	}
-
-	public void testConsumeMessage() {
-		LOGGER.info("test case subscribing message");
-		createTopic(topic_name);
-		target = client.target(url);
-		target = target.path("/events/");
-		target = target.path(topic_name);
-		target = target.path("consumGrp");
-		target = target.path(topicapikey);
-		Response response = target.request().get();
-		keyInstance.assertStatus(response);
-		LOGGER.info("successfully consumed messages");
-		InputStream is = (InputStream) response.getEntity();
-		Scanner s = new Scanner(is);
-		s.useDelimiter("\\A");
-		String data = s.next();
-		s.close();
-		LOGGER.info("Consumed Message data: " + data);
-	}
-
-	public void createTopic(String name) {
-		if (!topicExist(name)) {
-			TopicBean topicbean = new TopicBean();
-			topicbean.setDescription("creating topic");
-			topicbean.setPartitionCount(1);
-			topicbean.setReplicationCount(1);
-			topicbean.setTopicName(name);
-			topicbean.setTransactionEnabled(true);
-			target = client.target(url);
-			target = target.path("/topics/create");
-			JSONObject jsonObj = keyInstance.returnKey(new ApiKeyBean("ai039a@att.com", "topic creation"));
-			topicapikey = (String) jsonObj.get("key");
-			topicsecretKey = (String) jsonObj.get("secret");
-			serverCalculatedSignature = sha1HmacSigner.sign(date, topicsecretKey);
-			Response response = target.request().header("X-CambriaAuth", topicapikey + ":" + serverCalculatedSignature)
-					.header("X-CambriaDate", date).post(Entity.json(topicbean));
-			keyInstance.assertStatus(response);
-		}
-	}
-
-	public boolean topicExist(String topicName) {
-		target = target.path("/topics/" + topicName);
-		InputStream is, issecret;
-		Response response = target.request().get();
-		if (response.getStatus() == HttpStatus.SC_OK) {
-			is = (InputStream) response.getEntity();
-			Scanner s = new Scanner(is);
-			s.useDelimiter("\\A");
-			JSONObject dataObj = new JSONObject(s.next());
-			s.close();
-			// get owner of a topic
-			topicapikey = (String) dataObj.get("owner");
-			target = client.target(url);
-			target = target.path("/apiKeys/");
-			target = target.path(topicapikey);
-			Response response2 = target.request().get();
-			issecret = (InputStream) response2.getEntity();
-			Scanner st = new Scanner(issecret);
-			st.useDelimiter("\\A");
-			JSONObject dataObj1 = new JSONObject(st.next());
-			st.close();
-			// get secret key of this topic//
-			topicsecretKey = (String) dataObj1.get("secret");
-			serverCalculatedSignature = sha1HmacSigner.sign(date, topicsecretKey);
-			return true;
-		} else
-			return false;
-	}*/
-}
diff --git a/src/test/java/com/att/mr/test/dmaap/DMaapTopicTest.java b/src/test/java/com/att/mr/test/dmaap/DMaapTopicTest.java
deleted file mode 100644
index 1b5e746..0000000
--- a/src/test/java/com/att/mr/test/dmaap/DMaapTopicTest.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  Copyright © 2017 AT&T Intellectual Property. 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.
- *  You may obtain a copy of the License at
- *        http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
- *******************************************************************************/
-package com.att.mr.test.dmaap;
-
-import java.io.InputStream;
-import java.util.Properties;
-import java.util.Scanner;
-
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.Response;
-
-import junit.framework.TestCase;
-
-import org.apache.http.HttpStatus;
-import org.json.JSONObject;
-import org.apache.log4j.Logger;
-
-import com.att.nsa.drumlin.till.data.sha1HmacSigner;
-
-public class DMaapTopicTest {
-	/*private static final Logger LOGGER = Logger.getLogger(DMaapTopicTest.class);
-	Client client = ClientBuilder.newClient();
-	String topicapikey, topicsecretKey, serverCalculatedSignature;
-	Properties prop = LoadPropertyFile.getPropertyFileData();
-	String topicName = prop.getProperty("topicName");
-	String url = prop.getProperty("url");
-	String date = prop.getProperty("date");
-	WebTarget target = client.target(url);
-	DmaapApiKeyTest keyInstance = new DmaapApiKeyTest();
-
-
-	public void createTopic(String name) {
-		if (!topicExist(name)) {
-			TopicBean topicbean = new TopicBean();
-			topicbean.setDescription("creating topic");
-			topicbean.setPartitionCount(1);
-			topicbean.setReplicationCount(1);
-			topicbean.setTopicName(name);
-			topicbean.setTransactionEnabled(true);
-			target = client.target(url);
-			target = target.path("/topics/create");
-			JSONObject jsonObj = keyInstance.returnKey(new ApiKeyBean("nm254w@att.com", "topic creation"));
-			topicapikey = (String) jsonObj.get("key");
-			topicsecretKey = (String) jsonObj.get("secret");
-			serverCalculatedSignature = sha1HmacSigner.sign(date, topicsecretKey);
-			Response response = target.request().header("X-CambriaAuth", topicapikey + ":" + serverCalculatedSignature)
-					.header("X-CambriaDate", date).post(Entity.json(topicbean));
-			keyInstance.assertStatus(response);
-		}
-
-	}
-
-	public boolean topicExist(String topicName) {
-		target = target.path("/topics/" + topicName);
-		InputStream is, issecret;
-		Response response = target.request().get();
-		if (response.getStatus() == HttpStatus.SC_OK) {
-			is = (InputStream) response.getEntity();
-			Scanner s = new Scanner(is);
-			s.useDelimiter("\\A");
-			JSONObject dataObj = new JSONObject(s.next());
-			s.close();
-			// get owner of a topic
-			topicapikey = (String) dataObj.get("owner");
-			target = client.target(url);
-			target = target.path("/apiKeys/");
-			target = target.path(topicapikey);
-			Response response2 = target.request().get();
-			issecret = (InputStream) response2.getEntity();
-			Scanner st = new Scanner(issecret);
-			st.useDelimiter("\\A");
-			JSONObject dataObj1 = new JSONObject(st.next());
-			st.close();
-			// get secret key of this topic//
-			topicsecretKey = (String) dataObj1.get("secret");
-			serverCalculatedSignature = sha1HmacSigner.sign(date, topicsecretKey);
-			return true;
-		} else
-			return false;
-	}
-
-	public void testCreateTopic() {
-		LOGGER.info("test case create topic");
-		createTopic(topicName);
-		LOGGER.info("Returning after create topic");
-	}
-
-	public void testOneTopic() {
-		LOGGER.info("test case get specific topic name " + topicName);
-		createTopic(topicName);
-		target = client.target(url);
-		target = target.path("/topics/");
-		target = target.path(topicName);
-		Response response = target.request().get();
-		LOGGER.info("Successfully returned after fetching topic" + topicName);
-		keyInstance.assertStatus(response);
-		InputStream is = (InputStream) response.getEntity();
-		Scanner s = new Scanner(is);
-		s.useDelimiter("\\A");
-		JSONObject dataObj = new JSONObject(s.next());
-		LOGGER.info("Details of " + topicName + " : " + dataObj.toString());
-		s.close();
-	}
-
-	public void testdeleteTopic() {
-		LOGGER.info("test case delete topic name " + topicName);
-		createTopic(topicName);
-		target = client.target(url);
-		target = target.path("/topics/");
-		target = target.path(topicName);
-		Response response = target.request().header("X-CambriaAuth", topicapikey + ":" + serverCalculatedSignature)
-				.header("X-CambriaDate", date).delete();
-		keyInstance.assertStatus(response);
-		LOGGER.info("Successfully returned after deleting topic" + topicName);
-	}
-
-	public void testAllTopic() {
-		LOGGER.info("test case fetch all topic");
-		target = client.target(url);
-		target = target.path("/topics");
-		Response response = target.request().get();
-		keyInstance.assertStatus(response);
-		LOGGER.info("successfully returned after fetching all the topic");
-		InputStream is = (InputStream) response.getEntity();
-		Scanner s = new Scanner(is);
-		s.useDelimiter("\\A");
-		JSONObject dataObj = new JSONObject(s.next());
-		s.close();
-		LOGGER.info("List of all topics " + dataObj.toString());
-	}
-
-	public void testPublisherForTopic() {
-		LOGGER.info("test case get all publishers for topic: " + topicName);
-		// creating topic to check
-		createTopic(topicName);
-		target = client.target(url);
-		target = target.path("/topics/");
-		target = target.path(topicName);
-		target = target.path("/producers");
-		// checking all producer for a particular topic
-		Response response = target.request().get();
-		keyInstance.assertStatus(response);
-		LOGGER.info("Successfully returned after getting all the publishers" + topicName);
-	}
-
-	public void testPermitPublisherForTopic() {
-		LOGGER.info("test case permit user for topic " + topicName);
-		JSONObject jsonObj = keyInstance.returnKey(new ApiKeyBean("ai039a@att.com", "adding user to "));
-		String userapikey = (String) jsonObj.get("key");
-		createTopic(topicName);
-		// adding user to a topic//
-		target = client.target(url);
-		target = target.path("/topics/");
-		target = target.path(topicName);
-		target = target.path("/producers/");
-		target = target.path(userapikey);
-		Response response = target.request().header("X-CambriaAuth", topicapikey + ":" + serverCalculatedSignature)
-				.header("X-CambriaDate", date).put(Entity.json(""));
-		keyInstance.assertStatus(response);
-		LOGGER.info("successfully returned after permiting the user for topic " + topicName);
-	}
-
-	public void testDenyPublisherForTopic() {
-		LOGGER.info("test case denying user for topic " + topicName);
-		JSONObject jsonObj = keyInstance.returnKey(new ApiKeyBean("ai039a@att.com", "adding user to "));
-		String userapikey = (String) jsonObj.get("key");
-		createTopic(topicName);
-		// adding user to a topic//
-		target = client.target(url);
-		target = target.path("/topics/");
-		target = target.path(topicName);
-		target = target.path("/producers/");
-		target = target.path(userapikey);
-		target.request().header("X-CambriaAuth", topicapikey + ":" + serverCalculatedSignature)
-				.header("X-CambriaDate", date).put(Entity.json(""));
-		// deleting user who is just added//
-		target = client.target(url);
-		target = target.path("/topics/");
-		target = target.path(topicName);
-		target = target.path("/producers/");
-		target = target.path(userapikey);
-		Response response2 = target.request().header("X-CambriaAuth", topicapikey + ":" + serverCalculatedSignature)
-				.header("X-CambriaDate", date).delete();
-		keyInstance.assertStatus(response2);
-		LOGGER.info("successfully returned after denying the user for topic " + topicName);
-	}
-
-	public void testConsumerForTopic() {
-		LOGGER.info("test case get all consumers for topic: " + topicName);
-		// creating topic to check
-		createTopic(topicName);
-		target = client.target(url);
-		target = target.path("/topics/");
-		target = target.path(topicName);
-		target = target.path("/consumers");
-		// checking all consumer for a particular topic
-		Response response = target.request().get();
-		keyInstance.assertStatus(response);
-		LOGGER.info("Successfully returned after getting all the consumers" + topicName);
-	}
-
-	public void testPermitConsumerForTopic() {
-		LOGGER.info("test case get all consumer for topic: " + topicName);
-		// creating user for adding to topic//
-		JSONObject jsonObj = keyInstance.returnKey(new ApiKeyBean("ai039a@att.com", "adding user to "));
-		String userapikey = (String) jsonObj.get("key");
-		createTopic(topicName);
-		// adding user to a topic//
-		target = client.target(url);
-		target = target.path("/topics/");
-		target = target.path(topicName);
-		target = target.path("/consumers/");
-		target = target.path(userapikey);
-		Response response = target.request().header("X-CambriaAuth", topicapikey + ":" + serverCalculatedSignature)
-				.header("X-CambriaDate", date).put(Entity.json(""));
-		keyInstance.assertStatus(response);
-		LOGGER.info("Successfully returned after getting all the consumers" + topicName);
-	}
-
-	public void testDenyConsumerForTopic() {
-		LOGGER.info("test case denying consumer for topic " + topicName);
-		// creating user for adding and deleting from topic//
-		JSONObject jsonObj = keyInstance.returnKey(new ApiKeyBean("ai039a@att.com", "adding user to "));
-		String userapikey = (String) jsonObj.get("key");
-		createTopic(topicName);
-		// adding user to a topic//
-		target = client.target(url);
-		target = target.path("/topics/");
-		target = target.path(topicName);
-		target = target.path("/consumers/");
-		target = target.path(userapikey);
-		target.request().header("X-CambriaAuth", topicapikey + ":" + serverCalculatedSignature)
-				.header("X-CambriaDate", date).put(Entity.json(""));
-		// deleting user who is just added//
-		target = client.target(url);
-		target = target.path("/topics/");
-		target = target.path(topicName);
-		target = target.path("/consumers/");
-		target = target.path(userapikey);
-		Response response2 = target.request().header("X-CambriaAuth", topicapikey + ":" + serverCalculatedSignature)
-				.header("X-CambriaDate", date).delete();
-		keyInstance.assertStatus(response2);
-		LOGGER.info("successfully returned after denying the consumer for topic " + topicName);
-	}*/
-}
diff --git a/src/test/java/com/att/mr/test/dmaap/DmaapAdminTest.java b/src/test/java/com/att/mr/test/dmaap/DmaapAdminTest.java
deleted file mode 100644
index f3e7fa9..0000000
--- a/src/test/java/com/att/mr/test/dmaap/DmaapAdminTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  Copyright © 2017 AT&T Intellectual Property. 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.
- *  You may obtain a copy of the License at
- *        http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
- *******************************************************************************/
-package com.att.mr.test.dmaap;
-
-
-
-public class DmaapAdminTest {
-	/*private static final Logger LOGGER = Logger.getLogger(DmaapAdminTest.class);
-	Client client = ClientBuilder.newClient();
-	WebTarget target = client.target(LoadPropertyFile.getPropertyFileData().getProperty("url"));
-
-
-	public void assertStatus(Response response) {
-		assertTrue(response.getStatus() == HttpStatus.SC_OK);
-	}
-
-	// 1.get consumer cache
-	public void testConsumerCache() {
-		LOGGER.info("test case consumer cache");
-		target = target.path("/admin/consumerCache");
-		Response response = target.request().get();
-		assertStatus(response);
-		LOGGER.info("Successfully returned after fetching consumer cache");
-		InputStream is = (InputStream) response.getEntity();
-		Scanner s = new Scanner(is);
-		s.useDelimiter("\\A");
-		String data = s.next();
-		s.close();
-		LOGGER.info("Details of consumer cache :" + data);
-	}
-
-	// 2.drop consumer cache
-	public void testDropConsumerCache() {
-		LOGGER.info("test case drop consumer cache");
-		target = target.path("/admin/dropConsumerCache");
-		Response response = target.request().post(Entity.json(null));
-		assertStatus(response);
-		LOGGER.info("Successfully returned after dropping consumer cache");
-	}
-*/
-}
diff --git a/src/test/java/com/att/mr/test/dmaap/DmaapApiKeyTest.java b/src/test/java/com/att/mr/test/dmaap/DmaapApiKeyTest.java
deleted file mode 100644
index 77a2500..0000000
--- a/src/test/java/com/att/mr/test/dmaap/DmaapApiKeyTest.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  Copyright © 2017 AT&T Intellectual Property. 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.
- *  You may obtain a copy of the License at
- *        http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
- *******************************************************************************/
-package com.att.mr.test.dmaap;
-
-import java.io.InputStream;
-import java.util.Properties;
-import java.util.Scanner;
-
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.Response;
-
-import junit.framework.TestCase;
-
-import org.apache.log4j.Logger;
-import org.apache.http.HttpStatus;
-import org.json.JSONObject;
-
-import com.att.nsa.drumlin.till.data.sha1HmacSigner;
-
-public class DmaapApiKeyTest {
-	/*
-	private static final Logger LOGGER = Logger.getLogger(DmaapApiKeyTest.class);
-	Client client = ClientBuilder.newClient();
-	Properties prop = LoadPropertyFile.getPropertyFileData();
-	String url = prop.getProperty("url");
-	WebTarget target = client.target(url);
-	String date = prop.getProperty("date");
-
-
-	public JSONObject returnKey(ApiKeyBean apikeybean) {
-		LOGGER.info("Call to return newly created key");
-		target = client.target(url);
-		target = target.path("/apiKeys/create");
-		Response response = target.request().post(Entity.json(apikeybean));
-		assertStatus(response);
-		LOGGER.info("successfully created keys");
-		InputStream is = (InputStream) response.getEntity();
-		Scanner s = new Scanner(is);
-		s.useDelimiter("\\A");
-		JSONObject dataObj = new JSONObject(s.next());
-		s.close();
-		LOGGER.info("key details :" + dataObj.toString());
-		return dataObj;
-	}
-
-	// 1. create key
-	public void testCreateKey() {
-		LOGGER.info("test case create key");
-		ApiKeyBean apiKeyBean = new ApiKeyBean("nm254w@att.com", "Creating Api Key.");
-		returnKey(apiKeyBean);
-		LOGGER.info("Successfully returned after creating key");
-	}
-
-	public void assertStatus(Response response) {
-		assertTrue(response.getStatus() == HttpStatus.SC_OK);
-	}
-
-	// 2. get Allkey details
-	public void testAllKey() {
-		LOGGER.info("test case get all key");
-		target = target.path("/apiKeys");
-		Response response = target.request().get();
-		assertStatus(response);
-		LOGGER.info("successfully returned after get all key");
-		InputStream is = (InputStream) response.getEntity();
-		Scanner s = new Scanner(is);
-		s.useDelimiter("\\A");
-		LOGGER.info("Details of key: " + s.next());
-		s.close();
-
-	}
-
-	// 3. get specific key
-	public void testSpecificKey() {
-		LOGGER.info("test case get specific key");
-		String apiKey = "";
-		ApiKeyBean apiKeyBean = new ApiKeyBean("ai039@att.com", "Creating Api Key.");
-
-		apiKey = (String) returnKey(apiKeyBean).get("key");
-		target = client.target(url);
-		target = target.path("/apiKeys/");
-		target = target.path(apiKey);
-		Response response = target.request().get();
-		assertStatus(response);
-		LOGGER.info("successfully returned after fetching specific key");
-	}
-
-	// 4. update key
-
-	public void testUpdateKey() {
-		LOGGER.info("test case update key");
-		String apiKey = "";
-		String secretKey = "";
-		final String serverCalculatedSignature;
-		final String X_CambriaAuth;
-		final String X_CambriaDate;
-		JSONObject jsonObj;
-
-		ApiKeyBean apiKeyBean = new ApiKeyBean("ai039@att.com", "Creating Api Key for update");
-		ApiKeyBean apiKeyBean1 = new ApiKeyBean("ai03911@att.com", "updating Api Key.");
-		jsonObj = returnKey(apiKeyBean);
-		apiKey = (String) jsonObj.get("key");
-		secretKey = (String) jsonObj.get("secret");
-
-		serverCalculatedSignature = sha1HmacSigner.sign(date, secretKey);
-		X_CambriaAuth = apiKey + ":" + serverCalculatedSignature;
-		X_CambriaDate = date;
-		target = client.target(url);
-		target = target.path("/apiKeys/" + apiKey);
-		Response response1 = target.request().header("X-CambriaAuth", X_CambriaAuth)
-				.header("X-CambriaDate", X_CambriaDate).put(Entity.json(apiKeyBean1));
-		assertStatus(response1);
-		LOGGER.info("successfully returned after updating key");
-	}
-
-	// 5. delete key
-	public void testDeleteKey() {
-		LOGGER.info("test case delete key");
-		String apiKey = "";
-		String secretKey = "";
-		final String serverCalculatedSignature;
-		final String X_CambriaAuth;
-		final String X_CambriaDate;
-		JSONObject jsonObj;
-		ApiKeyBean apiKeyBean = new ApiKeyBean("ai039@att.com", "Creating Api Key.");
-		jsonObj = returnKey(apiKeyBean);
-		apiKey = (String) jsonObj.get("key");
-		secretKey = (String) jsonObj.get("secret");
-		serverCalculatedSignature = sha1HmacSigner.sign(date, secretKey);
-		X_CambriaAuth = apiKey + ":" + serverCalculatedSignature;
-		X_CambriaDate = date;
-		target = client.target(url);
-		target = target.path("/apiKeys/" + apiKey);
-		Response response2 = target.request().header("X-CambriaAuth", X_CambriaAuth)
-				.header("X-CambriaDate", X_CambriaDate).delete();
-		assertStatus(response2);
-		LOGGER.info("successfully returned after deleting key");
-	}
-*/
-}
\ No newline at end of file
diff --git a/src/test/java/com/att/mr/test/dmaap/DmaapMetricsTest.java b/src/test/java/com/att/mr/test/dmaap/DmaapMetricsTest.java
deleted file mode 100644
index 9728687..0000000
--- a/src/test/java/com/att/mr/test/dmaap/DmaapMetricsTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  Copyright © 2017 AT&T Intellectual Property. 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.
- *  You may obtain a copy of the License at
- *        http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
- *******************************************************************************/
-package com.att.mr.test.dmaap;
-
-import java.io.InputStream;
-import java.util.Scanner;
-
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.Response;
-
-import junit.framework.TestCase;
-
-import org.apache.log4j.Logger;
-import org.apache.http.HttpStatus;
-
-public class DmaapMetricsTest {
-	/*private static final Logger LOGGER = Logger.getLogger(DmaapMetricsTest.class);
-	Client client = ClientBuilder.newClient();
-	WebTarget target = client.target(LoadPropertyFile.getPropertyFileData().getProperty("url"));
-
-	public void assertStatus(Response response) {
-		assertTrue(response.getStatus() == HttpStatus.SC_OK);
-	}
-
-
-	// 1.get metrics
-	public void testMetrics() {
-		LOGGER.info("test case get all metrics");
-		target = target.path("/metrics");
-		Response response = target.request().get();
-		assertStatus(response);
-		LOGGER.info("successfully returned after fetching all metrics");
-		InputStream is = (InputStream) response.getEntity();
-		Scanner s = new Scanner(is);
-		s.useDelimiter("\\A");
-		String data = s.next();
-		s.close();
-		LOGGER.info("DmaapMetricTest Test all metrics" + data);
-	}
-
-	// 2.get metrics by name
-	public void testMetricsByName() {
-		LOGGER.info("test case get metrics by name");
-		target = target.path("/metrics/startTime");
-		Response response = target.request().get();
-		assertStatus(response);
-		LOGGER.info("successfully returned after fetching specific metrics");
-		InputStream is = (InputStream) response.getEntity();
-		Scanner s = new Scanner(is);
-		s.useDelimiter("\\A");
-		String data = s.next();
-		s.close();
-		LOGGER.info("DmaapMetricTest metrics by name" + data);
-	}
-*/
-}
diff --git a/src/test/java/com/att/mr/test/dmaap/JUnitTestSuite.java b/src/test/java/com/att/mr/test/dmaap/JUnitTestSuite.java
deleted file mode 100644
index 40a5286..0000000
--- a/src/test/java/com/att/mr/test/dmaap/JUnitTestSuite.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  Copyright © 2017 AT&T Intellectual Property. 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.
- *  You may obtain a copy of the License at
- *        http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
- *******************************************************************************/
-package com.att.mr.test.dmaap;
-
-import junit.framework.TestSuite;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-import org.apache.log4j.Logger;
-
-@RunWith(Suite.class)
-@SuiteClasses({ DMaapPubSubTest.class, DmaapApiKeyTest.class, DMaapTopicTest.class, DmaapMetricsTest.class,
-		DmaapAdminTest.class })
-public class JUnitTestSuite {
-	/*private static final Logger LOGGER = Logger.getLogger(DMaapTopicTest.class);
-
-
-	public static void main(String[] args) {
-		LOGGER.info("Running the test suite");
-		TestSuite tstSuite = new TestSuite();
-		LOGGER.info("Total Test Counts " + tstSuite.countTestCases());
-	}*/
-
-}
diff --git a/src/test/java/com/att/mr/test/dmaap/LoadPropertyFile.java b/src/test/java/com/att/mr/test/dmaap/LoadPropertyFile.java
deleted file mode 100644
index c9d0387..0000000
--- a/src/test/java/com/att/mr/test/dmaap/LoadPropertyFile.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  Copyright © 2017 AT&T Intellectual Property. 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.
- *  You may obtain a copy of the License at
- *        http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
- *******************************************************************************/
-package com.att.mr.test.dmaap;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-import org.apache.log4j.Logger;
-
-public class LoadPropertyFile {
-	/*private static final Logger LOGGER = Logger
-			.getLogger(LoadPropertyFile.class);
-
-	static public Properties getPropertyFileData() {
-		Properties prop = new Properties();
-		LOGGER.info("loading the property file");
-		
-		try {
-			InputStream inputStream = LoadPropertyFile.class.getClassLoader()
-					.getResourceAsStream("DMaaPUrl.properties");
-			prop.load(inputStream);
-			LOGGER.info("successfully loaded the property file");
-		} catch (IOException e) {
-			LOGGER.error("Error while retrieving API keys: " + e);
-		}
-		return prop;
-	}*/
-}
diff --git a/src/test/java/com/att/mr/test/dmaap/TestRunner.java b/src/test/java/com/att/mr/test/dmaap/TestRunner.java
deleted file mode 100644
index 9a744d9..0000000
--- a/src/test/java/com/att/mr/test/dmaap/TestRunner.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  Copyright © 2017 AT&T Intellectual Property. 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.
- *  You may obtain a copy of the License at
- *        http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
- *******************************************************************************/
-package com.att.mr.test.dmaap;
-
-import org.junit.runner.JUnitCore;
-import org.junit.runner.Result;
-import org.junit.runner.notification.Failure;
-import org.apache.log4j.Logger;
-
-public class TestRunner {
-	/*private static final Logger LOGGER = Logger.getLogger(TestRunner.class);
-
-
-	public static void main(String[] args) {
-		// TODO Auto-generated method stub
-		Result result = JUnitCore.runClasses(JUnitTestSuite.class);
-		for (Failure failure : result.getFailures()) {
-			LOGGER.info(failure.toString());
-		}
-		LOGGER.info(result.wasSuccessful());
-	}
-*/
-}
diff --git a/src/test/java/com/att/mr/test/dmaap/TopicBean.java b/src/test/java/com/att/mr/test/dmaap/TopicBean.java
deleted file mode 100644
index 62f9d0c..0000000
--- a/src/test/java/com/att/mr/test/dmaap/TopicBean.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  Copyright © 2017 AT&T Intellectual Property. 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.
- *  You may obtain a copy of the License at
- *        http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
- *******************************************************************************/
-/**
- * 
- */
-package com.att.mr.test.dmaap;
-
-import java.io.Serializable;
-
-public class TopicBean implements Serializable {
-
-	/*
-	 * private static final long serialVersionUID = -8620390377775457949L;
-	 * private String topicName; private String description;
-	 * 
-	 * 
-	 * private int partitionCount; private int replicationCount; private boolean
-	 * transactionEnabled = false;
-	 * 
-	 * public boolean isTransactionEnabled() { return transactionEnabled; }
-	 * 
-	 * public void setTransactionEnabled(boolean transactionEnabled) {
-	 * this.transactionEnabled = transactionEnabled; }
-	 * 
-	 * public TopicBean() { super(); }
-	 * 
-	 * public TopicBean(String topicName, String description, int
-	 * partitionCount, int replicationCount, boolean transactionEnabled) {
-	 * super(); this.topicName = topicName; this.description = description;
-	 * this.partitionCount = partitionCount; this.replicationCount =
-	 * replicationCount; this.transactionEnabled = transactionEnabled; }
-	 * 
-	 * public String getTopicName() { return topicName; }
-	 * 
-	 * public void setTopicName(String topicName) { this.topicName = topicName;
-	 * }
-	 * 
-	 * public String getDescription() { return description; }
-	 * 
-	 * public void setDescription(String description) { this.description =
-	 * description; }
-	 * 
-	 * public int getPartitionCount() { return partitionCount; }
-	 * 
-	 * public void setPartitionCount(int partitionCount) { this.partitionCount =
-	 * partitionCount; }
-	 * 
-	 * public int getReplicationCount() { return replicationCount; }
-	 * 
-	 * public void setReplicationCount(int replicationCount) {
-	 * this.replicationCount = replicationCount; }
-	 */
-}
diff --git a/src/test/java/com/att/mr/test/dme2/ApiKeyBean.java b/src/test/java/com/att/mr/test/dme2/ApiKeyBean.java
deleted file mode 100644
index e6545e1..0000000
--- a/src/test/java/com/att/mr/test/dme2/ApiKeyBean.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  Copyright © 2017 AT&T Intellectual Property. 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.
- *  You may obtain a copy of the License at
- *        http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
- *******************************************************************************/
-package com.att.mr.test.dme2;
-
-import java.io.Serializable;
-
-public class ApiKeyBean implements Serializable {
-
-	private static final long serialVersionUID = -8219849086890567740L;
-
-	// private static final String KEY_CHARS =
-	// "ABCDEFGHJIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-
-	
-	private String email;
-	private String description;
-
-	public ApiKeyBean() {
-		super();
-	}
-
-	public ApiKeyBean(String email, String description) {
-		super();
-		this.email = email;
-		this.description = description;
-	}
-
-	public String getEmail() {
-		return email;
-	}
-
-	public void setEmail(String email) {
-		this.email = email;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	/*
-	 * public String getKey() { return generateKey(16); }
-	 * 
-	 * public String getSharedSecret() { return generateKey(24); }
-	 * 
-	 * private static String generateKey ( int length ) { return
-	 * uniqueStringGenerator.createKeyUsingAlphabet ( KEY_CHARS, length ); }
-	 */
-
-}
diff --git a/src/test/java/com/att/mr/test/dme2/DME2AdminTest.java b/src/test/java/com/att/mr/test/dme2/DME2AdminTest.java
deleted file mode 100644
index 5f6f9c4..0000000
--- a/src/test/java/com/att/mr/test/dme2/DME2AdminTest.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  Copyright © 2017 AT&T Intellectual Property. 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.
- *  You may obtain a copy of the License at
- *        http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
- *******************************************************************************/
-package com.att.mr.test.dme2;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Properties;
-
-import org.apache.log4j.Logger;
-
-import junit.framework.TestCase;
-
-import com.att.aft.dme2.api.DME2Client;
-import com.att.aft.dme2.api.DME2Exception;
-import com.att.mr.test.dmaap.DmaapAdminTest;
-//import com.ibm.disthub2.impl.client.PropSchema;
-
-public class DME2AdminTest extends TestCase {
-	private static final Logger LOGGER = Logger.getLogger(DME2AdminTest.class);
-
-	protected String url;
-	
-	protected Properties props;
-	
-	protected HashMap<String, String> hm;
-	
-	protected String methodType;
-	
-	protected String contentType;
-	
-	protected String user;
-	
-	protected String password;
-	
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		System.setProperty("AFT_DME2_CLIENT_SSL_INCLUDE_PROTOCOLS", "SSLv3,TLSv1,TLSv1.1");
-		System.setProperty("AFT_DME2_CLIENT_IGNORE_SSL_CONFIG", "false");
-		System.setProperty("AFT_DME2_CLIENT_KEYSTORE_PASSWORD", "changeit");
-		this.props = LoadPropertyFile.getPropertyFileDataProducer();
-		String latitude = props.getProperty("Latitude");
-		String longitude = props.getProperty("Longitude");
-		String version = props.getProperty("Version");
-		String serviceName = props.getProperty("ServiceName");
-		serviceName = "dmaap-v1.dev.dmaap.dt.saat.acsi.att.com/admin";
-		String env = props.getProperty("Environment");
-		String partner = props.getProperty("Partner");
-		String protocol = props.getProperty("Protocol");
-		
-		methodType = props.getProperty("MethodTypeGet");
-		contentType = props.getProperty("contenttype");
-		user = props.getProperty("user");
-		password = props.getProperty("password");
-		
-		
-		this.url = protocol + "://" + serviceName + "?" + "version=" + version + "&" + "envContext=" + env + "&"
-				+ "routeOffer=" + partner + "&partner=BOT_R";
-		LoadPropertyFile.loadAFTProperties(latitude, longitude);
-		hm = new HashMap<String, String>();
-		hm.put("AFT_DME2_EP_READ_TIMEOUT_MS", "50000");
-		hm.put("AFT_DME2_ROUNDTRIP_TIMEOUT_MS", "240000");
-		hm.put("AFT_DME2_EP_CONN_TIMEOUT", "5000");		
-	}
-	
-	public void testGetConsumerCache() {
-		LOGGER.info("test case consumer cache started");
-		
-		String subContextPath = props.getProperty("SubContextPathGetAdminConsumerCache");
-		try {
-			DME2Client sender = new DME2Client(new URI(url), 5000L);
-			sender.setAllowAllHttpReturnCodes(true);
-			sender.setMethod(methodType);
-			sender.setSubContext(subContextPath);
-			sender.setPayload("");
-			sender.addHeader("Content-Type", contentType);
-			
-			sender.addHeader("X-CambriaAuth", "user1:7J49YriFlyRgebyOsSJhZvY/C60=");
-			sender.addHeader("X-X-CambriaDate", "2016-10-18T09:56:04-05:00");
-			
-			//sender.setCredentials(user, password);
-			sender.setHeaders(hm);
-			LOGGER.info("Getting consumer Cache");
-			String reply = sender.sendAndWait(5000L);
-			System.out.println(reply);
-			assertTrue(LoadPropertyFile.isValidJsonString(reply));
-			assertNotNull(reply);
-			LOGGER.info("response from consumer cache=" + reply);
-
-		} catch (DME2Exception e) {
-			e.printStackTrace();
-		} catch (URISyntaxException e) {
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	public void ttestDropConsumerCache() {
-		LOGGER.info("Drom consumer cache initiated");
-
-		String subContextPath = props.getProperty("SubContextPathDropAdminConsumerCache");
-
-		try {
-			DME2Client sender = new DME2Client(new URI(url), 5000L);
-			sender.setAllowAllHttpReturnCodes(true);
-			sender.setMethod(methodType);
-			sender.setSubContext(subContextPath);
-			sender.setPayload("");
-			sender.addHeader("Content-Type", contentType);
-			sender.setCredentials(user, password);
-			sender.setHeaders(hm);
-
-			LOGGER.info("Dropping consumer cache...........");
-			String reply = sender.sendAndWait(5000L);
-			
-			// assertTrue(LoadPropertyFile.isValidJsonString(reply));
-			assertNotNull(reply);
-			LOGGER.info("response =" + reply);
-		} catch (DME2Exception e) {
-			e.printStackTrace();
-		} catch (URISyntaxException e) {
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-}
diff --git a/src/test/java/com/att/mr/test/dme2/DME2ApiKeyTest.java b/src/test/java/com/att/mr/test/dme2/DME2ApiKeyTest.java
deleted file mode 100644
index bde61d5..0000000
--- a/src/test/java/com/att/mr/test/dme2/DME2ApiKeyTest.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  Copyright © 2017 AT&T Intellectual Property. 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.
- *  You may obtain a copy of the License at
- *        http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
- *******************************************************************************/
-package com.att.mr.test.dme2;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Properties;
-
-import org.apache.log4j.Logger;
-import org.json.JSONObject;
-
-import com.att.aft.dme2.api.DME2Client;
-import com.att.aft.dme2.api.DME2Exception;
-import com.att.aft.dme2.internal.jackson.map.ObjectMapper;
-
-import junit.framework.TestCase;
-
-public class DME2ApiKeyTest extends TestCase {
-	private static final Logger LOGGER = Logger.getLogger(DME2ApiKeyTest.class);
-
-	protected String url;
-
-	protected Properties props;
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		System.setProperty("AFT_DME2_CLIENT_SSL_INCLUDE_PROTOCOLS", "SSLv3,TLSv1,TLSv1.1");
-		System.setProperty("AFT_DME2_CLIENT_IGNORE_SSL_CONFIG", "false");
-		System.setProperty("AFT_DME2_CLIENT_KEYSTORE_PASSWORD", "changeit");
-		this.props = LoadPropertyFile.getPropertyFileDataProducer();
-		String latitude = props.getProperty("Latitude");
-		String longitude = props.getProperty("Longitude");
-		String version = props.getProperty("Version");
-		String serviceName = props.getProperty("ServiceName");
-		String env = props.getProperty("Environment");
-		String partner = props.getProperty("Partner");
-		String protocol = props.getProperty("Protocol");
-		this.url = protocol + "://" + serviceName + "?" + "version=" + version + "&" + "envContext=" + env + "&"
-				+ "routeOffer=" + partner + "&partner=BOT_R";
-		LoadPropertyFile.loadAFTProperties(latitude, longitude);
-	}
-
-	public void testCreateKey() {
-		LOGGER.info("Create Key test case initiated");
-
-		ApiKeyBean apiKeyBean = new ApiKeyBean("user1@us.att.com", "Creating Api Key.m");
-
-		System.out.println(url);
-
-		returnKey(apiKeyBean, url, props);
-
-	}
-
-	public String returnKey(ApiKeyBean apibean, String url, Properties props) {
-
-		String reply = null;
-		try {
-			LOGGER.info("Call to return key ");
-			DME2Client sender = new DME2Client(new URI(url), 5000L);
-			sender.setAllowAllHttpReturnCodes(true);
-			sender.setMethod(props.getProperty("MethodTypePost"));
-			sender.setSubContext(props.getProperty("SubContextPathGetCreateKeys"));
-			String jsonStringApiBean = new ObjectMapper().writeValueAsString(apibean);
-			sender.setPayload(jsonStringApiBean);
-			sender.addHeader("content-type", props.getProperty("contenttype"));
-			sender.setCredentials(props.getProperty("user"), props.getProperty("password"));
-			LOGGER.info("creating ApiKey");
-			reply = sender.sendAndWait(5000L);
-			System.out.println("reply: " + reply);
-			assertTrue(LoadPropertyFile.isValidJsonString(reply));
-			LOGGER.info("response =" + reply);
-
-		} catch (DME2Exception e) {
-			e.printStackTrace();
-		} catch (URISyntaxException e) {
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return reply;
-	}
-
-	public void testGetAllKey() {
-		LOGGER.info("Test case Get All key initiated....");
-		try {
-			DME2Client sender = new DME2Client(new URI(this.url), 5000L);
-			sender.setAllowAllHttpReturnCodes(true);
-			sender.setMethod(this.props.getProperty("MethodTypeGet"));
-			String subcontextPath = this.props.getProperty("SubContextPathGetApiKeys");
-			// sender.setSubContext(subcontextPath);
-			sender.setPayload("");
-			sender.addHeader("content-type", props.getProperty("contenttype"));
-			sender.setCredentials(props.getProperty("user"), props.getProperty("password"));
-			LOGGER.info("Fetching all keys");
-			String reply = sender.sendAndWait(5000L);
-			System.out.println(reply);
-			assertTrue(LoadPropertyFile.isValidJsonString(reply));
-			LOGGER.info("response =" + reply);
-		} catch (DME2Exception e) {
-			e.printStackTrace();
-		} catch (URISyntaxException e) {
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	public void testGetOneKey() {/*
-		LOGGER.info("Test case get one key initiated");
-		ApiKeyBean apiKeyBean = new ApiKeyBean("user1@att.com", "Creating Api Key.m");
-		JSONObject jsonObj = new JSONObject(returnKey(apiKeyBean, url, props));
-		String apiKey = (String) jsonObj.get("key");
-		try {
-			DME2Client sender = new DME2Client(new URI(url), 5000L);
-			sender.setAllowAllHttpReturnCodes(true);
-			sender.setMethod(props.getProperty("MethodTypeGet"));
-			sender.setSubContext(props.getProperty("SubContextPathGetOneKey") + apiKey);
-			sender.setPayload("");
-			sender.addHeader("content-type", props.getProperty("contenttype"));
-			sender.setCredentials(props.getProperty("user"), props.getProperty("password"));
-
-			LOGGER.info("Fetching details of api key: " + apiKey);
-			String reply = sender.sendAndWait(5000L);
-			System.out.println(reply);
-			assertTrue(LoadPropertyFile.isValidJsonString(reply));
-			LOGGER.info("response =" + reply);
-
-		} catch (DME2Exception e) {
-			e.printStackTrace();
-		} catch (URISyntaxException e) {
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	*/}
-
-	// ............. test case update key is not applicable in
-	// DME2.................//
-	public void testUpdateKey() {/*
-		ApiKeyBean apiKeyBean = new ApiKeyBean("user1@att.com", "Creating Api Key.m");
-
-		JSONObject jsonObj = new JSONObject(returnKey(apiKeyBean, url, props));
-		String apiKey = (String) jsonObj.get("key");
-		try {
-			DME2Client sender = new DME2Client(new URI(url), 5000L);
-			sender.setAllowAllHttpReturnCodes(true);
-			String p = props.getProperty("MethodTypePut");
-			sender.setMethod(p);
-			String s = props.getProperty("SubContextPathUpdateKeys") + apiKey;
-			sender.setSubContext(s);
-
-			String jsonStringApiBean = new ObjectMapper()
-					.writeValueAsString(new ApiKeyBean("user1@att.com", "updating key"));
-			sender.setPayload(jsonStringApiBean);
-			System.out.println(jsonStringApiBean);
-			String c = props.getProperty("contenttype");
-			sender.addHeader("content-type", c);
-			sender.setCredentials(props.getProperty("keyUser"), props.getProperty("keyPass"));
-
-			System.out.println("creating ApiKey");
-			String reply = sender.sendAndWait(5000L);
-			assertNotNull(reply);
-			System.out.println("response =" + reply);
-
-		} catch (DME2Exception e) {
-			e.printStackTrace();
-		} catch (URISyntaxException e) {
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	*/}
-
-	// ............. test case delete key is not applicable in
-	// DME2.................//
-
-	public void testDeleteKey() {/*
-		ApiKeyBean apiKeyBean = new ApiKeyBean("user1@att.com", "Creating Api Key.m");
-
-		JSONObject jsonObj = new JSONObject(returnKey(apiKeyBean, url, props));
-		String apiKey = (String) jsonObj.get("key");
-		try {
-			DME2Client sender = new DME2Client(new URI(url), 5000L);
-			sender.setAllowAllHttpReturnCodes(true);
-			String p = props.getProperty("MethodTypeDelete");
-			sender.setMethod(p);
-			String s = props.getProperty("SubContextPathDeleteteKeys") + apiKey;
-			sender.setSubContext(s);
-
-			sender.setPayload(""); // System.out.println(jsonStringApiBean);
-			String c = props.getProperty("contenttype");
-			sender.addHeader("content-type", c);
-			sender.setCredentials(props.getProperty("keyUser"), props.getProperty("keyPass"));
-
-			System.out.println("creating ApiKey");
-			String reply = sender.sendAndWait(5000L);
-			assertNotNull(reply);
-			System.out.println("response =" + reply);
-
-		} catch (DME2Exception e) {
-			e.printStackTrace();
-		} catch (URISyntaxException e) {
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	*/}
-
-}
diff --git a/src/test/java/com/att/mr/test/dme2/DME2ConsumerFilterTest.java b/src/test/java/com/att/mr/test/dme2/DME2ConsumerFilterTest.java
deleted file mode 100644
index 30c13ea..0000000
--- a/src/test/java/com/att/mr/test/dme2/DME2ConsumerFilterTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  Copyright © 2017 AT&T Intellectual Property. 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.
- *  You may obtain a copy of the License at
- *        http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
- *******************************************************************************/
-package com.att.mr.test.dme2;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URLEncoder;
-import java.util.HashMap;
-import java.util.Properties;
-
-import org.apache.log4j.Logger;
-
-import junit.framework.TestCase;
-
-import com.att.aft.dme2.api.DME2Client;
-import com.att.aft.dme2.api.DME2Exception;
-import com.att.mr.test.dmaap.DmaapAdminTest;
-
-public class DME2ConsumerFilterTest extends TestCase {
-	private static final Logger LOGGER = Logger.getLogger(DME2ConsumerFilterTest.class);
-
-	public void testConsumerFilter() {
-		LOGGER.info("Test case consumer filter initiated");
-		
-		Properties props = LoadPropertyFile.getPropertyFileDataProducer();
-		String latitude = props.getProperty("Latitude");
-		String longitude = props.getProperty("Longitude");
-		String version = props.getProperty("Version");
-		String serviceName = props.getProperty("ServiceName");
-		String env = props.getProperty("Environment");
-		String partner = props.getProperty("Partner");
-		String protocol = props.getProperty("Protocol");
-		String methodType = props.getProperty("MethodTypeGet");
-		String user = props.getProperty("user");
-		String password = props.getProperty("password");
-		String contenttype = props.getProperty("contenttype");
-
-		String url = protocol + "://DME2SEARCH/" + "service=" + serviceName + "/" + "version=" + version + "/"
-				+ "envContext=" + env + "/" + "partner=" + partner;
-		LoadPropertyFile.loadAFTProperties(latitude, longitude);
-		HashMap<String, String> hm = new HashMap<String, String>();
-		hm.put("AFT_DME2_EP_READ_TIMEOUT_MS", "50000");
-		hm.put("AFT_DME2_ROUNDTRIP_TIMEOUT_MS", "240000");
-		hm.put("AFT_DME2_EP_CONN_TIMEOUT", "5000");
-
-		try {
-			// ..checking for topic exist is commented
-			// if (!topicTestObj.topicExist(url, props, hm)) {
-			// throw new Exception("Topic does not exist");
-			// } else {
-			DME2Client sender = new DME2Client(new URI(url), 5000L);
-			sender.setAllowAllHttpReturnCodes(true);
-			sender.setMethod(methodType);
-			String subContextPathConsumer = props.getProperty("SubContextPathConsumer") + props.getProperty("newTopic")
-					+ "/" + props.getProperty("group") + "/" + props.getProperty("id") + "?"
-					+ props.getProperty("filterType");
-
-			sender.setSubContext(URLEncoder.encode(subContextPathConsumer, "UTF-8"));
-			sender.setPayload("");
-
-			sender.addHeader("Content-Type", contenttype);
-			sender.setCredentials(user, password);
-			sender.setHeaders(hm);
-
-			LOGGER.info("Consuming Message for Filter");
-			String reply = sender.sendAndWait(5000L);
-			assertNotNull(reply);
-			LOGGER.info("Message received = " + reply);
-			// }
-		} catch (DME2Exception e) {
-			e.printStackTrace();
-		} catch (URISyntaxException e) {
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-}
diff --git a/src/test/java/com/att/mr/test/dme2/DME2ConsumerTest.java b/src/test/java/com/att/mr/test/dme2/DME2ConsumerTest.java
deleted file mode 100644
index 810f451..0000000
--- a/src/test/java/com/att/mr/test/dme2/DME2ConsumerTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  Copyright © 2017 AT&T Intellectual Property. 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.
- *  You may obtain a copy of the License at
- *        http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
- *******************************************************************************/
-package com.att.mr.test.dme2;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Properties;
-
-import org.apache.log4j.Logger;
-
-import junit.framework.TestCase;
-
-import com.att.aft.dme2.api.DME2Client;
-import com.att.aft.dme2.api.DME2Exception;
-import com.att.mr.test.dmaap.DmaapAdminTest;
-
-public class DME2ConsumerTest extends TestCase {
-	private static final Logger LOGGER = Logger.getLogger(DME2ConsumerTest.class);
-
-	public void testConsumer() {
-		LOGGER.info("Test case subcribing initiated");
-		
-		Properties props = LoadPropertyFile.getPropertyFileDataProducer();
-		String latitude = props.getProperty("Latitude");
-		String longitude = props.getProperty("Longitude");
-		String version = props.getProperty("Version");
-		String serviceName = props.getProperty("ServiceName");
-		String env = props.getProperty("Environment");
-		String partner = props.getProperty("Partner");
-		String protocol = props.getProperty("Protocol");
-		String methodType = props.getProperty("MethodTypeGet");
-		String user = props.getProperty("user");
-		String password = props.getProperty("password");
-		String contenttype = props.getProperty("contenttype");
-		String url = protocol + "://DME2SEARCH/" + "service=" + serviceName + "/" + "version=" + version + "/"
-				+ "envContext=" + env + "/" + "partner=" + partner;
-		LoadPropertyFile.loadAFTProperties(latitude, longitude);
-		HashMap<String, String> hm = new HashMap<String, String>();
-		hm.put("AFT_DME2_EP_READ_TIMEOUT_MS", "50000");
-		hm.put("AFT_DME2_ROUNDTRIP_TIMEOUT_MS", "240000");
-		hm.put("AFT_DME2_EP_CONN_TIMEOUT", "5000");
-		try {
-
-			// topic exist logic is commented
-			// if (!topicTestObj.topicExist(url, props, hm)) {
-			// throw new Exception("Topic does not exist");
-			// } else {
-			DME2Client sender = new DME2Client(new URI(url), 5000L);
-			sender.setAllowAllHttpReturnCodes(true);
-			sender.setMethod(methodType);
-			String subContextPathConsumer = props.getProperty("SubContextPathConsumer") + props.getProperty("newTopic")
-					+ "/" + props.getProperty("group") + "/" + props.getProperty("id");
-			sender.setSubContext(subContextPathConsumer);
-			sender.setPayload("");
-
-			sender.addHeader("Content-Type", contenttype);
-			sender.setCredentials(user, password);
-			sender.setHeaders(hm);
-
-			LOGGER.info("Consuming Message");
-			String reply = sender.sendAndWait(5000L);
-
-			assertNotNull(reply);
-			LOGGER.info("Message received = " + reply);
-			// }
-		} catch (DME2Exception e) {
-			e.printStackTrace();
-		} catch (URISyntaxException e) {
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-}
diff --git a/src/test/java/com/att/mr/test/dme2/DME2MetricsTest.java b/src/test/java/com/att/mr/test/dme2/DME2MetricsTest.java
deleted file mode 100644
index e7ccebe..0000000
--- a/src/test/java/com/att/mr/test/dme2/DME2MetricsTest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  Copyright © 2017 AT&T Intellectual Property. 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.
- *  You may obtain a copy of the License at
- *        http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
- *******************************************************************************/
-package com.att.mr.test.dme2;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Properties;
-
-import org.apache.log4j.Logger;
-
-import junit.framework.TestCase;
-
-import com.att.aft.dme2.api.DME2Client;
-import com.att.aft.dme2.api.DME2Exception;
-import com.att.mr.test.dmaap.DmaapAdminTest;
-
-public class DME2MetricsTest extends TestCase {
-	private static final Logger LOGGER = Logger.getLogger(DME2MetricsTest.class);
-
-	public void testGetMetrics() {
-		LOGGER.info("Test case get metrics initiated...");
-		
-		Properties props = LoadPropertyFile.getPropertyFileDataProducer();
-		String latitude = props.getProperty("Latitude");
-		String longitude = props.getProperty("Longitude");
-		String version = props.getProperty("Version");
-		String serviceName = props.getProperty("ServiceName");
-		String env = props.getProperty("Environment");
-		String partner = props.getProperty("Partner");
-		String subContextPath = props.getProperty("SubContextPathGetMetrics");
-		String protocol = props.getProperty("Protocol");
-		String methodType = props.getProperty("MethodTypeGet");
-		String user = props.getProperty("user");
-		String password = props.getProperty("password");
-		String contenttype = props.getProperty("contenttype");
-		String url = protocol + "://DME2SEARCH/" + "service=" + serviceName + "/" + "version=" + version + "/"
-				+ "envContext=" + env + "/" + "partner=" + partner;
-		LoadPropertyFile.loadAFTProperties(latitude, longitude);
-		HashMap<String, String> hm = new HashMap<String, String>();
-		hm.put("AFT_DME2_EP_READ_TIMEOUT_MS", "50000");
-		hm.put("AFT_DME2_ROUNDTRIP_TIMEOUT_MS", "240000");
-		hm.put("AFT_DME2_EP_CONN_TIMEOUT", "5000");
-
-		try {
-			DME2Client sender = new DME2Client(new URI(url), 5000L);
-			sender.setAllowAllHttpReturnCodes(true);
-			sender.setMethod(methodType);
-			sender.setSubContext(subContextPath);
-			sender.setPayload("");
-			sender.addHeader("Content-Type", contenttype);
-			sender.setCredentials(user, password);
-			sender.setHeaders(hm);
-
-			LOGGER.info("Getting Metrics Details");
-			String reply = sender.sendAndWait(5000L);
-			assertTrue(LoadPropertyFile.isValidJsonString(reply));
-			LOGGER.info("response =" + reply);
-
-		} catch (DME2Exception e) {
-			e.printStackTrace();
-		} catch (URISyntaxException e) {
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	public void testGetMetricsByName() {
-		LOGGER.info("Test case get metrics by name initiated");
-		Properties props = LoadPropertyFile.getPropertyFileDataProducer();
-		String latitude = props.getProperty("Latitude");
-		String longitude = props.getProperty("Longitude");
-		String version = props.getProperty("Version");
-		String serviceName = props.getProperty("ServiceName");
-		String env = props.getProperty("Environment");
-		String partner = props.getProperty("Partner");
-		String subContextPath = props.getProperty("SubContextPathGetMetricsByName");
-		String protocol = props.getProperty("Protocol");
-		String methodType = props.getProperty("MethodTypeGet");
-		String user = props.getProperty("user");
-		String password = props.getProperty("password");
-		String contenttype = props.getProperty("contenttype");
-		String url = protocol + "://DME2SEARCH/" + "service=" + serviceName + "/" + "version=" + version + "/"
-				+ "envContext=" + env + "/" + "partner=" + partner;
-		LoadPropertyFile.loadAFTProperties(latitude, longitude);
-		HashMap<String, String> hm = new HashMap<String, String>();
-		hm.put("AFT_DME2_EP_READ_TIMEOUT_MS", "50000");
-		hm.put("AFT_DME2_ROUNDTRIP_TIMEOUT_MS", "240000");
-		hm.put("AFT_DME2_EP_CONN_TIMEOUT", "5000");
-		try {
-			DME2Client sender = new DME2Client(new URI(url), 5000L);
-			sender.setAllowAllHttpReturnCodes(true);
-			sender.setMethod(methodType);
-			sender.setSubContext(subContextPath);
-			sender.setPayload("");
-			sender.addHeader("Content-Type", contenttype);
-			sender.setCredentials(user, password);
-			sender.setHeaders(hm);
-
-			LOGGER.info("Getting Metrics By name");
-			String reply = sender.sendAndWait(5000L);
-			assertTrue(LoadPropertyFile.isValidJsonString(reply));
-			LOGGER.info("response =" + reply);
-
-		} catch (DME2Exception e) {
-			e.printStackTrace();
-		} catch (URISyntaxException e) {
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-}
diff --git a/src/test/java/com/att/mr/test/dme2/DME2ProducerTest.java b/src/test/java/com/att/mr/test/dme2/DME2ProducerTest.java
deleted file mode 100644
index 71c5e0f..0000000
--- a/src/test/java/com/att/mr/test/dme2/DME2ProducerTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  Copyright © 2017 AT&T Intellectual Property. 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.
- *  You may obtain a copy of the License at
- *        http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
- *******************************************************************************/
-package com.att.mr.test.dme2;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Properties;
-
-import org.apache.log4j.Logger;
-
-import junit.framework.TestCase;
-
-import com.att.aft.dme2.api.DME2Client;
-import com.att.aft.dme2.api.DME2Exception;
-import com.att.aft.dme2.internal.jackson.map.ObjectMapper;
-import com.att.mr.test.dmaap.DmaapAdminTest;
-
-public class DME2ProducerTest extends TestCase {
-	private static final Logger LOGGER = Logger.getLogger(DmaapAdminTest.class);
-
-	public void testProducer() {
-		DME2TopicTest topicTestObj = new DME2TopicTest();
-
-		Properties props = LoadPropertyFile.getPropertyFileDataProducer();
-		String latitude = props.getProperty("Latitude");
-		String longitude = props.getProperty("Longitude");
-		String version = props.getProperty("Version");
-		String serviceName = props.getProperty("ServiceName");
-		String env = props.getProperty("Environment");
-		String partner = props.getProperty("Partner");
-		String protocol = props.getProperty("Protocol");
-		String url = protocol + "://DME2SEARCH/" + "service=" + serviceName + "/" + "version=" + version + "/"
-				+ "envContext=" + env + "/" + "partner=" + partner;
-		LoadPropertyFile.loadAFTProperties(latitude, longitude);
-		HashMap<String, String> hm = new HashMap<String, String>();
-		hm.put("AFT_DME2_EP_READ_TIMEOUT_MS", "50000");
-		hm.put("AFT_DME2_ROUNDTRIP_TIMEOUT_MS", "240000");
-		hm.put("AFT_DME2_EP_CONN_TIMEOUT", "5000");
-		// checking whether topic exist or not
-		if (!topicTestObj.topicExist(url, props, hm)) {
-			// if topic doesn't exist then create the topic
-			topicTestObj.createTopic(url, props, hm);
-			// after creating the topic publish on that topic
-			publishMessage(url, props, hm);
-		} else {
-			// if topic already exist start publishing on the topic
-			publishMessage(url, props, hm);
-		}
-
-	}
-
-	public void publishMessage(String url, Properties props, HashMap<String, String> mapData) {
-		try {
-			LOGGER.info("Call to publish message ");
-			DME2Client sender = new DME2Client(new URI(url), 5000L);
-			sender.setAllowAllHttpReturnCodes(true);
-			sender.setMethod(props.getProperty("MethodTypePost"));
-			String subcontextpathPublish = props.getProperty("SubContextPathproducer") + props.getProperty("newTopic");
-			sender.setSubContext(subcontextpathPublish);
-			String jsonStringApiBean = new ObjectMapper().writeValueAsString(new ApiKeyBean("example@att.com",
-					"description"));
-			sender.setPayload(jsonStringApiBean);
-
-			sender.setCredentials(props.getProperty("user"), props.getProperty("password"));
-			sender.addHeader("content-type", props.getProperty("contenttype"));
-			LOGGER.info("Publishing message");
-			String reply = sender.sendAndWait(5000L);
-			// assertTrue(LoadPropertyFile.isValidJsonString(reply));
-			assertNotNull(reply);
-			LOGGER.info("response =" + reply);
-
-		} catch (DME2Exception e) {
-			e.printStackTrace();
-		} catch (URISyntaxException e) {
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-	}
-}
diff --git a/src/test/java/com/att/mr/test/dme2/DME2TopicTest.java b/src/test/java/com/att/mr/test/dme2/DME2TopicTest.java
deleted file mode 100644
index 9d26083..0000000
--- a/src/test/java/com/att/mr/test/dme2/DME2TopicTest.java
+++ /dev/null
@@ -1,546 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  Copyright © 2017 AT&T Intellectual Property. 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.
- *  You may obtain a copy of the License at
- *        http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
- *******************************************************************************/
-package com.att.mr.test.dme2;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Properties;
-
-import javax.ws.rs.client.Entity;
-
-import org.apache.log4j.Logger;
-
-import junit.framework.TestCase;
-
-import com.att.aft.dme2.api.DME2Client;
-import com.att.aft.dme2.api.DME2Exception;
-import com.att.aft.dme2.internal.jackson.map.ObjectMapper;
-import com.att.mr.test.dmaap.DmaapAdminTest;
-
-public class DME2TopicTest extends TestCase {
-	private String latitude;
-	private String longitude;
-	private String version;
-	private String serviceName;
-	private String env;
-	private String partner;
-	private String protocol;
-	private String methodTypeGet;
-	private String methodTypePost;
-	private String methodTypeDelete;
-	private String methodTypePut;
-
-	private String user;
-	private String password;
-	private String contenttype;
-	private String subContextPathGetAllTopic;
-	private String subContextPathGetOneTopic;
-	private String SubContextPathCreateTopic;
-	private String SubContextPathGetPublisherl;
-	private String SubContextPathGetPublisher;
-	private String SubContextPathGetPermitPublisher;
-	private String SubContextPathGetConsumer;
-	private String SubContextPathGetPermitConsumer;
-	private static final Logger LOGGER = Logger.getLogger(DME2TopicTest.class);
-
-	public void createTopic(String url, Properties props, HashMap<String, String> mapData) {
-		LOGGER.info("create topic method starts");
-		if (!topicExist(url, props, mapData)) {
-			LOGGER.info("creating a new topic");
-			try {
-				DME2Client sender = new DME2Client(new URI(url), 5000L);
-				sender.setAllowAllHttpReturnCodes(true);
-				sender.setMethod(props.getProperty("MethodTypePost"));
-				sender.setSubContext(props.getProperty("SubContextPathCreateTopic"));
-				TopicBeanDME2 topicBean = new TopicBeanDME2(props.getProperty("newTopic"),
-						props.getProperty("topicDescription"), Integer.parseInt(props.getProperty("partition")),
-						Integer.parseInt(props.getProperty("replication")), Boolean.valueOf(props
-								.getProperty("txenabled")));
-				String jsonStringApiBean = new ObjectMapper().writeValueAsString(topicBean);
-				sender.setPayload(jsonStringApiBean);
-				sender.addHeader("content-type", props.getProperty("contenttype"));
-				sender.setCredentials(props.getProperty("user"), props.getProperty("password"));
-
-				LOGGER.info("creating Topic");
-				String reply = sender.sendAndWait(5000L);
-				assertTrue(LoadPropertyFile.isValidJsonString(reply));
-				LOGGER.info("response =" + reply);
-
-			} catch (DME2Exception e) {
-				e.printStackTrace();
-			} catch (URISyntaxException e) {
-				e.printStackTrace();
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
-	}
-
-	public boolean topicExist(String url, Properties props, HashMap<String, String> mapData) {
-		boolean topicExist = false;
-		try {
-			LOGGER.info("Checking topic exists or not");
-			DME2Client sender = new DME2Client(new URI(url), 5000L);
-			sender.setAllowAllHttpReturnCodes(true);
-			sender.setMethod(props.getProperty("MethodTypeGet"));
-			String subcontextPath = props.getProperty("subContextPathGetOneTopic") + props.getProperty("newTopic");
-			sender.setSubContext(subcontextPath);
-			sender.setPayload("");
-			sender.addHeader("content-type", props.getProperty("contenttype"));
-			sender.setCredentials(props.getProperty("user"), props.getProperty("password"));
-			String reply = sender.sendAndWait(5000L);
-			topicExist = LoadPropertyFile.isValidJsonString(reply);
-			LOGGER.info("Topic exist =" + topicExist);
-		} catch (DME2Exception e) {
-			e.printStackTrace();
-		} catch (URISyntaxException e) {
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return topicExist;
-	}
-
-	public void testAllTopics() {
-		LOGGER.info("Test case get all topics initiated");
-		Properties props = LoadPropertyFile.getPropertyFileDataProducer();
-		latitude = props.getProperty("Latitude");
-		longitude = props.getProperty("Longitude");
-		version = props.getProperty("Version");
-		serviceName = props.getProperty("ServiceName");
-		env = props.getProperty("Environment");
-		partner = props.getProperty("Partner");
-		subContextPathGetAllTopic = props.getProperty("subContextPathGetAllTopic");
-		protocol = props.getProperty("Protocol");
-		methodTypeGet = props.getProperty("MethodTypeGet");
-		user = props.getProperty("user");
-		password = props.getProperty("password");
-		contenttype = props.getProperty("contenttype");
-
-		String url = protocol + "://DME2SEARCH/" + "service=" + serviceName + "/" + "version=" + version + "/"
-				+ "envContext=" + env + "/" + "partner=" + partner;
-		LoadPropertyFile.loadAFTProperties(latitude, longitude); // } else {
-		HashMap<String, String> hm = new HashMap<String, String>();
-		hm.put("AFT_DME2_EP_READ_TIMEOUT_MS", "50000");
-		hm.put("AFT_DME2_ROUNDTRIP_TIMEOUT_MS", "240000");
-		hm.put("AFT_DME2_EP_CONN_TIMEOUT", "5000");
-
-		try {
-			DME2Client sender = new DME2Client(new URI(url), 5000L);
-			sender.setAllowAllHttpReturnCodes(true);
-			sender.setMethod(methodTypeGet);
-			sender.setSubContext(subContextPathGetAllTopic);
-			sender.setPayload("");
-
-			sender.addHeader("Content-Type", contenttype);
-			sender.setCredentials(user, password);
-			sender.setHeaders(hm);
-
-			LOGGER.info("Retrieving all topics");
-			String reply = sender.sendAndWait(5000L);
-			assertTrue(LoadPropertyFile.isValidJsonString(reply));
-			LOGGER.info("All Topics details = " + reply);
-
-		} catch (DME2Exception e) {
-			e.printStackTrace();
-		} catch (URISyntaxException e) {
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	public void testOneTopic() {
-		LOGGER.info("Test case get one topic initiated");
-		Properties props = LoadPropertyFile.getPropertyFileDataProducer();
-		latitude = props.getProperty("Latitude");
-		longitude = props.getProperty("Longitude");
-		version = props.getProperty("Version");
-		serviceName = props.getProperty("ServiceName");
-		env = props.getProperty("Environment");
-		partner = props.getProperty("Partner");
-		subContextPathGetOneTopic = props.getProperty("subContextPathGetOneTopic");
-		protocol = props.getProperty("Protocol");
-		methodTypeGet = props.getProperty("MethodTypeGet");
-		user = props.getProperty("user");
-		password = props.getProperty("password");
-		contenttype = props.getProperty("contenttype");
-
-		String url = protocol + "://DME2SEARCH/" + "service=" + serviceName + "/" + "version=" + version + "/"
-				+ "envContext=" + env + "/" + "partner=" + partner;
-		LoadPropertyFile.loadAFTProperties(latitude, longitude);
-
-		HashMap<String, String> hm = new HashMap<String, String>();
-		hm.put("AFT_DME2_EP_READ_TIMEOUT_MS", "50000");
-		hm.put("AFT_DME2_ROUNDTRIP_TIMEOUT_MS", "240000");
-		hm.put("AFT_DME2_EP_CONN_TIMEOUT", "5000");
-		System.out.println("Retrieving topic detail");
-		if (!topicExist(url, props, hm)) {
-			createTopic(url, props, hm);
-		} else {
-			assertTrue(true);
-		}
-	}
-
-	public void createTopicForDeletion(String url, Properties props, HashMap<String, String> mapData) {
-		LOGGER.info("create topic method starts");
-
-		LOGGER.info("creating a new topic for deletion");
-		try {
-			DME2Client sender = new DME2Client(new URI(url), 5000L);
-			sender.setAllowAllHttpReturnCodes(true);
-			sender.setMethod(props.getProperty("MethodTypePost"));
-			sender.setSubContext(props.getProperty("SubContextPathCreateTopic"));
-			TopicBeanDME2 topicBean = new TopicBeanDME2(props.getProperty("deleteTopic"),
-					props.getProperty("topicDescription"), Integer.parseInt(props.getProperty("partition")),
-					Integer.parseInt(props.getProperty("replication")), Boolean.valueOf(props.getProperty("txenabled")));
-			String jsonStringApiBean = new ObjectMapper().writeValueAsString(topicBean);
-			sender.setPayload(jsonStringApiBean);
-			sender.addHeader("content-type", props.getProperty("contenttype"));
-			sender.setCredentials(props.getProperty("user"), props.getProperty("password"));
-
-			LOGGER.info("creating Topic");
-			String reply = sender.sendAndWait(5000L);
-			assertTrue(LoadPropertyFile.isValidJsonString(reply));
-			LOGGER.info("response =" + reply);
-
-		} catch (DME2Exception e) {
-			e.printStackTrace();
-		} catch (URISyntaxException e) {
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-	}
-
-	public boolean topicExistForDeletion(String url, Properties props, HashMap<String, String> mapData) {
-		boolean topicExist = false;
-		try {
-			LOGGER.info("Checking topic exists for deletion");
-			DME2Client sender = new DME2Client(new URI(url), 5000L);
-			sender.setAllowAllHttpReturnCodes(true);
-			sender.setMethod(props.getProperty("MethodTypeGet"));
-			String subcontextPath = props.getProperty("subContextPathGetOneTopic") + props.getProperty("deleteTopic");
-			sender.setSubContext(subcontextPath);
-			sender.setPayload("");
-			sender.addHeader("content-type", props.getProperty("contenttype"));
-			sender.setCredentials(props.getProperty("user"), props.getProperty("password"));
-			String reply = sender.sendAndWait(5000L);
-			topicExist = LoadPropertyFile.isValidJsonString(reply);
-			LOGGER.info("Topic exist for deletion=" + topicExist);
-		} catch (DME2Exception e) {
-			e.printStackTrace();
-		} catch (URISyntaxException e) {
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return topicExist;
-	}
-
-	public void testDeleteTopic() {
-		Properties props = LoadPropertyFile.getPropertyFileDataProducer();
-		latitude = props.getProperty("Latitude");
-		longitude = props.getProperty("Longitude");
-		version = props.getProperty("Version");
-		serviceName = props.getProperty("ServiceName");
-		env = props.getProperty("Environment");
-		partner = props.getProperty("Partner");
-		SubContextPathCreateTopic = props.getProperty("SubContextPathCreateTopic");
-		protocol = props.getProperty("Protocol");
-		methodTypePost = props.getProperty("MethodTypeDelete");
-		user = props.getProperty("user");
-		password = props.getProperty("password");
-		contenttype = props.getProperty("contenttypejson");
-		String url = protocol + "://DME2SEARCH/" + "service=" + serviceName + "/" + "version=" + version + "/"
-				+ "envContext=" + env + "/" + "partner=" + partner;
-		LoadPropertyFile.loadAFTProperties(latitude, longitude);
-		HashMap<String, String> hm = new HashMap<String, String>();
-		hm.put("AFT_DME2_EP_READ_TIMEOUT_MS", "50000");
-		hm.put("AFT_DME2_ROUNDTRIP_TIMEOUT_MS", "240000");
-		hm.put("AFT_DME2_EP_CONN_TIMEOUT", "5000");
-		System.out.println("deleteing topic");
-		if (!topicExistForDeletion(url, props, hm)) {
-			createTopicForDeletion(url, props, hm);
-			deleteTopic(url, props, hm);
-		} else {
-			deleteTopic(url, props, hm);
-		}
-	}
-
-	public void deleteTopic(String url, Properties props, HashMap<String, String> mapData) {
-		try {
-			DME2Client sender = new DME2Client(new URI(url), 5000L);
-			sender.setAllowAllHttpReturnCodes(true);
-			sender.setMethod(props.getProperty("MethodTypeDelete"));
-			String subsontextPathDelete = props.getProperty("subContextPathGetOneTopic")
-					+ props.getProperty("deleteTopic");
-			sender.setSubContext(subsontextPathDelete);
-			sender.setPayload("");
-			sender.addHeader("content-type", props.getProperty("contenttype"));
-			sender.setCredentials(props.getProperty("user"), props.getProperty("password"));
-			System.out.println("Deleting Topic " + props.getProperty("deleteTopic"));
-			String reply = sender.sendAndWait(5000L);
-			assertNotNull(reply);
-			System.out.println("response =" + reply);
-		} catch (DME2Exception e) {
-			e.printStackTrace();
-		} catch (URISyntaxException e) {
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	public void testGetProducersTopics() {
-		LOGGER.info("Test case get list of producers on topic");
-		Properties props = LoadPropertyFile.getPropertyFileDataProducer();
-		latitude = props.getProperty("Latitude");
-		longitude = props.getProperty("Longitude");
-		version = props.getProperty("Version");
-		serviceName = props.getProperty("ServiceName");
-		env = props.getProperty("Environment");
-		partner = props.getProperty("Partner");
-		SubContextPathGetPublisher = props.getProperty("SubContextPathGetPublisher");
-		protocol = props.getProperty("Protocol");
-		methodTypeGet = props.getProperty("MethodTypeGet");
-		user = props.getProperty("user");
-		password = props.getProperty("password");
-		contenttype = props.getProperty("contenttype");
-
-		String url = protocol + "://DME2SEARCH/" + "service=" + serviceName + "/" + "version=" + version + "/"
-				+ "envContext=" + env + "/" + "partner=" + partner;
-		LoadPropertyFile.loadAFTProperties(latitude, longitude);
-
-		HashMap<String, String> hm = new HashMap<String, String>();
-		hm.put("AFT_DME2_EP_READ_TIMEOUT_MS", "50000");
-		hm.put("AFT_DME2_ROUNDTRIP_TIMEOUT_MS", "240000");
-		hm.put("AFT_DME2_EP_CONN_TIMEOUT", "5000");
-
-		try {
-			DME2Client sender = new DME2Client(new URI(url), 5000L);
-			sender.setAllowAllHttpReturnCodes(true);
-			sender.setMethod(methodTypeGet);
-			sender.setSubContext(SubContextPathGetPublisher);
-			sender.setPayload("");
-
-			sender.addHeader("Content-Type", contenttype);
-			sender.setCredentials(user, password);
-			sender.setHeaders(hm);
-
-			LOGGER.info("Retrieving List of publishers");
-			String reply = sender.sendAndWait(5000L);
-			assertTrue(LoadPropertyFile.isValidJsonString(reply));
-			LOGGER.info("All Publishers details = " + reply);
-
-		} catch (DME2Exception e) {
-			e.printStackTrace();
-		} catch (URISyntaxException e) {
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	// permitting a producer on topic is not applicable
-	// public void testPermitProducersTopics() {
-	// LOGGER.info("Test case ");
-	// Properties props = LoadPropertyFile.getPropertyFileDataProducer();
-	// latitude = props.getProperty("Latitude");
-	// longitude = props.getProperty("Longitude");
-	// version = props.getProperty("Version");
-	// serviceName = props.getProperty("ServiceName");
-	// env = props.getProperty("Environment");
-	// partner = props.getProperty("Partner");
-	// SubContextPathGetPermitPublisher =
-	// props.getProperty("SubContextPathGetPermitPublisher");
-	// protocol = props.getProperty("Protocol");
-	// methodTypePut = props.getProperty("MethodTypePut");
-	// user = props.getProperty("user");
-	// password = props.getProperty("password");
-	// contenttype = props.getProperty("contenttype");
-	//
-	// String url = protocol + "://DME2SEARCH/" + "service=" + serviceName + "/"
-	// + "version=" + version + "/"
-	// + "envContext=" + env + "/" + "partner=" + partner;
-	// LoadPropertyFile.loadAFTProperties(latitude, longitude);
-	//
-	// HashMap<String, String> hm = new HashMap<String, String>();
-	// hm.put("AFT_DME2_EP_READ_TIMEOUT_MS", "50000");
-	// hm.put("AFT_DME2_ROUNDTRIP_TIMEOUT_MS", "240000");
-	// hm.put("AFT_DME2_EP_CONN_TIMEOUT", "5000");
-	//
-	// try {
-	// DME2Client sender = new DME2Client(new URI(url), 5000L);
-	// sender.setAllowAllHttpReturnCodes(true);
-	// sender.setMethod(methodTypePut);
-	// sender.setSubContext(SubContextPathGetPermitPublisher);
-	// sender.setPayload("");
-	//
-	// sender.addHeader("Content-Type", contenttype);
-	// sender.setCredentials(user, password);
-	// sender.setHeaders(hm);
-	//
-	// System.out.println("Permitting a producer on topic");
-	// String reply = sender.sendAndWait(5000L);
-	// System.out.println("Reply from server = " + reply);
-	//
-	// } catch (DME2Exception e) {
-	// e.printStackTrace();
-	// } catch (URISyntaxException e) {
-	// e.printStackTrace();
-	// } catch (Exception e) {
-	// e.printStackTrace();
-	// }
-	// }
-
-	public void testGetConsumersTopics() {
-		LOGGER.info("Test case get list of consumers on topic ");
-		Properties props = LoadPropertyFile.getPropertyFileDataProducer();
-		latitude = props.getProperty("Latitude");
-		longitude = props.getProperty("Longitude");
-		version = props.getProperty("Version");
-		serviceName = props.getProperty("ServiceName");
-		env = props.getProperty("Environment");
-		partner = props.getProperty("Partner");
-		SubContextPathGetConsumer = props.getProperty("SubContextPathGetConsumer");
-		protocol = props.getProperty("Protocol");
-		methodTypeGet = props.getProperty("MethodTypeGet");
-		user = props.getProperty("user");
-		password = props.getProperty("password");
-		contenttype = props.getProperty("contenttype");
-
-		String url = protocol + "://DME2SEARCH/" + "service=" + serviceName + "/" + "version=" + version + "/"
-				+ "envContext=" + env + "/" + "partner=" + partner;
-		LoadPropertyFile.loadAFTProperties(latitude, longitude);
-
-		HashMap<String, String> hm = new HashMap<String, String>();
-		hm.put("AFT_DME2_EP_READ_TIMEOUT_MS", "50000");
-		hm.put("AFT_DME2_ROUNDTRIP_TIMEOUT_MS", "240000");
-		hm.put("AFT_DME2_EP_CONN_TIMEOUT", "5000");
-
-		try {
-			DME2Client sender = new DME2Client(new URI(url), 5000L);
-			sender.setAllowAllHttpReturnCodes(true);
-			sender.setMethod(methodTypeGet);
-			sender.setSubContext(SubContextPathGetConsumer);
-			sender.setPayload("");
-
-			sender.addHeader("Content-Type", contenttype);
-			sender.setCredentials(user, password);
-			sender.setHeaders(hm);
-
-			LOGGER.info("Retrieving consumer details on topics");
-			String reply = sender.sendAndWait(5000L);
-			assertTrue(LoadPropertyFile.isValidJsonString(reply));
-			System.out.println("Reply from server = " + reply);
-
-		} catch (DME2Exception e) {
-			e.printStackTrace();
-		} catch (URISyntaxException e) {
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	public void testCreateTopic() {
-		LOGGER.info("Test case create topic starts");
-		Properties props = LoadPropertyFile.getPropertyFileDataProducer();
-		latitude = props.getProperty("Latitude");
-		longitude = props.getProperty("Longitude");
-		version = props.getProperty("Version");
-		serviceName = props.getProperty("ServiceName");
-		env = props.getProperty("Environment");
-		partner = props.getProperty("Partner");
-		SubContextPathCreateTopic = props.getProperty("SubContextPathCreateTopic");
-		protocol = props.getProperty("Protocol");
-		methodTypePost = props.getProperty("MethodTypePost");
-		user = props.getProperty("user");
-		password = props.getProperty("password");
-		contenttype = props.getProperty("contenttypejson");
-
-		String url = protocol + "://DME2SEARCH/" + "service=" + serviceName + "/" + "version=" + version + "/"
-				+ "envContext=" + env + "/" + "partner=" + partner;
-		LoadPropertyFile.loadAFTProperties(latitude, longitude);
-		HashMap<String, String> hm = new HashMap<String, String>();
-		hm.put("AFT_DME2_EP_READ_TIMEOUT_MS", "50000");
-		hm.put("AFT_DME2_ROUNDTRIP_TIMEOUT_MS", "240000");
-		hm.put("AFT_DME2_EP_CONN_TIMEOUT", "5000");
-
-		createTopic(url, props, hm);
-	}
-	// permitting a consumer on topic is not applicable
-	// public void testPermitConsumerTopics() {
-	// Properties props = LoadPropertyFile.getPropertyFileDataProducer();
-	// latitude = props.getProperty("Latitude");
-	// longitude = props.getProperty("Longitude");
-	// version = props.getProperty("Version");
-	// serviceName = props.getProperty("ServiceName");
-	// env = props.getProperty("Environment");
-	// partner = props.getProperty("Partner");
-	// SubContextPathGetPermitConsumer =
-	// props.getProperty("SubContextPathGetPermitConsumer");
-	// protocol = props.getProperty("Protocol");
-	// methodTypePut = props.getProperty("MethodTypePut");
-	// user = props.getProperty("user");
-	// password = props.getProperty("password");
-	// contenttype = props.getProperty("contenttype");
-	//
-	// String url = protocol + "://DME2SEARCH/" + "service=" + serviceName + "/"
-	// + "version=" + version + "/"
-	// + "envContext=" + env + "/" + "partner=" + partner;
-	// LoadPropertyFile.loadAFTProperties(latitude, longitude);
-	//
-	// HashMap<String, String> hm = new HashMap<String, String>();
-	// hm.put("AFT_DME2_EP_READ_TIMEOUT_MS", "50000");
-	// hm.put("AFT_DME2_ROUNDTRIP_TIMEOUT_MS", "240000");
-	// hm.put("AFT_DME2_EP_CONN_TIMEOUT", "5000");
-	//
-	// try {
-	// DME2Client sender = new DME2Client(new URI(url), 5000L);
-	// sender.setAllowAllHttpReturnCodes(true);
-	// sender.setMethod(methodTypePut);
-	// sender.setSubContext(SubContextPathGetPermitConsumer);
-	// sender.setPayload("");
-	//
-	// sender.addHeader("Content-Type", contenttype);
-	// sender.setCredentials(user, password);
-	// sender.setHeaders(hm);
-	//
-	// System.out.println("Permitting a consumer on topic");
-	// String reply = sender.sendAndWait(5000L);
-	// assertNotNull(reply);
-	// System.out.println("Reply from server = " + reply);
-	//
-	// } catch (DME2Exception e) {
-	// e.printStackTrace();
-	// } catch (URISyntaxException e) {
-	// e.printStackTrace();
-	// } catch (Exception e) {
-	// e.printStackTrace();
-	// }
-	// }
-
-}
diff --git a/src/test/java/com/att/mr/test/dme2/JUnitTestSuite.java b/src/test/java/com/att/mr/test/dme2/JUnitTestSuite.java
deleted file mode 100644
index b3f2683..0000000
--- a/src/test/java/com/att/mr/test/dme2/JUnitTestSuite.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  Copyright © 2017 AT&T Intellectual Property. 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.
- *  You may obtain a copy of the License at
- *        http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
- *******************************************************************************/
-package com.att.mr.test.dme2;
-
-import junit.framework.TestSuite;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-import org.apache.log4j.Logger;
-
-@RunWith(Suite.class)
-@SuiteClasses({ DME2AdminTest.class, DME2ApiKeyTest.class, DME2ConsumerTest.class, DME2ConsumerTest.class,
-		DME2MetricsTest.class, DME2ProducerTest.class, DME2TopicTest.class, })
-public class JUnitTestSuite {
-	private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);
-
-	public static void main(String[] args) {
-		LOGGER.info("Running the test suite");
-		
-		TestSuite tstSuite = new TestSuite();
-		LOGGER.info("Total Test Counts " + tstSuite.countTestCases());
-	}
-
-}
diff --git a/src/test/java/com/att/mr/test/dme2/LoadPropertyFile.java b/src/test/java/com/att/mr/test/dme2/LoadPropertyFile.java
deleted file mode 100644
index a274d68..0000000
--- a/src/test/java/com/att/mr/test/dme2/LoadPropertyFile.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  Copyright © 2017 AT&T Intellectual Property. 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.
- *  You may obtain a copy of the License at
- *        http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
- *******************************************************************************/
-package com.att.mr.test.dme2;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-import org.json.JSONObject;
-
-public class LoadPropertyFile {
-	//private static final Logger LOGGER = Logger.getLogger(LoadPropertyFile.class);
-	private static final EELFLogger LOGGER = EELFManager.getInstance().getLogger(LoadPropertyFile.class);
-
-	static public Properties getPropertyFileDataProducer() {
-		Properties prop = new Properties();
-		LOGGER.info("loading the property file");
-		try {
-			InputStream inputStream = LoadPropertyFile.class.getClassLoader()
-					.getResourceAsStream("dme2testcase.properties");
-			
-			prop.load(inputStream);
-			LOGGER.info("successfully loaded the property file");
-		} catch (IOException e) {
-			LOGGER.error("Error while retrieving API keys: " + e);
-		}
-		return prop;
-	}
-
-	static public void loadAFTProperties(String lat, String longi) {
-		System.setProperty("AFT_LATITUDE", lat);
-		System.setProperty("AFT_LONGITUDE", longi);
-		System.setProperty("AFT_ENVIRONMENT", "AFTUAT");
-		// printProperties();
-		System.out.println("Latitude =" + lat);
-		System.out.println("Longitude =" + longi);
-	}
-
-	static public boolean isValidJsonString(String chkString) {
-		boolean isJson = true;
-		try {
-			new JSONObject(chkString);
-		} catch (Exception e) {
-			isJson = false;
-		}
-		return isJson;
-	}
-}
diff --git a/src/test/java/com/att/mr/test/dme2/TestRunner.java b/src/test/java/com/att/mr/test/dme2/TestRunner.java
deleted file mode 100644
index dce6e6c..0000000
--- a/src/test/java/com/att/mr/test/dme2/TestRunner.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  Copyright © 2017 AT&T Intellectual Property. 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.
- *  You may obtain a copy of the License at
- *        http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
- *******************************************************************************/
-package com.att.mr.test.dme2;
-
-import org.junit.runner.JUnitCore;
-import org.junit.runner.Result;
-import org.junit.runner.notification.Failure;
-import org.apache.log4j.Logger;
-
-public class TestRunner {
-	private static final Logger LOGGER = Logger.getLogger(TestRunner.class);
-
-	public static void main(String[] args) {
-		// TODO Auto-generated method stub
-		Result result = JUnitCore.runClasses(JUnitTestSuite.class);
-		for (Failure failure : result.getFailures()) {
-			LOGGER.info(failure.toString());
-			
-		}
-		LOGGER.info(result.wasSuccessful());
-	}
-
-}
diff --git a/src/test/java/com/att/mr/test/dme2/TopicBeanDME2.java b/src/test/java/com/att/mr/test/dme2/TopicBeanDME2.java
deleted file mode 100644
index 4de5015..0000000
--- a/src/test/java/com/att/mr/test/dme2/TopicBeanDME2.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  Copyright © 2017 AT&T Intellectual Property. 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.
- *  You may obtain a copy of the License at
- *        http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
- *******************************************************************************/
-/**
- * 
- */
-package com.att.mr.test.dme2;
-
-import java.io.Serializable;
-
-public class TopicBeanDME2 implements Serializable {
-
-	private static final long serialVersionUID = -8620390377775457949L;
-	private String topicName;
-	private String description;
-
-	
-	private int partitionCount;
-	private int replicationCount;
-	private boolean transactionEnabled = false;
-
-	public boolean isTransactionEnabled() {
-		return transactionEnabled;
-	}
-
-	public void setTransactionEnabled(boolean transactionEnabled) {
-		this.transactionEnabled = transactionEnabled;
-	}
-
-	public TopicBeanDME2() {
-		super();
-	}
-
-	public TopicBeanDME2(String topicName, String description, int partitionCount, int replicationCount,
-			boolean transactionEnabled) {
-		super();
-		this.topicName = topicName;
-		this.description = description;
-		this.partitionCount = partitionCount;
-		this.replicationCount = replicationCount;
-		this.transactionEnabled = transactionEnabled;
-	}
-
-	public String getTopicName() {
-		return topicName;
-	}
-
-	public void setTopicName(String topicName) {
-		this.topicName = topicName;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public int getPartitionCount() {
-		return partitionCount;
-	}
-
-	public void setPartitionCount(int partitionCount) {
-		this.partitionCount = partitionCount;
-	}
-
-	public int getReplicationCount() {
-		return replicationCount;
-	}
-
-	public void setReplicationCount(int replicationCount) {
-		this.replicationCount = replicationCount;
-	}
-
-}
diff --git a/src/test/java/com/att/nsa/apiServer/metrics/cambria/DMaaPMetricsSenderTest.java b/src/test/java/com/att/nsa/apiServer/metrics/cambria/DMaaPMetricsSenderTest.java
deleted file mode 100644
index 9967036..0000000
--- a/src/test/java/com/att/nsa/apiServer/metrics/cambria/DMaaPMetricsSenderTest.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.apiServer.metrics.cambria;

-

-

-import static org.junit.Assert.assertTrue;

-

-import java.io.File;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.ajsc.filemonitor.AJSCPropertiesMap;

-import com.att.mr.apiServer.metrics.cambria.DMaaPMetricsSender;

-

-public class DMaaPMetricsSenderTest {

-

-	@Before

-	public void setUp() throws Exception {

-		ClassLoader classLoader = getClass().getClassLoader();		

-		AJSCPropertiesMap.refresh(new File(classLoader.getResource("MsgRtrApi.properties").getFile()));

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-	

-	@Test

-	public void testSendPeriodically() {

-		

-		DMaaPMetricsSender sender = new DMaaPMetricsSender(null, "url", "testTopic");

-		try {

-			sender.sendPeriodically(null, null, "testTopic");

-		} catch (org.json.JSONException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			//e.printStackTrace();

-			assertTrue(true);

-		} catch (NoClassDefFoundError e) {

-			// TODO Auto-generated catch block

-			//e.printStackTrace();

-			assertTrue(true);

-		}			

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	@Test

-	public void testSendPeriodically2() {

-		

-		DMaaPMetricsSender sender = new DMaaPMetricsSender(null, "url", "testTopic");

-		try {

-			sender.sendPeriodically(null, null, "url", "testTopic", 2);

-		} catch (org.json.JSONException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			//e.printStackTrace();

-			assertTrue(true);

-		} 	

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	@Test

-	public void testSend() {

-		

-		DMaaPMetricsSender sender = new DMaaPMetricsSender(null, "url", "testTopic");

-		try {

-			sender.send();

-		} catch (org.json.JSONException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			//e.printStackTrace();

-			assertTrue(true);

-		}		

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	@Test

-	public void testRun() {

-		

-		DMaaPMetricsSender sender = new DMaaPMetricsSender(null, "url", "testTopic");

-		try {

-			sender.run();

-		} catch (org.json.JSONException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			//e.printStackTrace();

-			assertTrue(true);

-		}		

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-

-}
\ No newline at end of file
diff --git a/src/test/java/com/att/nsa/apiServer/metrics/cambria/JUnitTestSuite.java b/src/test/java/com/att/nsa/apiServer/metrics/cambria/JUnitTestSuite.java
deleted file mode 100644
index 3e70420..0000000
--- a/src/test/java/com/att/nsa/apiServer/metrics/cambria/JUnitTestSuite.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.apiServer.metrics.cambria;

-

-import junit.framework.TestSuite;

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite;

-import org.junit.runners.Suite.SuiteClasses;

-import org.apache.log4j.Logger;

-

-@RunWith(Suite.class)

-@SuiteClasses({ DMaaPMetricsSenderTest.class})

-public class JUnitTestSuite {

-	private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);

-

-	public static void main(String[] args) {

-		LOGGER.info("Running the test suite");

-		

-		TestSuite tstSuite = new TestSuite();

-		LOGGER.info("Total Test Counts " + tstSuite.countTestCases());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/apiServer/metrics/cambria/TestRunner.java b/src/test/java/com/att/nsa/apiServer/metrics/cambria/TestRunner.java
deleted file mode 100644
index 9040ee8..0000000
--- a/src/test/java/com/att/nsa/apiServer/metrics/cambria/TestRunner.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.apiServer.metrics.cambria;

-

-import org.junit.runner.JUnitCore;

-import org.junit.runner.Result;

-import org.junit.runner.notification.Failure;

-import org.apache.log4j.Logger;

-

-public class TestRunner {

-	private static final Logger LOGGER = Logger.getLogger(TestRunner.class);

-

-	public static void main(String[] args) {

-		// TODO Auto-generated method stub

-		Result result = JUnitCore.runClasses(JUnitTestSuite.class);

-		for (Failure failure : result.getFailures()) {

-			LOGGER.info(failure.toString());

-			

-		}

-		LOGGER.info(result.wasSuccessful());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/CambriaApiExceptionTest.java b/src/test/java/com/att/nsa/cambria/CambriaApiExceptionTest.java
deleted file mode 100644
index f41f33f..0000000
--- a/src/test/java/com/att/nsa/cambria/CambriaApiExceptionTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria;

-

-import static org.junit.Assert.*;

-

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.exception.ErrorResponse;

-

-import java.io.IOException;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-public class CambriaApiExceptionTest {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetErrRes() {

-		

-		int status = 1;

-		String msg = "helloWorld";

-		CambriaApiException cambria = new CambriaApiException(status, msg);

-		

-		cambria.getErrRes();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	@Test

-	public void testSetErrRes() {

-		

-		int status = 1;

-		String msg = "helloWorld";

-		CambriaApiException cambria = new CambriaApiException(status, msg);

-		

-		cambria.setErrRes(new ErrorResponse(200, 0, "OK"));

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/CambriaApiTestCase.java b/src/test/java/com/att/nsa/cambria/CambriaApiTestCase.java
deleted file mode 100644
index cb934af..0000000
--- a/src/test/java/com/att/nsa/cambria/CambriaApiTestCase.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  Copyright © 2017 AT&T Intellectual Property. 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.
- *  You may obtain a copy of the License at
- *        http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
- *******************************************************************************/
-package com.att.nsa.cambria;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-import org.junit.Ignore;
-
-@Ignore
-public class CambriaApiTestCase extends TestCase {
-	
-	@Override
-	protected void setUp() throws Exception {
-		final Map<String, String> argMap = new HashMap<String, String> ();
-		
-		argMap.put("broker.type", "memory");
-		argMap.put("accounts.dao.class", "com.att.nsa.fe3c.dao.memory.MemoryDAOFactory");
-		argMap.put("topic.dao.class", "com.att.nsa.fe3c.dao.memory.MemoryDAOFactory");
-
-		//CambriaApiServer.start(argMap);
-		System.out.println("setUp() complete");
-	}
-	
-	public void tearDown() throws Exception {
-		System.out.println("tearDown() started");
-		//CambriaApiServer.stop();
-		System.out.println("tearDown() complete");
-	}
-}
diff --git a/src/test/java/com/att/nsa/cambria/CambriaApiVersionInfoTest.java b/src/test/java/com/att/nsa/cambria/CambriaApiVersionInfoTest.java
deleted file mode 100644
index b71bf6e..0000000
--- a/src/test/java/com/att/nsa/cambria/CambriaApiVersionInfoTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria;

-

-import static org.junit.Assert.*;

-

-import com.att.dmf.mr.CambriaApiVersionInfo;

-import com.att.dmf.mr.exception.ErrorResponse;

-

-import java.io.IOException;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-public class CambriaApiVersionInfoTest {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetVersion() {

-		CambriaApiVersionInfo.getVersion();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/CambriaRateLimiterTest.java b/src/test/java/com/att/nsa/cambria/CambriaRateLimiterTest.java
deleted file mode 100644
index 8e853d2..0000000
--- a/src/test/java/com/att/nsa/cambria/CambriaRateLimiterTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  Copyright © 2017 AT&T Intellectual Property. 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.
- *  You may obtain a copy of the License at
- *        http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
- *******************************************************************************/
-package com.att.nsa.cambria;
-
-import junit.framework.TestCase;
-
-import org.junit.Test;
-
-import com.att.nsa.apiServer.util.NsaTestClock;
-
-public class CambriaRateLimiterTest 
-{
-	@Test
-	public void testRateLimiter ()
-	{
-		/*final NsaTestClock clock = new NsaTestClock(1, false);
-
-		final String topic = "topic";
-		final String consumerGroup = "group";
-		final String clientId = "id";
-
-		final int window = 5;
-
-		// rate limit: 1 empty call/min avg over 5 minutes, with 10ms delay
-		final CambriaRateLimiter rater = new CambriaRateLimiter ( 1.0, window, 10 );
-		try
-		{
-			// prime with a call to start rate window
-			rater.onCall ( topic, consumerGroup, clientId );
-			rater.onSend ( topic, consumerGroup, clientId, 1 );
-			clock.addMs ( 1000*60*window );
-
-			// rate should now be 0, with a good window
-			for ( int i=0; i<4; i++ )
-			{
-				clock.addMs ( 1000*15 );
-				rater.onCall ( topic, consumerGroup, clientId );
-				rater.onSend ( topic, consumerGroup, clientId, 0 );
-			}
-			// rate is now 0.8 = 4 calls in last 5 minutes = 4/5 = 0.8
-
-			clock.addMs ( 1000*15 );
-			rater.onCall ( topic, consumerGroup, clientId );
-			rater.onSend ( topic, consumerGroup, clientId, 0 );
-				// rate = 1.0 = 5 calls in last 5 mins
-
-			clock.addMs ( 1000 );
-			rater.onCall ( topic, consumerGroup, clientId );
-			rater.onSend ( topic, consumerGroup, clientId, 0 );
-				// rate = 1.2 = 6 calls in last 5 mins, should fire
-
-			fail ( "Should have thrown rate limit exception." );
-		}
-		catch ( CambriaApiException x )
-		{
-			// good
-		}*/
-	}
-}
diff --git a/src/test/java/com/att/nsa/cambria/JUnitTestSuite.java b/src/test/java/com/att/nsa/cambria/JUnitTestSuite.java
deleted file mode 100644
index 9c98524..0000000
--- a/src/test/java/com/att/nsa/cambria/JUnitTestSuite.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria;

-

-import junit.framework.TestSuite;

-

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite;

-import org.junit.runners.Suite.SuiteClasses;

-import org.apache.log4j.Logger;

-

-@RunWith(Suite.class)

-@SuiteClasses({ CambriaApiExceptionTest.class, CambriaApiVersionInfoTest.class, CambriaApiTestCase.class, CambriaRateLimiterTest.class, })

-public class JUnitTestSuite {

-	private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);

-

-	public static void main(String[] args) {

-		LOGGER.info("Running the test suite");

-		

-		TestSuite tstSuite = new TestSuite();

-		LOGGER.info("Total Test Counts " + tstSuite.countTestCases());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/TestRunner.java b/src/test/java/com/att/nsa/cambria/TestRunner.java
deleted file mode 100644
index 24a9bc2..0000000
--- a/src/test/java/com/att/nsa/cambria/TestRunner.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria;

-

-import org.junit.runner.JUnitCore;

-import org.junit.runner.Result;

-import org.junit.runner.notification.Failure;

-import org.apache.log4j.Logger;

-

-public class TestRunner {

-	private static final Logger LOGGER = Logger.getLogger(TestRunner.class);

-

-	public static void main(String[] args) {

-		// TODO Auto-generated method stub

-		Result result = JUnitCore.runClasses(JUnitTestSuite.class);

-		for (Failure failure : result.getFailures()) {

-			LOGGER.info(failure.toString());

-			

-		}

-		LOGGER.info(result.wasSuccessful());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/backends/kafka/CuratorFrameworkImpl.java b/src/test/java/com/att/nsa/cambria/backends/kafka/CuratorFrameworkImpl.java
deleted file mode 100644
index a12e96c..0000000
--- a/src/test/java/com/att/nsa/cambria/backends/kafka/CuratorFrameworkImpl.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.backends.kafka;

-

-import java.util.concurrent.TimeUnit;

-

-import org.apache.curator.CuratorZookeeperClient;

-import org.apache.curator.framework.CuratorFramework;

-import org.apache.curator.framework.WatcherRemoveCuratorFramework;

-import org.apache.curator.framework.api.CreateBuilder;

-import org.apache.curator.framework.api.CuratorListener;

-import org.apache.curator.framework.api.DeleteBuilder;

-import org.apache.curator.framework.api.ExistsBuilder;

-import org.apache.curator.framework.api.GetACLBuilder;

-import org.apache.curator.framework.api.GetChildrenBuilder;

-import org.apache.curator.framework.api.GetConfigBuilder;

-import org.apache.curator.framework.api.GetDataBuilder;

-import org.apache.curator.framework.api.ReconfigBuilder;

-import org.apache.curator.framework.api.RemoveWatchesBuilder;

-import org.apache.curator.framework.api.SetACLBuilder;

-import org.apache.curator.framework.api.SetDataBuilder;

-import org.apache.curator.framework.api.SyncBuilder;

-import org.apache.curator.framework.api.UnhandledErrorListener;

-import org.apache.curator.framework.api.transaction.CuratorMultiTransaction;

-import org.apache.curator.framework.api.transaction.CuratorTransaction;

-import org.apache.curator.framework.api.transaction.TransactionOp;

-import org.apache.curator.framework.imps.CuratorFrameworkState;

-import org.apache.curator.framework.listen.Listenable;

-import org.apache.curator.framework.schema.SchemaSet;

-import org.apache.curator.framework.state.ConnectionStateErrorPolicy;

-import org.apache.curator.framework.state.ConnectionStateListener;

-import org.apache.curator.utils.EnsurePath;

-import org.apache.zookeeper.Watcher;

-import org.apache.zookeeper.server.quorum.flexible.QuorumVerifier;

-

-public class CuratorFrameworkImpl implements CuratorFramework {

-

-	@Override

-	public void blockUntilConnected() throws InterruptedException {

-		// TODO Auto-generated method stub

-		

-	}

-

-	@Override

-	public boolean blockUntilConnected(int arg0, TimeUnit arg1) throws InterruptedException {

-		// TODO Auto-generated method stub

-		return false;

-	}

-

-	@Override

-	public ExistsBuilder checkExists() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public void clearWatcherReferences(Watcher arg0) {

-		// TODO Auto-generated method stub

-		

-	}

-

-	@Override

-	public void close() {

-		// TODO Auto-generated method stub

-		

-	}

-

-	@Override

-	public CreateBuilder create() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public DeleteBuilder delete() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public GetACLBuilder getACL() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public GetChildrenBuilder getChildren() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public Listenable<ConnectionStateListener> getConnectionStateListenable() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public Listenable<CuratorListener> getCuratorListenable() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public GetDataBuilder getData() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public String getNamespace() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public CuratorFrameworkState getState() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public Listenable<UnhandledErrorListener> getUnhandledErrorListenable() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public CuratorZookeeperClient getZookeeperClient() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public CuratorTransaction inTransaction() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public boolean isStarted() {

-		// TODO Auto-generated method stub

-		return false;

-	}

-

-	@Override

-	public EnsurePath newNamespaceAwareEnsurePath(String arg0) {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public CuratorFramework nonNamespaceView() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public SetACLBuilder setACL() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public SetDataBuilder setData() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public void start() {

-		// TODO Auto-generated method stub

-		

-	}

-

-	@Override

-	public SyncBuilder sync() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public void sync(String arg0, Object arg1) {

-		// TODO Auto-generated method stub

-		

-	}

-

-	@Override

-	public CuratorFramework usingNamespace(String arg0) {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public ReconfigBuilder reconfig() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public GetConfigBuilder getConfig() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public CuratorMultiTransaction transaction() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public TransactionOp transactionOp() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public void createContainers(String path) throws Exception {

-		// TODO Auto-generated method stub

-		

-	}

-

-	@Override

-	public RemoveWatchesBuilder watches() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public WatcherRemoveCuratorFramework newWatcherRemoveCuratorFramework() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public ConnectionStateErrorPolicy getConnectionStateErrorPolicy() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public QuorumVerifier getCurrentConfig() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public SchemaSet getSchemaSet() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public boolean isZk34CompatibilityMode() {

-		// TODO Auto-generated method stub

-		return false;

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/backends/kafka/JUnitTestSuite.java b/src/test/java/com/att/nsa/cambria/backends/kafka/JUnitTestSuite.java
deleted file mode 100644
index 54ff469..0000000
--- a/src/test/java/com/att/nsa/cambria/backends/kafka/JUnitTestSuite.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.backends.kafka;

-

-import junit.framework.TestSuite;

-

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite;

-import org.junit.runners.Suite.SuiteClasses;

-import org.apache.log4j.Logger;

-

-@RunWith(Suite.class)

-@SuiteClasses({ KafkaConsumerCacheTest.class, KafkaPublisherTest.class, })

-public class JUnitTestSuite {

-	private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);

-

-	public static void main(String[] args) {

-		LOGGER.info("Running the test suite");

-		

-		TestSuite tstSuite = new TestSuite();

-		LOGGER.info("Total Test Counts " + tstSuite.countTestCases());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/backends/kafka/KafkaConsumerCacheTest.java b/src/test/java/com/att/nsa/cambria/backends/kafka/KafkaConsumerCacheTest.java
deleted file mode 100644
index 06d7b58..0000000
--- a/src/test/java/com/att/nsa/cambria/backends/kafka/KafkaConsumerCacheTest.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.backends.kafka;

-

-import static org.junit.Assert.*;

-

-import java.util.concurrent.ConcurrentHashMap;

-

-import org.apache.curator.framework.CuratorFramework;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-import org.junit.runner.RunWith;

-import org.mockito.Mock;

-import org.mockito.MockitoAnnotations;

-import org.powermock.api.mockito.PowerMockito;

-import org.powermock.modules.junit4.PowerMockRunner;

-import org.powermock.core.classloader.annotations.PrepareForTest;

-

-import com.att.ajsc.filemonitor.AJSCPropertiesMap;

-

-import com.att.dmf.mr.backends.MetricsSet;

-import com.att.dmf.mr.backends.kafka.Kafka011Consumer;

-import com.att.dmf.mr.backends.kafka.KafkaConsumerCache;

-import com.att.dmf.mr.backends.kafka.KafkaConsumerCache.KafkaConsumerCacheException;

-import com.att.dmf.mr.constants.CambriaConstants;

-import com.att.dmf.mr.security.DMaaPAuthenticatorImpl;

-

-@RunWith(PowerMockRunner.class)

-@PrepareForTest({ AJSCPropertiesMap.class })

-public class KafkaConsumerCacheTest {

-	private KafkaConsumerCache kafkaConsumerCache =null;

-	@Mock

-	private ConcurrentHashMap<String, Kafka011Consumer> fConsumers;

-	@Mock

-	private MetricsSet fMetrics;

-

-	@Before

-	public void setUp() throws Exception {

-		MockitoAnnotations.initMocks(this);

-		

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-

-	@Test

-	public void testSweep() {

-		kafkaConsumerCache = new KafkaConsumerCache();

-		PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "kSetting_TouchEveryMs")).thenReturn("100");

-		kafkaConsumerCache.sweep();

-

-	}

-	

-

-	// DOES NOT WORK

-	@Test

-	public void testStartCache() {

-

-		/*

-		 * KafkaConsumerCache kafka = null;

-		 * 

-		 * try { kafka = new KafkaConsumerCache("123", null);

-		 * 

-		 * } catch (NoClassDefFoundError e) { try { kafka.startCache("DMAAP",

-		 * null); } catch (NullPointerException e1) { // TODO Auto-generated

-		 * catch block assertTrue(true); } catch (KafkaConsumerCacheException

-		 * e1) { // TODO Auto-generated catch block e1.printStackTrace(); } }

-		 */

-

-		

-		new CuratorFrameworkImpl();

-		new MetricsSetImpl();

-		KafkaConsumerCache kafka=null;

-		try {

-			kafka = new KafkaConsumerCache();

-			kafka.setfApiId("1");

-			kafka.startCache("DMAAP", null);

-		} catch (NoClassDefFoundError e) {

-

-		} catch (KafkaConsumerCacheException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-

-	}

-

-	@Test

-	public void testGetCuratorFramework() {

-

-		CuratorFramework curator = new CuratorFrameworkImpl();

-		new MetricsSetImpl();

-		try {

-

-		} catch (NoClassDefFoundError e) {

-

-			KafkaConsumerCache.getCuratorFramework(curator);

-		}

-

-	}

-

-	/*

-	 * @Test public void testStopCache() {

-	 * 

-	 * KafkaConsumerCache kafka = null; new CuratorFrameworkImpl(); new

-	 * MetricsSetImpl(); try { kafka = new KafkaConsumerCache("123", null);

-	 * kafka.stopCache(); } catch (NoClassDefFoundError e) {

-	 * 

-	 * }

-	 * 

-	 * }

-	 */

-

-	@Test

-	public void testGetConsumerFor() {

-

-		KafkaConsumerCache kafka = null;

-

-		try {

-			kafka = new KafkaConsumerCache();

-			kafka.getConsumerFor("testTopic", "CG1", "23");

-		} catch (NoClassDefFoundError e) {

-

-		} catch (KafkaConsumerCacheException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-

-	}

-

-	@Test

-	public void testPutConsumerFor() {

-

-		Kafka011Consumer consumer = null;

-		KafkaConsumerCache kafka = null;

-

-		try {

-			kafka = new KafkaConsumerCache();

-

-		} catch (NoClassDefFoundError e) {

-			try {

-				kafka.putConsumerFor("testTopic", "CG1", "23", consumer);

-			} catch (NullPointerException e1) {

-				// TODO Auto-generated catch block

-				assertTrue(true);

-			} catch (KafkaConsumerCacheException e1) {

-				// TODO Auto-generated catch block

-				e1.printStackTrace();

-			}

-		}

-

-	}

-

-	@Test

-	public void testGetConsumers() {

-

-		KafkaConsumerCache kafka = null;

-

-		try {

-			kafka = new KafkaConsumerCache();

-

-		} catch (NoClassDefFoundError e) {

-			try {

-				kafka.getConsumers();

-			} catch (NullPointerException e1) {

-				// TODO Auto-generated catch block

-				assertTrue(true);

-			}

-		}

-

-	}

-

-	@Test

-	public void testDropAllConsumers() {

-

-		KafkaConsumerCache kafka = null;

-		try {

-			kafka = new KafkaConsumerCache();

-

-		} catch (NoClassDefFoundError e) {

-			try {

-				kafka.dropAllConsumers();

-			} catch (NullPointerException e1) {

-				// TODO Auto-generated catch block

-				assertTrue(true);

-			}

-		}

-

-	}

-

-	@Test

-	public void testSignalOwnership() {

-

-		KafkaConsumerCache kafka = null;

-

-		try {

-			kafka = new KafkaConsumerCache();

-			// kafka.signalOwnership("testTopic", "CG1", "23");

-		} catch (NoClassDefFoundError e) {

-			try {

-				kafka.signalOwnership("testTopic", "CG1", "23");

-			} catch (KafkaConsumerCacheException e1) {

-				// TODO Auto-generated catch block

-				e.printStackTrace();

-			} catch (NullPointerException e1) {

-				// TODO Auto-generated catch block

-				// assertTrue(true);

-				e1.printStackTrace();

-			}

-

-		}

-

-		// assertTrue(true);

-	}

-

-	@Test

-	public void testDropConsumer() {

-

-		KafkaConsumerCache kafka = null;

-

-		try {

-			kafka = new KafkaConsumerCache();

-			// kafka.dropConsumer("testTopic", "CG1", "23");

-		} catch (NoClassDefFoundError e) {

-			try {

-				kafka.dropConsumer("testTopic", "CG1", "23");

-			} catch (NullPointerException e1) {

-				// TODO Auto-generated catch block

-				assertTrue(true);

-			}

-		}

-

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/backends/kafka/KafkaPublisherTest.java b/src/test/java/com/att/nsa/cambria/backends/kafka/KafkaPublisherTest.java
deleted file mode 100644
index 3673845..0000000
--- a/src/test/java/com/att/nsa/cambria/backends/kafka/KafkaPublisherTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.backends.kafka;

-

-import static org.junit.Assert.assertTrue;

-

-import java.io.File;

-import java.io.IOException;

-import java.util.ArrayList;

-import java.util.List;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.ClassRule;

-import org.junit.Test;

-

-import com.att.ajsc.filemonitor.AJSCPropertiesMap;

-import com.att.dmf.mr.backends.Publisher.message;

-import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting;

-

-import kafka.common.FailedToSendMessageException;

-import kafka.producer.KeyedMessage;

-

-public class KafkaPublisherTest {

-	

-	

-

-	/*@Before

-	public void setUp() throws Exception {

-		ClassLoader classLoader = getClass().getClassLoader();		

-		AJSCPropertiesMap.refresh(new File(classLoader.getResource("MsgRtrApi.properties").getFile()));

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testSendMessages() {

-

-		String topic = "testTopic";

-

-		KafkaPublisher kafka = null;

-		try {

-			kafka = new KafkaPublisher(null);

-			

-		} catch (missingReqdSetting e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (NoClassDefFoundError e) {

-			try {

-				kafka.sendMessage(topic, null);

-			} catch (NullPointerException e1) {

-				// TODO Auto-generated catch block

-				assertTrue(true);

-			} catch (FailedToSendMessageException e1) {

-				// TODO Auto-generated catch block

-				e1.printStackTrace();

-			} catch (IOException e1) {

-				// TODO Auto-generated catch block

-				e1.printStackTrace();

-			}

-		} catch (FailedToSendMessageException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-

-	}

-

-	@Test

-	public void testSendBatchMessage() {

-

-		String topic = "testTopic";

-

-		KafkaPublisher kafka = null;

-		ArrayList<KeyedMessage<String, String>> kms = null;

-		try {

-			kafka = new KafkaPublisher(null);

-			

-		} catch (missingReqdSetting e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (NoClassDefFoundError e) {

-			try {

-				kafka.sendBatchMessage(topic, kms);

-			} catch (NullPointerException e1) {

-				// TODO Auto-generated catch block

-				assertTrue(true);

-			} catch (IOException e1) {

-				// TODO Auto-generated catch block

-				e1.printStackTrace();

-			}

-		} catch (FailedToSendMessageException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-

-	}

-	

-	@Test

-	public void sendMessages() {

-

-		String topic = "testTopic";

-		

-		List<message> msgs = null;

-

-		KafkaPublisher kafka = null;

-		//ArrayList<KeyedMessage<String, String>> kms = null;

-		try {

-			kafka = new KafkaPublisher(null);

-			

-		} catch (missingReqdSetting e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (NoClassDefFoundError e) {

-			try {

-				kafka.sendMessages(topic, msgs);

-			} catch (NullPointerException e1) {

-				// TODO Auto-generated catch block

-				assertTrue(true);

-			} catch (FailedToSendMessageException e1) {

-				// TODO Auto-generated catch block

-				e1.printStackTrace();

-			} catch (IOException e1) {

-				// TODO Auto-generated catch block

-				e1.printStackTrace();

-			}

-		} catch (FailedToSendMessageException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-

-	}*/

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/backends/kafka/MetricsSetImpl.java b/src/test/java/com/att/nsa/cambria/backends/kafka/MetricsSetImpl.java
deleted file mode 100644
index b5f7b74..0000000
--- a/src/test/java/com/att/nsa/cambria/backends/kafka/MetricsSetImpl.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.backends.kafka;

-

-import java.util.List;

-import java.util.Map;

-

-import org.json.JSONObject;

-

-import com.att.dmf.mr.backends.MetricsSet;

-import com.att.nsa.metrics.CdmMeasuredItem;

-

-public class MetricsSetImpl implements MetricsSet {

-

-	@Override

-	public List<? extends CdmMetricEntry> getEntries() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public CdmMeasuredItem getItem(String arg0) {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public Map<String, CdmMeasuredItem> getItems() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public void putItem(String arg0, CdmMeasuredItem arg1) {

-		// TODO Auto-generated method stub

-		

-	}

-

-	@Override

-	public void removeItem(String arg0) {

-		// TODO Auto-generated method stub

-		

-	}

-

-	@Override

-	public int size() {

-		// TODO Auto-generated method stub

-		return 0;

-	}

-

-	@Override

-	public JSONObject toJson() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public void setupCambriaSender() {

-		// TODO Auto-generated method stub

-		

-	}

-

-	@Override

-	public void onRouteComplete(String name, long durationMs) {

-		// TODO Auto-generated method stub

-		

-	}

-

-	@Override

-	public void publishTick(int amount) {

-		// TODO Auto-generated method stub

-		

-	}

-

-	@Override

-	public void consumeTick(int amount) {

-		// TODO Auto-generated method stub

-		

-	}

-

-	@Override

-	public void onKafkaConsumerCacheMiss() {

-		// TODO Auto-generated method stub

-		

-	}

-

-	@Override

-	public void onKafkaConsumerCacheHit() {

-		// TODO Auto-generated method stub

-		

-	}

-

-	@Override

-	public void onKafkaConsumerClaimed() {

-		// TODO Auto-generated method stub

-		

-	}

-

-	@Override

-	public void onKafkaConsumerTimeout() {

-		// TODO Auto-generated method stub

-		

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/backends/kafka/TestRunner.java b/src/test/java/com/att/nsa/cambria/backends/kafka/TestRunner.java
deleted file mode 100644
index 53ea31b..0000000
--- a/src/test/java/com/att/nsa/cambria/backends/kafka/TestRunner.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.backends.kafka;

-

-import org.junit.runner.JUnitCore;

-import org.junit.runner.Result;

-import org.junit.runner.notification.Failure;

-import org.apache.log4j.Logger;

-

-public class TestRunner {

-	private static final Logger LOGGER = Logger.getLogger(TestRunner.class);

-

-	public static void main(String[] args) {

-		// TODO Auto-generated method stub

-		Result result = JUnitCore.runClasses(JUnitTestSuite.class);

-		for (Failure failure : result.getFailures()) {

-			LOGGER.info(failure.toString());

-			

-		}

-		LOGGER.info(result.wasSuccessful());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/backends/memory/JUnitTestSuite.java b/src/test/java/com/att/nsa/cambria/backends/memory/JUnitTestSuite.java
deleted file mode 100644
index fc11552..0000000
--- a/src/test/java/com/att/nsa/cambria/backends/memory/JUnitTestSuite.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.backends.memory;

-

-import junit.framework.TestSuite;

-

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite;

-import org.junit.runners.Suite.SuiteClasses;

-import org.apache.log4j.Logger;

-

-@RunWith(Suite.class)

-@SuiteClasses({ MemoryConsumerFactoryTest.class, MemoryMetaBrokerTest.class, MemoryQueueTest.class, 

-	MemoryQueuePublisherTest.class,  MessageLoggerTest.class, })

-public class JUnitTestSuite {

-	private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);

-

-	public static void main(String[] args) {

-		LOGGER.info("Running the test suite");

-		

-		TestSuite tstSuite = new TestSuite();

-		LOGGER.info("Total Test Counts " + tstSuite.countTestCases());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/backends/memory/MemoryConsumerFactoryTest.java b/src/test/java/com/att/nsa/cambria/backends/memory/MemoryConsumerFactoryTest.java
deleted file mode 100644
index d6fe6e6..0000000
--- a/src/test/java/com/att/nsa/cambria/backends/memory/MemoryConsumerFactoryTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.backends.memory;

-

-import static org.junit.Assert.*;

-

-import java.io.IOException;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.backends.memory.MemoryConsumerFactory;

-

-public class MemoryConsumerFactoryTest {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetConsumerFor() {

-		MemoryConsumerFactory factory = new MemoryConsumerFactory(null);

-		

-		

-		String topic = "testTopic";

-		String consumerGroupId = "CG1";

-		String clientId = "C1";

-		String remoteHost="remoteHost";

-		int timeoutMs = 1000; 

-		factory.getConsumerFor(topic, consumerGroupId, clientId, timeoutMs,remoteHost);

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	@Test

-	public void testDropCache() {

-		MemoryConsumerFactory factory = new MemoryConsumerFactory(null);

-	

-		factory.dropCache();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	@Test

-	public void testGetConsumers() {

-		MemoryConsumerFactory factory = new MemoryConsumerFactory(null);

-		 

-		factory.getConsumers();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/backends/memory/MemoryMetaBrokerTest.java b/src/test/java/com/att/nsa/cambria/backends/memory/MemoryMetaBrokerTest.java
deleted file mode 100644
index 2c41068..0000000
--- a/src/test/java/com/att/nsa/cambria/backends/memory/MemoryMetaBrokerTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.backends.memory;

-

-import static org.junit.Assert.*;

-

-import java.io.IOException;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.backends.memory.MemoryMetaBroker;

-import com.att.dmf.mr.metabroker.Broker.TopicExistsException;

-

-public class MemoryMetaBrokerTest {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetAllTopics() {

-		MemoryMetaBroker broker = new MemoryMetaBroker(null, null);

-		

-		broker.getAllTopics();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	@Test

-	public void testGeTopic() {

-		MemoryMetaBroker broker = new MemoryMetaBroker(null, null);

-	

-		broker.getTopic("testTopic");

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	@Test

-	public void testCreateTopic() {

-	

-	//uncommenting this gives a Null Pointer Exception	

-		

-		MemoryMetaBroker broker = new MemoryMetaBroker(null, null);

-	

-		int timeoutMs = 1000; 

-		try {

-			broker.createTopic("testTopic","topic for testing", "ABCD123", 1,3, true);

-		} catch (TopicExistsException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}  catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			assertTrue(true);

-		}

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/backends/memory/MemoryQueuePublisherTest.java b/src/test/java/com/att/nsa/cambria/backends/memory/MemoryQueuePublisherTest.java
deleted file mode 100644
index 4522734..0000000
--- a/src/test/java/com/att/nsa/cambria/backends/memory/MemoryQueuePublisherTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.backends.memory;

-

-import static org.junit.Assert.*;

-

-import java.io.IOException;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.backends.memory.MemoryQueuePublisher;

-

-

-public class MemoryQueuePublisherTest {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testSendBatchMessage() {

-		MemoryQueuePublisher publisher = new MemoryQueuePublisher(null, null);

-		

-		try {

-			publisher.sendBatchMessageNew("testTopic", null);

-		} catch (IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	@Test

-	public void testSendMessage() {

-		MemoryQueuePublisher publisher = new MemoryQueuePublisher(null, null);

-

-		try {

-			publisher.sendMessage("testTopic", null);

-		} catch (IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			assertTrue(true);

-		}

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	@Test

-	public void testSendMessages() {

-		MemoryQueuePublisher publisher = new MemoryQueuePublisher(null, null);

-		

-

-		try {

-			publisher.sendMessages("testTopic", null);

-		} catch (IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			assertTrue(true);

-		}

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/backends/memory/MemoryQueueTest.java b/src/test/java/com/att/nsa/cambria/backends/memory/MemoryQueueTest.java
deleted file mode 100644
index 637add2..0000000
--- a/src/test/java/com/att/nsa/cambria/backends/memory/MemoryQueueTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.backends.memory;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.backends.memory.MemoryQueue;

-

-

-public class MemoryQueueTest {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testCreateTopic() {

-		MemoryQueue queue = new MemoryQueue();

-		 

-		queue.createTopic("testTopic");

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-	@Test

-	public void testRemoveTopic() {

-		MemoryQueue queue = new MemoryQueue();

-		 

-		queue.removeTopic("testTopic");

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	@Test

-	public void testPut() {

-		MemoryQueue queue = new MemoryQueue();

-		 

-		try {

-			queue.put("testTopic", null);

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			assertTrue(true);

-		}

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	@Test

-	public void testGet() {

-		MemoryQueue queue = new MemoryQueue();

-		 

-		queue.get("testTopic", "consumer");

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/backends/memory/MessageLoggerTest.java b/src/test/java/com/att/nsa/cambria/backends/memory/MessageLoggerTest.java
deleted file mode 100644
index 81e620c..0000000
--- a/src/test/java/com/att/nsa/cambria/backends/memory/MessageLoggerTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.backends.memory;

-

-import static org.junit.Assert.*;

-

-import java.io.IOException;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.backends.memory.MessageLogger;

-

-

-public class MessageLoggerTest {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testSendMessage() {

-		MessageLogger dropper = new MessageLogger();

-		

-		try {

-			dropper.sendMessage("testTopic", null);

-		} catch (IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			assertTrue(true);

-		}

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	@Test

-	public void testSendMessages() {

-		MessageLogger dropper = new MessageLogger();

-		 

-		try {

-			dropper.sendMessages("testTopic", null);

-		} catch (IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			assertTrue(true);

-		}

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	@Test

-	public void testSendBatchMessage() {

-		MessageLogger dropper = new MessageLogger();

-		

-		try {

-			dropper.sendBatchMessageNew("testTopic", null);

-		} catch (IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

-

-

-

-

diff --git a/src/test/java/com/att/nsa/cambria/backends/memory/TestRunner.java b/src/test/java/com/att/nsa/cambria/backends/memory/TestRunner.java
deleted file mode 100644
index 2c75929..0000000
--- a/src/test/java/com/att/nsa/cambria/backends/memory/TestRunner.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.backends.memory;

-

-import org.junit.runner.JUnitCore;

-import org.junit.runner.Result;

-import org.junit.runner.notification.Failure;

-import org.apache.log4j.Logger;

-

-public class TestRunner {

-	private static final Logger LOGGER = Logger.getLogger(TestRunner.class);

-

-	public static void main(String[] args) {

-		// TODO Auto-generated method stub

-		Result result = JUnitCore.runClasses(JUnitTestSuite.class);

-		for (Failure failure : result.getFailures()) {

-			LOGGER.info(failure.toString());

-			

-		}

-		LOGGER.info(result.wasSuccessful());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest.java b/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest.java
deleted file mode 100644
index 7fa2bfd..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-import com.att.dmf.mr.beans.ApiKeyBean;

-import com.att.nsa.metrics.CdmMetricsRegistry;

-

-import java.io.IOException;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-public class ApiKeyBeanTest {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetEmail() {

-		

-		ApiKeyBean bean = new ApiKeyBean("hs647a@att.com", "testing bean");

-		

-		bean.getEmail();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest2.java b/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest2.java
deleted file mode 100644
index 763c2e7..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest2.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-import com.att.dmf.mr.beans.ApiKeyBean;

-import com.att.nsa.metrics.CdmMetricsRegistry;

-

-import java.io.IOException;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-public class ApiKeyBeanTest2 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testSetEmail() {

-		

-		ApiKeyBean bean = new ApiKeyBean("hs647a@att.com", "testing bean");

-		

-		bean.setEmail("rs857c@att.com");

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest3.java b/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest3.java
deleted file mode 100644
index 27f7c15..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest3.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-import com.att.dmf.mr.beans.ApiKeyBean;

-import com.att.nsa.metrics.CdmMetricsRegistry;

-

-import java.io.IOException;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-public class ApiKeyBeanTest3 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetDescription() {

-		

-		ApiKeyBean bean = new ApiKeyBean("hs647a@att.com", "testing bean");

-		

-		bean.getDescription();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest4.java b/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest4.java
deleted file mode 100644
index 6191c70..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest4.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-import com.att.dmf.mr.beans.ApiKeyBean;

-import com.att.nsa.metrics.CdmMetricsRegistry;

-

-import java.io.IOException;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-public class ApiKeyBeanTest4 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testSetDescription() {

-		

-		ApiKeyBean bean = new ApiKeyBean("hs647a@att.com", "testing bean");

-		

-		bean.setDescription("new testing description");

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest5.java b/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest5.java
deleted file mode 100644
index 99fc9aa..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest5.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-import com.att.dmf.mr.beans.ApiKeyBean;

-import com.att.nsa.metrics.CdmMetricsRegistry;

-

-import java.io.IOException;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-public class ApiKeyBeanTest5 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetSharedSecret() {

-		

-		ApiKeyBean bean = new ApiKeyBean("hs647a@att.com", "testing bean");

-		

-		bean.getSharedSecret();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest6.java b/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest6.java
deleted file mode 100644
index ca368e3..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest6.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-import com.att.dmf.mr.beans.ApiKeyBean;

-import com.att.nsa.metrics.CdmMetricsRegistry;

-

-import java.io.IOException;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-public class ApiKeyBeanTest6 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetKey() {

-		

-		ApiKeyBean bean = new ApiKeyBean("hs647a@att.com", "testing bean");

-		

-		bean.getKey();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/DMaaPCambriaLimiterTest.java b/src/test/java/com/att/nsa/cambria/beans/DMaaPCambriaLimiterTest.java
deleted file mode 100644
index 8c3568f..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/DMaaPCambriaLimiterTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.beans.DMaaPCambriaLimiter;

-

-public class DMaaPCambriaLimiterTest {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetSleepMsForRate() {

-		

-	

-		double value = 3;

-		DMaaPCambriaLimiter.getSleepMsForRate(value);

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	@Test

-	public void testOnCall() {

-		

-		DMaaPCambriaLimiter limiter = new DMaaPCambriaLimiter(1,2, 3);

-		try {

-			limiter.onCall("testTopic", "ConsumerGroup1", "client2","remoteHost");

-		} catch (CambriaApiException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	@Test

-	public void testOnSend() {

-		

-		DMaaPCambriaLimiter limiter = new DMaaPCambriaLimiter(3,3, 3);

-		limiter.onSend("testTopic", "consumerGroup1", "client1", 100);

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest.java b/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest.java
deleted file mode 100644
index 784b97b..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.DMaaPContext;

-

-public class DMaaPContextTest {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetBatchID() {

-		

-		DMaaPContext.getBatchID();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest2.java b/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest2.java
deleted file mode 100644
index 88baf58..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest2.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-import javax.servlet.http.HttpServletRequest;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.DMaaPContext;

-

-public class DMaaPContextTest2 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetRequest() {

-		

-		DMaaPContext context = new DMaaPContext();

-		

-		context.getRequest();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest3.java b/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest3.java
deleted file mode 100644
index b6b12b0..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest3.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-import javax.servlet.http.HttpServletRequest;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.DMaaPContext;

-

-public class DMaaPContextTest3 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetResponse() {

-		

-		DMaaPContext context = new DMaaPContext();

-		

-		context.getResponse();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest4.java b/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest4.java
deleted file mode 100644
index 95fbeef..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest4.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-import javax.servlet.http.HttpServletRequest;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-import org.springframework.mock.web.MockHttpServletRequest;

-

-import com.att.dmf.mr.beans.DMaaPContext;

-

-public class DMaaPContextTest4 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetSession() {

-		

-		DMaaPContext context = new DMaaPContext();

-		MockHttpServletRequest request = new MockHttpServletRequest();

-		context.setRequest(request);

-		

-		context.getSession();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest5.java b/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest5.java
deleted file mode 100644
index 2b2c9e1..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest5.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-import javax.servlet.http.HttpServletRequest;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.DMaaPContext;

-

-public class DMaaPContextTest5 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetConfigReader() {

-		

-		DMaaPContext context = new DMaaPContext();

-		

-		context.getConfigReader();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest6.java b/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest6.java
deleted file mode 100644
index b87021d..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest6.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-import javax.servlet.http.HttpServletRequest;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.DMaaPContext;

-

-public class DMaaPContextTest6 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetConsumerRequestTime() {

-		

-		DMaaPContext context = new DMaaPContext();

-		

-		context.getConsumerRequestTime();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/DMaaPKafkaMetaBrokerTest.java b/src/test/java/com/att/nsa/cambria/beans/DMaaPKafkaMetaBrokerTest.java
deleted file mode 100644
index 67ade96..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/DMaaPKafkaMetaBrokerTest.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-package com.att.nsa.cambria.beans;
-
-import static org.junit.Assert.assertTrue;
-
-import org.I0Itec.zkclient.ZkClient;
-import org.I0Itec.zkclient.exception.ZkNoNodeException;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import static org.mockito.Matchers.any;
-
-import java.util.Properties;
-
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import com.att.dmf.mr.CambriaApiException;
-import org.apache.kafka.clients.admin.AdminClient;
-
-import com.att.dmf.mr.beans.DMaaPKafkaMetaBroker;
-import com.att.dmf.mr.constants.CambriaConstants;
-import com.att.dmf.mr.metabroker.Topic;
-import com.att.dmf.mr.metabroker.Broker1.TopicExistsException;
-import com.att.nsa.configs.ConfigDb;
-import com.att.nsa.configs.ConfigDbException;
-import com.att.nsa.configs.ConfigPath;
-
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ AdminClient.class})
-public class DMaaPKafkaMetaBrokerTest {
-
-	@InjectMocks
-	private DMaaPKafkaMetaBroker dMaaPKafkaMetaBroker;
-	@Mock
-	private ZkClient fZk;
-	@Mock
-	private AdminClient fKafkaAdminClient;
-	@Mock
-	private AdminClient client;
-	@Mock
-	private ConfigDb configDb;
-	@Mock
-	ConfigPath fBaseTopicData;
-	@Mock
-	private ZkClient zkClient;
-	@Mock
-	Topic mockTopic;
-
-	@Before
-	public void setUp() {
-		MockitoAnnotations.initMocks(this);
-		PowerMockito.mockStatic(AdminClient.class);
-		//PowerMockito.when(AdminClient.create (any(Properties.class) )).thenReturn(fKafkaAdminClient);
-		
-		//PowerMockito.mockStatic(AdminUtils.class);
-		PowerMockito.when(configDb.parse("/topics")).thenReturn(fBaseTopicData);
-		
-
-	}
-
-	@Test
-	public void testGetAlltopics() {
-		try {
-			dMaaPKafkaMetaBroker.getAllTopics();
-		} catch (ConfigDbException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-	}
-
-	@Test
-	public void testcreateTopic() {
-		try {
-			dMaaPKafkaMetaBroker.createTopic("testtopic", "testtopic", "admin", 1, 1, true);
-		} catch (CambriaApiException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (TopicExistsException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (Exception e) {
-			// TODO Auto-generatee.printStackTrace();
-		}
-
-	}
-	
-
-	@Test
-	public void testcreateTopic_wrongPartition() {
-		try {
-
-			dMaaPKafkaMetaBroker.createTopic("testtopic", "testtopic", "admin", 0, 1, true);
-		} catch (CambriaApiException e) {
-			assertTrue(true);
-		} catch (TopicExistsException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (Exception e) {
-			// TODO Auto-generatee.printStackTrace();
-		}
-
-	}
-
-	@Test
-	public void testcreateTopic_wrongReplica() {
-		try {
-
-			dMaaPKafkaMetaBroker.createTopic("testtopic", "testtopic", "admin", 1, 0, true);
-		} catch (CambriaApiException e) {
-			assertTrue(true);
-		} catch (TopicExistsException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (Exception e) {
-			// TODO Auto-generatee.printStackTrace();
-		}
-
-	}
-
-	@Test
-	public void testcreateTopic_error1() {
-		try {
-			dMaaPKafkaMetaBroker.createTopic("testtopic", "testtopic", "admin", 1, 1, true);
-		} catch (CambriaApiException e) {
-			assertTrue(true);
-		} catch (TopicExistsException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-	}
-
-	@Test
-	public void testcreateTopic_error2() {
-		try {
-			dMaaPKafkaMetaBroker.createTopic("testtopic", "testtopic", "admin", 1, 1, true);
-		} catch (CambriaApiException e) {
-			assertTrue(true);
-		} catch (TopicExistsException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	@Test
-	public void testcreateTopic_error3() {
-		try {
-			dMaaPKafkaMetaBroker.createTopic("testtopic", "testtopic", "admin", 1, 1, true);
-		} catch (CambriaApiException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (TopicExistsException e) {
-			assertTrue(true);
-
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-	}
-
-	@Test
-	public void testDeleteTopic() {
-		try {
-			dMaaPKafkaMetaBroker.deleteTopic("testtopic");
-		} catch (CambriaApiException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (TopicExistsException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		assertTrue(true);
-
-	}
-
-	@Test
-	public void testDeleteTopic_error1() {
-		try {
-			dMaaPKafkaMetaBroker.deleteTopic("testtopic");
-		} catch (CambriaApiException e) {
-			assertTrue(true);
-		} catch (TopicExistsException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-	}
-
-	@Test
-	public void testDeleteTopic_error2() {
-		try {
-			dMaaPKafkaMetaBroker.deleteTopic("testtopic");
-		} catch (CambriaApiException e) {
-			assertTrue(true);
-		} catch (TopicExistsException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-	}
-
-	@Test
-	public void testDeleteTopic_error3() {
-		try {
-			dMaaPKafkaMetaBroker.deleteTopic("testtopic");
-		} catch (CambriaApiException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (TopicExistsException e) {
-			assertTrue(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-	}
-
-}
diff --git a/src/test/java/com/att/nsa/cambria/beans/JUnitTestSuite.java b/src/test/java/com/att/nsa/cambria/beans/JUnitTestSuite.java
deleted file mode 100644
index e90675e..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/JUnitTestSuite.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import junit.framework.TestSuite;

-

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite;

-import org.junit.runners.Suite.SuiteClasses;

-import org.apache.log4j.Logger;

-

-@RunWith(Suite.class)

-@SuiteClasses({  ApiKeyBeanTest.class, ApiKeyBeanTest2.class, ApiKeyBeanTest3.class, ApiKeyBeanTest4.class, ApiKeyBeanTest5.class, ApiKeyBeanTest6.class, 

-	DMaaPCambriaLimiterTest.class, DMaaPContextTest.class, DMaaPContextTest2.class, 

-	DMaaPContextTest3.class,DMaaPContextTest4.class,DMaaPContextTest5.class,DMaaPContextTest6.class,

-	LogDetailsTest.class, LogDetailsTest2.class,LogDetailsTest3.class,LogDetailsTest4.class,LogDetailsTest5.class,LogDetailsTest6.class,

-	LogDetailsTest7.class,LogDetailsTest8.class,LogDetailsTest9.class,LogDetailsTest10.class,LogDetailsTest11.class,LogDetailsTest12.class,

-	LogDetailsTest13.class,LogDetailsTest14.class,LogDetailsTest15.class,LogDetailsTest16.class, TopicBeanTest.class,TopicBeanTest2.class,TopicBeanTest3.class,

-	TopicBeanTest4.class,TopicBeanTest5.class,TopicBeanTest6.class,TopicBeanTest7.class,TopicBeanTest8.class,TopicBeanTest9.class,TopicBeanTest10.class,})

-

-public class JUnitTestSuite {

-	private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);

-

-	public static void main(String[] args) {

-		LOGGER.info("Running the test suite");

-		

-		TestSuite tstSuite = new TestSuite();

-		LOGGER.info("Total Test Counts " + tstSuite.countTestCases());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest.java
deleted file mode 100644
index e7c2173..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.LogDetails;

-

-public class LogDetailsTest {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetPublisherId() {

-		

-		LogDetails details = new LogDetails();

-		

-		details.getPublisherId();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	@Test

-	public void testGetPublisherLogDetails(){

-		

-		LogDetails details = new LogDetails();

-		details.setTotalMessageCount(1);

-		details.setConsumeTimestamp("02-27-1018");

-		details.setSubscriberGroupId("1");

-		details.setSubscriberId("1");

-		assertEquals(details.getTotalMessageCount(),1);

-		assertEquals(details.getConsumeTimestamp(),"02-27-1018");

-		assertEquals(details.getSubscriberId(),"1");

-		assertEquals(details.getSubscriberGroupId(),"1");

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest10.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest10.java
deleted file mode 100644
index 44a6e45..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest10.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.LogDetails;

-

-public class LogDetailsTest10 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetPublishTimestamp() {

-		

-		LogDetails details = new LogDetails();

-		

-		details.getPublishTimestamp();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest11.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest11.java
deleted file mode 100644
index 3a935e6..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest11.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.LogDetails;

-

-public class LogDetailsTest11 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetMessageLengthInBytes() {

-		

-		LogDetails details = new LogDetails();

-		

-		details.getMessageLengthInBytes();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest12.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest12.java
deleted file mode 100644
index 1b2b3f5..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest12.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.LogDetails;

-

-public class LogDetailsTest12 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetConsumeTimestamp() {

-		

-		LogDetails details = new LogDetails();

-		

-		details.getConsumeTimestamp();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest13.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest13.java
deleted file mode 100644
index a30112e..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest13.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.LogDetails;

-

-public class LogDetailsTest13 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetTotalMessageCount() {

-		

-		LogDetails details = new LogDetails();

-		

-		details.getTotalMessageCount();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest14.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest14.java
deleted file mode 100644
index b04573d..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest14.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.LogDetails;

-

-public class LogDetailsTest14 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testIsTransactionEnabled() {

-		

-		LogDetails details = new LogDetails();

-		

-		details.isTransactionEnabled();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest15.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest15.java
deleted file mode 100644
index 8bbbb28..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest15.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.LogDetails;

-

-public class LogDetailsTest15 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetTransactionIdTs() {

-		

-		LogDetails details = new LogDetails();

-		

-		details.getTransactionIdTs();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest16.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest16.java
deleted file mode 100644
index eef7322..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest16.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.LogDetails;

-

-public class LogDetailsTest16 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetServerIp() {

-		

-		LogDetails details = new LogDetails();

-		

-		details.getServerIp();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest17.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest17.java
deleted file mode 100644
index c19b46d..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest17.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.LogDetails;

-

-public class LogDetailsTest17 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetPublisherLogDetails() {

-		

-		LogDetails details = new LogDetails();

-		

-		details.getPublisherLogDetails();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest18.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest18.java
deleted file mode 100644
index e894ae4..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest18.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.LogDetails;

-

-public class LogDetailsTest18 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetPublisherLogDetails() {

-		

-		LogDetails details = new LogDetails();

-		

-		details.getPublisherLogDetails();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest2.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest2.java
deleted file mode 100644
index acb818d..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest2.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.LogDetails;

-

-public class LogDetailsTest2 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetTransactionId() {

-		

-		LogDetails details = new LogDetails();

-		

-		details.getTransactionId();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest3.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest3.java
deleted file mode 100644
index b9b664d..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest3.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.LogDetails;

-

-public class LogDetailsTest3 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetTopicId() {

-		

-		LogDetails details = new LogDetails();

-		

-		details.getTopicId();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest4.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest4.java
deleted file mode 100644
index b17aadc..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest4.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.LogDetails;

-

-public class LogDetailsTest4 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetSubscriberGroupId() {

-		

-		LogDetails details = new LogDetails();

-		

-		details.getSubscriberGroupId();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest5.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest5.java
deleted file mode 100644
index 3beeab8..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest5.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.LogDetails;

-

-public class LogDetailsTest5 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetSubscriberId() {

-		

-		LogDetails details = new LogDetails();

-		

-		details.getSubscriberId();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest6.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest6.java
deleted file mode 100644
index 98d85d8..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest6.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.LogDetails;

-

-public class LogDetailsTest6 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetPublisherIp() {

-		

-		LogDetails details = new LogDetails();

-		

-		details.getPublisherIp();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest7.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest7.java
deleted file mode 100644
index 8753762..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest7.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.LogDetails;

-

-public class LogDetailsTest7 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetMessageBatchId() {

-		

-		LogDetails details = new LogDetails();

-		

-		details.getMessageBatchId();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest8.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest8.java
deleted file mode 100644
index d88ed11..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest8.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.LogDetails;

-

-public class LogDetailsTest8 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetMessageTimestamp() {

-		

-		LogDetails details = new LogDetails();

-		

-		details.getMessageTimestamp();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest9.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest9.java
deleted file mode 100644
index b47b152..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest9.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.LogDetails;

-

-public class LogDetailsTest9 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetMessageSequence() {

-		

-		LogDetails details = new LogDetails();

-		

-		details.getMessageSequence();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/TestRunner.java b/src/test/java/com/att/nsa/cambria/beans/TestRunner.java
deleted file mode 100644
index 25eb3c4..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/TestRunner.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import org.junit.runner.JUnitCore;

-import org.junit.runner.Result;

-import org.junit.runner.notification.Failure;

-import org.apache.log4j.Logger;

-

-public class TestRunner {

-	private static final Logger LOGGER = Logger.getLogger(TestRunner.class);

-

-	public static void main(String[] args) {

-		// TODO Auto-generated method stub

-		Result result = JUnitCore.runClasses(JUnitTestSuite.class);

-		for (Failure failure : result.getFailures()) {

-			LOGGER.info(failure.toString());

-			

-		}

-		LOGGER.info(result.wasSuccessful());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest.java b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest.java
deleted file mode 100644
index 5a60767..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.TopicBean;

-

-public class TopicBeanTest {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetTopicName() {

-		

-		TopicBean bean = new TopicBean();

-		

-		bean.getTopicName();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest10.java b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest10.java
deleted file mode 100644
index 4ebe601..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest10.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.TopicBean;

-

-public class TopicBeanTest10 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testSetTransactionEnabled() {

-		

-		TopicBean bean = new TopicBean();

-		bean.setTransactionEnabled(true);

-		

-	/*	String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));*/

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest2.java b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest2.java
deleted file mode 100644
index e6958de..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest2.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.TopicBean;

-

-public class TopicBeanTest2 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testSetTopicName() {

-		

-		TopicBean bean = new TopicBean();

-		bean.setTopicName("testTopic");

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest3.java b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest3.java
deleted file mode 100644
index 61dd6f9..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest3.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.TopicBean;

-

-public class TopicBeanTest3 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetPartitionCount() {

-		

-		TopicBean bean = new TopicBean();

-		bean.getPartitionCount();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest4.java b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest4.java
deleted file mode 100644
index 894f959..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest4.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.TopicBean;

-

-public class TopicBeanTest4 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testSetPartitionCount() {

-		

-		TopicBean bean = new TopicBean();

-		bean.setPartitionCount(8);

-		

-	/*	String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));*/

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest5.java b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest5.java
deleted file mode 100644
index bd69e2e..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest5.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.TopicBean;

-

-public class TopicBeanTest5 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetReplicationCount() {

-		

-		TopicBean bean = new TopicBean();

-		bean.getReplicationCount();

-		

-	/*	String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));*/

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest6.java b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest6.java
deleted file mode 100644
index db68525..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest6.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.TopicBean;

-

-public class TopicBeanTest6 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testSetReplicationCount() {

-		

-		TopicBean bean = new TopicBean();

-		bean.setReplicationCount(3);

-		

-	/*	String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));*/

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest7.java b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest7.java
deleted file mode 100644
index 3a6fdb6..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest7.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.TopicBean;

-

-public class TopicBeanTest7 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testIsTransactionEnabled() {

-		

-		TopicBean bean = new TopicBean();

-		bean.isTransactionEnabled();

-		

-	/*	String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));*/

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest8.java b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest8.java
deleted file mode 100644
index 7cf8049..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest8.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.TopicBean;

-

-public class TopicBeanTest8 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetTopicDescription() {

-		

-		TopicBean bean = new TopicBean();

-		bean.getTopicDescription();

-		

-	/*	String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));*/

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest9.java b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest9.java
deleted file mode 100644
index c6487e1..0000000
--- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest9.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.beans;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.TopicBean;

-

-public class TopicBeanTest9 {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testSetTopicDescription() {

-		

-		TopicBean bean = new TopicBean();

-		bean.setTopicDescription("testing topic");

-		

-	/*	String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));*/

-		

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/embed/EmbedConfigurationReader.java b/src/test/java/com/att/nsa/cambria/embed/EmbedConfigurationReader.java
deleted file mode 100644
index 228664b..0000000
--- a/src/test/java/com/att/nsa/cambria/embed/EmbedConfigurationReader.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************

- *  ============LICENSE_START=======================================================

- *  org.onap.dmaap

- *  ================================================================================

- *  Copyright © 2017 AT&T Intellectual Property. 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.

- *  You may obtain a copy of the License at

- *        http://www.apache.org/licenses/LICENSE-2.0

- *  

- *  Unless required by applicable law or agreed to in writing, software

- *  distributed under the License is distributed on an "AS IS" BASIS,

- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- *  See the License for the specific language governing permissions and

- *  limitations under the License.

- *  ============LICENSE_END=========================================================

- *

- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.

- *  

- *******************************************************************************/

-

-package com.att.nsa.cambria.embed;

-

-import java.io.File;

-import java.util.Arrays;

-import java.util.Map;

-import java.util.Properties;

-

-import org.apache.commons.io.FileUtils;

-import org.apache.curator.framework.CuratorFramework;

-

-import com.att.ajsc.filemonitor.AJSCPropertiesMap;

-import com.att.dmf.mr.backends.kafka.KafkaPublisher;

-import com.att.dmf.mr.backends.memory.MemoryMetaBroker;

-import com.att.dmf.mr.backends.memory.MemoryQueue;

-import org.apache.kafka.clients.admin.AdminClient;

-import org.apache.kafka.clients.admin.AdminClientConfig;

-import org.apache.kafka.clients.admin.CreateTopicsResult;

-import org.apache.kafka.clients.admin.NewTopic;

-import org.apache.kafka.common.KafkaFuture;

-import com.att.dmf.mr.beans.DMaaPKafkaConsumerFactory;

-import com.att.dmf.mr.beans.DMaaPKafkaMetaBroker;

-import com.att.dmf.mr.beans.DMaaPMetricsSet;

-import com.att.dmf.mr.beans.DMaaPZkClient;

-import com.att.dmf.mr.beans.DMaaPZkConfigDb;

-import com.att.dmf.mr.constants.CambriaConstants;

-import com.att.dmf.mr.security.DMaaPAuthenticator;

-import com.att.dmf.mr.security.DMaaPAuthenticatorImpl;

-import com.att.dmf.mr.utils.ConfigurationReader;

-import com.att.dmf.mr.utils.DMaaPCuratorFactory;

-import com.att.dmf.mr.utils.PropertyReader;

-import com.att.nsa.security.db.BaseNsaApiDbImpl;

-import com.att.nsa.security.db.simple.NsaSimpleApiKey;

-import com.att.nsa.security.db.simple.NsaSimpleApiKeyFactory;

-

-

-public class EmbedConfigurationReader {

-	private static final String DEFAULT_KAFKA_LOG_DIR = "/kafka_embedded";

-    public static final String TEST_TOPIC = "testTopic";

-    private static final int BROKER_ID = 0;

-    private static final int BROKER_PORT = 5000;

-    private static final String LOCALHOST_BROKER = String.format("localhost:%d", BROKER_PORT);

-

-    private static final String DEFAULT_ZOOKEEPER_LOG_DIR = "/zookeeper";

-    private static final int ZOOKEEPER_PORT = 2000;

-    private static final String ZOOKEEPER_HOST = String.format("localhost:%d", ZOOKEEPER_PORT);

-

-    private static final String groupId = "groupID";

-    String dir;

-    private  AdminClient fKafkaAdminClient;

-    KafkaLocal kafkaLocal;

-	

-	public void setUp() throws Exception {

-		

-		ClassLoader classLoader = getClass().getClassLoader();		

-		AJSCPropertiesMap.refresh(new File(classLoader.getResource(CambriaConstants.msgRtr_prop).getFile()));

-		

-		Properties kafkaProperties;

-        Properties zkProperties;

-

-        try {

-            //load properties

-        	dir = new File(classLoader.getResource(CambriaConstants.msgRtr_prop).getFile()).getParent();

-            kafkaProperties = getKafkaProperties(dir + DEFAULT_KAFKA_LOG_DIR, BROKER_PORT, BROKER_ID);

-            zkProperties = getZookeeperProperties(ZOOKEEPER_PORT,dir + DEFAULT_ZOOKEEPER_LOG_DIR);

-

-            //start kafkaLocalServer

-            kafkaLocal = new KafkaLocal(kafkaProperties, zkProperties);

-            

-            Map<String, String> map = com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperties(CambriaConstants.msgRtr_prop);

-            map.put(CambriaConstants.kSetting_ZkConfigDbServers, ZOOKEEPER_HOST);

-            map.put("kafka.client.zookeeper", ZOOKEEPER_HOST);

-            map.put("kafka.metadata.broker.list", LOCALHOST_BROKER);

-            

-            DMaaPZkClient dMaaPZkClient = new DMaaPZkClient(new PropertyReader());

-            

-            final Properties props = new Properties ();

-    	     props.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:9092" );

-    	     props.put("sasl.jaas.config", "org.apache.kafka.common.security.plain.PlainLoginModule required username='admin' password='admin_secret'");

-    	  	 props.put(AdminClientConfig.SECURITY_PROTOCOL_CONFIG, "SASL_PLAINTEXT");	     

-    	     props.put("sasl.mechanism", "PLAIN");

-    	     fKafkaAdminClient = AdminClient.create ( props );

-    	     

-           // if(!AdminUtils.topicExists(dMaaPZkClient, TEST_TOPIC))

-            //	AdminUtils.createTopic(dMaaPZkClient, TEST_TOPIC, 3, 1, new Properties());

-    	     final NewTopic topicRequest = new NewTopic ( TEST_TOPIC, 3, new Integer(1).shortValue () );

-			 fKafkaAdminClient.createTopics ( Arrays.asList ( topicRequest ) );

-            Thread.sleep(5000);

-        } catch (Exception e){

-            e.printStackTrace(System.out);

-        }	

-	}

-	

-	private static Properties getKafkaProperties(String logDir, int port, int brokerId) {

-        Properties properties = new Properties();

-        properties.put("port", port + "");

-        properties.put("broker.id", brokerId + "");

-        properties.put("log.dir", logDir);

-        properties.put("zookeeper.connect", ZOOKEEPER_HOST);

-        properties.put("default.replication.factor", "1");

-        properties.put("delete.topic.enable", "true");

-        properties.put("consumer.timeout.ms", -1);

-        return properties;

-    }

-	

-	private static Properties getZookeeperProperties(int port, String zookeeperDir) {

-        Properties properties = new Properties();

-        properties.put("clientPort", port + "");

-        properties.put("dataDir", zookeeperDir);

-        return properties;

-    }

-

-	public void tearDown() throws Exception {

-		DMaaPZkClient dMaaPZkClient = new DMaaPZkClient(new PropertyReader());

-		if(fKafkaAdminClient!=null)

-		fKafkaAdminClient.deleteTopics(Arrays.asList(TEST_TOPIC));

-		//AdminUtils.deleteTopic(dMaaPZkClient, TEST_TOPIC);

-		//dMaaPZkClient.delete(dir + DEFAULT_KAFKA_LOG_DIR);

-		//dMaaPZkClient.delete(dir + DEFAULT_ZOOKEEPER_LOG_DIR);

-		kafkaLocal.stop();

-		FileUtils.cleanDirectory(new File(dir + DEFAULT_KAFKA_LOG_DIR));		

-	}

-

-

-	public ConfigurationReader buildConfigurationReader() throws Exception {

-		

-		setUp();

-		

-		PropertyReader propertyReader = new PropertyReader();

-		DMaaPMetricsSet dMaaPMetricsSet = new DMaaPMetricsSet(propertyReader);

-		DMaaPZkClient dMaaPZkClient = new DMaaPZkClient(propertyReader);

-		DMaaPZkConfigDb dMaaPZkConfigDb = new DMaaPZkConfigDb(dMaaPZkClient, propertyReader);

-		CuratorFramework curatorFramework = DMaaPCuratorFactory.getCurator(new PropertyReader());

-		DMaaPKafkaConsumerFactory dMaaPKafkaConsumerFactory = new DMaaPKafkaConsumerFactory(dMaaPMetricsSet, curatorFramework,null);

-		MemoryQueue memoryQueue = new MemoryQueue();

-		MemoryMetaBroker memoryMetaBroker = new MemoryMetaBroker(memoryQueue, dMaaPZkConfigDb);

-		BaseNsaApiDbImpl<NsaSimpleApiKey> baseNsaApiDbImpl = new BaseNsaApiDbImpl<>(dMaaPZkConfigDb, new NsaSimpleApiKeyFactory());

-		DMaaPAuthenticator<NsaSimpleApiKey> dMaaPAuthenticator = new DMaaPAuthenticatorImpl<>(baseNsaApiDbImpl);

-		KafkaPublisher kafkaPublisher = new KafkaPublisher(propertyReader);

-		DMaaPKafkaMetaBroker dMaaPKafkaMetaBroker = new DMaaPKafkaMetaBroker(propertyReader, dMaaPZkClient, dMaaPZkConfigDb);

-		

-		return new ConfigurationReader(propertyReader, 

-				dMaaPMetricsSet, dMaaPZkClient, dMaaPZkConfigDb, kafkaPublisher, 

-				curatorFramework, dMaaPKafkaConsumerFactory, dMaaPKafkaMetaBroker, 

-				memoryQueue, memoryMetaBroker, baseNsaApiDbImpl, dMaaPAuthenticator);

-		

-	}

-}

diff --git a/src/test/java/com/att/nsa/cambria/embed/KafkaLocal.java b/src/test/java/com/att/nsa/cambria/embed/KafkaLocal.java
deleted file mode 100644
index b71976e..0000000
--- a/src/test/java/com/att/nsa/cambria/embed/KafkaLocal.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.embed;

-

-import java.io.IOException;

-import java.util.Properties;

-

-import kafka.server.KafkaConfig;

-import kafka.server.KafkaServerStartable;

- 

- 

-public class KafkaLocal {

- 

-	public KafkaServerStartable kafka;

-	public ZooKeeperLocal zookeeper;

-	

-	public KafkaLocal(Properties kafkaProperties, Properties zkProperties) throws IOException, InterruptedException{

-		KafkaConfig kafkaConfig = new KafkaConfig(kafkaProperties);

-		

-		//start local zookeeper

-		System.out.println("starting local zookeeper...");

-		zookeeper = new ZooKeeperLocal(zkProperties);

-		System.out.println("done");

-		

-		//start local kafka broker

-		kafka = new KafkaServerStartable(kafkaConfig);

-		System.out.println("starting local kafka broker...");

-		kafka.startup();

-		System.out.println("done");

-	}

-	

-	

-	public void stop(){

-		//stop kafka broker

-		System.out.println("stopping kafka...");

-		kafka.shutdown();

-		System.out.println("done");

-	}

-	

-}
\ No newline at end of file
diff --git a/src/test/java/com/att/nsa/cambria/embed/ZooKeeperLocal.java b/src/test/java/com/att/nsa/cambria/embed/ZooKeeperLocal.java
deleted file mode 100644
index b107826..0000000
--- a/src/test/java/com/att/nsa/cambria/embed/ZooKeeperLocal.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.embed;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-import java.util.Properties;

- 

-import org.apache.zookeeper.server.ServerConfig;

-import org.apache.zookeeper.server.ZooKeeperServerMain;

-import org.apache.zookeeper.server.quorum.QuorumPeerConfig;

- 

-public class ZooKeeperLocal {

-	

-	ZooKeeperServerMain zooKeeperServer;

-	

-	public ZooKeeperLocal(Properties zkProperties) throws FileNotFoundException, IOException{

-		QuorumPeerConfig quorumConfiguration = new QuorumPeerConfig();

-		try {

-		    quorumConfiguration.parseProperties(zkProperties);

-		} catch(Exception e) {

-		    throw new RuntimeException(e);

-		}

- 

-		zooKeeperServer = new ZooKeeperServerMain();

-		final ServerConfig configuration = new ServerConfig();

-		configuration.readFrom(quorumConfiguration);

-		

-		

-		new Thread() {

-		    public void run() {

-		        try {

-		            zooKeeperServer.runFromConfig(configuration);

-		        } catch (IOException e) {

-		            System.out.println("ZooKeeper Failed");

-		            e.printStackTrace(System.err);

-		        }

-		    }

-		}.start();

-	}

-}

diff --git a/src/test/java/com/att/nsa/cambria/exception/DMaaPCambriaExceptionMapperTest.java b/src/test/java/com/att/nsa/cambria/exception/DMaaPCambriaExceptionMapperTest.java
deleted file mode 100644
index b10c565..0000000
--- a/src/test/java/com/att/nsa/cambria/exception/DMaaPCambriaExceptionMapperTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.exception;

-

-import static org.junit.Assert.*;

-import com.att.dmf.mr.exception.DMaaPCambriaExceptionMapper;

-import com.att.dmf.mr.transaction.TransactionObj;

-import com.att.dmf.mr.transaction.impl.DMaaPSimpleTransactionFactory;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-public class DMaaPCambriaExceptionMapperTest {

-

-	@Before

-	public void setUp() throws Exception {

-		DMaaPCambriaExceptionMapper exception = new DMaaPCambriaExceptionMapper();

-	}

-

-	@After

-	public void tearDown() throws Exception {

-		

-	}

-

-	

-	@Test

-	public void testToResponse() {

-		

-		DMaaPCambriaExceptionMapper mapper = new DMaaPCambriaExceptionMapper();

-		

-		try {

-			mapper.toResponse(null);

-		} catch (NullPointerException e) {

-			assertTrue(true);

-		}

-		

-		

-	

-	}

-

-}
\ No newline at end of file
diff --git a/src/test/java/com/att/nsa/cambria/exception/DMaaPErrorMessagesTest.java b/src/test/java/com/att/nsa/cambria/exception/DMaaPErrorMessagesTest.java
deleted file mode 100644
index 1a97bb8..0000000
--- a/src/test/java/com/att/nsa/cambria/exception/DMaaPErrorMessagesTest.java
+++ /dev/null
@@ -1,372 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.exception;

-

-import static org.junit.Assert.*;

-import com.att.dmf.mr.exception.DMaaPErrorMessages;

-import com.att.dmf.mr.transaction.TransactionObj;

-import com.att.dmf.mr.transaction.impl.DMaaPSimpleTransactionFactory;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-public class DMaaPErrorMessagesTest {

-

-	@Before

-	public void setUp() throws Exception {

-		

-	}

-

-	@After

-	public void tearDown() throws Exception {

-		

-	}

-

-	

-	@Test

-	public void testGetMsgSizeExceeds() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.getMsgSizeExceeds();

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testSetMsgSizeExceeds() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.setMsgSizeExceeds("200");

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testGetNotFound() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.getNotFound();

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testSetNotFound() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.setNotFound("not found");

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testGetServerUnav() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.getServerUnav();

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testSetServerUnav() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.setServerUnav("server1");

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testGetMethodNotAllowed() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.getMethodNotAllowed();

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testSetMethodNotAllowed() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.setMethodNotAllowed("server2");

-		assertTrue(true);

-

-	}

-	

-

-	@Test

-	public void testGetBadRequest() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.getBadRequest();

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testSetBadRequest() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.setBadRequest("badRequest");

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testGetNwTimeout() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.getNwTimeout();

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testSetNwTimeout() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.setNwTimeout("12:00:00");

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testGetNotPermitted1() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.getNotPermitted1();

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testSetNotPermitted1() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.setNotPermitted1("not permitted");

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testGetNotPermitted2() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.getNotPermitted2();

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testSetNotPermitted2() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.setNotPermitted2("not permitted2");

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testGetTopicsfailure() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.getTopicsfailure();

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testSetTopicsfailure() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.setTopicsfailure("failure");

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testGetTopicDetailsFail() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.getTopicDetailsFail();

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testSetTopicDetailsFail() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.setTopicDetailsFail("topic details fail");

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testGetCreateTopicFail() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.getCreateTopicFail();

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testSetCreateTopicFail() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.setCreateTopicFail("topic details fail");

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testGetIncorrectJson() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.getIncorrectJson();

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testSetIncorrectJson() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.setIncorrectJson("incorrect Json");

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testGetDeleteTopicFail() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.getDeleteTopicFail();

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testSetDeleteTopicFail() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.setDeleteTopicFail("delete tpic fail");

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testGetConsumeMsgError() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.getConsumeMsgError();

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testSetConsumeMsgError() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.setConsumeMsgError("consume message error");

-		assertTrue(true);

-

-	}

-	

-

-	@Test

-	public void testGetPublishMsgError() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.getPublishMsgError();

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testSetPublishMsgError() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.setPublishMsgError("publish message error");

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testGetPublishMsgCount() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.getPublishMsgCount();

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testSetPublishMsgCount() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.setPublishMsgCount("200");

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testGetAuthFailure() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.getAuthFailure();

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testSetAuthFailure() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.setAuthFailure("auth failure");

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testGetTopicNotExist() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.getTopicNotExist();

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testSetTopicNotExist() {

-		

-		DMaaPErrorMessages msg = new DMaaPErrorMessages();

-		msg.setTopicNotExist("toopic doesn't exist");

-		assertTrue(true);

-

-	}

-	

-	

-}
\ No newline at end of file
diff --git a/src/test/java/com/att/nsa/cambria/exception/DMaaPWebExceptionMapperTest.java b/src/test/java/com/att/nsa/cambria/exception/DMaaPWebExceptionMapperTest.java
deleted file mode 100644
index 0f53416..0000000
--- a/src/test/java/com/att/nsa/cambria/exception/DMaaPWebExceptionMapperTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.exception;

-

-import static org.junit.Assert.*;

-import com.att.dmf.mr.exception.DMaaPWebExceptionMapper;

-import com.att.dmf.mr.transaction.TransactionObj;

-import com.att.dmf.mr.transaction.impl.DMaaPSimpleTransactionFactory;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-public class DMaaPWebExceptionMapperTest {

-

-	@Before

-	public void setUp() throws Exception {

-		

-	}

-

-	@After

-	public void tearDown() throws Exception {

-		

-	}

-

-	

-	@Test

-	public void testToResponse() {

-		

-		DMaaPWebExceptionMapper msg = new DMaaPWebExceptionMapper();

-		

-		try {

-			msg.toResponse(null);

-		} catch (Exception e) {

-			assertTrue(true);

-		}

-		

-	

-

-	}

-		

-}
\ No newline at end of file
diff --git a/src/test/java/com/att/nsa/cambria/exception/ErrorResponseTest.java b/src/test/java/com/att/nsa/cambria/exception/ErrorResponseTest.java
deleted file mode 100644
index aa463a7..0000000
--- a/src/test/java/com/att/nsa/cambria/exception/ErrorResponseTest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.exception;

-

-import static org.junit.Assert.*;

-import com.att.dmf.mr.exception.ErrorResponse;

-import com.att.dmf.mr.transaction.TransactionObj;

-import com.att.dmf.mr.transaction.impl.DMaaPSimpleTransactionFactory;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-public class ErrorResponseTest {

-

-	@Before

-	public void setUp() throws Exception {

-		

-	}

-

-	@After

-	public void tearDown() throws Exception {

-		

-	}

-

-	

-	@Test

-	public void testGetHttpStatusCode() {

-		

-		ErrorResponse resp = new ErrorResponse(200, 500, "no error");

-				

-		resp.getHttpStatusCode();

-		assertTrue(true);

-		

-

-	}

-	

-	@Test

-	public void tesSGetHttpStatusCode() {

-		

-		ErrorResponse resp = new ErrorResponse(200, 500, "no error");

-				

-		resp.setHttpStatusCode(200);

-		assertTrue(true);

-		

-

-	}

-	

-	@Test

-	public void testGetMrErrorCode() {

-		

-		ErrorResponse resp = new ErrorResponse(200, 500, "no error");

-				

-		resp.getMrErrorCode();

-		assertTrue(true);

-		

-

-	}

-	

-	@Test

-	public void testSetMrErrorCode() {

-		

-		ErrorResponse resp = new ErrorResponse(200, 500, "no error");

-				

-		resp.setMrErrorCode(500);

-		assertTrue(true);

-		

-

-	}

-	

-	@Test

-	public void testGetErrorMessage() {

-		

-		ErrorResponse resp = new ErrorResponse(200, 500, "no error");

-				

-		resp.getErrorMessage();

-		assertTrue(true);

-		

-

-	}

-	

-	@Test

-	public void testSetErrorMessage() {

-		

-		ErrorResponse resp = new ErrorResponse(200, 500, "no error");

-				

-		resp.setErrorMessage("no error");

-		assertTrue(true);

-		

-

-	}

-	

-	@Test

-	public void testToString() {

-		

-		ErrorResponse resp = new ErrorResponse(200, 500, "no error");

-				

-		resp.toString();

-		assertTrue(true);

-		

-

-	}

-	

-	@Test

-	public void testGetErrMapperStr1() {

-		

-		ErrorResponse resp = new ErrorResponse(200, 500, "no error");

-				

-		resp.setHelpURL("/help");

-		assertTrue(true);

-		

-

-	}

-	

-	@Test

-	public void testGetErrMapperStr() {

-		

-		ErrorResponse resp = new ErrorResponse(200, 500, "no error");

-				

-		resp.getHelpURL();

-		assertTrue(true);

-		

-

-	}

-	

-		

-		

-}
\ No newline at end of file
diff --git a/src/test/java/com/att/nsa/cambria/exception/JUnitTestSuite.java b/src/test/java/com/att/nsa/cambria/exception/JUnitTestSuite.java
deleted file mode 100644
index 5b3ab7e..0000000
--- a/src/test/java/com/att/nsa/cambria/exception/JUnitTestSuite.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.exception;

-

-import junit.framework.TestSuite;

-

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite;

-import org.junit.runners.Suite.SuiteClasses;

-import org.apache.log4j.Logger;

-

-@RunWith(Suite.class)

-@SuiteClasses({ DMaaPCambriaExceptionMapperTest.class,

-	DMaaPErrorMessagesTest.class, DMaaPWebExceptionMapperTest.class, ErrorResponseTest.class})

-public class JUnitTestSuite {

-	private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);

-

-	public static void main(String[] args) {

-		LOGGER.info("Running the test suite");

-		

-		TestSuite tstSuite = new TestSuite();

-		LOGGER.info("Total Test Counts " + tstSuite.countTestCases());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/exception/TestRunner.java b/src/test/java/com/att/nsa/cambria/exception/TestRunner.java
deleted file mode 100644
index 75cf48d..0000000
--- a/src/test/java/com/att/nsa/cambria/exception/TestRunner.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.exception;

-

-import org.junit.runner.JUnitCore;

-import org.junit.runner.Result;

-import org.junit.runner.notification.Failure;

-import org.apache.log4j.Logger;

-

-public class TestRunner {

-	private static final Logger LOGGER = Logger.getLogger(TestRunner.class);

-

-	public static void main(String[] args) {

-		// TODO Auto-generated method stub

-		Result result = JUnitCore.runClasses(JUnitTestSuite.class);

-		for (Failure failure : result.getFailures()) {

-			LOGGER.info(failure.toString());

-			

-		}

-		LOGGER.info(result.wasSuccessful());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/listener/CambriaServletContextListenerTest.java b/src/test/java/com/att/nsa/cambria/listener/CambriaServletContextListenerTest.java
deleted file mode 100644
index 441064f..0000000
--- a/src/test/java/com/att/nsa/cambria/listener/CambriaServletContextListenerTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-

-package com.att.nsa.cambria.listener;

-

-import static org.junit.Assert.*;

-

-import javax.servlet.ServletContextEvent;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.listener.CambriaServletContextListener;

-

-public class CambriaServletContextListenerTest {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testContextDestroyed() {

-		CambriaServletContextListener listener = new CambriaServletContextListener();

-		try {

-			listener.contextDestroyed(null);

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			assertTrue(true);

-		}

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	@Test

-	public void testContextInitialized() {

-		CambriaServletContextListener listener = new CambriaServletContextListener();

-		

-		try {

-			listener.contextInitialized(null);

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			assertTrue(true);

-		}

-		

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-	

-

-}
\ No newline at end of file
diff --git a/src/test/java/com/att/nsa/cambria/listener/DME2EndPointLoaderTest.java b/src/test/java/com/att/nsa/cambria/listener/DME2EndPointLoaderTest.java
deleted file mode 100644
index 31451b7..0000000
--- a/src/test/java/com/att/nsa/cambria/listener/DME2EndPointLoaderTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.listener;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.listener.DME2EndPointLoader;

-

-public class DME2EndPointLoaderTest {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testPublishEndPoints() {

-		DME2EndPointLoader loader = DME2EndPointLoader.getInstance();

-		

-		

-		try {

-			loader.publishEndPoints();

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			assertTrue(true);

-		}

-		

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	@Test

-	public void testUnPublishEndPoints() {

-		DME2EndPointLoader loader = DME2EndPointLoader.getInstance();

-		

-		

-		try {

-			loader.unPublishEndPoints();

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			assertTrue(true);

-		}

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/listener/JUnitTestSuite.java b/src/test/java/com/att/nsa/cambria/listener/JUnitTestSuite.java
deleted file mode 100644
index fab3777..0000000
--- a/src/test/java/com/att/nsa/cambria/listener/JUnitTestSuite.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-

-package com.att.nsa.cambria.listener;

-

-import junit.framework.TestSuite;

-

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite;

-import org.junit.runners.Suite.SuiteClasses;

-import org.apache.log4j.Logger;

-

-@RunWith(Suite.class)

-@SuiteClasses({ DME2EndPointLoaderTest.class, CambriaServletContextListenerTest.class })

-public class JUnitTestSuite {

-	private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);

-

-	public static void main(String[] args) {

-		LOGGER.info("Running the test suite");

-		

-		TestSuite tstSuite = new TestSuite();

-		LOGGER.info("Total Test Counts " + tstSuite.countTestCases());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/listener/TestRunner.java b/src/test/java/com/att/nsa/cambria/listener/TestRunner.java
deleted file mode 100644
index 68820c3..0000000
--- a/src/test/java/com/att/nsa/cambria/listener/TestRunner.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.listener;

-

-import org.junit.runner.JUnitCore;

-import org.junit.runner.Result;

-import org.junit.runner.notification.Failure;

-import org.apache.log4j.Logger;

-

-public class TestRunner {

-	private static final Logger LOGGER = Logger.getLogger(TestRunner.class);

-

-	public static void main(String[] args) {

-		// TODO Auto-generated method stub

-		Result result = JUnitCore.runClasses(JUnitTestSuite.class);

-		for (Failure failure : result.getFailures()) {

-			LOGGER.info(failure.toString());

-			

-		}

-		LOGGER.info(result.wasSuccessful());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/metabroker/BrokerImpl.java b/src/test/java/com/att/nsa/cambria/metabroker/BrokerImpl.java
deleted file mode 100644
index 9c5e4e0..0000000
--- a/src/test/java/com/att/nsa/cambria/metabroker/BrokerImpl.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.metabroker;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.metabroker.Broker;

-import com.att.dmf.mr.metabroker.Topic;

-import com.att.nsa.configs.ConfigDbException;

-import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;

-

-public class BrokerImpl implements Broker {

-

-	@Override

-	public List<Topic> getAllTopics() throws ConfigDbException {

-		// TODO Auto-generated method stub

-		Topic top = new TopicImplem();

-

-		List<Topic> list = new ArrayList<Topic>();

-

-		for (int i = 0; i < 5; i++) {

-			top = new TopicImplem();

-			list.add(top);

-

-		}

-

-		return null;

-

-	}

-

-	@Override

-	public Topic getTopic(String topic) throws ConfigDbException {

-		// TODO Auto-generated method stub

-		return new TopicImplem();

-	}

-

-	@Override

-	public Topic createTopic(String topic, String description, String ownerApiKey, int partitions, int replicas,

-			boolean transactionEnabled) throws TopicExistsException, CambriaApiException {

-		// TODO Auto-generated method stub

-		return new TopicImplem(topic, description, ownerApiKey, transactionEnabled);

-	}

-

-	@Override

-	public void deleteTopic(String topic) throws AccessDeniedException, CambriaApiException, TopicExistsException {

-		// TODO Auto-generated method stub

-		Topic top = new TopicImplem();

-

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/metabroker/BrokerImplTest.java b/src/test/java/com/att/nsa/cambria/metabroker/BrokerImplTest.java
deleted file mode 100644
index edc5641..0000000
--- a/src/test/java/com/att/nsa/cambria/metabroker/BrokerImplTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-

-package com.att.nsa.cambria.metabroker;

-

-import static org.junit.Assert.*;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.metabroker.Broker.TopicExistsException;

-import com.att.nsa.configs.ConfigDbException;

-import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;

-

-public class BrokerImplTest {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetOwners() {

-

-		try {

-			new BrokerImpl().getAllTopics();

-		} catch (ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-

-		assertTrue(true);

-	}

-

-	@Test

-	public void testGetTopic() {

-

-		try {

-			new BrokerImpl().getTopic("topicName");

-		} catch (ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-

-		assertTrue(true);

-

-	}

-

-	@Test

-	public void testCreateTopic() {

-

-		try {

-			new BrokerImpl().createTopic("topicName", "testing topic", "owner123", 3, 3, true);

-

-		} catch (CambriaApiException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (TopicExistsException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-

-		assertTrue(true);

-

-	}

-

-	@Test

-	public void testDeleteTopic() {

-

-		try {

-			new BrokerImpl().deleteTopic("topicName");

-		} catch (CambriaApiException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (AccessDeniedException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (TopicExistsException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-

-		assertTrue(true);

-

-	}

-}

diff --git a/src/test/java/com/att/nsa/cambria/metabroker/JUnitTestSuite.java b/src/test/java/com/att/nsa/cambria/metabroker/JUnitTestSuite.java
deleted file mode 100644
index 0e2535b..0000000
--- a/src/test/java/com/att/nsa/cambria/metabroker/JUnitTestSuite.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.metabroker;

-

-import junit.framework.TestSuite;

-

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite;

-import org.junit.runners.Suite.SuiteClasses;

-import org.apache.log4j.Logger;

-

-@RunWith(Suite.class)

-@SuiteClasses({ BrokerImplTest.class, TopicImplemTest.class, })

-public class JUnitTestSuite {

-	private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);

-

-	public static void main(String[] args) {

-		LOGGER.info("Running the test suite");

-		

-		TestSuite tstSuite = new TestSuite();

-		LOGGER.info("Total Test Counts " + tstSuite.countTestCases());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/metabroker/TestRunner.java b/src/test/java/com/att/nsa/cambria/metabroker/TestRunner.java
deleted file mode 100644
index e96d9c2..0000000
--- a/src/test/java/com/att/nsa/cambria/metabroker/TestRunner.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.metabroker;

-

-import org.junit.runner.JUnitCore;

-import org.junit.runner.Result;

-import org.junit.runner.notification.Failure;

-import org.apache.log4j.Logger;

-

-public class TestRunner {

-	private static final Logger LOGGER = Logger.getLogger(TestRunner.class);

-

-	public static void main(String[] args) {

-		// TODO Auto-generated method stub

-		Result result = JUnitCore.runClasses(JUnitTestSuite.class);

-		for (Failure failure : result.getFailures()) {

-			LOGGER.info(failure.toString());

-			

-		}

-		LOGGER.info(result.wasSuccessful());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/metabroker/TopicImplTest.java b/src/test/java/com/att/nsa/cambria/metabroker/TopicImplTest.java
deleted file mode 100644
index 67cf60d..0000000
--- a/src/test/java/com/att/nsa/cambria/metabroker/TopicImplTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.metabroker;

-

-public class TopicImplTest {

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/metabroker/TopicImplem.java b/src/test/java/com/att/nsa/cambria/metabroker/TopicImplem.java
deleted file mode 100644
index 9539073..0000000
--- a/src/test/java/com/att/nsa/cambria/metabroker/TopicImplem.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.metabroker;

-

-import java.util.Set;

-

-import com.att.dmf.mr.metabroker.Topic;

-import com.att.nsa.configs.ConfigDbException;

-import com.att.nsa.security.NsaAcl;

-import com.att.nsa.security.NsaApiKey;

-

-public class TopicImplem implements Topic {

-	private String name, owner, description;

-	boolean isTransactionEnabled;

-	private Set<String> set = null;

-	private  NsaAcl readerAcl, writerAcl;

-	

-	public TopicImplem() {

-		name = getName();

-		owner = getOwner();

-		description = getDescription();

-		isTransactionEnabled = true;

-		readerAcl = getReaderAcl();

-		writerAcl = getWriterAcl();

-	}

-	

-	public TopicImplem(String topic, String description, String ownerApiKey, boolean transactionEnabled) {

-		

-		this.name = topic;

-		this.owner = ownerApiKey;

-		this.description = description;

-		isTransactionEnabled = transactionEnabled;

-		

-		

-	}

-	@Override

-	public Set<String> getOwners() {

-		// TODO Auto-generated method stub

-		for (int i = 0; i < 5; i++) {

-			set.add("string" + (i + 1));

-		}

-		return set;

-	}

-

-	@Override

-	public String getName() {

-		// TODO Auto-generated method stub

-		return "testTopic";

-	}

-

-	@Override

-	public String getOwner() {

-		// TODO Auto-generated method stub

-		return "owner";

-	}

-

-	@Override

-	public String getDescription() {

-		// TODO Auto-generated method stub

-		return "topic for testing purposes";

-	}

-

-	@Override

-	public boolean isTransactionEnabled() {

-		// TODO Auto-generated method stub

-		return true;

-	}

-

-	@Override

-	public NsaAcl getReaderAcl() {

-		// TODO Auto-generated method stub

-		return new NsaAcl();

-	}

-

-	@Override

-	public NsaAcl getWriterAcl() {

-		// TODO Auto-generated method stub

-		return new NsaAcl();

-	}

-

-	@Override

-	public void checkUserRead(NsaApiKey user) throws AccessDeniedException {

-		// TODO Auto-generated method stub

-		NsaApiKey u = user;

-	}

-

-	@Override

-	public void checkUserWrite(NsaApiKey user) throws AccessDeniedException {

-		// TODO Auto-generated method stub

-		

-		NsaApiKey u = user;

-	}

-

-	@Override

-	public void permitWritesFromUser(String publisherId, NsaApiKey asUser)

-			throws AccessDeniedException, ConfigDbException {

-		// TODO Auto-generated method stub

-		String id = publisherId;

-		

-	}

-

-	@Override

-	public void denyWritesFromUser(String publisherId, NsaApiKey asUser)

-			throws AccessDeniedException, ConfigDbException {

-		// TODO Auto-generated method stub

-		String id = publisherId;

-		

-	}

-

-	@Override

-	public void permitReadsByUser(String consumerId, NsaApiKey asUser) throws AccessDeniedException, ConfigDbException {

-		// TODO Auto-generated method stub

-		String id = consumerId;

-	}

-

-	@Override

-	public void denyReadsByUser(String consumerId, NsaApiKey asUser) throws AccessDeniedException, ConfigDbException {

-		// TODO Auto-generated method stub

-		String id = consumerId;

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/metabroker/TopicImplemTest.java b/src/test/java/com/att/nsa/cambria/metabroker/TopicImplemTest.java
deleted file mode 100644
index c3ef097..0000000
--- a/src/test/java/com/att/nsa/cambria/metabroker/TopicImplemTest.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.metabroker;

-

-import static org.junit.Assert.*;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.nsa.configs.ConfigDbException;

-import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;

-

-public class TopicImplemTest {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	

-	@Test

-	public void testGetOwners() {

-

-		assertNotNull(new TopicImplem().getOwner());

-

-	}

-	

-	@Test

-	public void testGetName() {

-

-		assertNotNull(new TopicImplem().getName());

-

-	}

-	

-	@Test

-	public void testGetOwner() {

-

-		assertNotNull(new TopicImplem().getOwner());

-

-	}

-	

-	@Test

-	public void testGetDescription() {

-

-		assertNotNull(new TopicImplem().getDescription());

-

-	}

-	

-	@Test

-	public void testIsTransactionEnabled() {

-

-		assertTrue(new TopicImplem().isTransactionEnabled());

-

-	}

-	

-	@Test

-	public void testGetReaderAcl() {

-		new TopicImplem().getReaderAcl();

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testGetWriterAcl() {

-		new TopicImplem().getReaderAcl();

-		assertTrue(true);

-

-	}

-	

-

-	@Test

-	public void testCheckUserRead() {

-		try {

-			new TopicImplem().checkUserRead(null);

-		} catch (AccessDeniedException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testCheckUserWrite() {

-		try {

-			new TopicImplem().checkUserWrite(null);

-		} catch (AccessDeniedException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testPermitWritesFromUser() {

-		try {

-			new TopicImplem().permitWritesFromUser("publisherId", null);

-		} catch (AccessDeniedException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testDenyWritesFromUser() {

-		try {

-			new TopicImplem().denyWritesFromUser("publisherId", null);

-		} catch (AccessDeniedException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testPermitReadsByUser() {

-		try {

-			new TopicImplem().permitReadsByUser("consumerId", null);

-		} catch (AccessDeniedException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testDenyReadsByUser() {

-		try {

-			new TopicImplem().denyReadsByUser("consumerId", null);

-		} catch (AccessDeniedException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		assertTrue(true);

-

-	}

-}

diff --git a/src/test/java/com/att/nsa/cambria/metrics/publisher/CambriaPublisherUtilityTest.java b/src/test/java/com/att/nsa/cambria/metrics/publisher/CambriaPublisherUtilityTest.java
deleted file mode 100644
index 956d27b..0000000
--- a/src/test/java/com/att/nsa/cambria/metrics/publisher/CambriaPublisherUtilityTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.metrics.publisher;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.metrics.publisher.CambriaPublisherUtility;

-

-public class CambriaPublisherUtilityTest {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testEscape() {

-		

-		CambriaPublisherUtility utility = new CambriaPublisherUtility();

-		

-		utility.escape("testTopic");

-		assertTrue(true);

-		

-	}

-	

-	@Test

-	public void testMakeUrl() {

-		

-		CambriaPublisherUtility utility = new CambriaPublisherUtility();

-		

-		utility.makeUrl("testTopic");

-		assertTrue(true);

-		

-	}

-	

-	@Test

-	public void testMakeConsumerUrl() {

-		

-		CambriaPublisherUtility utility = new CambriaPublisherUtility();

-		

-		utility.makeConsumerUrl("testTopic", "CG1", "23");

-		assertTrue(true);

-		

-	}

-

-	@Test

-	public void testCreateHostsList() {

-		

-		CambriaPublisherUtility utility = new CambriaPublisherUtility();

-		

-		try {

-			utility.createHostsList(null);

-		} catch (NullPointerException e) {

-			assertTrue(true);

-		}

-

-			

-	}

-	

-	@Test

-	public void testHostForString() {

-		

-		CambriaPublisherUtility utility = new CambriaPublisherUtility();

-		

-		utility.hostForString("hello");

-		assertTrue(true);

-		

-	}

-}

diff --git a/src/test/java/com/att/nsa/cambria/metrics/publisher/DMaaPCambriaClientFactoryTest.java b/src/test/java/com/att/nsa/cambria/metrics/publisher/DMaaPCambriaClientFactoryTest.java
deleted file mode 100644
index 5916a18..0000000
--- a/src/test/java/com/att/nsa/cambria/metrics/publisher/DMaaPCambriaClientFactoryTest.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.metrics.publisher;

-

-import static org.junit.Assert.*;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.listener.DME2EndPointLoader;

-import com.att.dmf.mr.metrics.publisher.CambriaConsumer;

-import com.att.dmf.mr.metrics.publisher.CambriaPublisherUtility;

-import com.att.dmf.mr.metrics.publisher.DMaaPCambriaClientFactory;

-

-public class DMaaPCambriaClientFactoryTest {

-	

-	private Collection<String> hostSet;

-	

-	private String[] hostSetArray; 

-	@Before

-	public void setUp() throws Exception {

-		hostSet = new ArrayList<String>();

-		

-		hostSetArray = new String[10];

-		

-		for (int i = 0; i < 10; i++) {

-			hostSet.add("host" + (i+1));

-			hostSetArray[i] = "host" + (i+1);

-		}

-		

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testCreateConsumer() {

-		

-		

-		

-		DMaaPCambriaClientFactory.createConsumer("hostList", "testTopic");

-		assertTrue(true);

-		

-	}

-	

-	@Test

-	public void testCreateConsumer2() {

-		

-		

-		try {

-			DMaaPCambriaClientFactory.createConsumer(hostSet, "testTopic");

-		} catch (NullPointerException e) {

-			assertTrue(true);

-		}

-		

-		

-	}

-	

-	@Test

-	public void testCreateConsumer3() {

-		

-		DMaaPCambriaClientFactory.createConsumer(hostSet, "testTopic", "filter");

-		assertTrue(true);

-		

-	}

-	

-	@Test

-	public void testCreateConsumer4() {

-		DMaaPCambriaClientFactory.createConsumer(hostSet, "testTopic", "CG1", "23");

-		assertTrue(true);

-		

-	}

-	

-	@Test

-	public void testCreateConsumer5() {

-		

-		DMaaPCambriaClientFactory.createConsumer(hostSet, "testTopic", "CG1", "23", 100, 20);

-		assertTrue(true);

-		

-	}

-	

-	@Test

-	public void testCreateConsumer6() {

-		

-		

-		DMaaPCambriaClientFactory.createConsumer("hostList", "testTopic", "CG1", "23", 100, 20, "filter", "apikey", "apisecret");

-		assertTrue(true);

-		

-	}

-	

-	@Test

-	public void testCreateConsumer7() {

-		

-		DMaaPCambriaClientFactory.createConsumer(hostSet, "testTopic", "CG1", "23", 100, 20, "filter", "apikey", "apisecret");

-		assertTrue(true);

-		

-	}

-	

-	@Test

-	public void testCreateSimplePublisher() {

-		

-		DMaaPCambriaClientFactory.createSimplePublisher("hostList", "testTopic");

-		assertTrue(true);

-		

-	}

-	

-	@Test

-	public void testCreateBatchingPublisher() {

-		

-		DMaaPCambriaClientFactory.createBatchingPublisher("hostList", "testTopic", 100, 50);

-		assertTrue(true);

-		

-	}

-	

-	@Test

-	public void testCreateBatchingPublisher2() {

-		

-		DMaaPCambriaClientFactory.createBatchingPublisher("hostList", "testTopic", 100, 50, true);

-		assertTrue(true);

-		

-	}

-	

-	@Test

-	public void testCreateBatchingPublisher3() {

-		

-		DMaaPCambriaClientFactory.createBatchingPublisher(hostSetArray, "testTopic", 100, 50, true);

-		assertTrue(true);

-		

-	}

-	

-	@Test

-	public void testCreateBatchingPublisher4() {

-		

-		DMaaPCambriaClientFactory.createBatchingPublisher(hostSet, "testTopic", 100, 50, true);

-		assertTrue(true);

-		

-	}

-	

-	@Test

-	public void $testInject() {

-		

-		DMaaPCambriaClientFactory factory = new DMaaPCambriaClientFactory();

-		factory.$testInject(null);

-		assertTrue(true);

-		

-	}

-	

-}

diff --git a/src/test/java/com/att/nsa/cambria/metrics/publisher/JUnitTestSuite.java b/src/test/java/com/att/nsa/cambria/metrics/publisher/JUnitTestSuite.java
deleted file mode 100644
index 9b8e363..0000000
--- a/src/test/java/com/att/nsa/cambria/metrics/publisher/JUnitTestSuite.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.metrics.publisher;

-

-import junit.framework.TestSuite;

-

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite;

-import org.junit.runners.Suite.SuiteClasses;

-import org.apache.log4j.Logger;

-

-@RunWith(Suite.class)

-@SuiteClasses({ DMaaPCambriaClientFactoryTest.class, CambriaPublisherUtilityTest.class})

-public class JUnitTestSuite {

-	private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);

-

-	public static void main(String[] args) {

-		LOGGER.info("Running the test suite");

-		

-		TestSuite tstSuite = new TestSuite();

-		LOGGER.info("Total Test Counts " + tstSuite.countTestCases());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/metrics/publisher/TestRunner.java b/src/test/java/com/att/nsa/cambria/metrics/publisher/TestRunner.java
deleted file mode 100644
index 3b628d9..0000000
--- a/src/test/java/com/att/nsa/cambria/metrics/publisher/TestRunner.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.metrics.publisher;

-

-import org.junit.runner.JUnitCore;

-import org.junit.runner.Result;

-import org.junit.runner.notification.Failure;

-import org.apache.log4j.Logger;

-

-public class TestRunner {

-	private static final Logger LOGGER = Logger.getLogger(TestRunner.class);

-

-	public static void main(String[] args) {

-		// TODO Auto-generated method stub

-		Result result = JUnitCore.runClasses(JUnitTestSuite.class);

-		for (Failure failure : result.getFailures()) {

-			LOGGER.info(failure.toString());

-			

-		}

-		LOGGER.info(result.wasSuccessful());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/CambriaBaseClientTest.java b/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/CambriaBaseClientTest.java
deleted file mode 100644
index 3242e83..0000000
--- a/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/CambriaBaseClientTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.metrics.publisher.impl;

-

-import static org.junit.Assert.*;

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-

-import com.att.dmf.mr.metrics.publisher.impl.CambriaBaseClient;

-import com.att.eelf.configuration.EELFLogger;

-

-import org.json.JSONArray;

-import org.json.JSONObject;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-public class CambriaBaseClientTest {

-	

-	private CambriaBaseClient client = null;

-	@Before

-	public void setUp() throws Exception {

-		

-		Collection<String> hosts = new ArrayList<String>();

-		

-		for (int i = 0; i < 5; i++) {

-			hosts.add("host"+(i+1));

-		}

-		

-		

-		client = new CambriaBaseClient(hosts, "client1");

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testClose() {

-		client.close();

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	@Test

-	public void testGetLog() {

-		client.getLog();

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	@Test

-	public void testLogTo() {

-		client.logTo(null);

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	public JSONArray getJSONArray() {

-		

-		String[] data = {"stringone", "stringtwo"};

-		JSONArray array = new JSONArray(Arrays.asList(data));

-

-		return array;

-	}

-	

-	@Test

-	public void testJsonArrayToSet() {

-		client.jsonArrayToSet(getJSONArray());

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-}

diff --git a/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/ClockTest.java b/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/ClockTest.java
deleted file mode 100644
index e484722..0000000
--- a/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/ClockTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.metrics.publisher.impl;

-

-import static org.junit.Assert.*;

-

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.metrics.publisher.impl.Clock;

-

-public class ClockTest {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetIt() {

-		

-		Clock.getIt();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	@Test

-	public void testNow() {

-		

-		Clock.now();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	@Test

-	public void testNowImpl() {

-		

-		Clock clock = new Clock();

-		clock.nowImpl();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	@Test

-	public void testRegister() {

-		

-		Clock clock = new Clock();

-		Clock.register(clock);

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/DMaaPCambriaConsumerImplTest.java b/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/DMaaPCambriaConsumerImplTest.java
deleted file mode 100644
index fe034a5..0000000
--- a/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/DMaaPCambriaConsumerImplTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-

-package com.att.nsa.cambria.metrics.publisher.impl;

-

-import static org.junit.Assert.*;

-

-import java.io.IOException;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.List;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.metrics.publisher.impl.DMaaPCambriaConsumerImpl;

-

-public class DMaaPCambriaConsumerImplTest {

-	

-	private DMaaPCambriaConsumerImpl consumer = null; 

-	@Before

-	public void setUp() throws Exception {

-		

-		Collection<String> hosts = new ArrayList<String>();

-		

-		for (int i = 0; i < 5; i++) {

-			hosts.add("host"+(i+1));

-		}

-		consumer = new DMaaPCambriaConsumerImpl(hosts, "testTopic", "consumerGroup1", "1", 2000, 200, "hi", 

-				"9AMFFNIZpusO54oG","6BY86UQcio2LJdgyU7Cwg5oQ");

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testStringToList() {

-		

-		List<String> response = DMaaPCambriaConsumerImpl.stringToList("Hello world, this is a test string");

-		assertNotNull(response);

-		

-		

-	}

-	

-	@Test

-	public void testFetch() {

-		

-		Iterable<String> response = null;

-		boolean flag = true;

-		try {

-			response = consumer.fetch(200, 20);

-		} catch (IOException e) {

-			flag = false;

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		if(flag) {

-			assertNotNull(response);

-		} else {

-			assertTrue(true);

-		}

-		

-	}

-	

-	

-	@Test

-	public void testCreateUrlPath() {

-	

-		String response = consumer.createUrlPath(200, 20);

-		assertNotNull(response);

-	}

-

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisherTest.java b/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisherTest.java
deleted file mode 100644
index 0c2c4ba..0000000
--- a/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisherTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.metrics.publisher.impl;

-

-import static org.junit.Assert.*;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.metrics.publisher.impl.DMaaPCambriaSimplerBatchPublisher;

-

-

-

-public class DMaaPCambriaSimplerBatchPublisherTest {

-	

-	private DMaaPCambriaSimplerBatchPublisher publisher = null;

-	@Before

-	public void setUp() throws Exception {

-		

-		Collection<String> hosts = new ArrayList<String>();

-		

-		for (int i = 0; i < 5; i++) {

-			hosts.add("host"+(i+1));

-		}

-		

-		publisher = new DMaaPCambriaSimplerBatchPublisher.Builder().againstUrls(hosts).onTopic("testTopic")

-					.batchTo(200, 100).compress(true).build();				

-

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testSend() {

-		

-		publisher.send("hello", "test message");

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	@Test

-	public void testClose() {

-		

-		publisher.close();

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-	@Test

-	public void testGetPendingMEssageCount() {

-		

-		publisher.getPendingMessageCount();

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/JUnitTestSuite.java b/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/JUnitTestSuite.java
deleted file mode 100644
index b45e8e2..0000000
--- a/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/JUnitTestSuite.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.metrics.publisher.impl;

-

-import junit.framework.TestSuite;

-

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite;

-import org.junit.runners.Suite.SuiteClasses;

-import org.apache.log4j.Logger;

-

-@RunWith(Suite.class)

-@SuiteClasses({ DMaaPCambriaSimplerBatchPublisherTest.class, ClockTest.class,

-	CambriaBaseClientTest.class, DMaaPCambriaConsumerImplTest.class})

-public class JUnitTestSuite {

-	private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);

-

-	public static void main(String[] args) {

-		LOGGER.info("Running the test suite");

-		

-		TestSuite tstSuite = new TestSuite();

-		LOGGER.info("Total Test Counts " + tstSuite.countTestCases());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/TestRunner.java b/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/TestRunner.java
deleted file mode 100644
index a354678..0000000
--- a/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/TestRunner.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.metrics.publisher.impl;

-

-import org.junit.runner.JUnitCore;

-import org.junit.runner.Result;

-import org.junit.runner.notification.Failure;

-import org.apache.log4j.Logger;

-

-public class TestRunner {

-	private static final Logger LOGGER = Logger.getLogger(TestRunner.class);

-

-	public static void main(String[] args) {

-		// TODO Auto-generated method stub

-		Result result = JUnitCore.runClasses(JUnitTestSuite.class);

-		for (Failure failure : result.getFailures()) {

-			LOGGER.info(failure.toString());

-			

-		}

-		LOGGER.info(result.wasSuccessful());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/resources/CambriaEventSetTest.java b/src/test/java/com/att/nsa/cambria/resources/CambriaEventSetTest.java
deleted file mode 100644
index b9fa1e5..0000000
--- a/src/test/java/com/att/nsa/cambria/resources/CambriaEventSetTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.resources;

-

-import static org.junit.Assert.*;

-

-import java.io.ByteArrayInputStream;

-import java.io.IOException;

-import java.io.InputStream;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.resources.CambriaEventSet;

-import com.att.dmf.mr.resources.CambriaOutboundEventStream;

-

-

-public class CambriaEventSetTest {

-

-	private CambriaOutboundEventStream coes = null;

-	

-	@Before

-	public void setUp() throws Exception {

-	

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testNext() {

-		CambriaEventSet event = null;

-		String str = "contains text to be converted to InputStream";

-		

-		InputStream stream = new ByteArrayInputStream(str.getBytes());

-		try {

-			event = new CambriaEventSet("application/cambria", stream, true, "hi");

-		} catch (Exception e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		

-		try {

-			event.next();

-		} catch (Exception e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		

-		assertTrue(true);

-		

-	}

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/resources/CambriaOutboundEventStreamTest.java b/src/test/java/com/att/nsa/cambria/resources/CambriaOutboundEventStreamTest.java
deleted file mode 100644
index 8310bba..0000000
--- a/src/test/java/com/att/nsa/cambria/resources/CambriaOutboundEventStreamTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.resources;

-

-import static org.junit.Assert.*;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.beans.DMaaPContext;

-import com.att.dmf.mr.constants.CambriaConstants;

-import com.att.dmf.mr.resources.CambriaOutboundEventStream;

-

-public class CambriaOutboundEventStreamTest {

-

-	private CambriaOutboundEventStream coes = null;

-	

-	@Before

-	public void setUp() throws Exception {

-		coes = new CambriaOutboundEventStream.Builder(null).timeout(10).limit(1).filter(CambriaConstants.kNoFilter)

-				.pretty(false).withMeta(true).build();

-		DMaaPContext ctx = new DMaaPContext();

-		//ctx.set...

-		coes.setDmaapContext(ctx);

-		coes.setTopic(null);

-		coes.setTransEnabled(true);

-		coes.setTopicStyle(true);

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetSentCount() {

-		int sentCount = coes.getSentCount();

-		assertTrue("Doesn't match, got " + sentCount, sentCount==0);;

-	}

-

-	@Test

-	public void testWrite() {

-		//fail("Not yet implemented");

-	}

-

-	@Test

-	public void testForEachMessage() {

-		//fail("Not yet implemented");

-	}

-

-	@Test

-	public void testGetDmaapContext() {

-		DMaaPContext ctx = coes.getDmaapContext();

-		

-		assertNotNull(ctx);

-	}

-

-	@Test

-	public void testSetDmaapContext() {

-		DMaaPContext ctx = new DMaaPContext();

-		coes.setDmaapContext(ctx);

-		assertTrue(ctx.equals(coes.getDmaapContext()));

-	}

-

-	@Test

-	public void testGetTopic() {

-		coes.getTopic();

-		assertTrue(true);

-	}

-

-	@Test

-	public void testSetTopic() {

-		//fail("Not yet implemented");

-	}

-

-	@Test

-	public void testSetTopicStyle() {

-		coes.setTopicStyle(true);

-		assertTrue(true);

-	}

-

-	@Test

-	public void testSetTransEnabled() {

-		coes.setTransEnabled(true);

-		assertTrue(true);

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/resources/JUnitTestSuite.java b/src/test/java/com/att/nsa/cambria/resources/JUnitTestSuite.java
deleted file mode 100644
index a68bbf1..0000000
--- a/src/test/java/com/att/nsa/cambria/resources/JUnitTestSuite.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.resources;

-

-import junit.framework.TestSuite;

-

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite;

-import org.junit.runners.Suite.SuiteClasses;

-import org.apache.log4j.Logger;

-

-@RunWith(Suite.class)

-@SuiteClasses({ CambriaEventSetTest.class,CambriaOutboundEventStreamTest.class, })

-public class JUnitTestSuite {

-	private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);

-

-	public static void main(String[] args) {

-		LOGGER.info("Running the test suite");

-		

-		TestSuite tstSuite = new TestSuite();

-		LOGGER.info("Total Test Counts " + tstSuite.countTestCases());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/resources/TestRunner.java b/src/test/java/com/att/nsa/cambria/resources/TestRunner.java
deleted file mode 100644
index ecfa2ef..0000000
--- a/src/test/java/com/att/nsa/cambria/resources/TestRunner.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.resources;

-

-import org.junit.runner.JUnitCore;

-import org.junit.runner.Result;

-import org.junit.runner.notification.Failure;

-import org.apache.log4j.Logger;

-

-public class TestRunner {

-	private static final Logger LOGGER = Logger.getLogger(TestRunner.class);

-

-	public static void main(String[] args) {

-		// TODO Auto-generated method stub

-		Result result = JUnitCore.runClasses(JUnitTestSuite.class);

-		for (Failure failure : result.getFailures()) {

-			LOGGER.info(failure.toString());

-			

-		}

-		LOGGER.info(result.wasSuccessful());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/resources/streamReaders/CambriaJsonStreamReaderTest.java b/src/test/java/com/att/nsa/cambria/resources/streamReaders/CambriaJsonStreamReaderTest.java
deleted file mode 100644
index a308491..0000000
--- a/src/test/java/com/att/nsa/cambria/resources/streamReaders/CambriaJsonStreamReaderTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.resources.streamReaders;

-

-import static org.junit.Assert.*;

-

-import java.io.IOException;

-import java.io.InputStream;

-import com.att.dmf.mr.backends.Publisher.message;

-import com.att.dmf.mr.resources.streamReaders.CambriaJsonStreamReader;

-

-import org.apache.commons.io.IOUtils;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.backends.Publisher.message;

-

-public class CambriaJsonStreamReaderTest {

-	

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	

-	@Test

-	public void testNext() {

-		

-		CambriaJsonStreamReader test = null;

-	

-		String source = "{'name': 'tester', 'id': '2'}";

-		InputStream stream = null;

-		try {

-			stream = IOUtils.toInputStream(source, "UTF-8");

-			test = new CambriaJsonStreamReader(stream,"hello");

-			test.next();

-		} catch (IOException e1) {

-			// TODO Auto-generated catch block

-			e1.printStackTrace();

-		} catch (CambriaApiException e1) {

-			e1.printStackTrace();

-		}

-		

-		assertTrue(true);

-		

-	}

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/resources/streamReaders/CambriaRawStreamReaderTest.java b/src/test/java/com/att/nsa/cambria/resources/streamReaders/CambriaRawStreamReaderTest.java
deleted file mode 100644
index a5a3aac..0000000
--- a/src/test/java/com/att/nsa/cambria/resources/streamReaders/CambriaRawStreamReaderTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.resources.streamReaders;

-

-import static org.junit.Assert.*;

-

-import java.io.IOException;

-import java.io.InputStream;

-import com.att.dmf.mr.backends.Publisher.message;

-import com.att.dmf.mr.resources.streamReaders.CambriaRawStreamReader;

-

-import org.apache.commons.io.IOUtils;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.CambriaApiException;

-

-public class CambriaRawStreamReaderTest {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testNext() {

-		

-		CambriaRawStreamReader test = null;

-		message msg = null;

-

-		String source = "{'name': 'tester', 'id': '2'}";

-		InputStream stream = null;

-		try {

-			stream = IOUtils.toInputStream(source, "UTF-8");

-			test = new CambriaRawStreamReader(stream,"hello");

-			msg = test.next();

-		} catch (IOException e1) {

-			// TODO Auto-generated catch block

-			e1.printStackTrace();

-		} catch (CambriaApiException e1) {

-			e1.printStackTrace();

-		}

-		

-		assertNotNull(msg);

-	

-		

-	}

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/resources/streamReaders/CambriaStreamReaderTest.java b/src/test/java/com/att/nsa/cambria/resources/streamReaders/CambriaStreamReaderTest.java
deleted file mode 100644
index d992183..0000000
--- a/src/test/java/com/att/nsa/cambria/resources/streamReaders/CambriaStreamReaderTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.resources.streamReaders;

-

-import static org.junit.Assert.*;

-

-import java.io.IOException;

-import java.io.InputStream;

-import com.att.dmf.mr.backends.Publisher.message;

-import com.att.dmf.mr.resources.streamReaders.CambriaStreamReader;

-

-import org.apache.commons.io.IOUtils;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.CambriaApiException;

-

-public class CambriaStreamReaderTest {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testNext() {

-		

-		CambriaStreamReader test = null;

-		

-

-		String source = "{'name': 'tester', 'id': '2', 'message': 'hello'}";

-		InputStream stream = null;

-		try {

-			stream = IOUtils.toInputStream(source, "UTF-8");

-			test = new CambriaStreamReader(stream);

-			test.next();

-		} catch (IOException e1) {

-			// TODO Auto-generated catch block

-			e1.printStackTrace();

-		} catch (CambriaApiException e1) {

-			e1.printStackTrace();

-		}

-		

-		assertTrue(true);

-	

-		

-	}

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/resources/streamReaders/CambriaTextStreamReaderTest.java b/src/test/java/com/att/nsa/cambria/resources/streamReaders/CambriaTextStreamReaderTest.java
deleted file mode 100644
index e7b0c83..0000000
--- a/src/test/java/com/att/nsa/cambria/resources/streamReaders/CambriaTextStreamReaderTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.resources.streamReaders;

-

-import static org.junit.Assert.*;

-

-import java.io.IOException;

-import java.io.InputStream;

-import com.att.dmf.mr.backends.Publisher.message;

-import com.att.dmf.mr.resources.streamReaders.CambriaStreamReader;

-

-import org.apache.commons.io.IOUtils;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.CambriaApiException;

-

-public class CambriaTextStreamReaderTest {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testNext() {

-		

-		CambriaStreamReader test = null;

-		

-		String source = "{'name': 'tester', 'id': '2', 'message': 'hello'}";

-		InputStream stream = null;

-		try {

-			stream = IOUtils.toInputStream(source, "UTF-8");

-			test = new CambriaStreamReader(stream);

-			test.next();

-		} catch (IOException e1) {

-			// TODO Auto-generated catch block

-			e1.printStackTrace();

-		} catch (CambriaApiException e1) {

-			e1.printStackTrace();

-		}

-		

-		assertTrue(true);

-	

-		

-	}

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/resources/streamReaders/JUnitTestSuite.java b/src/test/java/com/att/nsa/cambria/resources/streamReaders/JUnitTestSuite.java
deleted file mode 100644
index d80abf9..0000000
--- a/src/test/java/com/att/nsa/cambria/resources/streamReaders/JUnitTestSuite.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.resources.streamReaders;

-

-import junit.framework.TestSuite;

-

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite;

-import org.junit.runners.Suite.SuiteClasses;

-import org.apache.log4j.Logger;

-

-@RunWith(Suite.class)

-@SuiteClasses({ CambriaJsonStreamReaderTest.class,CambriaRawStreamReaderTest.class, 

-	CambriaStreamReaderTest.class, CambriaTextStreamReaderTest.class, })

-public class JUnitTestSuite {

-	private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);

-

-	public static void main(String[] args) {

-		LOGGER.info("Running the test suite");

-		

-		TestSuite tstSuite = new TestSuite();

-		LOGGER.info("Total Test Counts " + tstSuite.countTestCases());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/resources/streamReaders/TestRunner.java b/src/test/java/com/att/nsa/cambria/resources/streamReaders/TestRunner.java
deleted file mode 100644
index 0f697cc..0000000
--- a/src/test/java/com/att/nsa/cambria/resources/streamReaders/TestRunner.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.resources.streamReaders;

-

-import org.junit.runner.JUnitCore;

-import org.junit.runner.Result;

-import org.junit.runner.notification.Failure;

-import org.apache.log4j.Logger;

-

-public class TestRunner {

-	private static final Logger LOGGER = Logger.getLogger(TestRunner.class);

-

-	public static void main(String[] args) {

-		// TODO Auto-generated method stub

-		Result result = JUnitCore.runClasses(JUnitTestSuite.class);

-		for (Failure failure : result.getFailures()) {

-			LOGGER.info(failure.toString());

-			

-		}

-		LOGGER.info(result.wasSuccessful());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/security/DMaaPAAFAuthenticatorImplTest.java b/src/test/java/com/att/nsa/cambria/security/DMaaPAAFAuthenticatorImplTest.java
deleted file mode 100644
index 82a9c2b..0000000
--- a/src/test/java/com/att/nsa/cambria/security/DMaaPAAFAuthenticatorImplTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.security;

-

-import static org.junit.Assert.*;

-

-import javax.servlet.http.HttpServletRequest;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-import org.springframework.mock.web.MockHttpServletRequest;

-

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.security.DMaaPAAFAuthenticatorImpl;

-

-

-

-public class DMaaPAAFAuthenticatorImplTest {

-	

-	private MockHttpServletRequest request = null;

-	@Before

-	public void setUp() throws Exception {

-		//creating servlet object

-		request = new MockHttpServletRequest();

-		request.setServerName("www.example.com");

-		request.setRequestURI("/foo");

-		request.setQueryString("param1=value1&param");

-		String url = request.getRequestURL() + "?" + request.getQueryString(); 

-

-		

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testAafAuthentication() {

-		

-		DMaaPAAFAuthenticatorImpl authenticator = new DMaaPAAFAuthenticatorImpl();

-		authenticator.aafAuthentication(request, "admin");

-		assertTrue(true);

-		

-	}

-	

-	

-	

-	/*@Test

-	public void testAafPermissionString() {

-		

-		DMaaPAAFAuthenticatorImpl authenticator = new DMaaPAAFAuthenticatorImpl();

-		try {

-			authenticator.aafPermissionString("testTopic", "admin");

-		} catch (CambriaApiException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		

-		assertTrue(true);

-		

-	}*/

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/security/DMaaPAuthenticatorImplTest.java b/src/test/java/com/att/nsa/cambria/security/DMaaPAuthenticatorImplTest.java
deleted file mode 100644
index 2f91db2..0000000
--- a/src/test/java/com/att/nsa/cambria/security/DMaaPAuthenticatorImplTest.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.security;

-

-import static org.junit.Assert.*;

-

-import javax.servlet.http.HttpServletRequest;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-import org.springframework.mock.web.MockHttpServletRequest;

-

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.beans.DMaaPContext;

-import com.att.dmf.mr.security.DMaaPAuthenticator;

-import com.att.dmf.mr.security.DMaaPAuthenticatorImpl;

-

-

-

-public class DMaaPAuthenticatorImplTest {

-	

-	private MockHttpServletRequest request = null;

-	@Before

-	public void setUp() throws Exception {

-		//creating servlet object

-		request = new MockHttpServletRequest();

-		request.setServerName("www.example.com");

-		request.setRequestURI("/foo");

-		request.setQueryString("param1=value1&param");

-		String url = request.getRequestURL() + "?" + request.getQueryString(); 

-

-		

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	/*@Test

-	public void testAuthenticate() {

-		

-		DMaaPAuthenticatorImpl<?> authenticator = new DMaaPAuthenticatorImpl(null);

-		

-		DMaaPContext ctx = new DMaaPContext();

-		authenticator.authenticate(ctx);

-		assertTrue(true);

-		

-	}*/

-	

-	

-	

-	/*@Test

-	public void testAafPermissionString() {

-		

-		DMaaPAAFAuthenticatorImpl authenticator = new DMaaPAAFAuthenticatorImpl();

-		try {

-			authenticator.aafPermissionString("testTopic", "admin");

-		} catch (CambriaApiException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		

-		assertTrue(true);

-		

-	}*/

-	

-	@Test

-	public void testIsAuthentic() {

-		

-		DMaaPAuthenticatorImpl<?> authenticator = new DMaaPAuthenticatorImpl(null);

-		

-		authenticator.isAuthentic(request);

-		assertTrue(true);

-		

-	}

-	

-	@Test

-	public void testQualify() {

-		

-		DMaaPAuthenticatorImpl<?> authenticator = new DMaaPAuthenticatorImpl(null);

-		

-		authenticator.qualify(request);

-		assertTrue(true);

-		

-	}

-	

-	@Test

-	public void testAddAuthenticator() {

-		

-		DMaaPAuthenticatorImpl authenticator = new DMaaPAuthenticatorImpl(null);

-		DMaaPAuthenticator authenticator2 = new DMaaPAuthenticatorImpl(null);

-		

-		authenticator.addAuthenticator(authenticator2);

-		assertTrue(true);

-		

-	}

-	

-	/*@Test

-	public void testGetAuthenticatedUser() {

-		

-		

-		DMaaPContext ctx = new DMaaPContext();

-		DMaaPAuthenticatorImpl.getAuthenticatedUser(ctx);

-		assertTrue(true);

-		

-	}

-	*/

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/security/JUnitTestSuite.java b/src/test/java/com/att/nsa/cambria/security/JUnitTestSuite.java
deleted file mode 100644
index 911fba3..0000000
--- a/src/test/java/com/att/nsa/cambria/security/JUnitTestSuite.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.security;

-

-import junit.framework.TestSuite;

-

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite;

-import org.junit.runners.Suite.SuiteClasses;

-import org.apache.log4j.Logger;

-

-@RunWith(Suite.class)

-@SuiteClasses({ DMaaPAAFAuthenticatorImplTest.class,DMaaPAuthenticatorImplTest.class, 

-})

-public class JUnitTestSuite {

-	private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);

-

-	public static void main(String[] args) {

-		LOGGER.info("Running the test suite");

-		

-		TestSuite tstSuite = new TestSuite();

-		LOGGER.info("Total Test Counts " + tstSuite.countTestCases());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/security/TestRunner.java b/src/test/java/com/att/nsa/cambria/security/TestRunner.java
deleted file mode 100644
index 3ab0ea7..0000000
--- a/src/test/java/com/att/nsa/cambria/security/TestRunner.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.security;

-

-import org.junit.runner.JUnitCore;

-import org.junit.runner.Result;

-import org.junit.runner.notification.Failure;

-import org.apache.log4j.Logger;

-

-public class TestRunner {

-	private static final Logger LOGGER = Logger.getLogger(TestRunner.class);

-

-	public static void main(String[] args) {

-		// TODO Auto-generated method stub

-		Result result = JUnitCore.runClasses(JUnitTestSuite.class);

-		for (Failure failure : result.getFailures()) {

-			LOGGER.info(failure.toString());

-			

-		}

-		LOGGER.info(result.wasSuccessful());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/security/impl/DMaaPMechIdAuthenticatorTest.java b/src/test/java/com/att/nsa/cambria/security/impl/DMaaPMechIdAuthenticatorTest.java
deleted file mode 100644
index 89ba6c1..0000000
--- a/src/test/java/com/att/nsa/cambria/security/impl/DMaaPMechIdAuthenticatorTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.security.impl;

-

-import static org.junit.Assert.*;

-

-import javax.servlet.http.HttpServletRequest;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-import org.springframework.mock.web.MockHttpServletRequest;

-

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.beans.DMaaPContext;

-import com.att.dmf.mr.security.DMaaPAuthenticator;

-import com.att.dmf.mr.security.DMaaPAuthenticatorImpl;

-import com.att.dmf.mr.security.impl.DMaaPMechIdAuthenticator;

-

-

-

-public class DMaaPMechIdAuthenticatorTest {

-	

-	private MockHttpServletRequest request = null;

-	@Before

-	public void setUp() throws Exception {

-		//creating servlet object

-		request = new MockHttpServletRequest();

-		request.setServerName("www.example.com");

-		request.setRequestURI("/foo");

-		request.setQueryString("param1=value1&param");

-		String url = request.getRequestURL() + "?" + request.getQueryString(); 

-

-		

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-	

-	

-	@Test

-	public void testQualify() {

-		

-		DMaaPMechIdAuthenticator authenticator = new DMaaPMechIdAuthenticator();

-		

-		authenticator.qualify(request);

-		assertTrue(true);

-		

-	}	

-	

-	@Test

-	public void testAuthenticate() {

-		

-		DMaaPMechIdAuthenticator authenticator = new DMaaPMechIdAuthenticator();

-		

-		DMaaPContext ctx = new DMaaPContext();

-		authenticator.authenticate(ctx);

-		assertTrue(true);

-		

-	}

-	

-	@Test

-	public void testIsAuthentic() {

-		DMaaPMechIdAuthenticator authenticator = new DMaaPMechIdAuthenticator();

-		

-		authenticator.isAuthentic(request);

-		assertTrue(true);

-		

-	}

-	

-	

-	

-	@Test

-	public void testAddAuthenticator() {

-		

-		DMaaPMechIdAuthenticator authenticator = new DMaaPMechIdAuthenticator();

-		DMaaPMechIdAuthenticator authenticator2 = new DMaaPMechIdAuthenticator();

-		

-		authenticator.addAuthenticator(authenticator2);

-		assertTrue(true);

-		

-	}

-	

-	

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/security/impl/DMaaPOriginalUebAuthenticatorTest.java b/src/test/java/com/att/nsa/cambria/security/impl/DMaaPOriginalUebAuthenticatorTest.java
deleted file mode 100644
index d437bf3..0000000
--- a/src/test/java/com/att/nsa/cambria/security/impl/DMaaPOriginalUebAuthenticatorTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.security.impl;

-

-import static org.junit.Assert.*;

-

-import javax.servlet.http.HttpServletRequest;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-import org.springframework.mock.web.MockHttpServletRequest;

-

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.beans.DMaaPContext;

-import com.att.dmf.mr.security.DMaaPAuthenticator;

-import com.att.dmf.mr.security.DMaaPAuthenticatorImpl;

-import com.att.dmf.mr.security.impl.DMaaPOriginalUebAuthenticator;

-

-

-

-public class DMaaPOriginalUebAuthenticatorTest {

-	

-	private MockHttpServletRequest request = null;

-	@Before

-	public void setUp() throws Exception {

-		//creating servlet object

-		request = new MockHttpServletRequest();

-		request.setServerName("www.example.com");

-		request.setRequestURI("/foo");

-		request.setQueryString("param1=value1&param");

-		String url = request.getRequestURL() + "?" + request.getQueryString(); 

-

-		

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-	

-	

-	@Test

-	public void testQualify() {

-		

-		DMaaPOriginalUebAuthenticator authenticator = new DMaaPOriginalUebAuthenticator(null, 100);

-		

-		authenticator.qualify(request);

-		assertTrue(true);

-		

-	}	

-	

-	@Test

-	public void testAuthenticate() {

-		

-		DMaaPOriginalUebAuthenticator authenticator = new DMaaPOriginalUebAuthenticator(null, 100);

-		

-		DMaaPContext ctx = new DMaaPContext();

-		authenticator.authenticate(ctx);

-		assertTrue(true);

-		

-	}

-	

-	@Test

-	public void testAuthenticate2() {

-		

-		DMaaPOriginalUebAuthenticator authenticator = new DMaaPOriginalUebAuthenticator(null, 100);

-		DMaaPContext ctx = new DMaaPContext();

-		authenticator.authenticate("google.com", "xHMDwk25kwkkyi26JH","Dec 16, 2016", "Dec/16/2016","123");

-		

-		

-	}

-	

-	@Test

-	public void testIsAuthentic() {

-		DMaaPOriginalUebAuthenticator authenticator = new DMaaPOriginalUebAuthenticator(null, 100);

-		

-		authenticator.isAuthentic(request);

-		assertTrue(true);

-		

-	}

-	

-	

-	

-	@Test

-	public void testAddAuthenticator() {

-		

-		DMaaPOriginalUebAuthenticator authenticator = new DMaaPOriginalUebAuthenticator(null, 100);

-		DMaaPOriginalUebAuthenticator authenticator2 = new DMaaPOriginalUebAuthenticator(null, 100);

-		

-		authenticator.addAuthenticator(authenticator2);

-		assertTrue(true);

-		

-	}

-	

-	

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/security/impl/JUnitTestSuite.java b/src/test/java/com/att/nsa/cambria/security/impl/JUnitTestSuite.java
deleted file mode 100644
index 0593ee5..0000000
--- a/src/test/java/com/att/nsa/cambria/security/impl/JUnitTestSuite.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.security.impl;

-

-import junit.framework.TestSuite;

-

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite;

-import org.junit.runners.Suite.SuiteClasses;

-import org.apache.log4j.Logger;

-

-@RunWith(Suite.class)

-@SuiteClasses({ DMaaPMechIdAuthenticatorTest.class, DMaaPOriginalUebAuthenticatorTest.class, 

-})

-public class JUnitTestSuite {

-	private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);

-

-	public static void main(String[] args) {

-		LOGGER.info("Running the test suite");

-		

-		TestSuite tstSuite = new TestSuite();

-		LOGGER.info("Total Test Counts " + tstSuite.countTestCases());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/security/impl/TestRunner.java b/src/test/java/com/att/nsa/cambria/security/impl/TestRunner.java
deleted file mode 100644
index 4688aec..0000000
--- a/src/test/java/com/att/nsa/cambria/security/impl/TestRunner.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.security.impl;

-

-import org.junit.runner.JUnitCore;

-import org.junit.runner.Result;

-import org.junit.runner.notification.Failure;

-import org.apache.log4j.Logger;

-

-public class TestRunner {

-	private static final Logger LOGGER = Logger.getLogger(TestRunner.class);

-

-	public static void main(String[] args) {

-		// TODO Auto-generated method stub

-		Result result = JUnitCore.runClasses(JUnitTestSuite.class);

-		for (Failure failure : result.getFailures()) {

-			LOGGER.info(failure.toString());

-			

-		}

-		LOGGER.info(result.wasSuccessful());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/service/impl/AdminServiceImplemTest.java b/src/test/java/com/att/nsa/cambria/service/impl/AdminServiceImplemTest.java
deleted file mode 100644
index fd87cdb..0000000
--- a/src/test/java/com/att/nsa/cambria/service/impl/AdminServiceImplemTest.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*-

-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.service.impl;

-

-import static org.junit.Assert.*;

-

-import java.io.IOException;

-

-import com.att.dmf.mr.backends.ConsumerFactory;

-import com.att.dmf.mr.beans.DMaaPContext;

-import com.att.dmf.mr.security.DMaaPAuthenticatorImpl;

-import com.att.dmf.mr.service.impl.AdminServiceImpl;

-import com.att.dmf.mr.utils.ConfigurationReader;

-import com.att.dmf.mr.utils.DMaaPResponseBuilder;

-import com.att.nsa.configs.ConfigDbException;

-import com.att.nsa.limits.Blacklist;

-import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;

-import com.att.nsa.security.db.simple.NsaSimpleApiKey;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-import org.junit.runner.RunWith;

-import org.mockito.InjectMocks;

-import org.mockito.Mock;

-import org.mockito.MockitoAnnotations;

-import org.powermock.api.mockito.PowerMockito;

-import org.powermock.core.classloader.annotations.PrepareForTest;

-import org.powermock.modules.junit4.PowerMockRunner;

-

-@RunWith(PowerMockRunner.class)

-@PrepareForTest({ DMaaPAuthenticatorImpl.class, DMaaPResponseBuilder.class })

-public class AdminServiceImplemTest {

-

-	@InjectMocks

-	AdminServiceImpl adminServiceImpl;

-

-	@Mock

-	DMaaPContext dmaapContext;

-	@Mock

-	ConsumerFactory factory;

-

-	@Mock

-	ConfigurationReader configReader;

-	@Mock

-	Blacklist Blacklist;

-

-	@Before

-	public void setUp() throws Exception {

-

-		MockitoAnnotations.initMocks(this);

-		PowerMockito.mockStatic(DMaaPAuthenticatorImpl.class);

-		NsaSimpleApiKey user = new NsaSimpleApiKey("admin", "password");

-

-		PowerMockito.when(dmaapContext.getConfigReader()).thenReturn(configReader);

-		PowerMockito.when(configReader.getfConsumerFactory()).thenReturn(factory);

-		PowerMockito.when(configReader.getfIpBlackList()).thenReturn(Blacklist);

-

-		PowerMockito.when(DMaaPAuthenticatorImpl.getAuthenticatedUser(dmaapContext)).thenReturn(user);

-		PowerMockito.mockStatic(DMaaPResponseBuilder.class);

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	// ISSUES WITH AUTHENTICATION

-	@Test

-	public void testShowConsumerCache() {

-

-		try {

-			adminServiceImpl.showConsumerCache(dmaapContext);

-		} catch (IOException | AccessDeniedException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			// e.printStackTrace();

-			assertTrue(true);

-		}

-

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-

-	}

-

-	@Test

-	public void testDropConsumerCache() {

-

-		try {

-			adminServiceImpl.dropConsumerCache(dmaapContext);

-		} catch (IOException | AccessDeniedException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			// e.printStackTrace();

-			assertTrue(true);

-		}

-

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-

-	}

-

-	@Test

-	public void testGetBlacklist() {

-

-		try {

-			adminServiceImpl.getBlacklist(dmaapContext);

-		} catch (IOException | AccessDeniedException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			// e.printStackTrace();

-			assertTrue(true);

-		}

-

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-

-	}

-

-	@Test

-	public void testAddToBlacklist() {

-

-		try {

-			adminServiceImpl.addToBlacklist(dmaapContext, "120.120.120.120");

-		} catch (IOException | AccessDeniedException | ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			// e.printStackTrace();

-			assertTrue(true);

-		}

-

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-

-	}

-

-	@Test

-	public void testRemoveFromBlacklist() {

-

-		try {

-			adminServiceImpl.removeFromBlacklist(dmaapContext, "120.120.120.120");

-		} catch (IOException | AccessDeniedException | ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			// e.printStackTrace();

-			assertTrue(true);

-		}

-

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/service/impl/ApiKeysServiceImplTest.java b/src/test/java/com/att/nsa/cambria/service/impl/ApiKeysServiceImplTest.java
deleted file mode 100644
index 89b25af..0000000
--- a/src/test/java/com/att/nsa/cambria/service/impl/ApiKeysServiceImplTest.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-

-package com.att.nsa.cambria.service.impl;

-

-import static org.junit.Assert.*;

-

-import java.io.IOException;

-import java.util.Arrays;

-import java.util.HashSet;

-import java.util.Map;

-import java.util.Set;

-

-import com.att.dmf.mr.backends.ConsumerFactory;

-import com.att.dmf.mr.beans.ApiKeyBean;

-import com.att.dmf.mr.beans.DMaaPContext;

-import com.att.dmf.mr.security.DMaaPAuthenticatorImpl;

-import com.att.dmf.mr.service.impl.ApiKeysServiceImpl;

-import com.att.dmf.mr.utils.ConfigurationReader;

-import com.att.dmf.mr.utils.DMaaPResponseBuilder;

-import com.att.dmf.mr.utils.Emailer;

-import com.att.nsa.configs.ConfigDbException;

-import com.att.nsa.limits.Blacklist;

-import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;

-import com.att.nsa.security.db.NsaApiDb;

-import com.att.nsa.security.db.NsaApiDb.KeyExistsException;

-import com.att.nsa.security.db.simple.NsaSimpleApiKey;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-import org.junit.runner.RunWith;

-import org.mockito.InjectMocks;

-import org.mockito.Mock;

-import org.mockito.MockitoAnnotations;

-import org.powermock.api.mockito.PowerMockito;

-import org.powermock.core.classloader.annotations.PrepareForTest;

-import org.powermock.modules.junit4.PowerMockRunner;

-

-@RunWith(PowerMockRunner.class)

-@PrepareForTest({ DMaaPAuthenticatorImpl.class, DMaaPResponseBuilder.class })

-public class ApiKeysServiceImplTest {

-	

-	@InjectMocks

-	ApiKeysServiceImpl service;

-

-	@Mock

-	DMaaPContext dmaapContext;

-	@Mock

-	ConsumerFactory factory;

-

-	@Mock

-	ConfigurationReader configReader;

-	@Mock

-	Blacklist Blacklist;

-	@Mock

-	Emailer emailer;

-

-	@Before

-	public void setUp() throws Exception {

-

-		MockitoAnnotations.initMocks(this);

-		PowerMockito.mockStatic(DMaaPAuthenticatorImpl.class);

-		NsaSimpleApiKey user = new NsaSimpleApiKey("admin", "password");

-

-		PowerMockito.when(dmaapContext.getConfigReader()).thenReturn(configReader);

-		PowerMockito.when(configReader.getfConsumerFactory()).thenReturn(factory);

-		PowerMockito.when(configReader.getfIpBlackList()).thenReturn(Blacklist);

-		

-		PowerMockito.when(configReader.getfApiKeyDb()).thenReturn(fApiKeyDb);

-		PowerMockito.when(configReader.getSystemEmailer()).thenReturn(emailer);

-		PowerMockito.when(DMaaPAuthenticatorImpl.getAuthenticatedUser(dmaapContext)).thenReturn(user);

-		PowerMockito.mockStatic(DMaaPResponseBuilder.class);

-	

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	

-	@Test

-	public void testGetAllApiKeys() {

-		

-		 service = new ApiKeysServiceImpl();

-		try {

-			service.getAllApiKeys(dmaapContext);

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			//e.printStackTrace();

-			

-		} catch (ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		assertTrue(true);

-	 

-	}

-	

-	@Test

-	public void testGetApiKey() {

-		

-		ApiKeysServiceImpl service = new ApiKeysServiceImpl();

-		try {

-			service.getApiKey(dmaapContext, "testkey");

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			//e.printStackTrace();

-			assertTrue(true);

-		} catch (ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (IOException e) {

-			// TODO Auto-generated catch block

-		}

-		assertTrue(true);

-	 

-	}

-	

-	@Test

-	public void testGetApiKey_error() {

-		

-		ApiKeysServiceImpl service = new ApiKeysServiceImpl();

-		try {

-			service.getApiKey(dmaapContext, "k35Hdw6Sde");

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			//e.printStackTrace();

-		} catch (ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (IOException e) {

-			// TODO Auto-generated catch block

-			assertTrue(true);

-		}

-	 

-	}

-	

-	@Test

-	public void testCreateApiKey() {

-		

-		ApiKeysServiceImpl service = new ApiKeysServiceImpl();

-		try {

-			service.createApiKey(dmaapContext, new ApiKeyBean("test@onap.com", "testing apikey bean"));

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			//e.printStackTrace();

-		} catch (ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (KeyExistsException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch(NoClassDefFoundError e) {

-			

-		}

-		 assertTrue(true);

-	}

-	

-	@Test

-	public void testUpdateApiKey() {

-		

-		ApiKeysServiceImpl service = new ApiKeysServiceImpl();

-		try {

-			

-			service.updateApiKey(dmaapContext, "admin", new ApiKeyBean("test@onapt.com", "testing apikey bean"));

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			//e.printStackTrace();

-		} catch (ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (AccessDeniedException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		 assertTrue(true);

-	 

-	}

-	@Test

-	public void testUpdateApiKey_error() {

-		

-		ApiKeysServiceImpl service = new ApiKeysServiceImpl();

-		try {

-			

-			service.updateApiKey(dmaapContext, null, new ApiKeyBean("test@onapt.com", "testing apikey bean"));

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			//e.printStackTrace();

-			assertTrue(true);

-		} catch (ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (IOException e) {

-			// TODO Auto-generated catch block

-			 assertTrue(true);

-		} catch (AccessDeniedException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-	 

-	}

-	

-	@Test

-	public void testDeleteApiKey() {

-		

-		ApiKeysServiceImpl service = new ApiKeysServiceImpl();

-		try {

-			

-			service.deleteApiKey(dmaapContext, null);

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			//e.printStackTrace();

-			assertTrue(true);

-		} catch (ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (AccessDeniedException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-	 

-	}

-	

-	@Test

-	public void testDeleteApiKey_error() {

-		

-		ApiKeysServiceImpl service = new ApiKeysServiceImpl();

-		try {

-			

-			service.deleteApiKey(dmaapContext, "admin");

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			//e.printStackTrace();

-			assertTrue(true);

-		} catch (ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (AccessDeniedException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-	 

-	}

-	

-	NsaApiDb<NsaSimpleApiKey> fApiKeyDb= new NsaApiDb<NsaSimpleApiKey>() {

-		

-		

-		Set<String> keys = new HashSet<>(Arrays.asList("testkey","admin"));

-		

-		

-		@Override

-		public NsaSimpleApiKey createApiKey(String arg0, String arg1)

-				throws com.att.nsa.security.db.NsaApiDb.KeyExistsException, ConfigDbException {

-			// TODO Auto-generated method stub

-			return new NsaSimpleApiKey(arg0, arg1);

-		}

-

-		@Override

-		public boolean deleteApiKey(NsaSimpleApiKey arg0) throws ConfigDbException {

-			// TODO Auto-generated method stub

-			return false;

-		}

-

-		@Override

-		public boolean deleteApiKey(String arg0) throws ConfigDbException {

-			// TODO Auto-generated method stub

-			return false;

-		}

-

-		@Override

-		public Map<String, NsaSimpleApiKey> loadAllKeyRecords() throws ConfigDbException {

-			// TODO Auto-generated method stub

-			return null;

-		}

-

-		@Override

-		public Set<String> loadAllKeys() throws ConfigDbException {

-			// TODO Auto-generated method stub

-			

-			return keys ;

-		}

-

-		@Override

-		public NsaSimpleApiKey loadApiKey(String arg0) throws ConfigDbException {

-			if(!keys.contains(arg0)){

-				return null;

-			}

-			return new NsaSimpleApiKey(arg0, "password");

-		}

-

-		@Override

-		public void saveApiKey(NsaSimpleApiKey arg0) throws ConfigDbException {

-			// TODO Auto-generated method stub

-			

-		}

-	};

-}
\ No newline at end of file
diff --git a/src/test/java/com/att/nsa/cambria/service/impl/BaseTransactionDbImplTest.java b/src/test/java/com/att/nsa/cambria/service/impl/BaseTransactionDbImplTest.java
deleted file mode 100644
index baef7be..0000000
--- a/src/test/java/com/att/nsa/cambria/service/impl/BaseTransactionDbImplTest.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.service.impl;

-

-import static org.junit.Assert.*;

-

-import java.io.ByteArrayInputStream;

-import java.io.IOException;

-import java.io.InputStream;

-

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.backends.ConsumerFactory.UnavailableException;

-import com.att.dmf.mr.beans.DMaaPContext;

-import com.att.dmf.mr.metabroker.Broker.TopicExistsException;

-import com.att.dmf.mr.service.impl.BaseTransactionDbImpl;

-import com.att.dmf.mr.transaction.DMaaPTransactionObjDB.KeyExistsException;

-import com.att.nsa.configs.ConfigDbException;

-import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting;

-import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-public class BaseTransactionDbImplTest {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-	

-	@Test

-	public void testCreateTransactionObj() {

-		

-		

-		try {

-			

-			BaseTransactionDbImpl service = new BaseTransactionDbImpl(null, null);

-			service.createTransactionObj("transition");

-		} catch (org.json.JSONException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			//e.printStackTrace();

-			assertTrue(true);

-		} catch (KeyExistsException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}		

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	@Test

-	public void testSaveTransactionObj() {

-		

-		

-		try {

-			

-			BaseTransactionDbImpl service = new BaseTransactionDbImpl(null, null);

-			service.saveTransactionObj(null);

-		} catch (org.json.JSONException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			//e.printStackTrace();

-			assertTrue(true);

-		} catch (ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}		

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	@Test

-	public void testLoadTransactionObj() {

-		

-		try {

-			

-			BaseTransactionDbImpl service = new BaseTransactionDbImpl(null, null);

-			service.loadTransactionObj("34");

-		} catch (org.json.JSONException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			//e.printStackTrace();

-			assertTrue(true);

-		} catch (ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}		

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-

-	@Test

-	public void testLoadAllTransactionObjs() {

-		

-		try {

-			

-			BaseTransactionDbImpl service = new BaseTransactionDbImpl(null, null);

-			service.loadAllTransactionObjs();

-		} catch (org.json.JSONException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			//e.printStackTrace();

-			assertTrue(true);

-		} catch (ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}		

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-

-

-	

-	

-}

diff --git a/src/test/java/com/att/nsa/cambria/service/impl/EventsServiceImplTest.java b/src/test/java/com/att/nsa/cambria/service/impl/EventsServiceImplTest.java
deleted file mode 100644
index 8cd560d..0000000
--- a/src/test/java/com/att/nsa/cambria/service/impl/EventsServiceImplTest.java
+++ /dev/null
@@ -1,312 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.service.impl;

-

-import static org.mockito.Mockito.when;

-import static org.mockito.Matchers.anyString;

-import static org.junit.Assert.assertFalse;

-import static org.junit.Assert.assertTrue;

-

-import java.io.ByteArrayInputStream;

-import java.io.File;

-import java.io.IOException;

-import java.io.InputStream;

-import java.lang.reflect.Constructor;

-import java.lang.reflect.InvocationTargetException;

-import java.lang.reflect.Method;

-import java.util.ConcurrentModificationException;

-import java.util.Map;

-import java.util.Properties;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-import org.junit.runner.RunWith;

-import org.mockito.Mock;

-import org.mockito.MockitoAnnotations;

-import org.powermock.api.mockito.PowerMockito;

-import org.powermock.core.classloader.annotations.PrepareForTest;

-import org.powermock.modules.junit4.PowerMockRunner;

-import org.springframework.beans.factory.annotation.Autowired;

-import org.springframework.mock.web.MockHttpServletRequest;

-import org.springframework.mock.web.MockHttpServletResponse;

-

-import com.att.ajsc.beans.PropertiesMapBean;

-import com.att.ajsc.filemonitor.AJSCPropertiesMap;

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.security.DMaaPAAFAuthenticator;

-import com.att.dmf.mr.security.DMaaPAuthenticator;

-import com.att.dmf.mr.security.DMaaPAuthenticatorImpl;

-import com.att.dmf.mr.utils.ConfigurationReader;

-import com.att.dmf.mr.backends.ConsumerFactory.UnavailableException;

-import com.att.dmf.mr.beans.DMaaPCambriaLimiter;

-import com.att.dmf.mr.backends.ConsumerFactory;

-import com.att.dmf.mr.beans.DMaaPContext;

-import com.att.dmf.mr.beans.DMaaPKafkaMetaBroker;

-import com.att.dmf.mr.constants.CambriaConstants;

-import com.att.dmf.mr.exception.DMaaPAccessDeniedException;

-import com.att.dmf.mr.exception.DMaaPErrorMessages;

-import com.att.dmf.mr.metabroker.Topic;

-import com.att.dmf.mr.metabroker.Broker.TopicExistsException;

-import com.att.dmf.mr.service.impl.EventsServiceImpl;

-import com.att.dmf.mr.utils.PropertyReader;

-import com.att.nsa.configs.ConfigDbException;

-import com.att.nsa.drumlin.till.nv.rrNvReadable.invalidSettingValue;

-import com.att.nsa.drumlin.till.nv.rrNvReadable.loadException;

-import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting;

-import com.att.nsa.limits.Blacklist;

-import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;

-import com.att.nsa.security.NsaApiKey;

-import com.att.nsa.security.db.simple.NsaSimpleApiKey;

-

-import kafka.admin.AdminUtils;

-

-@RunWith(PowerMockRunner.class)

-@PrepareForTest({ DMaaPAuthenticatorImpl.class, AJSCPropertiesMap.class })

-public class EventsServiceImplTest {

-

-	private InputStream iStream = null;

-	DMaaPContext dMaapContext = new DMaaPContext();

-	EventsServiceImpl service = new EventsServiceImpl();

-	DMaaPErrorMessages pErrorMessages = new DMaaPErrorMessages();

-	@Mock

-	ConfigurationReader configurationReader;

-	@Mock

-	Blacklist blacklist;

-	@Mock

-	DMaaPAuthenticator<NsaSimpleApiKey> dmaaPAuthenticator;

-	@Mock

-	DMaaPAAFAuthenticator dmaapAAFauthenticator;

-	@Mock

-	NsaApiKey user;

-	@Mock

-	NsaSimpleApiKey nsaSimpleApiKey;

-	@Mock

-	DMaaPKafkaMetaBroker dmaapKafkaMetaBroker;

-	@Mock

-	Topic createdTopic;

-	@Mock

-	ConsumerFactory factory;

-

-	@Before

-	public void setUp() throws Exception {

-		MockitoAnnotations.initMocks(this);

-		String source = "source of my InputStream";

-		iStream = new ByteArrayInputStream(source.getBytes("UTF-8"));

-

-		MockHttpServletRequest request = new MockHttpServletRequest();

-		MockHttpServletResponse response = new MockHttpServletResponse();

-		dMaapContext.setRequest(request);

-		dMaapContext.setResponse(response);

-		when(blacklist.contains(anyString())).thenReturn(false);

-		when(configurationReader.getfIpBlackList()).thenReturn(blacklist);

-		dMaapContext.setConfigReader(configurationReader);

-

-		service.setErrorMessages(pErrorMessages);

-		PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "timeout")).thenReturn("100");

-

-		AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "timeout");

-

-	}

-

-	@Test(expected = CambriaApiException.class)

-	public void testGetEvents() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException,

-			TopicExistsException, AccessDeniedException, UnavailableException, IOException {

-		when(dmaaPAuthenticator.authenticate(dMaapContext)).thenReturn(nsaSimpleApiKey);

-		when(configurationReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator);

-		when(configurationReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-		when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(createdTopic);

-		PowerMockito.when(configurationReader.getfConsumerFactory()).thenReturn(factory);

-		service.getEvents(dMaapContext, "testTopic", "CG1", "23");

-	}

-

-	@Test(expected = CambriaApiException.class)

-	public void testGetEventsBlackListErr() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException,

-			TopicExistsException, AccessDeniedException, UnavailableException, IOException {

-		when(blacklist.contains(anyString())).thenReturn(true);

-		when(configurationReader.getfIpBlackList()).thenReturn(blacklist);

-		dMaapContext.setConfigReader(configurationReader);

-		service.getEvents(dMaapContext, "testTopic", "CG1", "23");

-	}

-

-	@Test(expected = CambriaApiException.class)

-	public void testGetEventsNoTopicError() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException,

-			TopicExistsException, AccessDeniedException, UnavailableException, IOException {

-		when(dmaaPAuthenticator.authenticate(dMaapContext)).thenReturn(nsaSimpleApiKey);

-		when(configurationReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator);

-		when(configurationReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-		when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(null);

-		PowerMockito.when(configurationReader.getfConsumerFactory()).thenReturn(factory);

-		service.getEvents(dMaapContext, "testTopic", "CG1", "23");

-	}

-

-	@Test(expected = CambriaApiException.class)

-	public void testGetEventsuserNull() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException,

-			TopicExistsException, AccessDeniedException, UnavailableException, IOException {

-		when(dmaaPAuthenticator.authenticate(dMaapContext)).thenReturn(null);

-		when(configurationReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator);

-		when(configurationReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-		when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(createdTopic);

-		PowerMockito.when(configurationReader.getfConsumerFactory()).thenReturn(factory);

-		MockHttpServletRequest mockRequest = new MockHttpServletRequest();

-		mockRequest.addHeader("Authorization", "passed");

-		dMaapContext.setRequest(mockRequest);

-		dMaapContext.getRequest().getHeader("Authorization");

-		service.getEvents(dMaapContext, "testTopic", "CG1", "23");

-	}

-

-	@Test(expected = CambriaApiException.class)

-	public void testGetEventsExcp2() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException,

-			TopicExistsException, AccessDeniedException, UnavailableException, IOException {

-		when(dmaaPAuthenticator.authenticate(dMaapContext)).thenReturn(nsaSimpleApiKey);

-		when(configurationReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator);

-		when(configurationReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-		when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(createdTopic);

-		PowerMockito.when(configurationReader.getfConsumerFactory()).thenReturn(factory);

-		when(configurationReader.getfRateLimiter()).thenThrow(new ConcurrentModificationException("Error occurred"));

-		service.getEvents(dMaapContext, "testTopic", "CG1", "23");

-	}

-

-	@Test(expected = CambriaApiException.class)

-	public void testPushEvents() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException,

-			TopicExistsException, AccessDeniedException, UnavailableException, IOException, missingReqdSetting,

-			invalidSettingValue, loadException {

-

-		// AdminUtils.createTopic(configurationReader.getZk(), "testTopic", 10,

-		// 1, new Properties());

-

-		configurationReader.setfRateLimiter(new DMaaPCambriaLimiter(new PropertyReader()));

-

-		when(dmaaPAuthenticator.authenticate(dMaapContext)).thenReturn(nsaSimpleApiKey);

-		when(configurationReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator);

-		when(configurationReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-		when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(createdTopic);

-		PowerMockito.when(configurationReader.getfConsumerFactory()).thenReturn(factory);

-

-		service.pushEvents(dMaapContext, "testTopic", iStream, "3", "12:00:00");

-

-		service.getEvents(dMaapContext, "testTopic", "CG1", "23");

-

-		/*

-		 * String trueValue = "True";

-		 * assertTrue(trueValue.equalsIgnoreCase("True"));

-		 */

-

-	}

-

-	@Test(expected = CambriaApiException.class)

-	public void testPushEventsBlackListedIp() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException,

-			TopicExistsException, AccessDeniedException, UnavailableException, IOException, missingReqdSetting,

-			invalidSettingValue, loadException {

-

-		// AdminUtils.createTopic(configurationReader.getZk(), "testTopic", 10,

-		// 1, new Properties());

-		when(blacklist.contains(anyString())).thenReturn(true);

-		when(configurationReader.getfIpBlackList()).thenReturn(blacklist);

-		configurationReader.setfRateLimiter(new DMaaPCambriaLimiter(new PropertyReader()));

-		when(dmaaPAuthenticator.authenticate(dMaapContext)).thenReturn(nsaSimpleApiKey);

-		when(configurationReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator);

-		when(configurationReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-		when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(createdTopic);

-		PowerMockito.when(configurationReader.getfConsumerFactory()).thenReturn(factory);

-

-		service.pushEvents(dMaapContext, "testTopic", iStream, "3", "12:00:00");

-

-	}

-

-	@Test(expected = NullPointerException.class)

-	public void testPushEventsNoUser() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException,

-			TopicExistsException, AccessDeniedException, UnavailableException, IOException, missingReqdSetting,

-			invalidSettingValue, loadException {

-

-		configurationReader.setfRateLimiter(new DMaaPCambriaLimiter(new PropertyReader()));

-

-		when(dmaaPAuthenticator.authenticate(dMaapContext)).thenReturn(null);

-		when(configurationReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator);

-		when(configurationReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-		when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(createdTopic);

-		PowerMockito.when(configurationReader.getfConsumerFactory()).thenReturn(factory);

-		MockHttpServletRequest mockRequest = new MockHttpServletRequest();

-		mockRequest.addHeader("Authorization", "passed");

-		mockRequest.addHeader("Authorization", "passed");

-		dMaapContext.setRequest(mockRequest);

-		dMaapContext.getRequest().getHeader("Authorization");

-		service.pushEvents(dMaapContext, "testTopic", iStream, "3", "12:00:00");

-

-	}

-

-	@Test(expected = CambriaApiException.class)

-	public void testPushEventsWtTransaction() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException,

-			TopicExistsException, AccessDeniedException, UnavailableException, IOException, missingReqdSetting,

-			invalidSettingValue, loadException {

-

-		configurationReader.setfRateLimiter(new DMaaPCambriaLimiter(new PropertyReader()));

-

-		when(dmaaPAuthenticator.authenticate(dMaapContext)).thenReturn(nsaSimpleApiKey);

-		when(configurationReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator);

-		when(configurationReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-		when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(createdTopic);

-		PowerMockito.when(configurationReader.getfConsumerFactory()).thenReturn(factory);

-		when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "transidUEBtopicreqd")).thenReturn("true");

-

-		service.pushEvents(dMaapContext, "testTopic", iStream, "3", "12:00:00");

-

-	}

-	

-	@Test(expected = CambriaApiException.class)

-	public void testPushEventsWtTransactionError() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException,

-			TopicExistsException, AccessDeniedException, UnavailableException, IOException, missingReqdSetting,

-			invalidSettingValue, loadException {

-

-		configurationReader.setfRateLimiter(new DMaaPCambriaLimiter(new PropertyReader()));

-

-		when(dmaaPAuthenticator.authenticate(dMaapContext)).thenReturn(nsaSimpleApiKey);

-		when(configurationReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator);

-		when(configurationReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-		when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(createdTopic);

-		PowerMockito.when(configurationReader.getfConsumerFactory()).thenReturn(factory);

-		when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "transidUEBtopicreqd")).thenReturn("true");

-		when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "event.batch.length")).thenReturn("0");

-		when(configurationReader.getfPublisher()).thenThrow(new ConcurrentModificationException("Error occurred"));

-

-		service.pushEvents(dMaapContext, "testTopic", iStream, "3", "12:00:00");

-

-	}

-	

-	@Test

-	public void testIsTransEnabled1() {

-

-		when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,

-				"transidUEBtopicreqd")).thenReturn("true");

-		  assertTrue(service.isTransEnabled());

-

-	}

-	@Test

-	public void testIsTransEnabled2() {

-

-		when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,

-				"transidUEBtopicreqd")).thenReturn("false");

-		  assertFalse(service.isTransEnabled());

-

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/service/impl/JUnitTestSuite.java b/src/test/java/com/att/nsa/cambria/service/impl/JUnitTestSuite.java
deleted file mode 100644
index 8abafcc..0000000
--- a/src/test/java/com/att/nsa/cambria/service/impl/JUnitTestSuite.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.service.impl;

-

-import junit.framework.TestSuite;

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite;

-import org.junit.runners.Suite.SuiteClasses;

-import org.apache.log4j.Logger;

-

-@RunWith(Suite.class)

-@SuiteClasses({ UIServiceImplTest.class, AdminServiceImplemTest.class, ApiKeysServiceImplTest.class, 

-	ShowConsumerCacheTest.class,TopicServiceImplTest.class, TransactionServiceImplTest.class, MMServiceImplTest.class, 

-	BaseTransactionDbImplTest.class,  MetricsServiceImplTest.class,EventsServiceImplTest.class})

-public class JUnitTestSuite {

-	private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);

-

-	public static void main(String[] args) {

-		LOGGER.info("Running the test suite");

-		

-		TestSuite tstSuite = new TestSuite();

-		LOGGER.info("Total Test Counts " + tstSuite.countTestCases());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/service/impl/MMServiceImplTest.java b/src/test/java/com/att/nsa/cambria/service/impl/MMServiceImplTest.java
deleted file mode 100644
index f97952c..0000000
--- a/src/test/java/com/att/nsa/cambria/service/impl/MMServiceImplTest.java
+++ /dev/null
@@ -1,382 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.service.impl;

-

-import static org.junit.Assert.*;

-

-import java.io.ByteArrayInputStream;

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.Arrays;

-import java.util.ConcurrentModificationException;

-import java.util.HashSet;

-import java.util.Map;

-import java.util.Set;

-

-import com.att.ajsc.beans.PropertiesMapBean;

-import com.att.ajsc.filemonitor.AJSCPropertiesMap;

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.backends.ConsumerFactory;

-import com.att.dmf.mr.backends.ConsumerFactory.UnavailableException;

-import com.att.dmf.mr.beans.DMaaPContext;

-import com.att.dmf.mr.beans.DMaaPKafkaMetaBroker;

-import com.att.dmf.mr.constants.CambriaConstants;

-import com.att.dmf.mr.exception.DMaaPErrorMessages;

-import com.att.dmf.mr.metabroker.Topic;

-import com.att.dmf.mr.metabroker.Broker.TopicExistsException;

-import com.att.dmf.mr.security.DMaaPAuthenticatorImpl;

-import com.att.dmf.mr.service.impl.MMServiceImpl;

-import com.att.dmf.mr.utils.ConfigurationReader;

-import com.att.dmf.mr.utils.DMaaPResponseBuilder;

-import com.att.dmf.mr.utils.Emailer;

-import com.att.nsa.configs.ConfigDbException;

-import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting;

-import com.att.nsa.limits.Blacklist;

-import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;

-import com.att.nsa.security.db.NsaApiDb;

-import com.att.nsa.security.db.simple.NsaSimpleApiKey;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-import org.junit.runner.RunWith;

-import static org.mockito.Matchers.anyString;

-import org.mockito.InjectMocks;

-import org.mockito.Mock;

-import org.mockito.MockitoAnnotations;

-import org.powermock.api.mockito.PowerMockito;

-import org.powermock.core.classloader.annotations.PrepareForTest;

-import org.powermock.modules.junit4.PowerMockRunner;

-import org.springframework.mock.web.MockHttpServletRequest;

-import org.springframework.mock.web.MockHttpServletResponse;

-

-@RunWith(PowerMockRunner.class)

-@PrepareForTest({ DMaaPAuthenticatorImpl.class, DMaaPResponseBuilder.class, PropertiesMapBean.class,

-		AJSCPropertiesMap.class })

-public class MMServiceImplTest {

-

-	@InjectMocks

-	MMServiceImpl service;

-

-	@Mock

-	DMaaPContext dmaapContext;

-	@Mock

-	ConsumerFactory factory;

-	@Mock

-	private DMaaPErrorMessages errorMessages;

-	@Mock

-	ConfigurationReader configReader;

-	@Mock

-	Blacklist Blacklist;

-	@Mock

-	Emailer emailer;

-	@Mock

-	DMaaPKafkaMetaBroker dmaapKafkaMetaBroker;

-	@Mock

-	Topic metatopic;

-

-	@Before

-	public void setUp() throws Exception {

-

-		MockitoAnnotations.initMocks(this);

-		PowerMockito.mockStatic(DMaaPAuthenticatorImpl.class);

-		NsaSimpleApiKey user = new NsaSimpleApiKey("admin", "password");

-

-		PowerMockito.when(dmaapContext.getConfigReader()).thenReturn(configReader);

-		PowerMockito.when(configReader.getfConsumerFactory()).thenReturn(factory);

-		PowerMockito.when(configReader.getfIpBlackList()).thenReturn(Blacklist);

-

-		PowerMockito.when(configReader.getfApiKeyDb()).thenReturn(fApiKeyDb);

-		PowerMockito.when(configReader.getSystemEmailer()).thenReturn(emailer);

-		PowerMockito.when(DMaaPAuthenticatorImpl.getAuthenticatedUser(dmaapContext)).thenReturn(user);

-		PowerMockito.mockStatic(DMaaPResponseBuilder.class);

-

-		MockHttpServletRequest request = new MockHttpServletRequest();

-		MockHttpServletResponse response = new MockHttpServletResponse();

-		PowerMockito.when(dmaapContext.getRequest()).thenReturn(request);

-		PowerMockito.when(dmaapContext.getResponse()).thenReturn(response);

-

-		PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		PowerMockito.mockStatic(PropertiesMapBean.class);

-		PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "timeout")).thenReturn("1000");

-		PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "pretty")).thenReturn("true");

-		PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "meta")).thenReturn("true");

-		PowerMockito.when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testSubscribe_Blacklistip() {

-

-		try {

-			PowerMockito.when(Blacklist.contains("127.0.0.1")).thenReturn(true);

-			service.subscribe(dmaapContext, "testTopic", "CG1", "23");

-		} catch (org.json.JSONException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			// e.printStackTrace();

-		} catch (CambriaApiException e) {

-			assertTrue(true);

-		} catch (ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (TopicExistsException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (AccessDeniedException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (UnavailableException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-

-	}

-

-	@Test

-	public void testSubscribe_NullTopic() {

-

-		try {

-			PowerMockito.when(dmaapKafkaMetaBroker.getTopic(anyString())).thenReturn(null);

-			service.subscribe(dmaapContext, "testTopic", "CG1", "23");

-		} catch (org.json.JSONException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			// e.printStackTrace();

-			assertTrue(true);

-		} catch (CambriaApiException e) {

-			assertTrue(true);

-		} catch (ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (TopicExistsException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (AccessDeniedException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (UnavailableException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-

-	}

-	

-	@Test(expected = CambriaApiException.class)

-	public void testSubscribe_NullTopic_Error() throws ConfigDbException, TopicExistsException, AccessDeniedException, UnavailableException,

-	CambriaApiException, IOException {

-

-		    PowerMockito.when(configReader.getfMetrics()).thenThrow(new ConcurrentModificationException("Error occurred"));

-			PowerMockito.when(dmaapKafkaMetaBroker.getTopic(anyString())).thenReturn(metatopic);

-			service.subscribe(dmaapContext, "testTopic", "CG1", "23");

-	}

-

-	@Test

-	public void testPushEvents_wttransaction() {

-

-		String source = "source of my InputStream";

-

-		try {

-			InputStream iStream = new ByteArrayInputStream(source.getBytes("UTF-8"));

-			service.pushEvents(dmaapContext, "msgrtr.apinode.metrics.dmaap", iStream, "3", "12:00:00");

-

-		} catch (org.json.JSONException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			// e.printStackTrace();

-			assertTrue(true);

-		} catch (CambriaApiException e) {

-			assertTrue(true);

-		} catch (ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (TopicExistsException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (AccessDeniedException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (missingReqdSetting e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-	}

-	

-	@Test(expected = CambriaApiException.class)

-	public void testPushEvents_wttransaction_error() throws Exception {

-

-		String source = "source of my InputStream";

-

-		InputStream iStream = new ByteArrayInputStream(source.getBytes("UTF-8"));

-		PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		PowerMockito.mockStatic(PropertiesMapBean.class);

-		PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "event.batch.length")).thenReturn("-5");

-		PowerMockito.when(configReader.getfPublisher()).thenThrow(new ConcurrentModificationException("Error occurred"));

-		service.pushEvents(dmaapContext, "msgrtr.apinode.metrics.dmaap1", iStream, "3", "12:00:00");

-

-	}

-

-	@Test

-	public void testPushEvents() {

-

-		String source = "source of my InputStream";

-

-		try {

-			InputStream iStream = new ByteArrayInputStream(source.getBytes("UTF-8"));

-			service.pushEvents(dmaapContext, "testTopic", iStream, "3", "12:00:00");

-

-		} catch (org.json.JSONException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			// e.printStackTrace();

-			assertTrue(true);

-		} catch (CambriaApiException e) {

-			assertTrue(true);

-		} catch (ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (TopicExistsException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (AccessDeniedException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (missingReqdSetting e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-

-	}

-

-	@Test

-	public void testPushEvents_blacklistip() {

-

-		String source = "source of my InputStream";

-

-		try {

-			PowerMockito.when(Blacklist.contains("127.0.0.1")).thenReturn(true);

-			InputStream iStream = new ByteArrayInputStream(source.getBytes("UTF-8"));

-			service.pushEvents(dmaapContext, "testTopic", iStream, "3", "12:00:00");

-

-		} catch (org.json.JSONException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			// e.printStackTrace();

-			assertTrue(true);

-		} catch (CambriaApiException e) {

-			assertTrue(true);

-		} catch (ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (TopicExistsException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (AccessDeniedException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (missingReqdSetting e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-

-	}

-

-	NsaApiDb<NsaSimpleApiKey> fApiKeyDb = new NsaApiDb<NsaSimpleApiKey>() {

-

-		Set<String> keys = new HashSet<>(Arrays.asList("testkey", "admin"));

-

-		@Override

-		public NsaSimpleApiKey createApiKey(String arg0, String arg1)

-				throws com.att.nsa.security.db.NsaApiDb.KeyExistsException, ConfigDbException {

-			// TODO Auto-generated method stub

-			return new NsaSimpleApiKey(arg0, arg1);

-		}

-

-		@Override

-		public boolean deleteApiKey(NsaSimpleApiKey arg0) throws ConfigDbException {

-			// TODO Auto-generated method stub

-			return false;

-		}

-

-		@Override

-		public boolean deleteApiKey(String arg0) throws ConfigDbException {

-			// TODO Auto-generated method stub

-			return false;

-		}

-

-		@Override

-		public Map<String, NsaSimpleApiKey> loadAllKeyRecords() throws ConfigDbException {

-			// TODO Auto-generated method stub

-			return null;

-		}

-

-		@Override

-		public Set<String> loadAllKeys() throws ConfigDbException {

-			// TODO Auto-generated method stub

-

-			return keys;

-		}

-

-		@Override

-		public NsaSimpleApiKey loadApiKey(String arg0) throws ConfigDbException {

-			if (!keys.contains(arg0)) {

-				return null;

-			}

-			return new NsaSimpleApiKey(arg0, "password");

-		}

-

-		@Override

-		public void saveApiKey(NsaSimpleApiKey arg0) throws ConfigDbException {

-			// TODO Auto-generated method stub

-

-		}

-	};

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/service/impl/MessageTest.java b/src/test/java/com/att/nsa/cambria/service/impl/MessageTest.java
deleted file mode 100644
index 1d5c9c0..0000000
--- a/src/test/java/com/att/nsa/cambria/service/impl/MessageTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.service.impl;

-

-import com.att.dmf.mr.backends.Publisher.message;

-import com.att.dmf.mr.beans.LogDetails;

-

-public class MessageTest implements message {

-

-	@Override

-	public String getKey() {

-		// TODO Auto-generated method stub

-		return "123";

-	}

-

-	@Override

-	public String getMessage() {

-		// TODO Auto-generated method stub

-		return "Msg";

-	}

-

-	@Override

-	public void setLogDetails(LogDetails logDetails) {

-		// TODO Auto-generated method stub

-		

-	}

-

-	@Override

-	public LogDetails getLogDetails() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	@Override

-	public boolean isTransactionEnabled() {

-		// TODO Auto-generated method stub

-		return false;

-	}

-

-	@Override

-	public void setTransactionEnabled(boolean transactionEnabled) {

-		// TODO Auto-generated method stub

-		

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/service/impl/MetricsServiceImplTest.java b/src/test/java/com/att/nsa/cambria/service/impl/MetricsServiceImplTest.java
deleted file mode 100644
index e372d38..0000000
--- a/src/test/java/com/att/nsa/cambria/service/impl/MetricsServiceImplTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-

-package com.att.nsa.cambria.service.impl;

-

-import static org.junit.Assert.*;

-

-import java.io.IOException;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.beans.DMaaPContext;

-import com.att.dmf.mr.service.impl.MetricsServiceImpl;

-

-public class MetricsServiceImplTest {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-	

-	@Test

-	public void testGet() {

-		

-		MetricsServiceImpl service = new MetricsServiceImpl();

-		try {

-			service.get(new DMaaPContext());

-		} catch (org.json.JSONException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			//e.printStackTrace();

-			assertTrue(true);

-		} catch (IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}		

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-	@Test

-	public void testGetMetricByName() {

-		

-		MetricsServiceImpl service = new MetricsServiceImpl();

-		try {

-			service.getMetricByName(new DMaaPContext(), "uptime");

-		} catch (org.json.JSONException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			//e.printStackTrace();

-			assertTrue(true);

-		} catch (IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (CambriaApiException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}		

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-}

diff --git a/src/test/java/com/att/nsa/cambria/service/impl/ShowConsumerCacheTest.java b/src/test/java/com/att/nsa/cambria/service/impl/ShowConsumerCacheTest.java
deleted file mode 100644
index 4dd3076..0000000
--- a/src/test/java/com/att/nsa/cambria/service/impl/ShowConsumerCacheTest.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.service.impl;

-import static org.junit.Assert.assertEquals;

-import static org.mockito.Matchers.anyBoolean;

-import static org.mockito.Matchers.anyInt;

-import static org.mockito.Matchers.anyString;

-import static org.mockito.Mockito.mock;

-import static org.mockito.Mockito.times;

-import static org.mockito.Mockito.verify;

-import static org.mockito.Mockito.when;

-

-import java.io.IOException;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Iterator;

-

-import javax.servlet.http.HttpServletRequest;

-import javax.servlet.http.HttpServletResponse;

-

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Test;

-import org.junit.runner.RunWith;

-import org.mockito.InjectMocks;

-import org.mockito.Mock;

-import org.mockito.MockitoAnnotations;

-import org.powermock.api.mockito.PowerMockito;

-import org.powermock.core.classloader.annotations.PrepareForTest;

-import org.powermock.modules.junit4.PowerMockRunner;

-import org.mockito.runners.MockitoJUnitRunner;

-

-import com.att.aft.dme2.internal.jettison.json.JSONArray;

-import com.att.aft.dme2.internal.jettison.json.JSONException;

-import com.att.aft.dme2.internal.jettison.json.JSONObject;

-

-import com.att.ajsc.beans.PropertiesMapBean;

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.beans.DMaaPContext;

-import com.att.dmf.mr.beans.DMaaPKafkaMetaBroker;

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.beans.DMaaPContext;

-import com.att.dmf.mr.beans.TopicBean;

-import com.att.dmf.mr.constants.CambriaConstants;

-import com.att.dmf.mr.exception.DMaaPAccessDeniedException;

-import com.att.dmf.mr.exception.DMaaPErrorMessages;

-import com.att.dmf.mr.metabroker.Broker.TopicExistsException;

-import com.att.dmf.mr.metabroker.Topic;

-import com.att.dmf.mr.security.DMaaPAuthenticator;

-import com.att.dmf.mr.utils.ConfigurationReader;

-import com.att.dmf.mr.utils.DMaaPResponseBuilder;

-import com.att.nsa.security.NsaApiKey;

-import com.att.nsa.security.db.simple.NsaSimpleApiKey;

-

-import jline.internal.Log;

-import kafka.consumer.Consumer;

-

-

-

-//@RunWith(MockitoJUnitRunner.class)

-//@RunWith(PowerMockRunner.class)

-//@PrepareForTest(PropertiesMapBean.class)

-public class ShowConsumerCacheTest {

-/*

-@InjectMocks

-TopicServiceImpl topicService;

-

-@Mock

-private DMaaPErrorMessages errorMessages;

-

-@Mock

-DMaaPContext dmaapContext;

-

-@Mock

-ConfigurationReader configReader;

-

-

-@Mock

-JSONObject consumers;

-

-@Mock

-JSONObject consumerObject;

-

-@Mock

-JSONArray jsonConsumersList;

-

-@Mock

-DMaaPAuthenticator<NsaSimpleApiKey> dmaaPAuthenticator;

-

-@Mock

-NsaApiKey user;

-

-@Mock

-NsaSimpleApiKey nsaSimpleApiKey;

-

-@Mock

-HttpServletRequest httpServReq;

-

-

-@Before

-public void setUp(){

-MockitoAnnotations.initMocks(this);

-}

-

-

-//@Test(expected = DMaaPAccessDeniedException.class)

-@Test

-public void testShowConsmerCache()throws DMaaPAccessDeniedException, CambriaApiException, IOException, TopicExistsException, JSONException{

-Assert.assertNotNull(topicService);

-

-String myName = "Brian";

-Object created = null;

-Object accessed = null;

-Object log = null;

-Object info = null;

-

-when(consumerObject.put("name", myName)).thenReturn(consumerObject);

-when(consumerObject.put("created", created)).thenReturn(consumerObject);

-when(consumerObject.put("accessed", accessed)).thenReturn(consumerObject);

-when(consumerObject.put("accessed", Consumer.class)).thenReturn(consumerObject);

-when(jsonConsumersList.put(consumerObject)).thenReturn(null);

-

-when(consumers.put("consumers", jsonConsumersList)).thenReturn(consumerObject);

-

-

-

-}*/

-

-

-}
\ No newline at end of file
diff --git a/src/test/java/com/att/nsa/cambria/service/impl/TestRunner.java b/src/test/java/com/att/nsa/cambria/service/impl/TestRunner.java
deleted file mode 100644
index cf240b7..0000000
--- a/src/test/java/com/att/nsa/cambria/service/impl/TestRunner.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.service.impl;

-

-import org.junit.runner.JUnitCore;

-import org.junit.runner.Result;

-import org.junit.runner.notification.Failure;

-import org.apache.log4j.Logger;

-

-public class TestRunner {

-	private static final Logger LOGGER = Logger.getLogger(TestRunner.class);

-

-	public static void main(String[] args) {

-		// TODO Auto-generated method stub

-		Result result = JUnitCore.runClasses(JUnitTestSuite.class);

-		for (Failure failure : result.getFailures()) {

-			LOGGER.info(failure.toString());

-			

-		}

-		LOGGER.info(result.wasSuccessful());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/service/impl/TopicServiceImplTest.java b/src/test/java/com/att/nsa/cambria/service/impl/TopicServiceImplTest.java
deleted file mode 100644
index 47b351e..0000000
--- a/src/test/java/com/att/nsa/cambria/service/impl/TopicServiceImplTest.java
+++ /dev/null
@@ -1,766 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.service.impl;

-

-import static org.mockito.Matchers.anyBoolean;

-import static org.mockito.Matchers.anyInt;

-import static org.mockito.Matchers.anyString;

-import static org.mockito.Mockito.times;

-import static org.mockito.Mockito.verify;

-import static org.mockito.Mockito.when;

-

-import java.io.IOException;

-import java.util.Arrays;

-import java.util.HashSet;

-

-import javax.servlet.ServletOutputStream;

-import javax.servlet.http.HttpServletRequest;

-import javax.servlet.http.HttpServletResponse;

-

-import org.json.JSONArray;

-import org.json.JSONException;

-import org.json.JSONObject;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Test;

-import org.junit.runner.RunWith;

-import org.mockito.Mock;

-import org.mockito.MockitoAnnotations;

-import org.powermock.api.mockito.PowerMockito;

-import org.powermock.core.classloader.annotations.PrepareForTest;

-import org.powermock.modules.junit4.PowerMockRunner;

-

-import com.att.ajsc.beans.PropertiesMapBean;

-import com.att.ajsc.filemonitor.AJSCPropertiesMap;

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.beans.DMaaPContext;

-import com.att.dmf.mr.beans.DMaaPKafkaMetaBroker;

-import com.att.dmf.mr.beans.TopicBean;

-import com.att.dmf.mr.constants.CambriaConstants;

-import com.att.dmf.mr.exception.DMaaPAccessDeniedException;

-import com.att.dmf.mr.exception.DMaaPErrorMessages;

-import com.att.dmf.mr.metabroker.Broker.TopicExistsException;

-import com.att.dmf.mr.metabroker.Topic;

-import com.att.dmf.mr.security.DMaaPAAFAuthenticator;

-import com.att.dmf.mr.security.DMaaPAuthenticator;

-import com.att.dmf.mr.security.DMaaPAuthenticatorImpl;

-import com.att.dmf.mr.service.impl.TopicServiceImpl;

-import com.att.dmf.mr.utils.ConfigurationReader;

-import com.att.dmf.mr.utils.DMaaPResponseBuilder;

-import com.att.nsa.configs.ConfigDbException;

-import com.att.nsa.security.NsaAcl;

-import com.att.nsa.security.NsaApiKey;

-import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;

-import com.att.nsa.security.db.simple.NsaSimpleApiKey;

-

-//@RunWith(MockitoJUnitRunner.class)

-@RunWith(PowerMockRunner.class)

-@PrepareForTest({ PropertiesMapBean.class, DMaaPAuthenticatorImpl.class,AJSCPropertiesMap.class,DMaaPResponseBuilder.class })

-public class TopicServiceImplTest {

-

-	TopicServiceImpl topicService;

-

-	@Mock

-	private DMaaPErrorMessages errorMessages;

-

-	@Mock

-	DMaaPContext dmaapContext;

-

-	@Mock

-	ConfigurationReader configReader;

-

-	@Mock

-	ServletOutputStream oStream;

-

-	@Mock

-	DMaaPAuthenticator<NsaSimpleApiKey> dmaaPAuthenticator;

-

-	@Mock

-	DMaaPAAFAuthenticator dmaapAAFauthenticator;

-	@Mock

-	NsaApiKey user;

-

-	@Mock

-	NsaSimpleApiKey nsaSimpleApiKey;

-

-	@Mock

-	HttpServletRequest httpServReq;

-

-	@Mock

-	HttpServletResponse httpServRes;

-

-	@Mock

-	DMaaPKafkaMetaBroker dmaapKafkaMetaBroker;

-

-	@Mock

-	Topic createdTopic;

-

-	@Mock

-	NsaAcl nsaAcl;

-

-	@Mock

-	JSONObject jsonObj;

-

-	@Mock

-	JSONArray jsonArray;

-

-	@Before

-	public void setUp() {

-		MockitoAnnotations.initMocks(this);

-		topicService = new TopicServiceImpl();

-		topicService.setErrorMessages(errorMessages);

-		NsaSimpleApiKey user = new NsaSimpleApiKey("admin", "password");

-		PowerMockito.mockStatic(DMaaPAuthenticatorImpl.class);

-		PowerMockito.when(DMaaPAuthenticatorImpl.getAuthenticatedUser(dmaapContext)).thenReturn(user);

-	}

-

-	@Test(expected = NullPointerException.class)

-	public void testCreateTopicWithEnforcedName()

-			throws DMaaPAccessDeniedException, CambriaApiException, IOException, TopicExistsException {

-		

-		Assert.assertNotNull(topicService);

-		PowerMockito.mockStatic(PropertiesMapBean.class);

-

-		when(PropertiesMapBean.getProperty(CambriaConstants.msgRtr_prop, "enforced.topic.name.AAF"))

-				.thenReturn("enfTopicName");

-

-		when(httpServReq.getHeader("AppName")).thenReturn("MyApp");

-		when(dmaapContext.getRequest()).thenReturn(httpServReq);

-		when(dmaapContext.getResponse()).thenReturn(httpServRes);

-		when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(nsaSimpleApiKey);

-		when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator);

-		when(dmaapContext.getConfigReader()).thenReturn(configReader);

-

-		TopicBean topicBean = new TopicBean();

-		topicBean.setTopicName("enfTopicNamePlusExtra");

-		topicService.createTopic(dmaapContext, topicBean);

-	}

-

-	@Test

-	public void testCreateTopicWithTopicNameNotEnforced()

-			throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException,IOException,TopicExistsException, com.att.dmf.mr.metabroker.Broker1.TopicExistsException {

-

-		Assert.assertNotNull(topicService);

-

-		PowerMockito.mockStatic(PropertiesMapBean.class);

-		PowerMockito.mockStatic(DMaaPResponseBuilder.class);

-

-		when(PropertiesMapBean.getProperty(CambriaConstants.msgRtr_prop, "enforced.topic.name.AAF"))

-				.thenReturn("enfTopicName");

-

-		when(dmaapContext.getRequest()).thenReturn(httpServReq);

-		when(dmaapContext.getResponse()).thenReturn(httpServRes);

-

-		when(httpServReq.getHeader("AppName")).thenReturn("MyApp");

-		when(httpServReq.getMethod()).thenReturn("HEAD");

-

-		when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(nsaSimpleApiKey);

-		when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator);

-		when(dmaapContext.getConfigReader()).thenReturn(configReader);

-		when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-

-		when(nsaAcl.isActive()).thenReturn(true);

-		when(nsaAcl.getUsers()).thenReturn(new HashSet<>(Arrays.asList("user1,user2".split(","))));

-

-		when(createdTopic.getName()).thenReturn("topicName");

-		when(createdTopic.getOwner()).thenReturn("Owner");

-		when(createdTopic.getDescription()).thenReturn("Description");

-		when(createdTopic.getReaderAcl()).thenReturn(nsaAcl);

-		when(createdTopic.getWriterAcl()).thenReturn(nsaAcl);

-

-		when(dmaapKafkaMetaBroker.createTopic(anyString(), anyString(), anyString(), anyInt(), anyInt(), anyBoolean()))

-				.thenReturn(createdTopic);

-

-		TopicBean topicBean = new TopicBean();

-		topicBean.setTopicName("NotEnforcedTopicName");

-

-		topicService.createTopic(dmaapContext, topicBean);

-

-		verify(dmaapKafkaMetaBroker, times(1)).createTopic(anyString(), anyString(), anyString(), anyInt(), anyInt(),

-				anyBoolean());

-	}

-

-	@Test(expected = NullPointerException.class)

-	public void testCreateTopicNoUserInContextAndNoAuthHeader()

-			throws DMaaPAccessDeniedException, CambriaApiException, IOException, TopicExistsException {

-		

-		Assert.assertNotNull(topicService);

-

-		PowerMockito.mockStatic(PropertiesMapBean.class);

-

-		when(PropertiesMapBean.getProperty(CambriaConstants.msgRtr_prop, "enforced.topic.name.AAF"))

-				.thenReturn("enfTopicName");

-

-		when(httpServReq.getHeader("Authorization")).thenReturn(null);

-		when(dmaapContext.getRequest()).thenReturn(httpServReq);

-		when(dmaapContext.getResponse()).thenReturn(httpServRes);

-		when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null);

-

-		when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator);

-		when(dmaapContext.getConfigReader()).thenReturn(configReader);

-

-		TopicBean topicBean = new TopicBean();

-		topicBean.setTopicName("enfTopicNamePlusExtra");

-		topicService.createTopic(dmaapContext, topicBean);

-	}

-

-	@Test(expected = NullPointerException.class)

-	public void testCreateTopicNoUserInContextAndAuthHeaderAndPermitted()

-			throws DMaaPAccessDeniedException, CambriaApiException, IOException, TopicExistsException {

-		

-		Assert.assertNotNull(topicService);

-

-		PowerMockito.mockStatic(PropertiesMapBean.class);

-

-		when(PropertiesMapBean.getProperty(CambriaConstants.msgRtr_prop, "enforced.topic.name.AAF"))

-				.thenReturn("enfTopicName");

-

-		when(httpServReq.getHeader("Authorization")).thenReturn("Authorization");

-		when(dmaapContext.getRequest()).thenReturn(httpServReq);

-		when(dmaapContext.getResponse()).thenReturn(httpServRes);

-		when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null);

-

-		when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator);

-		when(dmaapContext.getConfigReader()).thenReturn(configReader);

-

-		// when(dmaapAAFauthenticator.aafAuthentication(httpServReq,

-		// anyString())).thenReturn(false);

-

-		TopicBean topicBean = new TopicBean();

-		topicBean.setTopicName("enfTopicNamePlusExtra");

-		topicService.createTopic(dmaapContext, topicBean);

-	}

-

-	@Test(expected = TopicExistsException.class)

-	public void testGetTopics_null_topic() throws DMaaPAccessDeniedException, CambriaApiException, IOException,

-			TopicExistsException, JSONException, ConfigDbException {

-

-		Assert.assertNotNull(topicService);

-		PowerMockito.mockStatic(DMaaPResponseBuilder.class);

-		when(dmaapContext.getConfigReader()).thenReturn(configReader);

-		when(dmaapContext.getRequest()).thenReturn(httpServReq);

-		when(dmaapContext.getResponse()).thenReturn(httpServRes);

-		when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-		when(httpServReq.getMethod()).thenReturn("HEAD");

-

-		when(dmaapKafkaMetaBroker.getTopic(anyString())).thenReturn(null);

-

-		topicService.getTopic(dmaapContext, "topicName");

-	}

-

-	@Test

-	public void testGetTopics_NonNull_topic() throws DMaaPAccessDeniedException, CambriaApiException, IOException,

-			TopicExistsException, JSONException, ConfigDbException {

-

-		Assert.assertNotNull(topicService);

-		PowerMockito.mockStatic(DMaaPResponseBuilder.class);

-		when(dmaapContext.getConfigReader()).thenReturn(configReader);

-		when(dmaapContext.getRequest()).thenReturn(httpServReq);

-		when(dmaapContext.getResponse()).thenReturn(httpServRes);

-		when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-

-		when(dmaapKafkaMetaBroker.getTopic(anyString())).thenReturn(createdTopic);

-

-		when(createdTopic.getName()).thenReturn("topicName");

-		when(createdTopic.getDescription()).thenReturn("topicDescription");

-		when(createdTopic.getOwners()).thenReturn(new HashSet<>(Arrays.asList("user1,user2".split(","))));

-

-		when(createdTopic.getReaderAcl()).thenReturn(nsaAcl);

-		when(createdTopic.getWriterAcl()).thenReturn(nsaAcl);

-

-		when(httpServReq.getMethod()).thenReturn("HEAD");

-

-		when(httpServRes.getOutputStream()).thenReturn(oStream);

-

-		topicService.getTopic(dmaapContext, "topicName");

-	}

-

-	@Test(expected = TopicExistsException.class)

-	public void testGetPublishersByTopicName_nullTopic() throws DMaaPAccessDeniedException, CambriaApiException,

-			IOException, TopicExistsException, JSONException, ConfigDbException, AccessDeniedException {

-

-		Assert.assertNotNull(topicService);

-

-		PowerMockito.mockStatic(DMaaPResponseBuilder.class);

-		when(dmaapContext.getConfigReader()).thenReturn(configReader);

-		when(dmaapContext.getRequest()).thenReturn(httpServReq);

-		when(dmaapContext.getResponse()).thenReturn(httpServRes);

-		when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-		when(httpServReq.getMethod()).thenReturn("HEAD");

-

-		when(dmaapKafkaMetaBroker.getTopic("topicNamespace.name")).thenReturn(null);

-

-		topicService.getPublishersByTopicName(dmaapContext, "topicNamespace.name");

-

-	}

-

-	@Test

-	public void testGetPublishersByTopicName_nonNullTopic() throws DMaaPAccessDeniedException, CambriaApiException,

-			IOException, TopicExistsException, JSONException, ConfigDbException, AccessDeniedException {

-

-		Assert.assertNotNull(topicService);

-

-		PowerMockito.mockStatic(DMaaPResponseBuilder.class);

-		when(dmaapContext.getConfigReader()).thenReturn(configReader);

-		when(dmaapContext.getRequest()).thenReturn(httpServReq);

-		when(dmaapContext.getResponse()).thenReturn(httpServRes);

-		when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-		when(httpServReq.getMethod()).thenReturn("HEAD");

-

-		when(dmaapKafkaMetaBroker.getTopic("topicNamespace.name")).thenReturn(createdTopic);

-		when(createdTopic.getWriterAcl()).thenReturn(nsaAcl);

-		topicService.getPublishersByTopicName(dmaapContext, "topicNamespace.name");

-	}

-

-	@Test(expected = TopicExistsException.class)

-	public void testGetConsumersByTopicName_nullTopic() throws DMaaPAccessDeniedException, CambriaApiException,

-			IOException, TopicExistsException, JSONException, ConfigDbException, AccessDeniedException {

-

-		Assert.assertNotNull(topicService);

-

-		PowerMockito.mockStatic(DMaaPResponseBuilder.class);

-		when(dmaapContext.getConfigReader()).thenReturn(configReader);

-		when(dmaapContext.getRequest()).thenReturn(httpServReq);

-		when(dmaapContext.getResponse()).thenReturn(httpServRes);

-		when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-		when(httpServReq.getMethod()).thenReturn("HEAD");

-

-		when(dmaapKafkaMetaBroker.getTopic("topicNamespace.name")).thenReturn(null);

-

-		topicService.getConsumersByTopicName(dmaapContext, "topicNamespace.name");

-

-	}

-

-	@Test

-	public void testGetConsumersByTopicName_nonNullTopic() throws DMaaPAccessDeniedException, CambriaApiException,

-			IOException, TopicExistsException, JSONException, ConfigDbException, AccessDeniedException {

-

-		Assert.assertNotNull(topicService);

-

-		PowerMockito.mockStatic(DMaaPResponseBuilder.class);

-		when(dmaapContext.getConfigReader()).thenReturn(configReader);

-		when(dmaapContext.getRequest()).thenReturn(httpServReq);

-		when(dmaapContext.getResponse()).thenReturn(httpServRes);

-		when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-		when(httpServReq.getMethod()).thenReturn("HEAD");

-

-		when(dmaapKafkaMetaBroker.getTopic("topicNamespace.name")).thenReturn(createdTopic);

-

-		when(createdTopic.getReaderAcl()).thenReturn(nsaAcl);

-

-		topicService.getConsumersByTopicName(dmaapContext, "topicNamespace.name");

-	}

-

-	@Test

-	public void testGetPublishersByTopicName() throws DMaaPAccessDeniedException, CambriaApiException, IOException,

-			TopicExistsException, JSONException, ConfigDbException, AccessDeniedException {

-

-		Assert.assertNotNull(topicService);

-

-		PowerMockito.mockStatic(DMaaPResponseBuilder.class);

-

-		PowerMockito.mockStatic(AJSCPropertiesMap.class);

-

-		PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf"))

-				.thenReturn("topicFactoryAAF");

-

-		when(dmaapContext.getConfigReader()).thenReturn(configReader);

-		when(dmaapContext.getRequest()).thenReturn(httpServReq);

-		when(dmaapContext.getResponse()).thenReturn(httpServRes);

-		when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-		when(httpServReq.getMethod()).thenReturn("HEAD");

-

-		when(dmaapKafkaMetaBroker.getTopic("topicNamespace.name")).thenReturn(createdTopic);

-

-		when(createdTopic.getReaderAcl()).thenReturn(nsaAcl);

-

-		topicService.getPublishersByTopicName(dmaapContext, "topicNamespace.name");

-	}

-	

-	@Test(expected=TopicExistsException.class)

-	public void testGetPublishersByTopicNameError() throws DMaaPAccessDeniedException, CambriaApiException, IOException,

-			TopicExistsException, JSONException, ConfigDbException, AccessDeniedException {

-

-		Assert.assertNotNull(topicService);

-

-		PowerMockito.mockStatic(DMaaPResponseBuilder.class);

-

-		PowerMockito.mockStatic(AJSCPropertiesMap.class);

-

-		PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf"))

-				.thenReturn("topicFactoryAAF");

-

-		when(dmaapContext.getConfigReader()).thenReturn(configReader);

-		when(dmaapContext.getRequest()).thenReturn(httpServReq);

-		when(dmaapContext.getResponse()).thenReturn(httpServRes);

-		when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-		when(httpServReq.getMethod()).thenReturn("HEAD");

-

-		when(dmaapKafkaMetaBroker.getTopic("topicNamespace.name")).thenReturn(null);

-

-		when(createdTopic.getReaderAcl()).thenReturn(nsaAcl);

-

-		topicService.getPublishersByTopicName(dmaapContext, "topicNamespace.name");

-	}

-

-	@Test

-	public void testdeleteTopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException,

-			TopicExistsException, JSONException, ConfigDbException, AccessDeniedException {

-

-		Assert.assertNotNull(topicService);

-

-		// PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf"))

-				.thenReturn("hello");

-

-		when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null);

-		when(httpServReq.getHeader("AppName")).thenReturn("MyApp");

-		when(httpServReq.getHeader("Authorization")).thenReturn("Admin");

-		when(dmaapContext.getRequest()).thenReturn(httpServReq);

-

-		when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator);

-		when(dmaapContext.getConfigReader()).thenReturn(configReader);

-		when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-		when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(createdTopic);

-		TopicBean topicBean = new TopicBean();

-		topicBean.setTopicName("enfTopicNamePlusExtra");

-

-		topicService.deleteTopic(dmaapContext, "topicNamespace.topic");

-	}

-	

-	@Test(expected=TopicExistsException.class)

-	public void testdeleteTopic_nulltopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException,

-			TopicExistsException, JSONException, ConfigDbException, AccessDeniedException {

-

-		Assert.assertNotNull(topicService);

-

-		// PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf"))

-				.thenReturn("hello");

-

-		when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null);

-		when(httpServReq.getHeader("AppName")).thenReturn("MyApp");

-		when(httpServReq.getHeader("Authorization")).thenReturn("Admin");

-		when(dmaapContext.getRequest()).thenReturn(httpServReq);

-

-		when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator);

-		when(dmaapContext.getConfigReader()).thenReturn(configReader);

-		when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-		when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(null);

-		TopicBean topicBean = new TopicBean();

-		topicBean.setTopicName("enfTopicNamePlusExtra");

-

-		topicService.deleteTopic(dmaapContext, "topicNamespace.topic");

-	}

-	

-	/*@Test(expected=DMaaPAccessDeniedException.class)

-	public void testdeleteTopic_authHeader() throws DMaaPAccessDeniedException, CambriaApiException, IOException,

-			TopicExistsException, JSONException, ConfigDbException, AccessDeniedException {

-

-		Assert.assertNotNull(topicService);

-

-		// PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf"))

-				.thenReturn("hello");

-

-		when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null);

-		when(httpServReq.getHeader("AppName")).thenReturn("MyApp");

-		when(httpServReq.getHeader("Authorization")).thenReturn("Admin");

-		when(dmaapContext.getRequest()).thenReturn(httpServReq);

-

-		when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator);

-		when(dmaapContext.getConfigReader()).thenReturn(configReader);

-		when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-		when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(createdTopic);

-		TopicBean topicBean = new TopicBean();

-		topicBean.setTopicName("enfTopicNamePlusExtra");

-		PowerMockito.when(DMaaPAuthenticatorImpl.getAuthenticatedUser(dmaapContext)).thenReturn(null);

-		topicService.deleteTopic(dmaapContext, "topicNamespace.topic");

-	}*/

-	

-	@Test

-	public void testPermitConsumerForTopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException,

-			TopicExistsException, JSONException, ConfigDbException, AccessDeniedException {

-

-		Assert.assertNotNull(topicService);

-

-		// PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf"))

-				.thenReturn("hello");

-

-		when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null);

-		when(httpServReq.getHeader("AppName")).thenReturn("MyApp");

-		when(httpServReq.getHeader("Authorization")).thenReturn("Admin");

-		when(dmaapContext.getRequest()).thenReturn(httpServReq);

-

-		when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator);

-		when(dmaapContext.getConfigReader()).thenReturn(configReader);

-		when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-		when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(createdTopic);

-		TopicBean topicBean = new TopicBean();

-		topicBean.setTopicName("enfTopicNamePlusExtra");

-

-		topicService.permitConsumerForTopic(dmaapContext, "topicNamespace.topic", "admin");

-	}

-	

-	@Test(expected=TopicExistsException.class)

-	public void testPermitConsumerForTopic_nulltopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException,

-			TopicExistsException, JSONException, ConfigDbException, AccessDeniedException {

-

-		Assert.assertNotNull(topicService);

-

-		// PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf"))

-				.thenReturn("hello");

-

-		when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null);

-		when(httpServReq.getHeader("AppName")).thenReturn("MyApp");

-		when(httpServReq.getHeader("Authorization")).thenReturn("Admin");

-		when(dmaapContext.getRequest()).thenReturn(httpServReq);

-

-		when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator);

-		when(dmaapContext.getConfigReader()).thenReturn(configReader);

-		when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-		when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(null);

-		TopicBean topicBean = new TopicBean();

-		topicBean.setTopicName("enfTopicNamePlusExtra");

-

-		topicService.permitConsumerForTopic(dmaapContext, "topicNamespace.topic", "admin");

-	}

-	

-	@Test

-	public void testdenyConsumerForTopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException,

-			TopicExistsException, JSONException, ConfigDbException, AccessDeniedException {

-

-		Assert.assertNotNull(topicService);

-

-		// PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf"))

-				.thenReturn("hello");

-

-		when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null);

-		when(httpServReq.getHeader("AppName")).thenReturn("MyApp");

-		when(httpServReq.getHeader("Authorization")).thenReturn("Admin");

-		when(dmaapContext.getRequest()).thenReturn(httpServReq);

-

-		when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator);

-		when(dmaapContext.getConfigReader()).thenReturn(configReader);

-		when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-		when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(createdTopic);

-		TopicBean topicBean = new TopicBean();

-		topicBean.setTopicName("enfTopicNamePlusExtra");

-

-		topicService.denyConsumerForTopic(dmaapContext, "topicNamespace.topic", "admin");

-	}

-	

-	@Test(expected=TopicExistsException.class)

-	public void testdenyConsumerForTopic_nulltopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException,

-			TopicExistsException, JSONException, ConfigDbException, AccessDeniedException {

-

-		Assert.assertNotNull(topicService);

-

-		// PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf"))

-				.thenReturn("hello");

-

-		when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null);

-		when(httpServReq.getHeader("AppName")).thenReturn("MyApp");

-		when(httpServReq.getHeader("Authorization")).thenReturn("Admin");

-		when(dmaapContext.getRequest()).thenReturn(httpServReq);

-

-		when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator);

-		when(dmaapContext.getConfigReader()).thenReturn(configReader);

-		when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-		when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(null);

-		TopicBean topicBean = new TopicBean();

-		topicBean.setTopicName("enfTopicNamePlusExtra");

-

-		topicService.denyConsumerForTopic(dmaapContext, "topicNamespace.topic", "admin");

-	}

-	

-	

-	@Test

-	public void testPermitPublisherForTopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException,

-			TopicExistsException, JSONException, ConfigDbException, AccessDeniedException {

-

-		Assert.assertNotNull(topicService);

-

-		// PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf"))

-				.thenReturn("hello");

-

-		when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null);

-		when(httpServReq.getHeader("AppName")).thenReturn("MyApp");

-		when(httpServReq.getHeader("Authorization")).thenReturn("Admin");

-		when(dmaapContext.getRequest()).thenReturn(httpServReq);

-

-		when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator);

-		when(dmaapContext.getConfigReader()).thenReturn(configReader);

-		when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-		when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(createdTopic);

-		TopicBean topicBean = new TopicBean();

-		topicBean.setTopicName("enfTopicNamePlusExtra");

-

-		topicService.permitPublisherForTopic(dmaapContext, "topicNamespace.topic", "admin");

-	}

-	

-	@Test(expected=TopicExistsException.class)

-	public void testPermitPublisherForTopic_nulltopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException,

-			TopicExistsException, JSONException, ConfigDbException, AccessDeniedException {

-

-		Assert.assertNotNull(topicService);

-

-		// PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf"))

-				.thenReturn("hello");

-

-		when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null);

-		when(httpServReq.getHeader("AppName")).thenReturn("MyApp");

-		when(httpServReq.getHeader("Authorization")).thenReturn("Admin");

-		when(dmaapContext.getRequest()).thenReturn(httpServReq);

-

-		when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator);

-		when(dmaapContext.getConfigReader()).thenReturn(configReader);

-		when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-		when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(null);

-		TopicBean topicBean = new TopicBean();

-		topicBean.setTopicName("enfTopicNamePlusExtra");

-

-		topicService.permitPublisherForTopic(dmaapContext, "topicNamespace.topic", "admin");

-	}

-	

-	@Test

-	public void testDenyPublisherForTopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException,

-			TopicExistsException, JSONException, ConfigDbException, AccessDeniedException {

-

-		Assert.assertNotNull(topicService);

-

-		// PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf"))

-				.thenReturn("hello");

-

-		when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null);

-		when(httpServReq.getHeader("AppName")).thenReturn("MyApp");

-		when(httpServReq.getHeader("Authorization")).thenReturn("Admin");

-		when(dmaapContext.getRequest()).thenReturn(httpServReq);

-		when(dmaapContext.getResponse()).thenReturn(httpServRes);

-

-		when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator);

-		when(dmaapContext.getConfigReader()).thenReturn(configReader);

-		when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-		when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(createdTopic);

-		TopicBean topicBean = new TopicBean();

-		topicBean.setTopicName("enfTopicNamePlusExtra");

-

-		topicService.denyPublisherForTopic(dmaapContext, "topicNamespace.topic", "admin");;

-	}

-	

-	@Test(expected=TopicExistsException.class)

-	public void testDenyPublisherForTopic_nulltopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException,

-			TopicExistsException, JSONException, ConfigDbException, AccessDeniedException {

-

-		Assert.assertNotNull(topicService);

-

-		// PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf"))

-				.thenReturn("hello");

-

-		when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null);

-		when(httpServReq.getHeader("AppName")).thenReturn("MyApp");

-		when(httpServReq.getHeader("Authorization")).thenReturn("Admin");

-		when(dmaapContext.getRequest()).thenReturn(httpServReq);

-

-		when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator);

-		when(dmaapContext.getConfigReader()).thenReturn(configReader);

-		when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-		when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(null);

-		TopicBean topicBean = new TopicBean();

-		topicBean.setTopicName("enfTopicNamePlusExtra");

-

-		topicService.denyPublisherForTopic(dmaapContext, "topicNamespace.topic", "admin");;

-	}

-	

-	@Test

-	public void testGetAllTopics() throws DMaaPAccessDeniedException, CambriaApiException, IOException,

-			TopicExistsException, JSONException, ConfigDbException, AccessDeniedException {

-

-		Assert.assertNotNull(topicService);

-

-		// PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf"))

-				.thenReturn("hello");

-		PowerMockito.mockStatic(DMaaPResponseBuilder.class);

-		when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null);

-		when(httpServReq.getHeader("AppName")).thenReturn("MyApp");

-		when(httpServReq.getHeader("Authorization")).thenReturn("Admin");

-		when(dmaapContext.getRequest()).thenReturn(httpServReq);

-

-		when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator);

-		when(dmaapContext.getConfigReader()).thenReturn(configReader);

-		when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-		when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(createdTopic);

-		TopicBean topicBean = new TopicBean();

-		topicBean.setTopicName("enfTopicNamePlusExtra");

-

-		topicService.getAllTopics(dmaapContext);

-	}

-	

-	@Test

-	public void testGetTopics() throws DMaaPAccessDeniedException, CambriaApiException, IOException,

-			TopicExistsException, JSONException, ConfigDbException, AccessDeniedException {

-

-		Assert.assertNotNull(topicService);

-

-		// PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		PowerMockito.mockStatic(AJSCPropertiesMap.class);

-		PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf"))

-				.thenReturn("hello");

-		PowerMockito.mockStatic(DMaaPResponseBuilder.class);

-		when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null);

-		when(httpServReq.getHeader("AppName")).thenReturn("MyApp");

-		when(httpServReq.getHeader("Authorization")).thenReturn("Admin");

-		when(dmaapContext.getRequest()).thenReturn(httpServReq);

-

-		when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator);

-		when(dmaapContext.getConfigReader()).thenReturn(configReader);

-		when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-		when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(createdTopic);

-		TopicBean topicBean = new TopicBean();

-		topicBean.setTopicName("enfTopicNamePlusExtra");

-

-		topicService.getTopics(dmaapContext);

-	}

-	

-

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/service/impl/TransactionServiceImplTest.java b/src/test/java/com/att/nsa/cambria/service/impl/TransactionServiceImplTest.java
deleted file mode 100644
index d7fcde4..0000000
--- a/src/test/java/com/att/nsa/cambria/service/impl/TransactionServiceImplTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-

-

-package com.att.nsa.cambria.service.impl;

-

-import static org.junit.Assert.*;

-

-import java.io.IOException;

-

-import com.att.aft.dme2.internal.jettison.json.JSONException;

-import com.att.dmf.mr.beans.DMaaPContext;

-import com.att.dmf.mr.service.impl.TransactionServiceImpl;

-import com.att.dmf.mr.transaction.TransactionObj;

-import com.att.nsa.configs.ConfigDbException;

-import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-public class TransactionServiceImplTest {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-	

-	@Test

-	public void testCheckTransaction() {

-		

-		TransactionServiceImpl service = new TransactionServiceImpl();

-		service.checkTransaction(new TransactionObj("23", 1100, 1000, 10));		

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	@Test

-	public void testGetAllTransactionObjs() {

-		

-		TransactionServiceImpl service = new TransactionServiceImpl();

-		try {

-			service.getAllTransactionObjs(new DMaaPContext());

-		} catch (ConfigDbException | IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}		

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	@Test

-	public void testGetTransactionObj() {

-		

-		TransactionServiceImpl service = new TransactionServiceImpl();

-		try {

-			service.getTransactionObj(new DMaaPContext(), "23");

-		} catch (ConfigDbException | IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (JSONException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}		

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	}

-	

-	

-}

diff --git a/src/test/java/com/att/nsa/cambria/service/impl/UIServiceImplTest.java b/src/test/java/com/att/nsa/cambria/service/impl/UIServiceImplTest.java
deleted file mode 100644
index d47c2d6..0000000
--- a/src/test/java/com/att/nsa/cambria/service/impl/UIServiceImplTest.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.service.impl;

-

-import static org.junit.Assert.*;

-import static org.mockito.Mockito.when;

-

-import java.io.IOException;

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Map;

-import java.util.Set;

-

-import com.att.dmf.mr.backends.ConsumerFactory;

-import com.att.dmf.mr.beans.DMaaPContext;

-import com.att.dmf.mr.beans.DMaaPKafkaMetaBroker;

-import com.att.dmf.mr.metabroker.Topic;

-import com.att.dmf.mr.service.impl.UIServiceImpl;

-import com.att.dmf.mr.security.DMaaPAuthenticatorImpl;

-import com.att.dmf.mr.utils.ConfigurationReader;

-import com.att.dmf.mr.utils.DMaaPResponseBuilder;

-import com.att.nsa.configs.ConfigDbException;

-import com.att.nsa.security.db.NsaApiDb;

-import com.att.nsa.security.db.simple.NsaSimpleApiKey;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-import org.junit.runner.RunWith;

-import org.mockito.InjectMocks;

-import org.mockito.Mock;

-import org.mockito.MockitoAnnotations;

-import org.powermock.api.mockito.PowerMockito;

-import org.powermock.core.classloader.annotations.PrepareForTest;

-import org.powermock.modules.junit4.PowerMockRunner;

-

-@RunWith(PowerMockRunner.class)

-@PrepareForTest({ DMaaPAuthenticatorImpl.class, DMaaPResponseBuilder.class })

-public class UIServiceImplTest {

-

-	@InjectMocks

-	UIServiceImpl service;

-

-	@Mock

-	DMaaPContext dmaapContext;

-	@Mock

-	ConsumerFactory factory;

-

-	@Mock

-	ConfigurationReader configReader;

-

-	@Mock

-	DMaaPKafkaMetaBroker dmaapKafkaMetaBroker;

-

-	@Mock

-	Topic metatopic;

-

-	@Before

-	public void setUp() throws Exception {

-		MockitoAnnotations.initMocks(this);

-		PowerMockito.mockStatic(DMaaPAuthenticatorImpl.class);

-		NsaSimpleApiKey user = new NsaSimpleApiKey("admin", "password");

-

-		PowerMockito.when(dmaapContext.getConfigReader()).thenReturn(configReader);

-		PowerMockito.when(configReader.getfConsumerFactory()).thenReturn(factory);

-

-		PowerMockito.when(configReader.getfApiKeyDb()).thenReturn(fApiKeyDb);

-		PowerMockito.when(DMaaPAuthenticatorImpl.getAuthenticatedUser(dmaapContext)).thenReturn(user);

-		PowerMockito.mockStatic(DMaaPResponseBuilder.class);

-		PowerMockito.when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testHello() {

-

-		try {

-			service.hello(dmaapContext);

-		} catch (IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-

-	}

-

-	@Test

-	public void testGetApiKeysTable() {

-

-		try {

-			service.getApiKeysTable(dmaapContext);

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			// e.printStackTrace();

-			assertTrue(true);

-		} catch (ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		assertTrue(true);

-

-	}

-

-	@Test

-	public void testGetApiKey() {

-

-		try {

-			service.getApiKey(dmaapContext, "admin");

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			// e.printStackTrace();

-			assertTrue(true);

-		} catch (ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (Exception e) {

-			// TODO Auto-generated catch block

-			assertTrue(true);

-		}

-

-	}

-

-	@Test

-	public void testGetApiKey_invalidkey() {

-

-		try {

-			service.getApiKey(dmaapContext, "k56HmWT72J");

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			// e.printStackTrace();

-			assertTrue(true);

-		} catch (ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (Exception e) {

-			// TODO Auto-generated catch block

-			assertTrue(true);

-		}

-

-	}

-

-	@Test

-	public void testGetTopicsTable() {

-

-		try {

-			List<Topic> topics = new ArrayList<Topic>();

-			topics.add(metatopic);

-			when(dmaapKafkaMetaBroker.getAllTopics()).thenReturn(topics);

-			service.getTopicsTable(dmaapContext);

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			// e.printStackTrace();

-

-		} catch (ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (Exception e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		assertTrue(true);

-

-	}

-

-	@Test

-	public void testGetTopic() {

-

-		try {

-			when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(metatopic);

-			service.getTopic(dmaapContext, "testTopic");

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			// e.printStackTrace();

-

-		} catch (ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (Exception e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		assertTrue(true);

-	}

-

-	@Test

-	public void testGetTopic_nulltopic() {

-

-		try {

-			when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(null);

-			service.getTopic(dmaapContext, "testTopic");

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			// e.printStackTrace();

-		} catch (ConfigDbException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (Exception e) {

-			// TODO Auto-generated catch block

-			assertTrue(true);

-		}

-

-	}

-

-	NsaApiDb<NsaSimpleApiKey> fApiKeyDb = new NsaApiDb<NsaSimpleApiKey>() {

-

-		Set<String> keys = new HashSet<>(Arrays.asList("testkey", "admin"));

-

-		@Override

-		public NsaSimpleApiKey createApiKey(String arg0, String arg1)

-				throws com.att.nsa.security.db.NsaApiDb.KeyExistsException, ConfigDbException {

-			// TODO Auto-generated method stub

-			return new NsaSimpleApiKey(arg0, arg1);

-		}

-

-		@Override

-		public boolean deleteApiKey(NsaSimpleApiKey arg0) throws ConfigDbException {

-			// TODO Auto-generated method stub

-			return false;

-		}

-

-		@Override

-		public boolean deleteApiKey(String arg0) throws ConfigDbException {

-			// TODO Auto-generated method stub

-			return false;

-		}

-

-		@Override

-		public Map<String, NsaSimpleApiKey> loadAllKeyRecords() throws ConfigDbException {

-			Map<String, NsaSimpleApiKey> map = new HashMap<String, NsaSimpleApiKey>();

-			map.put("testkey", new NsaSimpleApiKey("testkey", "password"));

-			map.put("admin", new NsaSimpleApiKey("admin", "password"));

-

-			return map;

-		}

-

-		@Override

-		public Set<String> loadAllKeys() throws ConfigDbException {

-			// TODO Auto-generated method stub

-

-			return keys;

-		}

-

-		@Override

-		public NsaSimpleApiKey loadApiKey(String arg0) throws ConfigDbException {

-			if (!keys.contains(arg0)) {

-				return null;

-			}

-			return new NsaSimpleApiKey(arg0, "password");

-		}

-

-		@Override

-		public void saveApiKey(NsaSimpleApiKey arg0) throws ConfigDbException {

-			// TODO Auto-generated method stub

-

-		}

-	};

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/transaction/JUnitTestSuite.java b/src/test/java/com/att/nsa/cambria/transaction/JUnitTestSuite.java
deleted file mode 100644
index 2391679..0000000
--- a/src/test/java/com/att/nsa/cambria/transaction/JUnitTestSuite.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.transaction;

-

-import junit.framework.TestSuite;

-

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite;

-import org.junit.runners.Suite.SuiteClasses;

-import org.apache.log4j.Logger;

-

-@RunWith(Suite.class)

-@SuiteClasses({ TransactionObjTest.class, TrnRequestTest.class, })

-public class JUnitTestSuite {

-	private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);

-

-	public static void main(String[] args) {

-		LOGGER.info("Running the test suite");

-		

-		TestSuite tstSuite = new TestSuite();

-		LOGGER.info("Total Test Counts " + tstSuite.countTestCases());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/transaction/TestRunner.java b/src/test/java/com/att/nsa/cambria/transaction/TestRunner.java
deleted file mode 100644
index e420175..0000000
--- a/src/test/java/com/att/nsa/cambria/transaction/TestRunner.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.transaction;

-

-import org.junit.runner.JUnitCore;

-import org.junit.runner.Result;

-import org.junit.runner.notification.Failure;

-import org.apache.log4j.Logger;

-

-public class TestRunner {

-	private static final Logger LOGGER = Logger.getLogger(TestRunner.class);

-

-	public static void main(String[] args) {

-		// TODO Auto-generated method stub

-		Result result = JUnitCore.runClasses(JUnitTestSuite.class);

-		for (Failure failure : result.getFailures()) {

-			LOGGER.info(failure.toString());

-			

-		}

-		LOGGER.info(result.wasSuccessful());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/transaction/TransactionObjTest.java b/src/test/java/com/att/nsa/cambria/transaction/TransactionObjTest.java
deleted file mode 100644
index 2e6aa21..0000000
--- a/src/test/java/com/att/nsa/cambria/transaction/TransactionObjTest.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.transaction;

-

-import static org.junit.Assert.*;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.transaction.TransactionObj;

-

-public class TransactionObjTest {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testAsJsonObject() {

-		TransactionObj obj = new TransactionObj("23", 100, 98, 2);

-		

-		try {

-			obj.asJsonObject();

-			

-		} catch(NullPointerException e) {

-			assertTrue(true);

-		}

-		 

-	}

-	

-	@Test

-	public void testGetId() {

-		TransactionObj obj = new TransactionObj("23", 100, 98, 2);

-		obj.getId();

-		assertTrue(true);

-

-	}

-	

-	@Test

-	public void testSetId() {

-		TransactionObj obj = new TransactionObj("23", 100, 98, 2);

-		obj.setId("23");

-		assertTrue(true);

-	 

-	}

-

-	@Test

-	public void testGetCreateTime() {

-		TransactionObj obj = new TransactionObj("23", 100, 98, 2);

-		obj.getCreateTime();

-		assertTrue(true);

-		 

-	}

-	

-	@Test

-	public void testSetCreateTime() {

-		TransactionObj obj = new TransactionObj("23", 100, 98, 2);

-		obj.setCreateTime("12:00:00");

-		assertTrue(true);

-		 

-	}

-	

-	@Test

-	public void testSerialize() {

-		TransactionObj obj = new TransactionObj("23", 100, 98, 2);

-		obj.serialize();

-		assertTrue(true);

-		 

-	}

-	

-	@Test

-	public void testGetTotalMessageCount() {

-		TransactionObj obj = new TransactionObj("23", 100, 98, 2);

-		obj.getTotalMessageCount();

-		assertTrue(true);

-		 

-	}

-	

-	@Test

-	public void testSetTotalMessageCount() {

-		TransactionObj obj = new TransactionObj("23", 100, 98, 2);

-		obj.setTotalMessageCount(200);

-		assertTrue(true);

-		 

-	}

-	

-	@Test

-	public void testGetSuccessMessageCount() {

-		TransactionObj obj = new TransactionObj("23", 100, 98, 2);

-		obj.getSuccessMessageCount();

-		assertTrue(true);

-		 

-	}

-	

-	@Test

-	public void testSetSuccessMessageCount() {

-		TransactionObj obj = new TransactionObj("23", 100, 98, 2);

-		obj.setSuccessMessageCount(198);

-		assertTrue(true);

-		 

-	}

-	

-	@Test

-	public void testGetFailureMessageCount() {

-		TransactionObj obj = new TransactionObj("23", 100, 98, 2);

-		obj.getFailureMessageCount();

-		assertTrue(true);

-		 

-	}

-	

-	@Test

-	public void testSetFailureMessageCount() {

-		TransactionObj obj = new TransactionObj("23", 100, 98, 2);

-		obj.setFailureMessageCount(2);

-		assertTrue(true);

-		 

-	}

-	

-	@Test

-	public void testGetfData() {

-		TransactionObj obj = new TransactionObj("23", 100, 98, 2);

-		obj.getfData();

-		assertTrue(true);

-		 

-	}

-	

-	@Test

-	public void testSetfData() {

-		TransactionObj obj = new TransactionObj("23", 100, 98, 2);

-		obj.setfData(null);

-		assertTrue(true);

-		 

-	}

-	

-	@Test

-	public void testGetTrnRequest() {

-		TransactionObj obj = new TransactionObj("23", 100, 98, 2);

-		obj.getTrnRequest();

-		assertTrue(true);

-		 

-	}

-	

-	@Test

-	public void testSetTrnRequest() {

-		TransactionObj obj = new TransactionObj("23", 100, 98, 2);

-		obj.setTrnRequest(null);

-		assertTrue(true);

-		 

-	}

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/transaction/TrnRequestTest.java b/src/test/java/com/att/nsa/cambria/transaction/TrnRequestTest.java
deleted file mode 100644
index 40e59af..0000000
--- a/src/test/java/com/att/nsa/cambria/transaction/TrnRequestTest.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.transaction;

-

-import static org.junit.Assert.*;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.transaction.TransactionObj;

-import com.att.dmf.mr.transaction.TrnRequest;

-

-public class TrnRequestTest {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetId() {

-		TrnRequest req = new TrnRequest();

-		

-		req.getId();

-		assertTrue(true);

-		 

-	}

-	

-	@Test

-	public void testSetId() {

-		TrnRequest req = new TrnRequest();

-		

-		req.setId("23");

-		assertTrue(true);

-	 

-	}

-	

-	@Test

-	public void testGetRequestCreate() {

-		TrnRequest req = new TrnRequest();

-		

-		req.getRequestCreate();

-		assertTrue(true);

-	 

-	}

-	

-	@Test

-	public void testSetRequestCreate() {

-		TrnRequest req = new TrnRequest();

-		

-		req.setRequestCreate("createRequest");

-		assertTrue(true);

-	 

-	}

-	

-	@Test

-	public void testGetRequestHost() {

-		TrnRequest req = new TrnRequest();

-		

-		req.getRequestHost();

-		assertTrue(true);

-	 

-	}

-	

-	@Test

-	public void testSetRequestHost() {

-		TrnRequest req = new TrnRequest();

-		

-		req.setRequestHost("requestHost");

-		assertTrue(true);

-	 

-	}

-	

-	@Test

-	public void testGetServerHost() {

-		TrnRequest req = new TrnRequest();

-		

-		req.getServerHost();

-		assertTrue(true);

-	 

-	}

-	

-	@Test

-	public void testSetServerHost() {

-		TrnRequest req = new TrnRequest();

-		

-		req.setServerHost("requestHost");

-		assertTrue(true);

-	 

-	}

-	

-	@Test

-	public void testGetMessageProceed() {

-		TrnRequest req = new TrnRequest();

-		

-		req.getMessageProceed();

-		assertTrue(true);

-	 

-	}

-	

-	@Test

-	public void testSetMessageProceed() {

-		TrnRequest req = new TrnRequest();

-		

-		req.setMessageProceed("messageProceed");

-		assertTrue(true);

-	 

-	}

-	

-	@Test

-	public void testGetTotalMessage() {

-		TrnRequest req = new TrnRequest();

-		

-		req.getTotalMessage();

-		assertTrue(true);

-	 

-	}

-	

-	@Test

-	public void testSetTotalMessage() {

-		TrnRequest req = new TrnRequest();

-		

-		req.setTotalMessage("200");

-		assertTrue(true);

-	 

-	}

-	

-	

-	@Test

-	public void testGetClientType() {

-		TrnRequest req = new TrnRequest();

-		

-		req.getClientType();

-		assertTrue(true);

-	 

-	}

-	

-	@Test

-	public void testSetClientType() {

-		TrnRequest req = new TrnRequest();

-		

-		req.setClientType("admin");

-		assertTrue(true);

-	 

-	}

-	

-	@Test

-	public void testGetUrl() {

-		TrnRequest req = new TrnRequest();

-		

-		req.getUrl();

-		assertTrue(true);

-	 

-	}

-	

-	@Test

-	public void testSetUrl() {

-		TrnRequest req = new TrnRequest();

-		

-		req.setUrl("http://google.com");

-		assertTrue(true);

-	 

-	}

-	

-}

diff --git a/src/test/java/com/att/nsa/cambria/transaction/impl/DMaaPSimpleTransactionFactoryTest.java b/src/test/java/com/att/nsa/cambria/transaction/impl/DMaaPSimpleTransactionFactoryTest.java
deleted file mode 100644
index 5260993..0000000
--- a/src/test/java/com/att/nsa/cambria/transaction/impl/DMaaPSimpleTransactionFactoryTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.transaction.impl;

-

-import static org.junit.Assert.*;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.dmf.mr.transaction.impl.DMaaPSimpleTransactionFactory;

-

-public class DMaaPSimpleTransactionFactoryTest {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testMakeNewTransactionObj() {

-		

-		DMaaPSimpleTransactionFactory factory = new DMaaPSimpleTransactionFactory();

-		

-		factory.makeNewTransactionObj("{'transactionId': '123', 'totalMessageCount': '200', "

-				+ "'successMessageCount': '200', 'failureMessageCount': '0'}");

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-		

-	 

-	}

-	

-	@Test

-	public void testMakeNewTransactionId() {

-		

-		DMaaPSimpleTransactionFactory factory = new DMaaPSimpleTransactionFactory();

-		factory.makeNewTransactionId("123");

-		

-		String trueValue = "True";

-		assertTrue(trueValue.equalsIgnoreCase("True"));

-	

-	}

-	

-	

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/transaction/impl/JUnitTestSuite.java b/src/test/java/com/att/nsa/cambria/transaction/impl/JUnitTestSuite.java
deleted file mode 100644
index c18ac8e..0000000
--- a/src/test/java/com/att/nsa/cambria/transaction/impl/JUnitTestSuite.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.transaction.impl;

-

-import junit.framework.TestSuite;

-

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite;

-import org.junit.runners.Suite.SuiteClasses;

-import org.apache.log4j.Logger;

-

-@RunWith(Suite.class)

-@SuiteClasses({ DMaaPSimpleTransactionFactoryTest.class, })

-public class JUnitTestSuite {

-	private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);

-

-	public static void main(String[] args) {

-		LOGGER.info("Running the test suite");

-		

-		TestSuite tstSuite = new TestSuite();

-		LOGGER.info("Total Test Counts " + tstSuite.countTestCases());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/transaction/impl/TestRunner.java b/src/test/java/com/att/nsa/cambria/transaction/impl/TestRunner.java
deleted file mode 100644
index 430509e..0000000
--- a/src/test/java/com/att/nsa/cambria/transaction/impl/TestRunner.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.transaction.impl;

-

-import org.junit.runner.JUnitCore;

-import org.junit.runner.Result;

-import org.junit.runner.notification.Failure;

-import org.apache.log4j.Logger;

-

-public class TestRunner {

-	private static final Logger LOGGER = Logger.getLogger(TestRunner.class);

-

-	public static void main(String[] args) {

-		// TODO Auto-generated method stub

-		Result result = JUnitCore.runClasses(JUnitTestSuite.class);

-		for (Failure failure : result.getFailures()) {

-			LOGGER.info(failure.toString());

-			

-		}

-		LOGGER.info(result.wasSuccessful());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/utils/ConfigurationReaderTest.java b/src/test/java/com/att/nsa/cambria/utils/ConfigurationReaderTest.java
deleted file mode 100644
index 907b935..0000000
--- a/src/test/java/com/att/nsa/cambria/utils/ConfigurationReaderTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.utils;

-

-import static org.junit.Assert.assertNotNull;

-

-import org.junit.After;

-import org.junit.Test;

-

-import com.att.nsa.cambria.embed.EmbedConfigurationReader;

-import com.att.dmf.mr.utils.ConfigurationReader;

-

-public class ConfigurationReaderTest {

-

-	EmbedConfigurationReader embedConfigurationReader = new EmbedConfigurationReader();

-

-	@After

-	public void tearDown() throws Exception {

-		embedConfigurationReader.tearDown();

-	}

-

-	@Test

-	public void testConfigurationReader() throws Exception {

-				

-		ConfigurationReader configurationReader = embedConfigurationReader.buildConfigurationReader();

-		

-		assertNotNull(configurationReader);

-		assertNotNull(configurationReader.getfApiKeyDb());

-		assertNotNull(configurationReader.getfConfigDb());

-		assertNotNull(configurationReader.getfConsumerFactory());

-		assertNotNull(configurationReader.getfIpBlackList());

-		assertNotNull(configurationReader.getfMetaBroker());

-		assertNotNull(configurationReader.getfMetrics());

-		assertNotNull(configurationReader.getfPublisher());

-		assertNotNull(configurationReader.getfSecurityManager());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/utils/DMaaPCuratorFactoryTest.java b/src/test/java/com/att/nsa/cambria/utils/DMaaPCuratorFactoryTest.java
deleted file mode 100644
index 90e6f6f..0000000
--- a/src/test/java/com/att/nsa/cambria/utils/DMaaPCuratorFactoryTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.utils;

-

-import static org.junit.Assert.*;

-

-import java.io.File;

-import java.util.HashMap;

-import java.util.Map;

-

-import org.apache.curator.framework.CuratorFramework;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.ajsc.filemonitor.AJSCPropertiesMap;

-import com.att.dmf.mr.constants.CambriaConstants;

-import com.att.dmf.mr.utils.DMaaPCuratorFactory;

-import com.att.dmf.mr.utils.PropertyReader;

-import com.att.nsa.drumlin.till.nv.rrNvReadable.loadException;

-import com.att.nsa.drumlin.till.nv.impl.nvPropertiesFile;

-import com.att.nsa.drumlin.till.nv.impl.nvReadableTable;

-

-public class DMaaPCuratorFactoryTest {

-

-	@Before

-	public void setUp() throws Exception {

-		ClassLoader classLoader = getClass().getClassLoader();		

-		AJSCPropertiesMap.refresh(new File(classLoader.getResource(CambriaConstants.msgRtr_prop).getFile()));

-		

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testgetCurator() throws loadException {

-		CuratorFramework curatorFramework = DMaaPCuratorFactory.getCurator(new PropertyReader());

-		assertNotNull(curatorFramework);

-		

-		Map<String, String> map = com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperties(CambriaConstants.msgRtr_prop);

-		map.remove(CambriaConstants.kSetting_ZkConfigDbServers);

-		map.remove(CambriaConstants.kSetting_ZkSessionTimeoutMs);

-		

-		

-		

-		curatorFramework = DMaaPCuratorFactory.getCurator(new PropertyReader());

-		assertNotNull(curatorFramework);

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/utils/DMaaPResponseBuilderTest.java b/src/test/java/com/att/nsa/cambria/utils/DMaaPResponseBuilderTest.java
deleted file mode 100644
index 66e4405..0000000
--- a/src/test/java/com/att/nsa/cambria/utils/DMaaPResponseBuilderTest.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.cambria.utils;

-

-import static org.junit.Assert.*;

-

-import java.io.IOException;

-

-import org.json.JSONException;

-import org.json.JSONObject;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-import org.springframework.mock.web.MockHttpServletRequest;

-import org.springframework.mock.web.MockHttpServletResponse;

-

-import com.att.dmf.mr.beans.DMaaPContext;

-import com.att.dmf.mr.utils.DMaaPResponseBuilder;

-

-public class DMaaPResponseBuilderTest {

-	

-	DMaaPContext dMaapContext;

-	MockHttpServletRequest request;

-	MockHttpServletResponse response;

-

-	@Before

-	public void setUp() throws Exception {

-		

-		dMaapContext = new DMaaPContext();

-		request = new MockHttpServletRequest();

-		response = new MockHttpServletResponse();

-		dMaapContext.setRequest(request);

-		dMaapContext.setResponse(response);

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testsetNoCacheHeadings(){		

-		DMaaPResponseBuilder.setNoCacheHeadings(dMaapContext);		

-		assertEquals("no-cache", response.getHeader("Pragma"));

-	}

-	

-	@Test

-	public void testrespondOk() throws JSONException, IOException{

-		JSONObject jsonObject = new JSONObject();

-		jsonObject.put("Name", "Test");

-		

-		DMaaPResponseBuilder.respondOk(dMaapContext, jsonObject);

-		assertEquals("application/json", response.getContentType());

-		assertEquals(200, response.getStatus());

-		

-		request.setMethod("HEAD");

-		

-		DMaaPResponseBuilder.respondOk(dMaapContext, jsonObject);

-		assertEquals("application/json", response.getContentType());

-		assertEquals(200, response.getStatus());

-	}

-	

-	@Test

-	public void testrespondOkNoContent(){

-		DMaaPResponseBuilder.respondOkNoContent(dMaapContext);

-		assertEquals(204, response.getStatus());

-	}

-	

-	@Test

-	public void testrespondOkWithHtml(){

-		DMaaPResponseBuilder.respondOkWithHtml(dMaapContext, "<head></head>");

-		

-		assertEquals("text/html", response.getContentType());

-		assertEquals(200, response.getStatus());

-	}

-	

-	@Test

-	public void testrespondWithError(){

-		DMaaPResponseBuilder.respondWithError(dMaapContext, 500, "InternalServerError");

-		assertEquals(500, response.getStatus());

-	}

-	

-	@Test

-	public void testrespondWithJsonError(){

-		JSONObject o = new JSONObject();

-		o.put("status", 500);

-		o.put("message", "InternalServerError");

-		DMaaPResponseBuilder.respondWithError(dMaapContext, 500, o);

-		assertEquals(500, response.getStatus());

-	}

-	

-	@Test

-	public void testrespondWithErrorInJson(){

-		DMaaPResponseBuilder.respondWithErrorInJson(dMaapContext, 500, "InternalServerError");

-		

-		assertEquals("application/json", response.getContentType());

-		assertEquals(500, response.getStatus());

-	}

-	

-	@Test

-	public void testsendErrorAndBody(){

-		DMaaPResponseBuilder.sendErrorAndBody(dMaapContext, 500, "InternalServerError", "text/html");

-		

-		assertEquals("text/html", response.getContentType());

-		assertEquals(500, response.getStatus());

-		

-		request.setMethod("HEAD");

-		

-		DMaaPResponseBuilder.sendErrorAndBody(dMaapContext, 500, "InternalServerError", "text/html");

-		

-		assertEquals("text/html", response.getContentType());

-		assertEquals(500, response.getStatus());

-		

-	}

-	

-	@Test

-	public void testgetStreamForBinaryResponse() throws IOException{

-		DMaaPResponseBuilder.getStreamForBinaryResponse(dMaapContext);

-		

-		assertEquals("application/octet-stream", response.getContentType());

-		assertEquals(200, response.getStatus());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/cambria/utils/UtilsTest.java b/src/test/java/com/att/nsa/cambria/utils/UtilsTest.java
deleted file mode 100644
index bff4d48..0000000
--- a/src/test/java/com/att/nsa/cambria/utils/UtilsTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
-/*-
- * ============LICENSE_START=======================================================
- * ONAP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
- 
-package com.att.nsa.cambria.utils;
-
-import static org.junit.Assert.*;
-
-import java.security.Principal;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.http.auth.BasicUserPrincipal;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.mock.web.MockHttpServletRequest;
-
-import com.att.dmf.mr.beans.DMaaPContext;
-import com.att.dmf.mr.utils.Utils;
-
-public class UtilsTest {
-
-	private static final String DATE_FORMAT = "dd-MM-yyyy::hh:mm:ss:SSS";
-
-	@Before
-	public void setUp() throws Exception {
-	}
-
-	@After
-	public void tearDown() throws Exception {
-	}
-
-	@Test
-	public void testGetFormattedDate() {
-		Date now = new Date();
-		String dateStr = Utils.getFormattedDate(now);
-		SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT);
-		String expectedStr = sdf.format(now);
-		assertNotNull(dateStr);
-		assertTrue("Formatted date does not match - expected [" + expectedStr
-				+ "] received [" + dateStr + "]",
-				dateStr.equalsIgnoreCase(expectedStr));
-	}
-	
-	@Test
-	public void testgetUserApiKey(){
-		MockHttpServletRequest request = new MockHttpServletRequest();
-		request.addHeader(Utils.CAMBRIA_AUTH_HEADER, "User:Password");
-		assertEquals("User", Utils.getUserApiKey(request));
-		
-		MockHttpServletRequest request2 = new MockHttpServletRequest();
-		Principal principal = new BasicUserPrincipal("User@Test");
-		request2.setUserPrincipal(principal);
-		request2.addHeader("Authorization", "test");
-		assertEquals("User", Utils.getUserApiKey(request2));
-		
-		MockHttpServletRequest request3 = new MockHttpServletRequest();
-		assertNull(Utils.getUserApiKey(request3));
-	}
-	
-	@Test
-	public void testgetFromattedBatchSequenceId(){
-		Long x = new Long(1234);
-		String str = Utils.getFromattedBatchSequenceId(x);
-		assertEquals("001234", str);		
-	}
-	
-	@Test
-	public void testmessageLengthInBytes(){
-		String str = "TestString";
-		long length = Utils.messageLengthInBytes(str);
-		assertEquals(10, length);
-		assertEquals(0, Utils.messageLengthInBytes(null));
-	}
-
-	@Test
-	public void testgetResponseTransactionId(){
-		String transactionId = "test123::sampleResponseMessage";
-		assertEquals("test123",Utils.getResponseTransactionId(transactionId));
-		assertNull(Utils.getResponseTransactionId(null));
-		assertNull(Utils.getResponseTransactionId(""));
-	}
-	
-	@Test
-	public void testgetSleepMsForRate(){
-		long x = Utils.getSleepMsForRate(1024.124);
-		assertEquals(1000, x);
-		assertEquals(0, Utils.getSleepMsForRate(-1));
-	}
-	
-	@Test
-	public void testgetRemoteAddress(){
-		DMaaPContext dMaapContext = new DMaaPContext();
-		MockHttpServletRequest request = new MockHttpServletRequest();
-		
-		dMaapContext.setRequest(request);
-		
-		assertEquals(request.getRemoteAddr(), Utils.getRemoteAddress(dMaapContext));
-		
-		request.addHeader("X-Forwarded-For", "XForward");
-		assertEquals("XForward", Utils.getRemoteAddress(dMaapContext));
-		
-		
-	}
-}
diff --git a/src/test/java/com/att/nsa/filter/ContentLengthFilterTest.java b/src/test/java/com/att/nsa/filter/ContentLengthFilterTest.java
deleted file mode 100644
index 6930f73..0000000
--- a/src/test/java/com/att/nsa/filter/ContentLengthFilterTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.filter;

-

-import static org.junit.Assert.*;

-

-import java.io.IOException;

-

-import javax.servlet.ServletException;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.mr.filter.ContentLengthFilter;

-

-public class ContentLengthFilterTest {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testDestroy() {

-		ContentLengthFilter filter = new ContentLengthFilter();

-		

-		filter.destroy();

-		

-		assertTrue(true);

-	}

-	

-	

-	@Test

-	public void testFilter() {

-		ContentLengthFilter filter = new ContentLengthFilter();

-		

-		try {

-			filter.doFilter(null, null, null);

-		} catch (IOException | ServletException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			assertTrue(true);

-		}

-		

-		

-	}

-	

-	@Test

-	public void testInit() {

-		ContentLengthFilter filter = new ContentLengthFilter();

-		

-		try {

-			filter.init(null);

-		} catch (ServletException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		} catch (NullPointerException e) {

-			// TODO Auto-generated catch block

-			assertTrue(true);

-		}		

-		

-	}

-

-

-}
\ No newline at end of file
diff --git a/src/test/java/com/att/nsa/filter/DefaultLengthTest.java b/src/test/java/com/att/nsa/filter/DefaultLengthTest.java
deleted file mode 100644
index 8be5ca7..0000000
--- a/src/test/java/com/att/nsa/filter/DefaultLengthTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.filter;

-

-import static org.junit.Assert.*;

-

-import java.io.IOException;

-

-import javax.servlet.ServletException;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.att.mr.filter.DefaultLength;

-

-public class DefaultLengthTest {

-

-	@Before

-	public void setUp() throws Exception {

-	}

-

-	@After

-	public void tearDown() throws Exception {

-	}

-

-	@Test

-	public void testGetDefaultLength() {

-		DefaultLength length = new DefaultLength();

-		

-		length.getDefaultLength();

-		

-		assertTrue(true);

-	}

-	

-	@Test

-	public void testSetDefaultLength() {

-		DefaultLength length = new DefaultLength();

-		

-		length.setDefaultLength("23");

-		

-		assertTrue(true);

-	}

-

-

-

-

-

-}
\ No newline at end of file
diff --git a/src/test/java/com/att/nsa/filter/JUnitTestSuite.java b/src/test/java/com/att/nsa/filter/JUnitTestSuite.java
deleted file mode 100644
index 46df4a3..0000000
--- a/src/test/java/com/att/nsa/filter/JUnitTestSuite.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.filter;

-

-import junit.framework.TestSuite;

-

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite;

-import org.junit.runners.Suite.SuiteClasses;

-import org.apache.log4j.Logger;

-

-@RunWith(Suite.class)

-@SuiteClasses({ ContentLengthFilterTest.class, DefaultLengthTest.class,})

-public class JUnitTestSuite {

-	private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);

-

-	public static void main(String[] args) {

-		LOGGER.info("Running the test suite");

-		

-		TestSuite tstSuite = new TestSuite();

-		LOGGER.info("Total Test Counts " + tstSuite.countTestCases());

-	}

-

-}

diff --git a/src/test/java/com/att/nsa/filter/TestRunner.java b/src/test/java/com/att/nsa/filter/TestRunner.java
deleted file mode 100644
index 832a720..0000000
--- a/src/test/java/com/att/nsa/filter/TestRunner.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP Policy Engine

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package com.att.nsa.filter;

-

-import org.junit.runner.JUnitCore;

-import org.junit.runner.Result;

-import org.junit.runner.notification.Failure;

-import org.apache.log4j.Logger;

-

-public class TestRunner {

-	private static final Logger LOGGER = Logger.getLogger(TestRunner.class);

-

-	public static void main(String[] args) {

-		// TODO Auto-generated method stub

-		Result result = JUnitCore.runClasses(JUnitTestSuite.class);

-		for (Failure failure : result.getFailures()) {

-			LOGGER.info(failure.toString());

-			

-		}

-		LOGGER.info(result.wasSuccessful());

-	}

-

-}

diff --git a/src/test/java/com/att/sa/cambria/testClient/SimpleExample.java b/src/test/java/com/att/sa/cambria/testClient/SimpleExample.java
deleted file mode 100644
index a6ad73e..0000000
--- a/src/test/java/com/att/sa/cambria/testClient/SimpleExample.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  Copyright © 2017 AT&T Intellectual Property. 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.
- *  You may obtain a copy of the License at
- *        http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
- *******************************************************************************/
-
-package com.att.sa.cambria.testClient;
-
-import kafka.api.FetchRequest;
-import kafka.api.FetchRequestBuilder;
-import kafka.api.PartitionOffsetRequestInfo;
-import kafka.cluster.Broker;
-import kafka.common.ErrorMapping;
-import kafka.common.TopicAndPartition;
-import kafka.javaapi.*;
-import kafka.javaapi.consumer.SimpleConsumer;
-import kafka.message.MessageAndOffset;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-public class SimpleExample
-{
-//	public static void main ( String args[] )
-//	{
-//		if ( args.length < 5 )
-//		{
-//			System.err.println ( "usage: SimpleExample <maxReads> <topic> <partition> <host> <port>" );
-//			return;
-//		}
-//		
-//		final long maxReads = Long.parseLong ( args[0] );
-//		final String topic = args[1];
-//		final int partition = Integer.parseInt ( args[2] );
-//
-//		final int port = Integer.parseInt ( args[4] );
-//		final hostPort hp = new hostPort ( args[3], port );
-//		final LinkedList<hostPort> seeds = new LinkedList<hostPort> ();
-//		seeds.add ( hp );
-//
-//		try
-//		{
-//			final SimpleExample example = new SimpleExample ();
-//			example.run ( maxReads, topic, partition, seeds );
-//		}
-//		catch ( Exception e )
-//		{
-//			System.out.println ( "Oops:" + e );
-//			e.printStackTrace ();
-//		}
-//	}
-//
-//	public SimpleExample ()
-//	{
-//		fReplicaBrokers = new ArrayList<hostPort> ();
-//	}
-//
-//	public void run ( long remainingAllowedReads, String a_topic, int a_partition, List<hostPort> seedHosts ) throws IOException
-//	{
-//		// find the meta data about the topic and partition we are interested in
-//
-//		hostPort leadBroker = findLeader ( seedHosts, a_topic, a_partition );
-//		if ( leadBroker == null )
-//		{
-//			System.out.println ( "Can't find leader for Topic and Partition. Exiting" );
-//			return;
-//		}
-//
-//		final String clientName = "Client_" + a_topic + "_" + a_partition;
-//
-//		SimpleConsumer consumer = new SimpleConsumer ( leadBroker.fHost, leadBroker.fPort, 100000, 64 * 1024, clientName );
-//		long readOffset = getLastOffset ( consumer, a_topic, a_partition, kafka.api.OffsetRequest.EarliestTime (), clientName );
-//
-//		int numErrors = 0;
-//		while ( remainingAllowedReads > 0 )
-//		{
-//			if ( consumer == null )
-//			{
-//				consumer = new SimpleConsumer ( leadBroker.fHost, leadBroker.fPort, 100000, 64 * 1024, clientName );
-//			}
-//
-//			final FetchRequest req = new FetchRequestBuilder ()
-//				.clientId ( clientName )
-//				.addFetch ( a_topic, a_partition, readOffset, 100000 ).build ();
-//			final FetchResponse fetchResponse = consumer.fetch ( req );
-//
-//			if ( fetchResponse.hasError () )
-//			{
-//				numErrors++;
-//
-//				// Something went wrong!
-//				final short code = fetchResponse.errorCode ( a_topic, a_partition );
-//				System.out.println ( "Error fetching data from the Broker:" + leadBroker + " Reason: " + code );
-//				if ( numErrors > 5 )
-//					break;
-//
-//				if ( code == ErrorMapping.OffsetOutOfRangeCode () )
-//				{
-//					// We asked for an invalid offset. For simple case ask for
-//					// the last element to reset
-//					readOffset = getLastOffset ( consumer, a_topic,
-//						a_partition, kafka.api.OffsetRequest.LatestTime (),
-//						clientName );
-//					continue;
-//				}
-//
-//				consumer.close ();
-//				consumer = null;
-//
-//				leadBroker = findNewLeader ( leadBroker, a_topic, a_partition );
-//				continue;
-//			}
-//			numErrors = 0;
-//
-//			long numRead = 0;
-//			for ( MessageAndOffset messageAndOffset : fetchResponse.messageSet ( a_topic, a_partition ) )
-//			{
-//				long currentOffset = messageAndOffset.offset ();
-//				if ( currentOffset < readOffset )
-//				{
-//					System.out.println ( "Found an old offset: "
-//						+ currentOffset + " Expecting: " + readOffset );
-//					continue;
-//				}
-//				readOffset = messageAndOffset.nextOffset ();
-//				ByteBuffer payload = messageAndOffset.message ().payload ();
-//
-//				byte[] bytes = new byte [payload.limit ()];
-//				payload.get ( bytes );
-//				System.out.println ( String.valueOf ( messageAndOffset.offset () ) + ": " + new String ( bytes, "UTF-8" ) );
-//				numRead++;
-//				remainingAllowedReads--;
-//			}
-//
-//			if ( numRead == 0 )
-//			{
-//				try
-//				{
-//					Thread.sleep ( 1000 );
-//				}
-//				catch ( InterruptedException ie )
-//				{
-//				}
-//			}
-//		}
-//
-//		if ( consumer != null )
-//		{
-//			consumer.close ();
-//		}
-//	}
-//
-//	public static long getLastOffset ( SimpleConsumer consumer, String topic,
-//		int partition, long whichTime, String clientName )
-//	{
-//		TopicAndPartition topicAndPartition = new TopicAndPartition ( topic,
-//			partition );
-//		Map<TopicAndPartition, PartitionOffsetRequestInfo> requestInfo = new HashMap<TopicAndPartition, PartitionOffsetRequestInfo> ();
-//		requestInfo.put ( topicAndPartition, new PartitionOffsetRequestInfo (
-//			whichTime, 1 ) );
-//		kafka.javaapi.OffsetRequest request = new kafka.javaapi.OffsetRequest (
-//			requestInfo, kafka.api.OffsetRequest.CurrentVersion (), clientName );
-//		OffsetResponse response = consumer.getOffsetsBefore ( request );
-//
-//		if ( response.hasError () )
-//		{
-//			System.out.println ( "Error fetching data Offset Data the Broker. Reason: "
-//					+ response.errorCode ( topic, partition ) );
-//			return 0;
-//		}
-//
-//		final long[] offsets = response.offsets ( topic, partition );
-//		return offsets[0];
-//	}
-//
-//	/**
-//	 * Find a new leader for a topic/partition, including a pause for the coordinator to 
-//	 * find a new leader, as needed.
-//	 * 
-//	 * @param oldLeader
-//	 * @param topic
-//	 * @param partition
-//	 * @return
-//	 * @throws IOException
-//	 */
-//	private hostPort findNewLeader ( hostPort oldLeader, String topic, int partition ) throws IOException
-//	{
-//		try
-//		{
-//			int attemptsLeft = 3;
-//			boolean haveSlept = false;
-//
-//			while ( attemptsLeft-- > 0 )
-//			{
-//				System.out.println ( "" + attemptsLeft + " attempts Left" );	// FIXME: make sure it's 3 attempts!
-//
-//				// ask the brokers for a leader
-//				final hostPort newLeader = findLeader ( fReplicaBrokers, topic, partition );
-//				if ( newLeader != null )
-//				{
-//					// we can use this leader if it's different (i.e. a new leader has been elected)
-//					// or it's the same leader, but we waited to allow ZK to get a new one, and
-//					// the original recovered
-//					if ( !oldLeader.equals ( newLeader ) || haveSlept )
-//					{
-//						return newLeader;
-//					}
-//				}
-//
-//				// sleep
-//				haveSlept = true;
-//				Thread.sleep ( 1000 );
-//			}
-//		}
-//		catch ( InterruptedException x )
-//		{
-//			// just give up
-//		}
-//
-//		System.out.println ( "Unable to find new leader after Broker failure. Exiting" );
-//		throw new IOException ( "Unable to find new leader after Broker failure. Exiting" );
-//	}
-//
-//	/**
-//	 * Given one or more seed brokers, find the leader for a given topic/partition
-//	 * @param seeds
-//	 * @param topic
-//	 * @param partition
-//	 * @return partition metadata, or null
-//	 */
-//	private hostPort findLeader ( List<hostPort> seeds, String topic, int partition )
-//	{
-//		final List<String> topics = new ArrayList<String> ();
-//		topics.add ( topic );
-//
-//		for ( hostPort seed : seeds )
-//		{
-//			final SimpleConsumer consumer = new SimpleConsumer ( seed.fHost, seed.fPort, 100000, 64 * 1024, "leaderLookup" );
-//			final TopicMetadataRequest req = new TopicMetadataRequest ( topics );
-//			final TopicMetadataResponse resp = consumer.send ( req );
-//			consumer.close ();
-//
-//			final List<TopicMetadata> metaData = resp.topicsMetadata ();
-//			for ( TopicMetadata item : metaData )
-//			{
-//				for ( PartitionMetadata part : item.partitionsMetadata () )
-//				{
-//					if ( part.partitionId () == partition )
-//					{
-//						// found our partition. load the details, then return it
-//						fReplicaBrokers.clear ();
-//						for ( kafka.cluster.Broker replica : part.replicas () )
-//						{
-//							fReplicaBrokers.add ( new hostPort ( replica.host (), replica.port () ) );
-//						}
-//						return new hostPort ( part.leader () );
-//					}
-//				}
-//			}
-//		}
-//
-//		return null;
-//	}
-//
-//	private static class hostPort
-//	{
-//		public hostPort ( String host, int port ) { fHost = host; fPort = port; }
-//
-//		public hostPort ( Broker leader )
-//		{
-//			fHost = leader.host ();
-//			fPort = leader.port ();
-//		}
-//
-//		
-//		public final String fHost;
-//		public final int fPort;
-//
-//		@Override
-//		public int hashCode ()
-//		{
-//			final int prime = 31;
-//			int result = 1;
-//			result = prime * result
-//				+ ( ( fHost == null ) ? 0 : fHost.hashCode () );
-//			result = prime * result + fPort;
-//			return result;
-//		}
-//
-//		@Override
-//		public boolean equals ( Object obj )
-//		{
-//			if ( this == obj )
-//				return true;
-//			if ( obj == null )
-//				return false;
-//			if ( getClass () != obj.getClass () )
-//				return false;
-//			hostPort other = (hostPort) obj;
-//			if ( fHost == null )
-//			{
-//				if ( other.fHost != null )
-//					return false;
-//			}
-//			else if ( !fHost.equals ( other.fHost ) )
-//				return false;
-//			if ( fPort != other.fPort )
-//				return false;
-//			return true;
-//		}
-//	}
-//	
-//	private List<hostPort> fReplicaBrokers;
-}