From b60213dc26540543f500b3442b061565907c3cf8 Mon Sep 17 00:00:00 2001 From: EmmettCox Date: Mon, 8 Apr 2019 10:34:31 +0000 Subject: update DR logging to log under one system Change-Id: I7e21a9c698e49601b090cee350c5a5cc7deb8315 Issue-ID: DMAAP-1050 Signed-off-by: EmmettCox --- .../org/onap/dmaap/datarouter/provisioning/DRFeedsServletTest.java | 1 - .../org/onap/dmaap/datarouter/provisioning/InternalServletTest.java | 2 ++ .../org/onap/dmaap/datarouter/provisioning/PublishServletTest.java | 4 ---- 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'datarouter-prov/src/test/java/org/onap') diff --git a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/DRFeedsServletTest.java b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/DRFeedsServletTest.java index e2a2bc21..d014629d 100755 --- a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/DRFeedsServletTest.java +++ b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/DRFeedsServletTest.java @@ -46,7 +46,6 @@ import javax.persistence.Persistence; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; import java.util.HashSet; import java.util.Set; diff --git a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/InternalServletTest.java b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/InternalServletTest.java index b421e99e..edf9ef52 100644 --- a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/InternalServletTest.java +++ b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/InternalServletTest.java @@ -169,7 +169,9 @@ public class InternalServletTest extends DrServletTestBase { public void Given_Request_Is_HTTP_GET_Starts_With_Logs_In_Endpoint_And_File_Exists_Then_Request_Returns_Ok() throws Exception { when(request.getPathInfo()).thenReturn("/logs/testFile.txt"); + File testDir = new File("unit-test-logs"); File testFile = new File("unit-test-logs/testFile.txt"); + testDir.mkdirs(); testFile.createNewFile(); testFile.deleteOnExit(); ServletOutputStream outStream = mock(ServletOutputStream.class); diff --git a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/PublishServletTest.java b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/PublishServletTest.java index b99e63c0..2202550b 100755 --- a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/PublishServletTest.java +++ b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/PublishServletTest.java @@ -23,7 +23,6 @@ package org.onap.dmaap.datarouter.provisioning; -import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.read.ListAppender; import org.apache.commons.lang3.reflect.FieldUtils; @@ -33,7 +32,6 @@ import org.mockito.Mock; import org.onap.dmaap.datarouter.provisioning.utils.DB; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import org.slf4j.LoggerFactory; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; @@ -42,9 +40,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.File; import java.io.FileNotFoundException; -import java.io.PrintWriter; import java.net.InetAddress; import static org.hamcrest.Matchers.notNullValue; -- cgit 1.2.3-korg