diff options
Diffstat (limited to 'datarouter-prov/src/test')
3 files changed, 76 insertions, 1 deletions
diff --git a/datarouter-prov/src/test/java/datarouter/provisioning/testBase.java b/datarouter-prov/src/test/java/datarouter/provisioning/testBase.java index d124af43..dd8e86cc 100644 --- a/datarouter-prov/src/test/java/datarouter/provisioning/testBase.java +++ b/datarouter-prov/src/test/java/datarouter/provisioning/testBase.java @@ -32,6 +32,7 @@ import java.io.InputStream; import java.security.KeyStore; import java.util.Properties; +import org.apache.commons.io.FileUtils; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.StatusLine; @@ -49,7 +50,7 @@ import org.onap.dmaap.datarouter.provisioning.FeedServlet; public class testBase { /** The properties file to read the DB properties from */ - public static final String CONFIG_FILE = "tests.properties"; + public static final String CONFIG_FILE = "integration_test.properties"; public Properties props; protected AbstractHttpClient httpclient; @@ -145,6 +146,7 @@ public class testBase { // shut down the connection manager to ensure // immediate deallocation of all system resources httpclient.getConnectionManager().shutdown(); + FileUtils.deleteDirectory(new File("./unit-test-logs")); } protected void ckResponse(HttpResponse response, int expect) { diff --git a/datarouter-prov/src/test/resources/integration_test.properties b/datarouter-prov/src/test/resources/integration_test.properties new file mode 100644 index 00000000..36b2ac3c --- /dev/null +++ b/datarouter-prov/src/test/resources/integration_test.properties @@ -0,0 +1,5 @@ +test.keystore=self_signed/keystore.jks +test.kspassword=changeit +test.truststore=self_signed/cacerts.jks +test.tspassword=changeit +test.host=https://prov.datarouternew.com:8443
\ No newline at end of file diff --git a/datarouter-prov/src/test/resources/log4j.properties b/datarouter-prov/src/test/resources/log4j.properties new file mode 100644 index 00000000..b3be5b02 --- /dev/null +++ b/datarouter-prov/src/test/resources/log4j.properties @@ -0,0 +1,68 @@ +#------------------------------------------------------------------------------- +# ============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 |