X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fmessagerouter%2Fmirroragent.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fcom%2Fatt%2Fnsa%2FdmaapMMAgent%2FTestMirrorMakerAgent.java;h=1dcd6c8f1c5822864ab69a33756af3a06c1e1c84;hp=22ceaf924c7dc86bfec71c48519edce62704be29;hb=21cf6bed993d82fc2c27c742d5b4d274710f58d8;hpb=fe3bf852db2311615a74e31600b2cdca6b427b02

diff --git a/src/test/java/com/att/nsa/dmaapMMAgent/TestMirrorMakerAgent.java b/src/test/java/com/att/nsa/dmaapMMAgent/TestMirrorMakerAgent.java
index 22ceaf9..1dcd6c8 100644
--- a/src/test/java/com/att/nsa/dmaapMMAgent/TestMirrorMakerAgent.java
+++ b/src/test/java/com/att/nsa/dmaapMMAgent/TestMirrorMakerAgent.java
@@ -24,7 +24,6 @@ package com.att.nsa.dmaapMMAgent;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
 
@@ -43,16 +42,17 @@ import com.google.gson.internal.LinkedTreeMap;
 
 @RunWith(PowerMockRunner.class)
 public class TestMirrorMakerAgent {
+
 	MirrorMakerAgent mirrorMakerAgent = new MirrorMakerAgent();
 	ListMirrorMaker listMirrorMaker = new ListMirrorMaker();
 	MirrorMaker mirrorMaker = new MirrorMaker();
 	MirrorMaker mirrorMaker2 = new MirrorMaker();
 	ArrayList<MirrorMaker> listsMirrorMaker = new ArrayList<MirrorMaker>();
 	Gson g = new Gson();
-	@Mock
-	ListMirrorMaker mirrorMakers;
 	@InjectMocks
-	MirrorMakerAgent agent;
+	private MirrorMakerAgent agent = spy(new MirrorMakerAgent());
+	@Mock
+	private TopicUtil topicUtil;
 
 	@Before
 	public void setUp() {
@@ -73,18 +73,12 @@ public class TestMirrorMakerAgent {
 
 	@Test
 	public void testReadAgentTopics() {
-		MirrorMakerAgent agent = spy(new MirrorMakerAgent());
-		when(agent.subscribeTopic("60000")).thenReturn(null);
 		agent.exitLoop = true;
 		agent.readAgentTopic();
 	}
 
 	@Test
 	public void testReadCreateMirrorMaker() {
-		agent = spy(new MirrorMakerAgent());
-		when(agent.publishTopic(
-				"{\"messageID\":\"test\",\"listMirrorMaker\":[{\"name\":\"test\",\"consumer\":\"test\",\"producer\":\"test\",\"status\":\"STOPPED\"}]}"))
-						.thenReturn(null);
 		String topicMessage = "{ messageID:\"test\", createMirrorMaker: {   name:\"test\",   consumer:\"test\",  producer:\"test\"}}";
 		LinkedTreeMap<?, ?> object = g.fromJson(topicMessage, LinkedTreeMap.class);
 		agent.readAgent(object, topicMessage);
@@ -93,10 +87,6 @@ public class TestMirrorMakerAgent {
 
 	@Test
 	public void testReadUpdateMirrorMaker() {
-		agent = spy(new MirrorMakerAgent());
-		when(agent.publishTopic(
-				"{\"messageID\":\"test\",\"listMirrorMaker\":[{\"name\":\"test\",\"consumer\":\"test\",\"producer\":\"test\",\"status\":\"STOPPED\"}]}"))
-						.thenReturn(null);
 		String topicMessage = "{ messageID:\"test\", updateMirrorMaker: {   name:\"test\",   consumer:\"test\",  producer:\"test\"}}";
 		LinkedTreeMap<?, ?> object = g.fromJson(topicMessage, LinkedTreeMap.class);
 		testReadCreateMirrorMaker();
@@ -106,10 +96,6 @@ public class TestMirrorMakerAgent {
 
 	@Test
 	public void testReadDeleteMirrorMaker() {
-		agent = spy(new MirrorMakerAgent());
-		when(agent.publishTopic(
-				"{\"messageID\":\"test\",\"listMirrorMaker\":[{\"name\":\"test\",\"consumer\":\"test\",\"producer\":\"test\",\"status\":\"STOPPED\"}]}"))
-						.thenReturn(null);
 		String topicMessage = "{ messageID:\"test\", deleteMirrorMaker: {   name:\"test\",   consumer:\"test\",  producer:\"test\",  whitelist:\"test\",status:\"test\" }}";
 		LinkedTreeMap<?, ?> object = g.fromJson(topicMessage, LinkedTreeMap.class);
 		testReadCreateMirrorMaker();
@@ -119,10 +105,6 @@ public class TestMirrorMakerAgent {
 
 	@Test
 	public void testReadListMirrorMaker() {
-		agent = spy(new MirrorMakerAgent());
-		when(agent.publishTopic(
-				"{\"messageID\":\"test\",\"listMirrorMaker\":[{\"name\":\"test\",\"consumer\":\"test\",\"producer\":\"test\",\"status\":\"STOPPED\"}]}"))
-						.thenReturn(null);
 		String topicMessage = "{ messageID:\"test\", listAllMirrorMaker: {   name:\"test\",   consumer:\"test\",  producer:\"test\",  whitelist:\"test\",status:\"test\" }}";
 		LinkedTreeMap<?, ?> object = g.fromJson(topicMessage, LinkedTreeMap.class);
 		testReadCreateMirrorMaker();
@@ -132,10 +114,6 @@ public class TestMirrorMakerAgent {
 
 	@Test
 	public void testReadWhitelistMirrorMaker() {
-		agent = spy(new MirrorMakerAgent());
-		when(agent.publishTopic(
-				"{\"messageID\":\"test\",\"listMirrorMaker\":[{\"name\":\"test\",\"consumer\":\"test\",\"producer\":\"test\",\"status\":\"STOPPED\"}]}"))
-						.thenReturn(null);
 		String topicMessage = "{ messageID:\"test\", updateWhiteList: {   name:\"test\",   consumer:\"test\",  producer:\"test\",  whitelist:\"test\",status:\"test\" }}";
 		LinkedTreeMap<?, ?> object = g.fromJson(topicMessage, LinkedTreeMap.class);
 		testReadCreateMirrorMaker();