X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Fdmaap%2Fservice%2FMetricsRestServiceTest.java;h=bbcf88ebb0624b62c4750cab8139f252064ea51c;hb=5ad0b4d710f20bd7bed96486aa878645d5f8e806;hp=a7e88ca5feb2bda050675ebc6d7b8fc364232996;hpb=346db85cc2c56830d9186516bba09166e8dddc1d;p=dmaap%2Fmessagerouter%2Fmessageservice.git

diff --git a/src/test/java/org/onap/dmaap/service/MetricsRestServiceTest.java b/src/test/java/org/onap/dmaap/service/MetricsRestServiceTest.java
index a7e88ca..bbcf88e 100644
--- a/src/test/java/org/onap/dmaap/service/MetricsRestServiceTest.java
+++ b/src/test/java/org/onap/dmaap/service/MetricsRestServiceTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -20,26 +20,23 @@
 
  package org.onap.dmaap.service;
 
-import org.junit.After;
-import org.junit.Before;
+import static org.mockito.Mockito.doThrow;
+
+import java.io.IOException;
+
 import org.junit.Test;
 
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatchers;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import com.att.ajsc.beans.PropertiesMapBean;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;
 import org.onap.dmaap.dmf.mr.CambriaApiException;
 import org.onap.dmaap.dmf.mr.service.MetricsService;
 
 
-@RunWith(PowerMockRunner.class)
-@PowerMockIgnore("jdk.internal.reflect.*")
-@PrepareForTest({ PropertiesMapBean.class })
+@RunWith(MockitoJUnitRunner.class)
 public class MetricsRestServiceTest {
 
 	@InjectMocks
@@ -47,15 +44,6 @@ public class MetricsRestServiceTest {
 
 	@Mock
 	private MetricsService metricsService;
-	
-	@Before
-	public void setUp() throws Exception {
-		MockitoAnnotations.initMocks(this);
-	}
-
-	@After
-	public void tearDown() throws Exception {
-	}
 
 	@Test
 	public void testGetMetrics() throws CambriaApiException {
@@ -63,14 +51,24 @@ public class MetricsRestServiceTest {
 		metricsRestService.getMetrics();
 
 	}
-	
+
+	@Test(expected = CambriaApiException.class)
+	public void testGetMetrics_IOException() throws CambriaApiException, IOException {
+		doThrow(new IOException("error")).when(metricsService).get(ArgumentMatchers.any(DMaaPContext.class));
+		metricsRestService.getMetrics();
+	}
+
+
 	@Test
 	public void testGetMetricsByName() throws CambriaApiException {
 
 		metricsRestService.getMetricsByName("metricsName");
-
 	}
 
-
+	@Test(expected = CambriaApiException.class)
+	public void testGetMetricsByName_IOException() throws CambriaApiException, IOException {
+		doThrow(new IOException("error")).when(metricsService).getMetricByName(ArgumentMatchers.any(DMaaPContext.class), ArgumentMatchers.any(String.class));
+		metricsRestService.getMetricsByName("metricsName");
+	}
 
 }
\ No newline at end of file