You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2020/08/29 19:43:54 UTC

[logging-log4j2] branch master updated (cdc6185 -> 23347b7)

This is an automated email from the ASF dual-hosted git repository.

mattsicker pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.


    from cdc6185  Update changes.xml.
     add 2e48bef  [LOG4J2-2653] Migrate lookup and net tests to JUnit 5
     add 23347b7  [LOG4J2-2653] Migrate layout tests to JUnit 5

No new revisions were added by this update.

Summary of changes:
 .../java/org/apache/logging/log4j/LogManager.java  |   9 +-
 .../apache/logging/log4j/spi/LoggerContext.java    |  24 +++++
 .../logging/log4j/CloseableThreadContextTest.java  |  17 +--
 .../log4j/ThreadContextInheritanceTest.java        |  17 +--
 .../apache/logging/log4j/ThreadContextTest.java    |  17 +--
 .../junit/LogManagerLoggerContextFactoryRule.java  |   2 +-
 .../log4j/junit/LoggerContextFactoryExtension.java |   2 +-
 .../log4j/junit/StatusLoggerLevelExtension.java    |   2 +-
 .../logging/log4j/junit/StatusLoggerRule.java      |   2 +-
 ...lExtension.java => ThreadContextExtension.java} |  45 ++++----
 .../logging/log4j/junit/ThreadContextMapRule.java  |   3 +
 .../logging/log4j/junit/ThreadContextRule.java     |   3 +
 .../log4j/junit/ThreadContextStackRule.java        |   2 +
 .../logging/log4j/junit/UsingAnyThreadContext.java |  19 ++--
 .../logging/log4j/junit/UsingThreadContextMap.java |  19 ++--
 .../log4j/junit/UsingThreadContextStack.java       |  19 ++--
 log4j-core/pom.xml                                 |   5 +-
 .../org/apache/logging/log4j/core/LoggerTest.java  |   5 +-
 .../apache/logging/log4j/core/jmx/ServerTest.java  |   4 +-
 .../core/layout/AbstractStringLayoutTest.java      |  30 +++---
 .../ConcurrentLoggingWithGelfLayoutTest.java       |  48 ++++-----
 .../logging/log4j/core/layout/GelfLayoutTest.java  |  19 ++--
 .../logging/log4j/core/layout/GelfLayoutTest2.java |  21 ++--
 .../logging/log4j/core/layout/GelfLayoutTest3.java |  35 +++---
 .../logging/log4j/core/layout/HtmlLayoutTest.java  |  42 ++++----
 .../log4j/core/layout/Log4j2_2195_Test.java        |  43 ++++----
 .../log4j/core/layout/LogEventFixtures.java        |   7 +-
 .../core/layout/PatternLayoutLookupDateTest.java   |  20 ++--
 .../layout/PatternLayoutMainMapLookupTest.java     |  40 +++----
 .../core/layout/PatternLayoutNoLookupDateTest.java |  21 ++--
 .../log4j/core/layout/PatternLayoutTest.java       |  71 ++++++-------
 .../log4j/core/layout/PatternSelectorTest.java     |  16 +--
 .../log4j/core/layout/Rfc5424LayoutTest.java       |  96 ++++++++---------
 .../core/layout/StringBuilderEncoderTest.java      | 118 ++++++++++-----------
 .../log4j/core/layout/SyslogLayoutTest.java        |  30 +++---
 .../logging/log4j/core/lookup/CaseLookupTest.java  |  12 +--
 .../log4j/core/lookup/ContextMapLookupTest.java    |  36 +++----
 .../logging/log4j/core/lookup/DateLookupTest.java  |  11 +-
 .../log4j/core/lookup/EnvironmentLookupTest.java   |   8 +-
 .../logging/log4j/core/lookup/EventLookupTest.java |   7 +-
 .../logging/log4j/core/lookup/Log4jLookupTest.java |  28 +++--
 .../core/lookup/Log4jLookupWithSpacesTest.java     |  29 +++--
 .../lookup/MainInputArgumentsJmxLookupTest.java    |  14 +--
 .../logging/log4j/core/lookup/MainLookupTest.java  |  30 +++---
 .../logging/log4j/core/lookup/MapLookupTest.java   |  26 +++--
 .../log4j/core/lookup/MarkerLookupConfigTest.java  |  45 ++++----
 .../log4j/core/lookup/MarkerLookupTest.java        |   7 +-
 .../core/lookup/ResourceBundleLookupTest.java      |  17 ++-
 .../log4j/core/lookup/StrSubstitutorTest.java      |  15 ++-
 .../core/lookup/StructuredDataLookupTest.java      |   7 +-
 .../core/lookup/SystemPropertiesLookupTest.java    |  15 ++-
 .../message/ExtendedThreadInformationTest.java     |   6 +-
 .../logging/log4j/core/net/PriorityTest.java       |   9 +-
 .../log4j/core/net/SocketMessageLossTest.java      |  24 ++---
 .../log4j/core/net/SocketReconnectTest.java        |  28 ++---
 .../apache/logging/log4j/core/net/SocketTest.java  |  37 ++-----
 .../net/ssl/EnvironmentPasswordProviderTest.java   |   8 +-
 .../core/net/ssl/FilePasswordProviderTest.java     |  13 +--
 .../core/net/ssl/KeyStoreConfigurationTest.java    |  60 ++++++-----
 .../core/net/ssl/MemoryPasswordProviderTest.java   |   6 +-
 .../log4j/core/net/ssl/SslConfigurationTest.java   |  41 ++++---
 .../log4j/core/net/ssl/StoreConfigurationTest.java |  16 +--
 .../core/net/ssl/TrustStoreConfigurationTest.java  |  54 +++++-----
 .../core/parser/AbstractLogEventParserTest.java    |   8 +-
 .../core/pattern/MdcPatternConverterTest.java      |  12 +--
 .../core/pattern/NdcPatternConverterTest.java      |  17 +--
 .../log4j/core/pattern/RegexReplacementTest.java   |  11 +-
 .../logging/log4j/junit/LoggerContextResolver.java |  28 +++--
 .../logging/log4j/junit/LoggerContextSource.java   |  22 +++-
 .../java/org/apache/logging/log4j/junit/Named.java |   7 ++
 .../log4j/junit/ReconfigurationPolicy.java}        |  24 +++--
 pom.xml                                            |   6 ++
 72 files changed, 770 insertions(+), 847 deletions(-)
 copy log4j-api/src/test/java/org/apache/logging/log4j/junit/{StatusLoggerLevelExtension.java => ThreadContextExtension.java} (50%)
 copy log4j-core/src/test/java/org/apache/logging/log4j/junit/Named.java => log4j-api/src/test/java/org/apache/logging/log4j/junit/UsingAnyThreadContext.java (71%)
 copy log4j-core/src/test/java/org/apache/logging/log4j/junit/Named.java => log4j-api/src/test/java/org/apache/logging/log4j/junit/UsingThreadContextMap.java (71%)
 copy log4j-core/src/test/java/org/apache/logging/log4j/junit/Named.java => log4j-api/src/test/java/org/apache/logging/log4j/junit/UsingThreadContextStack.java (71%)
 copy log4j-core/src/{main/java/org/apache/logging/log4j/core/impl/ContextAnchor.java => test/java/org/apache/logging/log4j/junit/ReconfigurationPolicy.java} (61%)