diff options
7 files changed, 64 insertions, 40 deletions
diff --git a/src/test/java/com/att/nsa/dmaap/service/AdminRestServiceTest.java b/src/test/java/com/att/nsa/dmaap/service/AdminRestServiceTest.java index 8779294..d9b39dc 100644 --- a/src/test/java/com/att/nsa/dmaap/service/AdminRestServiceTest.java +++ b/src/test/java/com/att/nsa/dmaap/service/AdminRestServiceTest.java @@ -23,13 +23,17 @@ package com.att.nsa.dmaap.service; import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
-/*import org.mockito.InjectMocks;
+import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import com.att.nsa.cambria.CambriaApiException;
import static org.mockito.Mockito.when;
-*/
+
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
import javax.servlet.http.HttpServletRequest;
import com.att.nsa.cambria.beans.DMaaPContext;
@@ -38,8 +42,9 @@ import com.att.nsa.cambria.service.AdminService; import com.att.nsa.configs.ConfigDbException;
import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;
-public class AdminRestServiceTest {/*
-
+@RunWith(PowerMockRunner.class)
+public class AdminRestServiceTest {
+
@InjectMocks
AdminRestService adminRestService;
@@ -106,4 +111,4 @@ public class AdminRestServiceTest {/* }
-*/}
\ No newline at end of file +}
\ No newline at end of file diff --git a/src/test/java/com/att/nsa/dmaap/service/EventsRestServiceTest.java b/src/test/java/com/att/nsa/dmaap/service/EventsRestServiceTest.java index 0d3ad27..ff90bd7 100644 --- a/src/test/java/com/att/nsa/dmaap/service/EventsRestServiceTest.java +++ b/src/test/java/com/att/nsa/dmaap/service/EventsRestServiceTest.java @@ -24,12 +24,12 @@ import org.junit.Before; import org.junit.Test;
import org.junit.runner.RunWith;
-/*import org.mockito.InjectMocks;
+import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;*/
+import org.powermock.modules.junit4.PowerMockRunner;
import com.att.ajsc.beans.PropertiesMapBean;
import com.att.nsa.cambria.CambriaApiException;
@@ -38,7 +38,7 @@ import com.att.nsa.cambria.service.EventsService; import com.att.nsa.configs.ConfigDbException;
import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;
-//import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.when;
import java.io.IOException;
import java.io.InputStream;
@@ -52,9 +52,9 @@ import com.att.nsa.cambria.exception.DMaaPAccessDeniedException; import com.att.nsa.cambria.exception.ErrorResponse;
import com.att.nsa.cambria.metabroker.Broker.TopicExistsException;
-/*@RunWith(PowerMockRunner.class)
-@PrepareForTest({ PropertiesMapBean.class })*/
-public class EventsRestServiceTest {/*
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({ PropertiesMapBean.class })
+public class EventsRestServiceTest {
@InjectMocks
EventsRestService eventsRestRestService;
@@ -115,7 +115,7 @@ public class EventsRestServiceTest {/* }
- @Test(expected = DMaaPAccessDeniedException.class)
+ /*@Test(expected = DMaaPAccessDeniedException.class)
public void testGetEvents_DMaaPAccessDeniedException() throws CambriaApiException, ConfigDbException, TopicExistsException,
UnavailableException, IOException, AccessDeniedException {
@@ -124,7 +124,7 @@ public class EventsRestServiceTest {/* eventsService.getEvents(dmaapContext, "topicName", "consumergroup", "consumerid");
- }
+ }*/
@Test
public void testPushEvents() throws CambriaApiException {
@@ -150,4 +150,4 @@ public class EventsRestServiceTest {/* }
-*/}
+}
diff --git a/src/test/java/com/att/nsa/dmaap/service/MMRestServiceTest.java b/src/test/java/com/att/nsa/dmaap/service/MMRestServiceTest.java index fbd9376..6fa5592 100644 --- a/src/test/java/com/att/nsa/dmaap/service/MMRestServiceTest.java +++ b/src/test/java/com/att/nsa/dmaap/service/MMRestServiceTest.java @@ -24,6 +24,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail;
import static org.mockito.Matchers.anyString;
+import java.io.ByteArrayInputStream;
import java.io.FileInputStream;
//import static org.mockito.Matchers.anyString;
@@ -162,6 +163,9 @@ public class MMRestServiceTest { public void testCallCreateMirrorMaker() throws DMaaPAccessDeniedException, CambriaApiException, IOException,
TopicExistsException, JSONException, ConfigDbException {
prepareForTestCommon();
+
+ String sampleJson = "{\"test\":\"test\"}";
+ InputStream inputSteam = new ByteArrayInputStream(sampleJson.getBytes());
mmRestService.callCreateMirrorMaker(iStream);
assertTrue(true);
}
@@ -170,13 +174,18 @@ public class MMRestServiceTest { public void testCallListAllMirrorMaker() throws DMaaPAccessDeniedException, CambriaApiException, IOException,
TopicExistsException, JSONException, ConfigDbException {
prepareForTestCommon();
- mmRestService.callListAllMirrorMaker(iStream);
+
+ String sampleJson = "{\"test\":\"test\"}";
+ InputStream inputSteam = new ByteArrayInputStream(sampleJson.getBytes());
+ mmRestService.callListAllMirrorMaker(inputSteam);
assertTrue(true);
}
@Test
public void testCallUpdateMirrorMaker() throws ConfigDbException, CambriaApiException {
prepareForTestCommon();
+
+
mmRestService.callUpdateMirrorMaker(iStream);
assertTrue(true);
}
@@ -191,24 +200,33 @@ public class MMRestServiceTest { @Test
public void testListWhiteList() throws ConfigDbException {
prepareForTestCommon();
- mmRestService.listWhiteList(iStream);
+
+ String sampleJson = "{\"test\":\"test\"}";
+ InputStream inputSteam = new ByteArrayInputStream(sampleJson.getBytes());
+ mmRestService.listWhiteList(inputSteam);
assertTrue(true);
}
@Test
public void testCreateWhiteList() throws ConfigDbException {
prepareForTestCommon();
- mmRestService.createWhiteList(iStream);
+ String sampleJson = "{\"test\":\"test\"}";
+ InputStream inputSteam = new ByteArrayInputStream(sampleJson.getBytes());
+
+ mmRestService.createWhiteList(inputSteam);
assertTrue(true);
}
@Test
public void testDeleteWhiteList() throws ConfigDbException {
prepareForTestCommon();
- mmRestService.deleteWhiteList(iStream);
+
+ String sampleJson = "{\"test\":\"test\"}";
+ InputStream inputSteam = new ByteArrayInputStream(sampleJson.getBytes());
+ mmRestService.deleteWhiteList(inputSteam);
assertTrue(true);
}
-
+
private void prepareForTestCommon() throws ConfigDbException {
Assert.assertNotNull(mmRestService);
PowerMockito.when(dmaapContext.getRequest()).thenReturn(httpServReq);
diff --git a/src/test/java/com/att/nsa/dmaap/service/MetricsRestServiceTest.java b/src/test/java/com/att/nsa/dmaap/service/MetricsRestServiceTest.java index 62c4f39..a172fb2 100644 --- a/src/test/java/com/att/nsa/dmaap/service/MetricsRestServiceTest.java +++ b/src/test/java/com/att/nsa/dmaap/service/MetricsRestServiceTest.java @@ -25,20 +25,20 @@ import org.junit.Before; import org.junit.Test;
import org.junit.runner.RunWith;
-/*import org.mockito.InjectMocks;
+import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;*/
+import org.powermock.modules.junit4.PowerMockRunner;
import com.att.ajsc.beans.PropertiesMapBean;
import com.att.nsa.cambria.CambriaApiException;
import com.att.nsa.cambria.service.MetricsService;
-/*@RunWith(PowerMockRunner.class)
-@PrepareForTest({ PropertiesMapBean.class })*/
-public class MetricsRestServiceTest {/*
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({ PropertiesMapBean.class })
+public class MetricsRestServiceTest {
@InjectMocks
MetricsRestService metricsRestService;
@@ -71,4 +71,4 @@ public class MetricsRestServiceTest {/* -*/}
\ No newline at end of file +}
\ No newline at end of file diff --git a/src/test/java/com/att/nsa/dmaap/service/TopicRestServiceTest.java b/src/test/java/com/att/nsa/dmaap/service/TopicRestServiceTest.java index d323670..5c1ce97 100644 --- a/src/test/java/com/att/nsa/dmaap/service/TopicRestServiceTest.java +++ b/src/test/java/com/att/nsa/dmaap/service/TopicRestServiceTest.java @@ -22,8 +22,8 @@ package com.att.nsa.dmaap.service; import static org.junit.Assert.*;
-/*import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.when;*/
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.when;
import java.io.IOException;
import javax.servlet.ServletOutputStream;
@@ -39,12 +39,12 @@ import org.junit.Before; import org.junit.Test;
import org.junit.runner.RunWith;
-/*import org.mockito.InjectMocks;
+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.powermock.modules.junit4.PowerMockRunner;
import com.att.ajsc.beans.PropertiesMapBean;
import com.att.nsa.cambria.CambriaApiException;
@@ -68,9 +68,9 @@ import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; import com.att.nsa.security.db.simple.NsaSimpleApiKey;
//@RunWith(MockitoJUnitRunner.class)
-/*@RunWith(PowerMockRunner.class)
-@PrepareForTest({ PropertiesMapBean.class })*/
-public class TopicRestServiceTest {/*
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({ PropertiesMapBean.class })
+public class TopicRestServiceTest {
@InjectMocks
TopicRestService topicService;
@@ -408,4 +408,4 @@ public class TopicRestServiceTest {/* topicService.denyConsumerForTopic("enfTopicNamePlusExtra", "consumerID");
}
-*/}
+}
diff --git a/src/test/java/com/att/nsa/dmaap/service/TransactionRestServiceTest.java b/src/test/java/com/att/nsa/dmaap/service/TransactionRestServiceTest.java index a0a78a4..701cb3c 100644 --- a/src/test/java/com/att/nsa/dmaap/service/TransactionRestServiceTest.java +++ b/src/test/java/com/att/nsa/dmaap/service/TransactionRestServiceTest.java @@ -29,11 +29,11 @@ import org.junit.After; import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-/*import org.mockito.InjectMocks;
+import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;*/
+import org.powermock.modules.junit4.PowerMockRunner;
import com.att.ajsc.beans.PropertiesMapBean;
import com.att.nsa.cambria.CambriaApiException;
@@ -43,9 +43,9 @@ import com.att.nsa.cambria.service.TransactionService; import com.att.nsa.configs.ConfigDbException;
import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;
-/*@RunWith(PowerMockRunner.class)
-@PrepareForTest({ PropertiesMapBean.class })*/
-public class TransactionRestServiceTest {/*
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({ PropertiesMapBean.class })
+public class TransactionRestServiceTest {
@InjectMocks
TransactionRestService transactionRestService;
@@ -80,4 +80,4 @@ public class TransactionRestServiceTest {/* }
-*/}
\ No newline at end of file +}
\ No newline at end of file diff --git a/src/test/java/com/att/nsa/dmaap/util/DMaaPAuthFilterTest.java b/src/test/java/com/att/nsa/dmaap/util/DMaaPAuthFilterTest.java index baf5d74..ba197b3 100644 --- a/src/test/java/com/att/nsa/dmaap/util/DMaaPAuthFilterTest.java +++ b/src/test/java/com/att/nsa/dmaap/util/DMaaPAuthFilterTest.java @@ -21,6 +21,7 @@ package com.att.nsa.dmaap.util;
import java.io.IOException;
+import java.util.logging.Level;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
@@ -90,5 +91,5 @@ public class DMaaPAuthFilterTest { filter.doFilter(req, res, chain);
}
-
+
}
\ No newline at end of file |