update the testcases after the kafka 11 changes

Issue-ID: DMAAP-526
Change-Id: I477a8ee05fb3cdd76af726b6ca0d1a69aa9eef93
Signed-off-by: sunil unnava <su622b@att.com>

43 files changed, 111 insertions, 25 deletions

diff --git a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest.java b/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest.java
index 45fa039..7fa2bfd 100644
--- a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest.java
+++ b/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest.java
@@ -21,6 +21,8 @@
 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;

diff --git a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest2.java b/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest2.java
index 0d795ac..763c2e7 100644
--- a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest2.java
+++ b/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest2.java
@@ -21,6 +21,8 @@
 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;

diff --git a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest3.java b/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest3.java
index cb10fa1..27f7c15 100644
--- a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest3.java
+++ b/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest3.java
@@ -21,6 +21,8 @@
 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;

diff --git a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest4.java b/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest4.java
index 86a75a2..6191c70 100644
--- a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest4.java
+++ b/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest4.java
@@ -21,6 +21,8 @@
 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;

diff --git a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest5.java b/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest5.java
index e4ad2c3..99fc9aa 100644
--- a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest5.java
+++ b/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest5.java
@@ -21,6 +21,8 @@
 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;

diff --git a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest6.java b/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest6.java
index 2dd8db8..ca368e3 100644
--- a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest6.java
+++ b/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest6.java
@@ -21,6 +21,8 @@
 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;

diff --git a/src/test/java/com/att/nsa/cambria/beans/DMaaPCambriaLimiterTest.java b/src/test/java/com/att/nsa/cambria/beans/DMaaPCambriaLimiterTest.java
index 10f2613..8c3568f 100644
--- a/src/test/java/com/att/nsa/cambria/beans/DMaaPCambriaLimiterTest.java
+++ b/src/test/java/com/att/nsa/cambria/beans/DMaaPCambriaLimiterTest.java
@@ -26,7 +26,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

