You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2017/02/05 13:45:14 UTC
svn commit: r1781759 - in /jmeter/trunk/test/src/org/apache: jmeter/
jmeter/gui/logging/ jmeter/samplers/ jmeter/util/ jorphan/reflect/
jorphan/test/
Author: pmouawad
Date: Sun Feb 5 13:45:14 2017
New Revision: 1781759
URL: http://svn.apache.org/viewvc?rev=1781759&view=rev
Log:
Bug 60589 - Migrate LogKit to SLF4J - Drop avalon, logkit and excalibur with backward compatibility for 3rd party modules
Part 4 of PR #254
Contributed by Woonsan Ko
Bugzilla Id: 60589
Added:
jmeter/trunk/test/src/org/apache/jmeter/gui/logging/
jmeter/trunk/test/src/org/apache/jmeter/gui/logging/TestGuiLogEventAppender.java (with props)
jmeter/trunk/test/src/org/apache/jmeter/util/LogRecord.java (with props)
jmeter/trunk/test/src/org/apache/jmeter/util/LogRecordingDelegatingLogger.java (with props)
Modified:
jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java
jmeter/trunk/test/src/org/apache/jmeter/samplers/TestSampleResult.java
jmeter/trunk/test/src/org/apache/jorphan/reflect/TestFunctor.java
jmeter/trunk/test/src/org/apache/jorphan/test/AllTests.java
Modified: jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java?rev=1781759&r1=1781758&r2=1781759&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java Sun Feb 5 13:45:14 2017
@@ -201,7 +201,8 @@ public class JMeterVersionTest extends J
final BufferedReader maven = new BufferedReader(
new FileReader(getFileFromHome("res/maven/ApacheJMeter_parent.pom"))); // assume default charset is OK here
// <apache-bsf.version>2.4.0</apache-bsf.version>
- final Pattern p = Pattern.compile("\\s+<([^\\.]+)\\.version>([^<]+)<.*");
+// <log4j-1.2-api.version>2.7</log4j-1.2-api.version>
+ final Pattern p = Pattern.compile("\\s+<([^\\<\\>]+)\\.version>([^<]+)<.*");
String line;
while((line=maven.readLine()) != null){
Added: jmeter/trunk/test/src/org/apache/jmeter/gui/logging/TestGuiLogEventAppender.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/gui/logging/TestGuiLogEventAppender.java?rev=1781759&view=auto
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/gui/logging/TestGuiLogEventAppender.java (added)
+++ jmeter/trunk/test/src/org/apache/jmeter/gui/logging/TestGuiLogEventAppender.java Sun Feb 5 13:45:14 2017
@@ -0,0 +1,111 @@
+/*
+ * 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.
+ *
+ */
+
+package org.apache.jmeter.gui.logging;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.ErrorHandler;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.appender.ConsoleAppender;
+import org.apache.logging.log4j.core.config.Configurator;
+import org.apache.logging.log4j.core.config.builder.api.AppenderComponentBuilder;
+import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilder;
+import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilderFactory;
+import org.apache.logging.log4j.core.config.builder.api.RootLoggerComponentBuilder;
+import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Unit test for {@link GuiLogEventAppender}.
+ */
+public class TestGuiLogEventAppender {
+
+ private static List<String> log4j2LevelErrorMessages = Collections.synchronizedList(new LinkedList<>());
+
+ /*
+ * Configure logging with GuiLogEventAppender for root logger, and override the handler of GuiLogEventAppender
+ * to see if there's any log4j2 AppenderControl level error (e.g, "Recursive call to appender gui-log-event").
+ */
+ @BeforeClass
+ public static void beforeClass() {
+ ConfigurationBuilder<BuiltConfiguration> builder = ConfigurationBuilderFactory.newConfigurationBuilder();
+ builder.setPackages("org.apache.jmeter.gui.logging");
+
+ AppenderComponentBuilder appenderBuilder = builder.newAppender("Stdout", "CONSOLE").addAttribute("target",
+ ConsoleAppender.Target.SYSTEM_OUT);
+ appenderBuilder.add(builder.newLayout("PatternLayout").addAttribute("pattern", "%d %p %c{1.}: %m%n"));
+ builder.add(appenderBuilder);
+
+ appenderBuilder = builder.newAppender("gui-log-event", "GuiLogEvent");
+ appenderBuilder.add(builder.newLayout("PatternLayout").addAttribute("pattern", "%d %p %c{1.}: %m%n"));
+ builder.add(appenderBuilder);
+
+ RootLoggerComponentBuilder rootLoggerBuilder = builder.newRootLogger(Level.INFO);
+ rootLoggerBuilder.add(builder.newAppenderRef("Stdout")).add(builder.newAppenderRef("gui-log-event"));
+ builder.add(rootLoggerBuilder);
+
+ final LoggerContext loggerContext = Configurator.initialize(builder.build());
+ final Appender guiLogEventAppender = loggerContext.getRootLogger().getAppenders().get("gui-log-event");
+
+ guiLogEventAppender.stop();
+ guiLogEventAppender.setHandler(new ErrorHandler() {
+ public void error(String msg) {
+ log4j2LevelErrorMessages.add(msg);
+ }
+
+ public void error(String msg, Throwable t) {
+ log4j2LevelErrorMessages.add(msg + " " + t);
+ }
+
+ public void error(String msg, LogEvent event, Throwable t) {
+ log4j2LevelErrorMessages.add(msg + " " + t);
+ }
+ });
+ guiLogEventAppender.start();
+ }
+
+ @Before
+ public void setUp() {
+ log4j2LevelErrorMessages.clear();
+ }
+
+ /*
+ * Make simple logs and see whether there's any log4j2 AppenderControl level error (e.g, "Recursive call to
+ * appender gui-log-event").
+ * For example, if GuiLogEventAppender meets an exception while accessing GuiPackage class due to static member
+ * initialization failure, the error is passed to the root logger, causing "Recursive call ...".
+ */
+ @Test
+ public void testSimpleLogging() throws Exception {
+ final Logger log = LoggerFactory.getLogger(TestGuiLogEventAppender.class);
+ log.info("logger created.");
+ assertTrue("Logging appender error: " + log4j2LevelErrorMessages, log4j2LevelErrorMessages.isEmpty());
+ }
+}
Propchange: jmeter/trunk/test/src/org/apache/jmeter/gui/logging/TestGuiLogEventAppender.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: jmeter/trunk/test/src/org/apache/jmeter/samplers/TestSampleResult.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/samplers/TestSampleResult.java?rev=1781759&r1=1781758&r2=1781759&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/samplers/TestSampleResult.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/samplers/TestSampleResult.java Sun Feb 5 13:45:14 2017
@@ -25,14 +25,9 @@ import static org.junit.Assert.assertNul
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import java.io.StringWriter;
-
import org.apache.jmeter.junit.JMeterTestCase;
import org.apache.jmeter.util.Calculator;
-import org.apache.log.LogTarget;
-import org.apache.log.format.Formatter;
-import org.apache.log.format.RawFormatter;
-import org.apache.log.output.io.WriterTarget;
+import org.apache.jmeter.util.LogRecordingDelegatingLogger;
import org.junit.Test;
// TODO need more tests - particularly for the new functions
@@ -107,14 +102,16 @@ public class TestSampleResult {
}
}
- private static final Formatter fmt = new RawFormatter();
-
- private StringWriter wr = null;
+ private LogRecordingDelegatingLogger recordLogger;
private void divertLog() {// N.B. This needs to divert the log for SampleResult
- wr = new StringWriter(1000);
- LogTarget[] lt = { new WriterTarget(wr, fmt) };
- SampleResult.log.setLogTargets(lt);
+ if (SampleResult.log instanceof LogRecordingDelegatingLogger) {
+ recordLogger = (LogRecordingDelegatingLogger) SampleResult.log;
+ } else {
+ recordLogger = new LogRecordingDelegatingLogger(SampleResult.log);
+ SampleResult.log = recordLogger;
+ }
+ recordLogger.clearLogRecords();
}
@Test
@@ -123,9 +120,9 @@ public class TestSampleResult {
SampleResult res = new SampleResult(true);
res.sampleStart();
res.samplePause();
- assertEquals(0, wr.toString().length());
+ assertEquals(0, recordLogger.getLogRecordCount());
res.samplePause();
- assertNotEquals(0, wr.toString().length());
+ assertNotEquals(0, recordLogger.getLogRecordCount());
}
@Test
@@ -134,9 +131,9 @@ public class TestSampleResult {
SampleResult res = new SampleResult(false);
res.sampleStart();
res.samplePause();
- assertEquals(0, wr.toString().length());
+ assertEquals(0, recordLogger.getLogRecordCount());
res.samplePause();
- assertNotEquals(0, wr.toString().length());
+ assertNotEquals(0, recordLogger.getLogRecordCount());
}
@Test
Added: jmeter/trunk/test/src/org/apache/jmeter/util/LogRecord.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/util/LogRecord.java?rev=1781759&view=auto
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/util/LogRecord.java (added)
+++ jmeter/trunk/test/src/org/apache/jmeter/util/LogRecord.java Sun Feb 5 13:45:14 2017
@@ -0,0 +1,112 @@
+/*
+ * 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.
+ *
+ */
+package org.apache.jmeter.util;
+
+import org.slf4j.Marker;
+import org.slf4j.spi.LocationAwareLogger;
+
+/**
+ * Log record.
+ */
+public class LogRecord {
+
+ public static final int TRACE = LocationAwareLogger.TRACE_INT;
+ public static final int DEBUG = LocationAwareLogger.DEBUG_INT;
+ public static final int INFO = LocationAwareLogger.INFO_INT;
+ public static final int WARN = LocationAwareLogger.WARN_INT;
+ public static final int ERROR = LocationAwareLogger.ERROR_INT;
+
+ private int level;
+ private Marker marker;
+ private String format;
+ private Object[] arguments;
+ private Throwable throwable;
+
+ public LogRecord(int level, String msg) {
+ this(level, null, msg, (Object []) null, null);
+ }
+
+ public LogRecord(int level, String format, Object arg) {
+ this(level, null, format, new Object [] { arg }, null);
+ }
+
+ public LogRecord(int level, String format, Object arg1, Object arg2) {
+ this(level, null, format, new Object [] { arg1, arg2 }, null);
+ }
+
+ public LogRecord(int level, String format, Object[] argArray) {
+ this(level, null, format, argArray, null);
+ }
+
+ public LogRecord(int level, String msg, Throwable t) {
+ this(level, null, msg, null, t);
+ }
+
+ public LogRecord(int level, Marker marker, String msg) {
+ this(level, marker, msg, null, null);
+ }
+
+ public LogRecord(int level, Marker marker, String format, Object arg) {
+ this(level, marker, format, new Object [] { arg }, null);
+ }
+
+ public LogRecord(int level, Marker marker, String format, Object arg1, Object arg2) {
+ this(level, marker, format, new Object [] { arg1, arg2 }, null);
+ }
+
+ public LogRecord(int level, Marker marker, String format, Object[] argArray) {
+ this(level, marker, format, argArray, null);
+ }
+
+ public LogRecord(int level, Marker marker, String msg, Throwable t) {
+ this(level, marker, msg, null, t);
+ }
+
+ public LogRecord(int level, Marker marker, String format, Object[] argArray, Throwable throwable) {
+ this.level = level;
+ this.marker = marker;
+ this.format = format;
+
+ if (argArray != null) {
+ this.arguments = new Object[argArray.length];
+ System.arraycopy(argArray, 0, this.arguments, 0, argArray.length);
+ }
+
+ this.throwable = throwable;
+ }
+
+ public int getLevel() {
+ return level;
+ }
+
+ public Marker getMarker() {
+ return marker;
+ }
+
+ public String getFormat() {
+ return format;
+ }
+
+ public Object[] getArguments() {
+ return arguments;
+ }
+
+ public Throwable getThrowable() {
+ return throwable;
+ }
+}
Propchange: jmeter/trunk/test/src/org/apache/jmeter/util/LogRecord.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: jmeter/trunk/test/src/org/apache/jmeter/util/LogRecordingDelegatingLogger.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/util/LogRecordingDelegatingLogger.java?rev=1781759&view=auto
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/util/LogRecordingDelegatingLogger.java (added)
+++ jmeter/trunk/test/src/org/apache/jmeter/util/LogRecordingDelegatingLogger.java Sun Feb 5 13:45:14 2017
@@ -0,0 +1,341 @@
+/*
+ * 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.
+ *
+ */
+package org.apache.jmeter.util;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.Marker;
+import org.slf4j.ext.LoggerWrapper;
+
+/**
+ * Logger wrapper to keep the log event for the record and delegate to the internal logger.
+ */
+public class LogRecordingDelegatingLogger extends LoggerWrapper {
+
+ private static final String FQCN = LogRecordingDelegatingLogger.class.getName();
+
+ private List<LogRecord> logRecords = Collections.synchronizedList(new LinkedList<>());
+
+ public LogRecordingDelegatingLogger(Logger logger) {
+ super(logger, FQCN);
+ }
+
+ public Collection<LogRecord> getLogRecords() {
+ return Collections.unmodifiableCollection(logRecords);
+ }
+
+ public int getLogRecordCount() {
+ return logRecords.size();
+ }
+
+ public void clearLogRecords() {
+ logRecords.clear();
+ }
+
+ @Override
+ public void trace(String msg) {
+ logRecords.add(new LogRecord(LogRecord.TRACE, msg));
+ super.trace(msg);
+ }
+
+ @Override
+ public void trace(String format, Object arg) {
+ logRecords.add(new LogRecord(LogRecord.TRACE, format, arg));
+ super.trace(format, arg);
+ }
+
+ @Override
+ public void trace(String format, Object arg1, Object arg2) {
+ logRecords.add(new LogRecord(LogRecord.TRACE, format, arg1, arg2));
+ super.trace(format, arg1, arg2);
+ }
+
+ @Override
+ public void trace(String format, Object... argArray) {
+ logRecords.add(new LogRecord(LogRecord.TRACE, format, argArray));
+ super.trace(format, argArray);
+ }
+
+ @Override
+ public void trace(String msg, Throwable t) {
+ logRecords.add(new LogRecord(LogRecord.TRACE, msg, t));
+ super.trace(msg, t);
+ }
+
+ @Override
+ public void trace(Marker marker, String msg) {
+ logRecords.add(new LogRecord(LogRecord.TRACE, marker, msg));
+ super.trace(marker, msg);
+ }
+
+ @Override
+ public void trace(Marker marker, String format, Object arg) {
+ logRecords.add(new LogRecord(LogRecord.TRACE, marker, format, arg));
+ super.trace(marker, format, arg);
+ }
+
+ @Override
+ public void trace(Marker marker, String format, Object arg1, Object arg2) {
+ logRecords.add(new LogRecord(LogRecord.TRACE, marker, format, arg1, arg2));
+ super.trace(marker, format, arg1, arg2);
+ }
+
+ @Override
+ public void trace(Marker marker, String format, Object... argArray) {
+ logRecords.add(new LogRecord(LogRecord.TRACE, marker, format, argArray));
+ super.trace(marker, format, argArray);
+ }
+
+ @Override
+ public void trace(Marker marker, String msg, Throwable t) {
+ logRecords.add(new LogRecord(LogRecord.TRACE, marker, msg, t));
+ super.trace(marker, msg, t);
+ }
+
+ @Override
+ public void debug(String msg) {
+ logRecords.add(new LogRecord(LogRecord.DEBUG, msg));
+ super.debug(msg);
+ }
+
+ @Override
+ public void debug(String format, Object arg) {
+ logRecords.add(new LogRecord(LogRecord.DEBUG, format, arg));
+ super.debug(format, arg);
+ }
+
+ @Override
+ public void debug(String format, Object arg1, Object arg2) {
+ logRecords.add(new LogRecord(LogRecord.DEBUG, format, arg1, arg2));
+ super.debug(format, arg1, arg2);
+ }
+
+ @Override
+ public void debug(String format, Object... argArray) {
+ logRecords.add(new LogRecord(LogRecord.DEBUG, format, argArray));
+ super.debug(format, argArray);
+ }
+
+ @Override
+ public void debug(String msg, Throwable t) {
+ logRecords.add(new LogRecord(LogRecord.DEBUG, msg, t));
+ super.debug(msg, t);
+ }
+
+ @Override
+ public void debug(Marker marker, String msg) {
+ logRecords.add(new LogRecord(LogRecord.DEBUG, marker, msg));
+ super.debug(marker, msg);
+ }
+
+ @Override
+ public void debug(Marker marker, String format, Object arg) {
+ logRecords.add(new LogRecord(LogRecord.DEBUG, marker, format, arg));
+ super.debug(marker, format, arg);
+ }
+
+ @Override
+ public void debug(Marker marker, String format, Object arg1, Object arg2) {
+ logRecords.add(new LogRecord(LogRecord.DEBUG, marker, format, arg1, arg2));
+ super.debug(marker, format, arg1, arg2);
+ }
+
+ @Override
+ public void debug(Marker marker, String format, Object... argArray) {
+ logRecords.add(new LogRecord(LogRecord.DEBUG, marker, format, argArray));
+ super.debug(marker, format, argArray);
+ }
+
+ @Override
+ public void debug(Marker marker, String msg, Throwable t) {
+ logRecords.add(new LogRecord(LogRecord.DEBUG, marker, msg, t));
+ super.debug(marker, msg, t);
+ }
+
+ @Override
+ public void info(String msg) {
+ logRecords.add(new LogRecord(LogRecord.INFO, msg));
+ super.info(msg);
+ }
+
+ @Override
+ public void info(String format, Object arg) {
+ logRecords.add(new LogRecord(LogRecord.INFO, format, arg));
+ super.info(format, arg);
+ }
+
+ @Override
+ public void info(String format, Object arg1, Object arg2) {
+ logRecords.add(new LogRecord(LogRecord.INFO, format, arg1, arg2));
+ super.info(format, arg1, arg2);
+ }
+
+ @Override
+ public void info(String format, Object... argArray) {
+ logRecords.add(new LogRecord(LogRecord.INFO, format, argArray));
+ super.info(format, argArray);
+ }
+
+ @Override
+ public void info(String msg, Throwable t) {
+ logRecords.add(new LogRecord(LogRecord.INFO, msg, t));
+ super.info(msg, t);
+ }
+
+ @Override
+ public void info(Marker marker, String msg) {
+ logRecords.add(new LogRecord(LogRecord.INFO, marker, msg));
+ super.info(marker, msg);
+ }
+
+ @Override
+ public void info(Marker marker, String format, Object arg) {
+ logRecords.add(new LogRecord(LogRecord.INFO, marker, format, arg));
+ super.info(marker, format, arg);
+ }
+
+ @Override
+ public void info(Marker marker, String format, Object arg1, Object arg2) {
+ logRecords.add(new LogRecord(LogRecord.INFO, marker, format, arg1, arg2));
+ super.info(marker, format, arg1, arg2);
+ }
+
+ @Override
+ public void info(Marker marker, String format, Object... argArray) {
+ logRecords.add(new LogRecord(LogRecord.INFO, marker, format, argArray));
+ super.info(marker, format, argArray);
+ }
+
+ @Override
+ public void info(Marker marker, String msg, Throwable t) {
+ logRecords.add(new LogRecord(LogRecord.INFO, marker, msg, t));
+ super.info(marker, msg, t);
+ }
+
+ @Override
+ public void warn(String msg) {
+ logRecords.add(new LogRecord(LogRecord.WARN, msg));
+ super.warn(msg);
+ }
+
+ @Override
+ public void warn(String format, Object arg) {
+ logRecords.add(new LogRecord(LogRecord.WARN, format, arg));
+ super.warn(format, arg);
+ }
+
+ @Override
+ public void warn(String format, Object arg1, Object arg2) {
+ logRecords.add(new LogRecord(LogRecord.WARN, format, arg1, arg2));
+ super.warn(format, arg1, arg2);
+ }
+
+ @Override
+ public void warn(String format, Object... argArray) {
+ logRecords.add(new LogRecord(LogRecord.WARN, format, argArray));
+ super.warn(format, argArray);
+ }
+
+ @Override
+ public void warn(String msg, Throwable t) {
+ logRecords.add(new LogRecord(LogRecord.WARN, msg, t));
+ super.warn(msg, t);
+ }
+
+ @Override
+ public void warn(Marker marker, String msg) {
+ logRecords.add(new LogRecord(LogRecord.WARN, marker, msg));
+ super.warn(marker, msg);
+ }
+
+ @Override
+ public void warn(Marker marker, String format, Object arg) {
+ logRecords.add(new LogRecord(LogRecord.WARN, marker, format, arg));
+ super.warn(marker, format, arg);
+ }
+
+ @Override
+ public void warn(Marker marker, String format, Object arg1, Object arg2) {
+ logRecords.add(new LogRecord(LogRecord.WARN, marker, format, arg1, arg2));
+ super.warn(marker, format, arg1, arg2);
+ }
+
+ public void warn(Marker marker, String format, Object... argArray) {
+ logRecords.add(new LogRecord(LogRecord.WARN, marker, format, argArray));
+ super.warn(marker, format, argArray);
+ }
+
+ public void warn(Marker marker, String msg, Throwable t) {
+ logRecords.add(new LogRecord(LogRecord.WARN, marker, msg, t));
+ super.warn(marker, msg, t);
+ }
+
+ public void error(String msg) {
+ logRecords.add(new LogRecord(LogRecord.ERROR, msg));
+ super.error(msg);
+ }
+
+ public void error(String format, Object arg) {
+ logRecords.add(new LogRecord(LogRecord.ERROR, format, arg));
+ super.error(format, arg);
+ }
+
+ public void error(String format, Object arg1, Object arg2) {
+ logRecords.add(new LogRecord(LogRecord.ERROR, format, arg1, arg2));
+ super.error(format, arg1, arg2);
+ }
+
+ public void error(String format, Object... argArray) {
+ logRecords.add(new LogRecord(LogRecord.ERROR, format, argArray));
+ super.error(format, argArray);
+ }
+
+ public void error(String msg, Throwable t) {
+ logRecords.add(new LogRecord(LogRecord.ERROR, msg, t));
+ super.error(msg, t);
+ }
+
+ public void error(Marker marker, String msg) {
+ logRecords.add(new LogRecord(LogRecord.ERROR, marker, msg));
+ super.error(marker, msg);
+ }
+
+ public void error(Marker marker, String format, Object arg) {
+ logRecords.add(new LogRecord(LogRecord.ERROR, marker, format, arg));
+ super.error(marker, format, arg);
+ }
+
+ public void error(Marker marker, String format, Object arg1, Object arg2) {
+ logRecords.add(new LogRecord(LogRecord.ERROR, marker, format, arg1, arg2));
+ super.error(marker, format, arg1, arg2);
+ }
+
+ public void error(Marker marker, String format, Object... argArray) {
+ logRecords.add(new LogRecord(LogRecord.ERROR, marker, format, argArray));
+ super.error(marker, format, argArray);
+ }
+
+ public void error(Marker marker, String msg, Throwable t) {
+ logRecords.add(new LogRecord(LogRecord.ERROR, marker, msg, t));
+ super.error(marker, msg, t);
+ }
+}
Propchange: jmeter/trunk/test/src/org/apache/jmeter/util/LogRecordingDelegatingLogger.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: jmeter/trunk/test/src/org/apache/jorphan/reflect/TestFunctor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jorphan/reflect/TestFunctor.java?rev=1781759&r1=1781758&r2=1781759&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jorphan/reflect/TestFunctor.java (original)
+++ jmeter/trunk/test/src/org/apache/jorphan/reflect/TestFunctor.java Sun Feb 5 13:45:14 2017
@@ -25,8 +25,9 @@ import java.util.Map;
import java.util.Properties;
import org.apache.jmeter.junit.JMeterTestCase;
-import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.util.JMeterError;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.core.config.Configurator;
import org.junit.Before;
import org.junit.Test;
@@ -92,7 +93,7 @@ public class TestFunctor extends JMeterT
@Before
public void setUp(){
- LoggingManager.setPriority("FATAL_ERROR",LoggingManager.removePrefix(Functor.class.getName()));
+ Configurator.setAllLevels(Functor.class.getName(), Level.FATAL);
}
@Test
Modified: jmeter/trunk/test/src/org/apache/jorphan/test/AllTests.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jorphan/test/AllTests.java?rev=1781759&r1=1781758&r2=1781759&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jorphan/test/AllTests.java (original)
+++ jmeter/trunk/test/src/org/apache/jorphan/test/AllTests.java Sun Feb 5 13:45:14 2017
@@ -249,7 +249,7 @@ public final class AllTests {
Properties props = new Properties();
InputStream inputStream = null;
try {
- System.out.println("Setting up logging props using file: " + args[1]);
+ System.out.println("Setting up props using file: " + args[1]);
inputStream = new FileInputStream(args[1]);
props.load(inputStream);
LoggingManager.initializeLogging(props);