This is an automated email from the ASF dual-hosted git repository.
robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
The following commit(s) were added to refs/heads/master by this push:
new d53fe1b1 Test code cleanup
d53fe1b1 is described below
commit d53fe1b1a995098dd39f5175b035555e4e54aceb
Author: Robert Lazarski <robertlazar...@gmail.com>
AuthorDate: Fri Oct 25 11:48:19 2024 -1000
Test code cleanup
---
.../test/java/org/apache/rampart/RampartTest.java | 5 +----
.../rampart-samples/src/test/conf/log4j.properties | 24 ----------------------
.../org/apache/rampart/samples/runner/Sample.java | 3 +--
3 files changed, 2 insertions(+), 30 deletions(-)
diff --git
a/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
b/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
index fc9d44ec..246d40f6 100644
---
a/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
+++
b/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
@@ -145,10 +145,7 @@ public class RampartTest {
if (i == 28) {
assertEquals(resources.getString("encryptionMissing"), axisFault.getMessage());
} else if (i == 34) {
- // TODO this is failing in build server
- // Need to find the exact cause
-
//assertEquals(resources.getString("invalidSignatureAlgo"),
axisFault.getMessage());
- System.out.println(axisFault.getMessage());
+
assertEquals(resources.getString("invalidSignatureAlgo"),
axisFault.getMessage());
}
}
diff --git a/modules/rampart-samples/src/test/conf/log4j.properties
b/modules/rampart-samples/src/test/conf/log4j.properties
deleted file mode 100644
index b319014c..00000000
--- a/modules/rampart-samples/src/test/conf/log4j.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you 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.
-#
-
-log4j.rootCategory=INFO, CONSOLE
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%d %-5p %c - %m%n
diff --git
a/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/Sample.java
b/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/Sample.java
index 83a55102..5bcf6859 100644
---
a/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/Sample.java
+++
b/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/Sample.java
@@ -41,8 +41,7 @@ final class Sample {
project.setUserProperty("client.port", String.valueOf(port));
project.setUserProperty("server.port", String.valueOf(port));
StringBuilder vmargs = new StringBuilder();
- vmargs.append("-Dlog4j.configuration=");
- vmargs.append(new
File("src/test/conf/log4j.properties").getAbsoluteFile().toURI().toString());
+
vmargs.append("-Dorg.apache.logging.log4j.simplelog.StatusLogger.level=info");
String jacocoArgLineTemplate =
System.getProperty("jacoco.argLineTemplate");
if (jacocoArgLineTemplate != null) {
vmargs.append(" ");