-import com.att.nsa.cambria.CambriaApiException;

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

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

 

 public class DMaaPCambriaLimiterTest {

 

@@ -53,9 +54,9 @@ public class DMaaPCambriaLimiterTest {
 	@Test

 	public void testOnCall() {

 		

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

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

 		try {

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

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

 		} catch (CambriaApiException e) {

 			// TODO Auto-generated catch block

 			e.printStackTrace();

@@ -69,7 +70,7 @@ public class DMaaPCambriaLimiterTest {
 	@Test

 	public void testOnSend() {

 		

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

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

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

 		

 		String trueValue = "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
index 8362f26..784b97b 100644
--- a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest.java
+++ b/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest.java
@@ -26,6 +26,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

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

+

 public class DMaaPContextTest {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest2.java b/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest2.java
index f7c89d0..88baf58 100644
--- a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest2.java
+++ b/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest2.java
@@ -27,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

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

+

 public class DMaaPContextTest2 {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest3.java b/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest3.java
index 972f0dd..b6b12b0 100644
--- a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest3.java
+++ b/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest3.java
@@ -28,6 +28,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

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

+

 public class DMaaPContextTest3 {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest4.java b/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest4.java
index 2843d9c..95fbeef 100644
--- a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest4.java
+++ b/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest4.java
@@ -29,6 +29,8 @@ 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

diff --git a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest5.java b/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest5.java
index 6cc8209..2b2c9e1 100644
--- a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest5.java
+++ b/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest5.java
@@ -28,6 +28,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

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

+

 public class DMaaPContextTest5 {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest6.java b/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest6.java
index af6af04..b87021d 100644
--- a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest6.java
+++ b/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest6.java
@@ -28,6 +28,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

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

+

 public class DMaaPContextTest6 {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/DMaaPKafkaMetaBrokerTest.java b/src/test/java/com/att/nsa/cambria/beans/DMaaPKafkaMetaBrokerTest.java
index eb28f67..67ade96 100644
--- a/src/test/java/com/att/nsa/cambria/beans/DMaaPKafkaMetaBrokerTest.java
+++ b/src/test/java/com/att/nsa/cambria/beans/DMaaPKafkaMetaBrokerTest.java
@@ -26,6 +26,10 @@ 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;
@@ -33,36 +37,48 @@ import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import com.att.nsa.cambria.CambriaApiException;
-import com.att.nsa.cambria.metabroker.Broker.TopicExistsException;
+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;
 
-import kafka.admin.AdminUtils;
 
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({ AdminUtils.class, ZkClientFactory.class })
+@PrepareForTest({ AdminClient.class})
 public class DMaaPKafkaMetaBrokerTest {
 
 	@InjectMocks
 	private DMaaPKafkaMetaBroker dMaaPKafkaMetaBroker;
-
 	@Mock
-	private ZkClient zk;
+	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(AdminUtils.class);
-		PowerMockito.mockStatic(ZkClientFactory.class);
+		PowerMockito.mockStatic(AdminClient.class);
+		//PowerMockito.when(AdminClient.create (any(Properties.class) )).thenReturn(fKafkaAdminClient);
+		
+		//PowerMockito.mockStatic(AdminUtils.class);
 		PowerMockito.when(configDb.parse("/topics")).thenReturn(fBaseTopicData);
+		
 
 	}
 
@@ -80,7 +96,6 @@ public class DMaaPKafkaMetaBrokerTest {
 	@Test
 	public void testcreateTopic() {
 		try {
-			PowerMockito.when(ZkClientFactory.createZkClient()).thenReturn(zkClient);
 			dMaaPKafkaMetaBroker.createTopic("testtopic", "testtopic", "admin", 1, 1, true);
 		} catch (CambriaApiException e) {
 			// TODO Auto-generated catch block
@@ -93,12 +108,12 @@ public class DMaaPKafkaMetaBrokerTest {
 		}
 
 	}
+	
 
 	@Test
 	public void testcreateTopic_wrongPartition() {
 		try {
 
-			PowerMockito.when(ZkClientFactory.createZkClient()).thenReturn(zkClient);
 			dMaaPKafkaMetaBroker.createTopic("testtopic", "testtopic", "admin", 0, 1, true);
 		} catch (CambriaApiException e) {
 			assertTrue(true);
@@ -115,7 +130,6 @@ public class DMaaPKafkaMetaBrokerTest {
 	public void testcreateTopic_wrongReplica() {
 		try {
 
-			PowerMockito.when(ZkClientFactory.createZkClient()).thenReturn(zkClient);
 			dMaaPKafkaMetaBroker.createTopic("testtopic", "testtopic", "admin", 1, 0, true);
 		} catch (CambriaApiException e) {
 			assertTrue(true);
@@ -131,7 +145,6 @@ public class DMaaPKafkaMetaBrokerTest {
 	@Test
 	public void testcreateTopic_error1() {
 		try {
-			PowerMockito.when(ZkClientFactory.createZkClient()).thenThrow(new ZkNoNodeException());
 			dMaaPKafkaMetaBroker.createTopic("testtopic", "testtopic", "admin", 1, 1, true);
 		} catch (CambriaApiException e) {
 			assertTrue(true);
@@ -147,8 +160,6 @@ public class DMaaPKafkaMetaBrokerTest {
 	@Test
 	public void testcreateTopic_error2() {
 		try {
-			PowerMockito.when(ZkClientFactory.createZkClient())
-					.thenThrow(new kafka.admin.AdminOperationException("error"));
 			dMaaPKafkaMetaBroker.createTopic("testtopic", "testtopic", "admin", 1, 1, true);
 		} catch (CambriaApiException e) {
 			assertTrue(true);
@@ -163,7 +174,6 @@ public class DMaaPKafkaMetaBrokerTest {
 	@Test
 	public void testcreateTopic_error3() {
 		try {
-			PowerMockito.when(ZkClientFactory.createZkClient()).thenThrow(new kafka.common.TopicExistsException());
 			dMaaPKafkaMetaBroker.createTopic("testtopic", "testtopic", "admin", 1, 1, true);
 		} catch (CambriaApiException e) {
 			// TODO Auto-generated catch block
@@ -180,7 +190,6 @@ public class DMaaPKafkaMetaBrokerTest {
 	@Test
 	public void testDeleteTopic() {
 		try {
-			PowerMockito.when(ZkClientFactory.createZkClient()).thenReturn(zkClient);
 			dMaaPKafkaMetaBroker.deleteTopic("testtopic");
 		} catch (CambriaApiException e) {
 			// TODO Auto-generated catch block
@@ -198,7 +207,6 @@ public class DMaaPKafkaMetaBrokerTest {
 	@Test
 	public void testDeleteTopic_error1() {
 		try {
-			PowerMockito.when(ZkClientFactory.createZkClient()).thenThrow(new ZkNoNodeException());
 			dMaaPKafkaMetaBroker.deleteTopic("testtopic");
 		} catch (CambriaApiException e) {
 			assertTrue(true);
@@ -214,8 +222,6 @@ public class DMaaPKafkaMetaBrokerTest {
 	@Test
 	public void testDeleteTopic_error2() {
 		try {
-			PowerMockito.when(ZkClientFactory.createZkClient())
-					.thenThrow(new kafka.admin.AdminOperationException("error"));
 			dMaaPKafkaMetaBroker.deleteTopic("testtopic");
 		} catch (CambriaApiException e) {
 			assertTrue(true);
@@ -231,7 +237,6 @@ public class DMaaPKafkaMetaBrokerTest {
 	@Test
 	public void testDeleteTopic_error3() {
 		try {
-			PowerMockito.when(ZkClientFactory.createZkClient()).thenThrow(new kafka.common.TopicExistsException());
 			dMaaPKafkaMetaBroker.deleteTopic("testtopic");
 		} catch (CambriaApiException e) {
 			// TODO Auto-generated catch block
diff --git a/src/test/java/com/att/nsa/cambria/beans/JUnitTestSuite.java b/src/test/java/com/att/nsa/cambria/beans/JUnitTestSuite.java
index 6c900a4..e90675e 100644
--- a/src/test/java/com/att/nsa/cambria/beans/JUnitTestSuite.java
+++ b/src/test/java/com/att/nsa/cambria/beans/JUnitTestSuite.java
@@ -28,7 +28,7 @@ import org.junit.runners.Suite.SuiteClasses;
 import org.apache.log4j.Logger;

 

 @RunWith(Suite.class)

-@SuiteClasses({ DMaaPKafkaMetaBrokerTest.class, ApiKeyBeanTest.class, ApiKeyBeanTest2.class, ApiKeyBeanTest3.class, ApiKeyBeanTest4.class, ApiKeyBeanTest5.class, ApiKeyBeanTest6.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,

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest.java
index b409e1e..e7c2173 100644
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest.java
+++ b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest.java
@@ -27,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

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

+

 public class LogDetailsTest {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest10.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest10.java
index d36f3d7..44a6e45 100644
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest10.java
+++ b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest10.java
@@ -27,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

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

+

 public class LogDetailsTest10 {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest11.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest11.java
index 8af2297..3a935e6 100644
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest11.java
+++ b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest11.java
@@ -27,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

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

+

 public class LogDetailsTest11 {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest12.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest12.java
index a737a87..1b2b3f5 100644
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest12.java
+++ b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest12.java
@@ -27,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

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

+

 public class LogDetailsTest12 {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest13.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest13.java
index 0e3782a..a30112e 100644
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest13.java
+++ b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest13.java
@@ -27,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

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

+

 public class LogDetailsTest13 {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest14.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest14.java
index 6d8c12f..b04573d 100644
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest14.java
+++ b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest14.java
@@ -27,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

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

+

 public class LogDetailsTest14 {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest15.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest15.java
index 3018668..8bbbb28 100644
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest15.java
+++ b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest15.java
@@ -27,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

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

+

 public class LogDetailsTest15 {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest16.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest16.java
index 058121c..eef7322 100644
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest16.java
+++ b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest16.java
@@ -27,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

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

+

 public class LogDetailsTest16 {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest17.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest17.java
index c0a6ede..c19b46d 100644
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest17.java
+++ b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest17.java
@@ -27,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

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

+

 public class LogDetailsTest17 {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest18.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest18.java
index 1475141..e894ae4 100644
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest18.java
+++ b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest18.java
@@ -27,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

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

+

 public class LogDetailsTest18 {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest2.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest2.java
index 17d615c..acb818d 100644
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest2.java
+++ b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest2.java
@@ -27,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

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

+

 public class LogDetailsTest2 {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest3.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest3.java
index c829a91..b9b664d 100644
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest3.java
+++ b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest3.java
@@ -27,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

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

+

 public class LogDetailsTest3 {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest4.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest4.java
index 5a151e3..b17aadc 100644
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest4.java
+++ b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest4.java
@@ -27,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

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

+

 public class LogDetailsTest4 {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest5.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest5.java
index 731768b..3beeab8 100644
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest5.java
+++ b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest5.java
@@ -27,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

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

+

 public class LogDetailsTest5 {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest6.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest6.java
index 8271a0c..98d85d8 100644
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest6.java
+++ b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest6.java
@@ -27,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

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

+

 public class LogDetailsTest6 {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest7.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest7.java
index c5d6237..8753762 100644
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest7.java
+++ b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest7.java
@@ -27,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

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

+

 public class LogDetailsTest7 {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest8.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest8.java
index 71a66b7..d88ed11 100644
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest8.java
+++ b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest8.java
@@ -27,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

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

+

 public class LogDetailsTest8 {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest9.java b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest9.java
index 109d60b..b47b152 100644
--- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest9.java
+++ b/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest9.java
@@ -27,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

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

+

 public class LogDetailsTest9 {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest.java b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest.java
index 0173cd1..5a60767 100644
--- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest.java
+++ b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest.java
@@ -27,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

+import com.att.dmf.mr.beans.TopicBean;

+

 public class TopicBeanTest {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest10.java b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest10.java
index e4a96f6..4ebe601 100644
--- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest10.java
+++ b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest10.java
@@ -27,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

+import com.att.dmf.mr.beans.TopicBean;

+

 public class TopicBeanTest10 {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest2.java b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest2.java
index 08514f7..e6958de 100644
--- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest2.java
+++ b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest2.java
@@ -27,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

+import com.att.dmf.mr.beans.TopicBean;

+

 public class TopicBeanTest2 {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest3.java b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest3.java
index 093461a..61dd6f9 100644
--- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest3.java
+++ b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest3.java
@@ -27,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

+import com.att.dmf.mr.beans.TopicBean;

+

 public class TopicBeanTest3 {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest4.java b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest4.java
index cdce1d5..894f959 100644
--- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest4.java
+++ b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest4.java
@@ -27,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

+import com.att.dmf.mr.beans.TopicBean;

+

 public class TopicBeanTest4 {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest5.java b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest5.java
index 41a23ab..bd69e2e 100644
--- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest5.java
+++ b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest5.java
@@ -27,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

+import com.att.dmf.mr.beans.TopicBean;

+

 public class TopicBeanTest5 {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest6.java b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest6.java
index 5fb9b2a..db68525 100644
--- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest6.java
+++ b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest6.java
@@ -27,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

+import com.att.dmf.mr.beans.TopicBean;

+

 public class TopicBeanTest6 {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest7.java b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest7.java
index 385d05d..3a6fdb6 100644
--- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest7.java
+++ b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest7.java
@@ -27,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

+import com.att.dmf.mr.beans.TopicBean;

+

 public class TopicBeanTest7 {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest8.java b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest8.java
index d6b36a7..7cf8049 100644
--- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest8.java
+++ b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest8.java
@@ -27,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

+import com.att.dmf.mr.beans.TopicBean;

+

 public class TopicBeanTest8 {

 

 	@Before

diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest9.java b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest9.java
index f2a4a91..c6487e1 100644
--- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest9.java
+++ b/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest9.java
@@ -27,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

+import com.att.dmf.mr.beans.TopicBean;

+

 public class TopicBeanTest9 {

 

 	@Before