diff options
Diffstat (limited to 'datarouter-prov/src/test')
4 files changed, 2 insertions, 73 deletions
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; diff --git a/datarouter-prov/src/test/resources/log4j.properties b/datarouter-prov/src/test/resources/log4j.properties deleted file mode 100644 index b3be5b02..00000000 --- a/datarouter-prov/src/test/resources/log4j.properties +++ /dev/null @@ -1,68 +0,0 @@ -#------------------------------------------------------------------------------- -# ============LICENSE_START================================================== -# * org.onap.dmaap -# * =========================================================================== -# * Copyright � 2017 AT&T Intellectual Property. All rights reserved. -# * =========================================================================== -# * 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. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# * ============LICENSE_END==================================================== -# * -# * ECOMP is a trademark and service mark of AT&T Intellectual Property. -# * -#------------------------------------------------------------------------------- - - -log4j.rootLogger=debug, eventlog, intlog, pelog - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] - %m%n - -# -# Logger used for provisioning events -# -log4j.logger.org.onap.dmaap.datarouter.provisioning.events=debug, eventlog -log4j.additivity.org.onap.dmaap.datarouter.provisioning.events=false - -log4j.appender.eventlog=org.apache.log4j.DailyRollingFileAppender -log4j.appender.eventlog.file=./unit-test-logs/provevent.log -log4j.appender.eventlog.datePattern='.'yyyyMMdd -log4j.appender.eventlog.append=true -log4j.appender.eventlog.layout=org.apache.log4j.PatternLayout -log4j.appender.eventlog.layout.ConversionPattern=%d %-5p [%t] - %m%n - -# -# Logger used for internal provisioning server events -# -log4j.logger.org.onap.dmaap.datarouter.provisioning.internal=debug, intlog -log4j.additivity.org.onap.dmaap.datarouter.provisioning.internal=false - -log4j.appender.intlog=org.apache.log4j.DailyRollingFileAppender -log4j.appender.intlog.file=./unit-test-logs/provint.log -log4j.appender.intlog.datePattern='.'yyyyMMdd -log4j.appender.intlog.append=true -log4j.appender.intlog.layout=org.apache.log4j.PatternLayout -log4j.appender.intlog.layout.ConversionPattern=%d %-5p [%t] - %m%n - -# -# Logger used for policy engine -# -log4j.logger.org.onap.dmaap.datarouter.authz.impl.ProvAuthorizer=debug, pelog -log4j.additivity.org.onap.dmaap.datarouter.authz.impl.ProvAuthorizer=false - -log4j.appender.pelog=org.apache.log4j.DailyRollingFileAppender -log4j.appender.pelog.file=./unit-test-logs/policyengine.log -log4j.appender.pelog.datePattern='.'yyyyMMdd -log4j.appender.pelog.append=true -log4j.appender.pelog.layout=org.apache.log4j.PatternLayout -log4j.appender.pelog.layout.ConversionPattern=%d %-5p [%t] - %m%n |