This is an automated email from the ASF dual-hosted git repository. mattsicker pushed a commit to branch 2.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 5df0a575cece5a770f2be491bbe97689af9c644f Merge: 64ba05a980 c4e64310c7 Author: Matt Sicker <[email protected]> AuthorDate: Tue Dec 3 16:31:26 2024 -0600 Merge pull request #3221 from strangelookingnerd/migrate_to_junit5 Migrate tests to JUnit5 .../org/apache/log4j/BasicConfiguratorTest.java | 12 +- .../org/apache/log4j/CallerInformationTest.java | 6 +- .../test/java/org/apache/log4j/CategoryTest.java | 75 ++++----- .../java/org/apache/log4j/ConsoleAppenderTest.java | 10 +- .../src/test/java/org/apache/log4j/LayoutTest.java | 3 +- .../src/test/java/org/apache/log4j/LevelTest.java | 73 ++++----- .../test/java/org/apache/log4j/ListAppender.java | 3 +- .../test/java/org/apache/log4j/LogManagerTest.java | 4 +- .../test/java/org/apache/log4j/LogWithMDCTest.java | 6 +- .../java/org/apache/log4j/LogWithRouteTest.java | 6 +- .../java/org/apache/log4j/LoggerJira3410Test.java | 4 +- .../src/test/java/org/apache/log4j/LoggerTest.java | 77 +++++----- .../test/java/org/apache/log4j/LoggingTest.java | 4 +- .../test/java/org/apache/log4j/MDCTestCase.java | 10 +- .../src/test/java/org/apache/log4j/NDCTest.java | 8 +- .../test/java/org/apache/log4j/PriorityTest.java | 60 ++++---- .../org/apache/log4j/PropertyConfiguratorTest.java | 7 +- .../apache/log4j/bridge/LogEventWrapperTest.java | 6 +- .../apache/log4j/builders/BuilderManagerTest.java | 4 +- .../filter/LevelRangeFilterBuilderTest.java | 16 +- .../builders/layout/PatternLayoutBuilderTest.java | 10 +- .../AbstractLog4j1ConfigurationConverterTest.java | 2 +- .../config/AbstractLog4j1ConfigurationTest.java | 106 +++++++------ .../org/apache/log4j/config/AsyncAppenderTest.java | 4 +- .../org/apache/log4j/config/AutoConfigTest.java | 10 +- .../config/Log4j1ConfigurationFactoryTest.java | 43 +++--- .../log4j/config/MapRewriteAppenderTest.java | 10 +- .../config/PropertiesConfigurationFactoryTest.java | 6 +- .../log4j/config/PropertiesConfigurationTest.java | 42 ++--- .../config/PropertiesReconfigurationTest.java | 10 +- .../PropertiesRollingWithPropertiesTest.java | 6 +- .../apache/log4j/config/RewriteAppenderTest.java | 10 +- .../config/SocketAppenderConfigurationTest.java | 11 +- .../config/SyslogAppenderConfigurationTest.java | 14 +- .../apache/log4j/config/SyslogAppenderTest.java | 10 +- .../log4j/config/XmlConfigurationFactoryTest.java | 6 +- .../apache/log4j/config/XmlConfigurationTest.java | 24 +-- .../log4j/config/XmlReconfigurationTest.java | 4 +- .../log4j/config/XmlRollingWithPropertiesTest.java | 6 +- .../apache/log4j/helpers/BoundedFIFOTestCase.java | 20 +-- .../apache/log4j/helpers/CyclicBufferTestCase.java | 20 +-- .../log4j/helpers/OptionConverterLevelTest.java | 13 +- .../apache/log4j/helpers/UtilLoggingLevelTest.java | 4 +- .../log4j/layout/Log4j1SyslogLayoutTest.java | 4 +- .../apache/log4j/layout/Log4j1XmlLayoutTest.java | 6 +- .../apache/log4j/pattern/FormattingInfoTest.java | 4 +- .../pattern/Log4j1LevelPatternConverterTest.java | 4 +- .../pattern/Log4j1MdcPatternConverterTest.java | 10 +- .../pattern/Log4j1NdcPatternConverterTest.java | 10 +- .../apache/log4j/pattern/NameAbbreviatorTest.java | 2 +- .../apache/log4j/spi/ThrowableInformationTest.java | 10 +- .../java/org/apache/log4j/xml/DOMTestCase.java | 8 +- .../log4j/util/java9/ProcessIdUtilTest.java | 4 +- .../logging/log4j/util/java9/StackLocatorTest.java | 20 +-- .../log4j/test/AbstractSerializationTest.java | 2 +- .../log4j/test/ThreadContextUtilityClass.java | 4 +- .../apache/logging/log4j/AbstractLoggerTest.java | 42 ++--- .../logging/log4j/CloseableThreadContextTest.java | 30 ++-- .../org/apache/logging/log4j/EventLoggerTest.java | 6 +- .../org/apache/logging/log4j/LambdaLoggerTest.java | 146 +++++++++--------- .../java/org/apache/logging/log4j/LevelTest.java | 22 +-- .../org/apache/logging/log4j/LogManagerTest.java | 22 +-- .../apache/logging/log4j/LoggerSupplierTest.java | 30 ++-- .../java/org/apache/logging/log4j/LoggerTest.java | 114 +++++++------- .../java/org/apache/logging/log4j/MarkerTest.java | 20 +-- .../logging/log4j/NoopThreadContextTest.java | 4 +- .../log4j/ThreadContextInheritanceTest.java | 32 ++-- .../apache/logging/log4j/ThreadContextTest.java | 36 ++--- .../org/apache/logging/log4j/TraceLoggingTest.java | 6 +- .../log4j/internal/DefaultLogBuilderTest.java | 4 +- .../map/UnmodifiableArrayBackedMapTest.java | 75 ++++----- .../log4j/message/FormattedMessageTest.java | 26 ++-- .../log4j/message/LocalizedMessageFactoryTest.java | 14 +- .../log4j/message/LocalizedMessageTest.java | 14 +- .../logging/log4j/message/MapMessageTest.java | 54 +++---- .../log4j/message/MessageFormatMessageTest.java | 16 +- .../log4j/message/MessageFormatsPerfTest.java | 20 +-- .../log4j/message/ObjectArrayMessageTest.java | 6 +- .../logging/log4j/message/ObjectMessageTest.java | 12 +- .../log4j/message/ParameterFormatterTest.java | 6 +- .../log4j/message/ReusableMessageFactoryTest.java | 13 +- .../log4j/message/ReusableObjectMessageTest.java | 24 +-- .../message/ReusableParameterizedMessageTest.java | 24 +-- .../log4j/message/ReusableSimpleMessageTest.java | 24 +-- .../logging/log4j/message/SimpleMessageTest.java | 4 +- .../log4j/message/StringFormattedMessageTest.java | 20 +-- .../log4j/message/StructuredDataMessageTest.java | 16 +- .../log4j/message/ThreadDumpMessageTest.java | 12 +- .../logging/log4j/simple/SimpleLoggerTest.java | 12 +- .../log4j/spi/DefaultThreadContextStackTest.java | 52 +++---- .../logging/log4j/spi/LoggerAdapterTest.java | 6 +- .../log4j/spi/MutableThreadContextStackTest.java | 66 ++++---- .../log4j/test/junit/TempLoggingDirectoryTest.java | 2 +- .../log4j/test/junit/TestPropertySourceTest.java | 8 +- .../org/apache/logging/log4j/util/CharsTest.java | 6 +- .../apache/logging/log4j/util/ConstantsTest.java | 4 +- .../log4j/util/EnvironmentPropertySourceTest.java | 4 +- .../apache/logging/log4j/util/LambdaUtilTest.java | 24 +-- .../util/LegacyPropertiesCompatibilityTest.java | 4 +- .../log4j/util/Log4jCharsetsPropertiesTest.java | 4 +- .../logging/log4j/util/ProcessIdUtilTest.java | 6 +- .../log4j/util/PropertiesPropertySourceTest.java | 6 +- .../log4j/util/PropertiesUtilOrderTest.java | 6 +- .../log4j/util/PropertySourceCamelCaseTest.java | 4 +- .../log4j/util/PropertySourceTokenizerTest.java | 4 +- .../logging/log4j/util/ServiceLoaderUtilTest.java | 8 +- .../log4j/util/SortedArrayStringMapTest.java | 118 +++++++------- .../logging/log4j/util/StackLocatorTestIT.java | 5 +- .../logging/log4j/util/StackLocatorUtilTest.java | 20 +-- .../logging/log4j/util/StringBuildersTest.java | 12 +- .../org/apache/logging/log4j/util/StringsTest.java | 18 +-- .../util/SystemPropertiesPropertySourceTest.java | 4 +- .../org/apache/logging/log4j/util/Unbox1Test.java | 26 ++-- .../logging/log4j/util/Unbox2ConfigurableTest.java | 10 +- .../logging/log4j/cassandra/CassandraRule.java | 4 +- .../logging/log4j/FilterPerformanceComparison.java | 41 +++-- .../logging/log4j/PerformanceComparison.java | 23 ++- .../org/apache/logging/log4j/PerformanceRun.java | 2 +- .../apache/logging/log4j/core/SimplePerfTest.java | 37 +++-- .../logging/log4j/core/ThreadedPerfTest.java | 17 +-- .../apache/logging/log4j/core/ThreadedTest.java | 9 +- .../log4j/core/async/perftest/PerfTestDriver.java | 9 +- .../log4j/FormatterLoggerManualExample.java | 2 +- .../apache/logging/log4j/MarkerMixInJsonTest.java | 7 +- .../org/apache/logging/log4j/MarkerMixInTest.java | 35 +++-- .../apache/logging/log4j/MarkerMixInXmlTest.java | 7 +- .../apache/logging/log4j/MarkerMixInYamlTest.java | 7 +- .../log4j/core/AppenderRefLevelJsonTest.java | 8 +- .../logging/log4j/core/AppenderRefLevelTest.java | 12 +- .../logging/log4j/core/BasicLoggingTest.java | 4 +- .../logging/log4j/core/CollectionLoggingTest.java | 8 +- .../log4j/core/CustomLevelsOverrideTest.java | 10 +- .../logging/log4j/core/CustomLevelsTest.java | 8 +- .../log4j/core/CustomLevelsWithFiltersTest.java | 10 +- .../apache/logging/log4j/core/DeadlockTest.java | 4 +- .../logging/log4j/core/ExtendedLevelTest.java | 4 +- .../log4j/core/GcFreeAsynchronousLoggingTest.java | 4 +- .../core/GcFreeMixedSyncAsyncLoggingTest.java | 4 +- .../log4j/core/GcFreeSynchronousLoggingTest.java | 4 +- .../apache/logging/log4j/core/HostNameTest.java | 4 +- .../apache/logging/log4j/core/LateConfigTest.java | 14 +- .../org/apache/logging/log4j/core/LevelTest.java | 4 +- .../apache/logging/log4j/core/Log4j1222Test.java | 11 +- .../apache/logging/log4j/core/LogEventTest.java | 12 +- .../apache/logging/log4j/core/LoggerDateTest.java | 2 +- .../org/apache/logging/log4j/core/LoggerTest.java | 74 ++++----- .../logging/log4j/core/LoggerUpdateTest.java | 6 +- .../org/apache/logging/log4j/core/LookupTest.java | 7 +- ...rnResolverDoesNotEvaluateThreadContextTest.java | 10 +- .../logging/log4j/core/PatternSelectorTest.java | 8 +- .../log4j/core/PatternVariableResolverTest.java | 2 +- .../log4j/core/PropertiesFileConfigTest.java | 2 +- ...ReusableParameterizedMessageMemoryLeakTest.java | 4 +- .../logging/log4j/core/ShutdownDisabledTest.java | 4 +- .../core/ShutdownTimeoutConfigurationTest.java | 4 +- .../logging/log4j/core/StrictXmlConfigTest.java | 22 +-- .../logging/log4j/core/TimestampMessageTest.java | 8 +- .../org/apache/logging/log4j/core/XmlEvents.java | 4 +- .../core/appender/AbstractAppenderBuilderTest.java | 4 +- .../appender/AsyncAppenderQueueFullPolicyTest.java | 6 +- .../log4j/core/appender/AsyncAppenderTest.java | 25 +-- .../ConsoleAppenderAnsiStyleLayoutMain.java | 6 +- .../ConsoleAppenderAnsiXExceptionMain.java | 6 +- .../core/appender/ConsoleAppenderBuilderTest.java | 8 +- .../log4j/core/appender/ConsoleAppenderTest.java | 16 +- .../log4j/core/appender/FailoverAppenderTest.java | 16 +- .../FailoverFailedPrimaryAppenderTest.java | 16 +- .../core/appender/FileAppenderBuilderTest.java | 12 +- .../core/appender/FileAppenderPermissionsTest.java | 14 +- .../log4j/core/appender/FileAppenderTest.java | 21 ++- .../log4j/core/appender/HttpAppenderTest.java | 2 +- .../log4j/core/appender/InMemoryAppenderTest.java | 8 +- .../appender/JsonCompleteFileAppenderTest.java | 7 +- .../appender/MemoryMappedFileAppenderTest.java | 6 +- .../core/appender/MemoryMappedFileManagerTest.java | 6 +- .../core/appender/OutputStreamAppenderTest.java | 42 ++--- .../core/appender/OutputStreamManagerTest.java | 4 +- .../appender/RandomAccessFileAppenderTest.java | 2 +- .../core/appender/RandomAccessFileManagerTest.java | 12 +- .../core/appender/ReconfigureAppenderTest.java | 4 +- .../core/appender/ScriptAppenderSelectorTest.java | 2 +- .../log4j/core/appender/SmtpAppenderTest.java | 36 ++--- .../core/appender/SocketAppenderBuilderTest.java | 4 +- .../core/appender/SocketAppenderReconnectTest.java | 2 +- .../appender/SocketAppenderSocketOptionsTest.java | 8 +- .../SocketAppenderSslSocketOptionsTest.java | 2 +- .../log4j/core/appender/SocketAppenderTest.java | 86 +++++------ .../core/appender/SyslogAppenderTestBase.java | 32 ++-- .../log4j/core/appender/TlsSyslogAppenderTest.java | 10 +- .../log4j/core/appender/TlsSyslogFrameTest.java | 8 +- .../log4j/core/appender/WriterAppenderTest.java | 12 +- .../core/appender/XmlCompactFileAppenderTest.java | 39 ++--- .../core/appender/XmlCompleteFileAppenderTest.java | 11 +- .../log4j/core/appender/XmlFileAppenderTest.java | 30 ++-- .../appender/db/AbstractDatabaseAppenderTest.java | 5 +- .../appender/db/AbstractDatabaseManagerTest.java | 82 +++++----- .../db/jdbc/AbstractJdbcDataSourceTest.java | 4 +- .../core/appender/db/jdbc/ColumnConfigTest.java | 170 ++++++++++----------- .../jdbc/JdbcAppenderStringSubstitutionTest.java | 2 +- .../log4j/core/appender/mom/JmsAppenderTest.java | 4 +- .../appender/mom/jeromq/JeroMqAppenderTest.java | 10 +- .../core/appender/mom/jeromq/JeroMqTestClient.java | 2 +- .../mom/kafka/KafkaAppenderCloseTimeoutTest.java | 6 +- .../core/appender/mom/kafka/KafkaAppenderTest.java | 17 +-- .../kafka/KafkaManagerProducerThreadLeakTest.java | 7 +- .../core/appender/nosql/NoSqlAppenderTest.java | 36 ++--- .../rewrite/LoggerNameLevelRewritePolicyTest.java | 4 +- .../appender/rewrite/MapRewritePolicyTest.java | 10 +- .../core/appender/rewrite/RewriteAppenderTest.java | 10 +- .../appender/rolling/CronTriggeringPolicyTest.java | 16 +- .../core/appender/rolling/EligibleFilesTest.java | 12 +- .../log4j/core/appender/rolling/FileSizeTest.java | 2 +- .../rolling/OnStartupTriggeringPolicyTest.java | 8 +- .../appender/rolling/PatternProcessorTest.java | 52 +++---- .../RandomRollingAppenderOnStartupTest.java | 11 +- .../appender/rolling/RollingAppenderCountTest.java | 2 +- .../RollingAppenderCronAndSizeLookupTest.java | 6 +- .../rolling/RollingAppenderCronAndSizeTest.java | 4 +- .../rolling/RollingAppenderCronOnStartupTest.java | 28 ++-- .../rolling/RollingAppenderCronOnceADayTest.java | 9 +- .../appender/rolling/RollingAppenderCronTest.java | 5 +- .../rolling/RollingAppenderDeleteScriptTest.java | 3 +- .../RollingAppenderDirectWrite1906Test.java | 9 +- .../RollingAppenderDirectWriteStartupSizeTest.java | 2 +- ...erDirectWriteTempCompressedFilePatternTest.java | 4 +- .../rolling/RollingAppenderDirectWriteTest.java | 4 +- ...RollingAppenderDirectWriteWithFilenameTest.java | 4 +- ...llingAppenderDirectWriteWithHtmlLayoutTest.java | 2 +- ...lingAppenderDirectWriteWithReconfigureTest.java | 4 +- .../RollingAppenderNoUnconditionalDeleteTest.java | 2 +- .../rolling/RollingAppenderOnStartup2Test.java | 29 ++-- .../RollingAppenderOnStartupDirectTest.java | 32 ++-- .../rolling/RollingAppenderOnStartupTest.java | 18 ++- .../rolling/RollingAppenderReconfigureTest.java | 4 +- ...RollingAppenderSizeCompressPermissionsTest.java | 2 +- .../rolling/RollingAppenderSizeMaxWidthTest.java | 4 +- .../rolling/RollingAppenderSizeNoCompressTest.java | 4 +- .../appender/rolling/RollingAppenderSizeTest.java | 6 +- .../rolling/RollingAppenderSizeWithTimeTest.java | 2 +- ...llingAppenderTempCompressedFilePatternTest.java | 4 +- .../RollingAppenderTimeAndSizeDirectTest.java | 4 +- .../rolling/RollingAppenderTimeAndSizeTest.java | 4 +- .../rolling/RollingAppenderUncompressedTest.java | 2 +- .../rolling/RollingDirectSize3490Test.java | 6 +- .../rolling/RollingFileAppenderAccessTest.java | 19 +-- .../rolling/RollingFileAppenderBuilderTest.java | 11 +- .../RollingFileAppenderInterruptedThreadTest.java | 9 +- .../rolling/RollingFileAppenderLayoutTest.java | 11 +- .../rolling/RollingFileAppenderUpdateDataTest.java | 29 ++-- .../appender/rolling/RollingFileManagerTest.java | 22 +-- .../appender/rolling/RollingNewDirectoryTest.java | 2 +- .../RollingRandomAccessFileManagerTest.java | 28 ++-- ...omAppenderDirectWriteAndSwitchDirectorTest.java | 4 +- .../RollingRandomAppenderDirectWriteTest.java | 4 +- ...gRandomAppenderDirectWriteWithFilenameTest.java | 4 +- .../appender/rolling/RolloverFilePatternTest.java | 20 +-- .../appender/rolling/RolloverWithPaddingTest.java | 6 +- .../rolling/action/Bzip2CompressActionTest.java | 10 +- .../appender/rolling/action/DeleteActionTest.java | 18 +-- .../rolling/action/DeletingVisitorTest.java | 20 +-- .../core/appender/rolling/action/DurationTest.java | 28 ++-- .../rolling/action/FileRenameActionTest.java | 12 +- .../core/appender/rolling/action/FileSizeTest.java | 6 +- .../rolling/action/IfAccumulatedFileCountTest.java | 10 +- .../rolling/action/IfAccumulatedFileSizeTest.java | 16 +- .../core/appender/rolling/action/IfAnyTest.java | 10 +- .../appender/rolling/action/IfFileNameTest.java | 20 +-- .../rolling/action/IfLastModifiedTest.java | 14 +- .../core/appender/rolling/action/IfNotTest.java | 10 +- .../appender/rolling/action/PathConditionTest.java | 10 +- .../action/PathSortByModificationTimeTest.java | 8 +- .../rolling/action/ScriptConditionTest.java | 16 +- .../rolling/action/SortingVisitorTest.java | 12 +- .../appender/routing/JsonRoutingAppender2Test.java | 3 +- .../appender/routing/JsonRoutingAppenderTest.java | 3 +- .../routing/PropertiesRoutingAppenderTest.java | 7 +- .../appender/routing/RoutingAppender2767Test.java | 4 +- .../appender/routing/RoutingAppender3350Test.java | 2 +- .../RoutingAppenderKeyLookupEvaluationTest.java | 4 +- .../core/appender/routing/RoutingAppenderTest.java | 7 +- .../routing/RoutingAppenderWithJndiTest.java | 28 ++-- .../routing/RoutingAppenderWithPurgingTest.java | 6 +- .../routing/RoutingDefaultAppenderTest.java | 3 +- .../async/AsyncAppenderExceptionHandlingTest.java | 13 +- .../async/AsyncLoggerArgumentFreedOnErrorTest.java | 6 +- .../async/AsyncLoggerClassLoadDeadlockTest.java | 25 +-- .../core/async/AsyncLoggerConfigAutoFlushTest.java | 28 ++-- .../core/async/AsyncLoggerConfigErrorOnFormat.java | 34 ++--- .../log4j/core/async/AsyncLoggerConfigTest.java | 8 +- .../log4j/core/async/AsyncLoggerConfigTest2.java | 26 ++-- .../AsyncLoggerConfigUseAfterShutdownTest.java | 18 +-- .../AsyncLoggerConfigWithAsyncEnabledTest.java | 30 ++-- ...AsyncLoggerContextSelectorInitialStateTest.java | 14 +- .../core/async/AsyncLoggerContextSelectorTest.java | 31 ++-- .../log4j/core/async/AsyncLoggerContextTest.java | 6 +- .../AsyncLoggerCustomSelectorLocationTest.java | 24 +-- .../core/async/AsyncLoggerDefaultLocationTest.java | 36 ++--- .../AsyncLoggerEventTranslationExceptionTest.java | 10 +- .../log4j/core/async/AsyncLoggerLocationTest.java | 34 ++--- .../log4j/core/async/AsyncLoggerNanoTimeTest.java | 41 ++--- .../logging/log4j/core/async/AsyncLoggerTest.java | 38 ++--- .../async/AsyncLoggerTestCachedThreadName.java | 36 ++--- .../async/AsyncLoggerTestUncachedThreadName.java | 36 ++--- .../core/async/AsyncLoggerThreadContextTest.java | 6 +- .../async/AsyncLoggerThreadNameStrategyTest.java | 38 ++--- .../async/AsyncLoggerTimestampMessageTest.java | 32 ++-- .../async/AsyncLoggerUseAfterShutdownTest.java | 24 +-- .../async/AsyncLoggersWithAsyncAppenderTest.java | 4 +- .../AsyncLoggersWithAsyncLoggerConfigTest.java | 8 +- .../async/AsyncQueueFullPolicyFactoryTest.java | 36 ++--- .../async/AsyncRootLoggerDefaultLocationTest.java | 36 ++--- ...WaitStrategyFactoryConfigGlobalLoggersTest.java | 28 ++-- .../async/AsyncWaitStrategyFactoryConfigTest.java | 45 ++++-- ...egyFactoryIncorrectConfigGlobalLoggersTest.java | 26 ++-- .../async/BasicAsyncLoggerContextSelectorTest.java | 50 +++--- .../async/DefaultAsyncQueueFullPolicyTest.java | 16 +- .../async/DiscardingAsyncQueueFullPolicyTest.java | 70 ++++----- .../log4j/core/async/Log4j2Jira1688AsyncTest.java | 2 +- .../log4j/core/async/Log4j2Jira1688Test.java | 2 +- .../core/async/QueueFullAsyncLogger3Test.java | 4 +- .../log4j/core/async/RingBufferLogEventTest.java | 3 +- .../logging/log4j/core/config/AdvertiserTest.java | 12 +- .../core/config/AppenderControlArraySetTest.java | 26 ++-- .../config/CompositeConfigurationMissingTest.java | 6 +- .../core/config/CompositeConfigurationTest.java | 16 +- .../core/config/ConfigurationFactoryTest.java | 5 +- .../core/config/ConfigurationPropertyTest.java | 6 +- .../log4j/core/config/ConfigurationSourceTest.java | 2 +- .../log4j/core/config/Configurator1Test.java | 48 +++--- .../log4j/core/config/Configurator2Test.java | 12 +- .../log4j/core/config/ConfiguratorErrorTest.java | 6 +- .../core/config/ConfiguratorSetLevelTest.java | 4 +- .../log4j/core/config/CustomConfigurationTest.java | 7 +- .../logging/log4j/core/config/FileOutputTest.java | 5 +- .../log4j/core/config/JiraLog4j2_2134Test.java | 12 +- .../log4j/core/config/LoggerConfigTest.java | 16 +- .../log4j/core/config/LoggersPluginTest.java | 4 +- .../log4j/core/config/MissingLanguageTest.java | 6 +- .../log4j/core/config/MissingRootLoggerTest.java | 4 +- .../log4j/core/config/NestedLoggerConfigTest.java | 29 ++-- .../logging/log4j/core/config/NoLanguagesTest.java | 6 +- .../log4j/core/config/PropertiesPluginTest.java | 6 +- .../logging/log4j/core/config/PropertyTest.java | 12 +- .../core/config/ReconfigurationDeadlockTest.java | 18 ++- .../core/config/ReconfigurationFailureTest.java | 15 +- .../core/config/arbiters/BasicArbiterTest.java | 16 +- .../config/arbiters/EnvironmentArbiterTest.java | 12 +- .../core/config/arbiters/ScriptArbiterTest.java | 16 +- .../core/config/arbiters/SelectArbiterTest.java | 14 +- .../config/arbiters/SystemPropertyArbiterTest.java | 16 +- .../config/builder/ConfigurationAssemblerTest.java | 12 +- .../config/builder/ConfigurationBuilderTest.java | 4 +- .../plugins/convert/DateTypeConverterTest.java | 26 +--- .../plugins/convert/TypeConverterRegistryTest.java | 30 ++-- .../config/plugins/convert/TypeConvertersTest.java | 29 +--- .../config/plugins/processor/PluginCacheTest.java | 25 ++- .../plugins/processor/PluginProcessorTest.java | 37 +++-- .../util/ResolverUtilCustomProtocolTest.java | 28 ++-- .../core/config/plugins/util/ResolverUtilTest.java | 18 +-- .../validators/RequiredValidatorTest.java | 8 +- .../validators/ValidHostValidatorTest.java | 10 +- .../validators/ValidPortValidatorTest.java | 10 +- .../ValidatingPluginWithFailoverTest.java | 6 +- .../ValidatingPluginWithGenericBuilderTest.java | 8 +- ...ngPluginWithGenericSubclassFoo1BuilderTest.java | 8 +- .../ValidatingPluginWithTypedBuilderTest.java | 8 +- .../properties/PropertiesConfigurationTest.java | 24 +-- .../core/config/xml/XmlConfigurationSecurity.java | 5 +- .../log4j/core/config/xml/XmlLoggerPropsTest.java | 4 +- ...GarbageFreeSortedArrayThreadContextMapTest.java | 2 +- .../log4j/core/filter/AbstractFilterTest.java | 4 +- .../log4j/core/filter/AbstractFilterableTest.java | 54 +++---- .../core/filter/AbstractScriptFilterTest.java | 9 +- .../log4j/core/filter/BurstFilterLogDelayTest.java | 4 +- .../logging/log4j/core/filter/BurstFilterTest.java | 4 +- .../log4j/core/filter/CompositeFilterTest.java | 4 +- .../core/filter/DynamicThresholdFilterTest.java | 15 +- .../logging/log4j/core/filter/MapFilterTest.java | 9 +- .../log4j/core/filter/MarkerFilterTest.java | 10 +- .../log4j/core/filter/NoMarkerFilterTest.java | 8 +- .../logging/log4j/core/filter/RegexFilterTest.java | 26 ++-- .../log4j/core/filter/StringMatchFilterTest.java | 12 +- .../core/filter/StructuredDataFilterTest.java | 9 +- .../core/filter/ThreadContextMapFilterTest.java | 20 +-- .../log4j/core/filter/ThresholdFilterTest.java | 8 +- .../logging/log4j/core/filter/TimeFilterTest.java | 113 ++++---------- ...taFactoryPropertySetMissingConstructorTest.java | 8 +- .../impl/ContextDataFactoryPropertySetTest.java | 14 +- .../log4j/core/impl/ContextDataFactoryTest.java | 14 +- .../core/impl/JdkMapAdapterStringMapTest.java | 92 +++++------ .../log4j/core/impl/Log4jLogEventNanoTimeTest.java | 13 +- .../logging/log4j/core/impl/Log4jLogEventTest.java | 35 ++--- .../log4j/core/impl/MutableLogEventTest.java | 18 +-- .../core/impl/ReusableLogEventFactoryTest.java | 12 +- .../core/impl/ThreadContextDataInjectorTest.java | 2 +- .../core/jackson/JacksonIssue429MyNamesTest.java | 28 ++-- .../log4j/core/jackson/JacksonIssue429Test.java | 28 ++-- .../log4j/core/jackson/LevelMixInXmlTest.java | 2 +- .../core/jackson/StackTraceElementMixInTest.java | 28 ++-- .../apache/logging/log4j/core/jmx/ServerTest.java | 22 +-- .../core/layout/AbstractStringLayoutTest.java | 6 +- .../ConcurrentLoggingWithGelfLayoutTest.java | 4 +- .../ConcurrentLoggingWithJsonLayoutTest.java | 2 +- .../log4j/core/layout/CsvLogEventLayoutTest.java | 10 +- .../layout/CsvParameterLayoutAllAsyncTest.java | 27 ++-- .../log4j/core/layout/CsvParameterLayoutTest.java | 4 +- .../logging/log4j/core/layout/GelfLayout2Test.java | 4 +- .../logging/log4j/core/layout/GelfLayout3Test.java | 6 +- .../core/layout/GelfLayoutPatternSelectorTest.java | 4 +- .../logging/log4j/core/layout/GelfLayoutTest.java | 30 ++-- .../logging/log4j/core/layout/HtmlLayoutTest.java | 32 ++-- .../log4j/core/layout/JsonLayoutMillisTest.java | 2 +- .../logging/log4j/core/layout/JsonLayoutTest.java | 124 ++++++++------- .../log4j/core/layout/Log4j2_2195_Test.java | 4 +- .../log4j/core/layout/LogEventFixtures.java | 12 +- .../core/layout/PatternLayoutLookupDateTest.java | 4 +- .../layout/PatternLayoutMainMapLookupTest.java | 6 +- .../core/layout/PatternLayoutNoLookupDateTest.java | 9 +- .../log4j/core/layout/PatternLayoutTest.java | 55 ++++--- .../log4j/core/layout/PatternSelectorTest.java | 6 +- .../log4j/core/layout/Rfc5424LayoutTest.java | 40 ++--- .../log4j/core/layout/SerializedLayoutTest.java | 2 +- .../core/layout/StringBuilderEncoderTest.java | 37 +++-- .../log4j/core/layout/SyslogLayoutTest.java | 8 +- .../logging/log4j/core/layout/XmlLayoutTest.java | 16 +- .../logging/log4j/core/layout/YamlLayoutTest.java | 84 +++++----- .../logging/log4j/core/lookup/CaseLookupTest.java | 4 +- .../log4j/core/lookup/ContextMapLookupTest.java | 2 +- .../logging/log4j/core/lookup/DateLookupTest.java | 8 +- .../log4j/core/lookup/EnvironmentLookupTest.java | 4 +- .../logging/log4j/core/lookup/EventLookupTest.java | 14 +- .../log4j/core/lookup/InterpolatorTest.java | 2 +- .../log4j/core/lookup/JndiDisabledLookupTest.java | 6 +- .../logging/log4j/core/lookup/JndiExploit.java | 3 +- .../logging/log4j/core/lookup/JndiLookupTest.java | 2 +- .../core/lookup/JndiRestrictedLookupTest.java | 5 +- .../logging/log4j/core/lookup/Log4jLookupTest.java | 10 +- .../core/lookup/Log4jLookupWithSpacesTest.java | 10 +- .../logging/log4j/core/lookup/MainLookupTest.java | 4 +- .../logging/log4j/core/lookup/MapLookupTest.java | 18 +-- .../log4j/core/lookup/MarkerLookupConfigTest.java | 4 +- .../log4j/core/lookup/MarkerLookupTest.java | 14 +- .../log4j/core/lookup/PropertiesLookupTest.java | 16 +- .../core/lookup/ResourceBundleLookupTest.java | 11 +- .../log4j/core/lookup/StrSubstitutorTest.java | 56 +++---- .../core/lookup/StructuredDataLookupTest.java | 8 +- .../core/lookup/SystemPropertiesLookupTest.java | 8 +- .../message/ExtendedThreadInformationTest.java | 4 +- .../logging/log4j/core/net/JndiManagerTest.java | 14 +- .../logging/log4j/core/net/PriorityTest.java | 4 +- .../logging/log4j/core/net/SmtpManagerTest.java | 10 +- .../log4j/core/net/UrlConnectionFactoryTest.java | 2 +- .../net/ssl/EnvironmentPasswordProviderTest.java | 6 +- .../core/net/ssl/FilePasswordProviderTest.java | 8 +- .../core/net/ssl/KeyStoreConfigurationTest.java | 18 +-- .../core/net/ssl/MemoryPasswordProviderTest.java | 8 +- .../core/net/ssl/SslConfigurationFactoryTest.java | 9 +- .../log4j/core/net/ssl/StoreConfigurationTest.java | 8 +- .../core/net/ssl/TrustStoreConfigurationTest.java | 21 +-- .../log4j/core/parser/JsonLogEventParserTest.java | 46 +++--- .../log4j/core/parser/LogEventParserTest.java | 6 +- .../log4j/core/parser/XmlLogEventParserTest.java | 44 +++--- .../log4j/core/parser/YamlLogEventParserTest.java | 42 ++--- .../log4j/core/pattern/CallerInformationTest.java | 6 +- .../core/pattern/DatePatternConverterTestBase.java | 56 +++---- .../log4j/core/pattern/DisableAnsiTest.java | 6 +- .../core/pattern/DynamicWordAbbreviatorTest.java | 7 +- .../core/pattern/EncodingPatternConverterTest.java | 12 +- .../pattern/EndOfBatchPatternConverterTest.java | 6 +- .../EqualsIgnoreCaseReplacementConverterTest.java | 8 +- .../pattern/EqualsReplacementConverterTest.java | 18 +-- .../log4j/core/pattern/FormattingInfoTest.java | 8 +- .../log4j/core/pattern/HighlightConverterTest.java | 22 +-- .../core/pattern/LevelPatternConverterTest.java | 18 +-- .../core/pattern/LiteralPatternConverterTest.java | 6 +- ...cationPatternConvertersRequireLocationTest.java | 3 +- .../pattern/LoggerFqcnPatternConverterTest.java | 4 +- .../core/pattern/MapPatternConverterTest.java | 8 +- .../core/pattern/MarkerPatternConverterTest.java | 4 +- .../MarkerSimpleNamePatternConverterTest.java | 4 +- .../log4j/core/pattern/MaxLengthConverterTest.java | 8 +- .../core/pattern/MdcPatternConverterTest.java | 22 +-- .../core/pattern/MessageAnsiConverterTest.java | 6 +- .../core/pattern/MessagePatternConverterTest.java | 22 +-- .../core/pattern/MessageStyledConverterTest.java | 6 +- .../log4j/core/pattern/NameAbbreviatorTest.java | 40 ++--- .../core/pattern/NanoTimePatternConverterTest.java | 4 +- .../core/pattern/NdcPatternConverterTest.java | 10 +- .../log4j/core/pattern/NoConsoleNoAnsiTest.java | 6 +- .../log4j/core/pattern/PatternParserTest.java | 81 +++++----- .../pattern/ProcessIdPatternConverterTest.java | 4 +- .../pattern/RegexReplacementConverterTest.java | 4 +- .../log4j/core/pattern/RegexReplacementTest.java | 8 +- .../core/pattern/RepeatPatternConverterTest.java | 4 +- .../SequenceNumberPatternConverterTest.java | 4 +- ...quenceNumberPatternConverterZeroPaddedTest.java | 4 +- .../pattern/SimpleLiteralPatternConverterTest.java | 6 +- .../log4j/core/pattern/StyleConverterTest.java | 14 +- .../core/pattern/ThreadIdPatternConverterTest.java | 4 +- .../pattern/ThreadNamePatternConverterTest.java | 4 +- .../ThreadPriorityPatternConverterTest.java | 4 +- .../VariablesNotEmptyReplacementConverterTest.java | 14 +- .../core/selector/BasicContextSelectorTest.java | 24 +-- .../selector/ClassLoaderContextSelectorTest.java | 6 +- .../logging/log4j/core/test/LogBuilderTest.java | 4 +- .../log4j/core/tools/GenerateCustomLoggerTest.java | 6 +- .../core/tools/GenerateExtendedLoggerTest.java | 6 +- .../logging/log4j/core/util/ClockFactoryTest.java | 18 +-- .../log4j/core/util/ContextDataProviderTest.java | 6 +- .../log4j/core/util/CronExpressionTest.java | 28 ++-- .../logging/log4j/core/util/CyclicBufferTest.java | 10 +- .../log4j/core/util/DummyNanoClockTest.java | 6 +- .../logging/log4j/core/util/FileUtilsTest.java | 20 +-- .../apache/logging/log4j/core/util/InitTest.java | 6 +- .../logging/log4j/core/util/IntegersTest.java | 6 +- .../logging/log4j/core/util/JsonUtilsTest.java | 8 +- .../apache/logging/log4j/core/util/LoaderTest.java | 6 +- .../logging/log4j/core/util/NetUtilsTest.java | 12 +- .../log4j/core/util/OptionConverterTest.java | 10 +- .../core/util/ShutdownCallbackRegistryTest.java | 8 +- .../apache/logging/log4j/core/util/SourceTest.java | 46 +++--- .../logging/log4j/core/util/SystemClockTest.java | 6 +- .../log4j/core/util/SystemNanoClockTest.java | 4 +- .../apache/logging/log4j/core/util/UuidTest.java | 8 +- .../core/util/datetime/FixedDateFormatTest.java | 54 +++---- .../InstantPatternDynamicFormatterTest.java | 2 +- .../MutableLogEventWithReusableParamMsgTest.java | 4 +- .../logging/log4j/io/AbstractStreamTest.java | 2 +- .../org/apache/logging/log4j/io/IoBuilderTest.java | 4 +- .../log4j/io/LoggerPrintStreamCallerInfoTest.java | 28 ++-- .../logging/log4j/io/LoggerPrintStreamTest.java | 18 +-- .../log4j/io/LoggerPrintWriterCallerInfoTest.java | 30 ++-- .../log4j/io/LoggerPrintWriterJdbcH2Test.java | 6 +- .../logging/log4j/io/LoggerPrintWriterTest.java | 18 +-- .../logging/log4j/smtp/SmtpAppenderAsyncTest.java | 14 +- .../logging/log4j/smtp/SmtpAppenderTest.java | 17 ++- .../apache/logging/log4j/smtp/SmtpManagerTest.java | 8 +- .../web/Log4jServletContainerInitializerTest.java | 22 +-- .../log4j/web/Log4jServletContextListenerTest.java | 12 +- .../logging/log4j/web/Log4jServletFilterTest.java | 12 +- ...og4jShutdownOnContextDestroyedListenerTest.java | 10 +- .../log4j/web/Log4jWebInitializerImplTest.java | 40 ++--- .../org/apache/logging/log4j/web/PropertyTest.java | 6 +- .../apache/logging/log4j/web/TestAsyncServlet.java | 8 +- .../logging/log4j/jcl/CallerInformationTest.java | 6 +- .../db/jdbc/PoolableConnectionFactoryTest.java | 4 +- .../db/jdbc/PoolingDriverConnectionSourceTest.java | 12 +- .../appender/db/jpa/AbstractJpaAppenderTest.java | 5 +- .../core/appender/db/jpa/JpaH2AppenderTest.java | 7 +- .../appender/db/jpa/JpaHsqldbAppenderTest.java | 14 +- .../core/appender/db/jpa/LogEventEntityTest.java | 6 +- .../ContextDataAttributeConverterTest.java | 12 +- .../ContextDataJsonAttributeConverterTest.java | 12 +- .../ContextMapAttributeConverterTest.java | 12 +- .../ContextMapJsonAttributeConverterTest.java | 12 +- .../ContextStackAttributeConverterTest.java | 12 +- .../ContextStackJsonAttributeConverterTest.java | 12 +- .../converter/InstantAttributeConverterTest.java | 10 +- .../converter/MarkerAttributeConverterTest.java | 12 +- .../converter/MessageAttributeConverterTest.java | 10 +- .../StackTraceElementAttributeConverterTest.java | 20 +-- .../converter/ThrowableAttributeConverterTest.java | 12 +- .../logging/log4j/jpl/Log4jSystemLoggerTest.java | 24 +-- .../logging/log4j/jul/test/AbstractLoggerTest.java | 50 +++--- .../logging/log4j/jul/test/ApiLoggerTest.java | 50 +++--- .../log4j/jul/test/AsyncLoggerThreadsTest.java | 28 ++-- .../test/BracketInNotInterpolatedMessageTest.java | 22 +-- .../log4j/jul/test/CallerInformationTest.java | 4 +- .../logging/log4j/jul/test/CoreLoggerTest.java | 34 ++--- .../DefaultLevelConverterCustomJulLevelsTest.java | 75 ++++----- .../log4j/jul/test/DefaultLevelConverterTest.java | 11 +- .../log4j/jul/test/JavaLevelTranslatorTest.java | 29 ++-- .../log4j/jul/test/Log4jBridgeHandlerTest.java | 60 ++++---- .../log4j/jul/test/Log4jLevelTranslatorTest.java | 24 +-- .../JsonTemplateLayoutNullEventDelimiterTest.java | 4 +- .../log4j/layout/template/json/LogstashIT.java | 6 +- .../json/ThreadLocalRecyclerNestedLoggingTest.java | 4 +- .../resolver/ReadOnlyStringMapResolverTest.java | 6 +- .../layout/template/json/util/JsonReaderTest.java | 2 +- .../log4j/mongodb/AbstractMongoDbCappedIT.java | 12 +- .../log4j/mongodb/MongoDbAuthFailureIT.java | 1 - .../logging/log4j/mongodb/MongoDbMapMessageIT.java | 14 +- .../logging/log4j/mongodb/MongoDbResolver.java | 4 +- .../log4j/mongodb4/AbstractMongoDb4CappedIT.java | 12 +- .../log4j/mongodb4/MongoDb4AuthFailureIT.java | 1 - .../log4j/mongodb4/MongoDb4MapMessageIT.java | 14 +- .../logging/log4j/mongodb4/MongoDb4Resolver.java | 4 +- .../logging/other/pkg/LoggerContextAnchorTest.java | 8 +- .../logging/slf4j/CallerInformationTest.java | 6 +- .../org/apache/logging/slf4j/Log4j1222Test.java | 4 +- .../org/apache/logging/slf4j/Log4jMarkerTest.java | 8 +- .../apache/logging/slf4j/LoggerContextTest.java | 4 +- .../java/org/apache/logging/slf4j/LoggerTest.java | 21 ++- .../java/org/apache/logging/slf4j/MarkerTest.java | 20 +-- .../org/apache/logging/slf4j/OptionalTest.java | 9 +- .../org/apache/logging/slf4j/OverflowTest.java | 4 +- .../org/apache/logging/slf4j/SerializeTest.java | 4 +- .../ThrowableConsumingMessageFactoryTest.java | 2 +- .../logging/other/pkg/LoggerContextAnchorTest.java | 8 +- .../logging/slf4j/CallerInformationTest.java | 8 +- .../org/apache/logging/slf4j/Log4j1222Test.java | 4 +- .../logging/slf4j/Log4jEventBuilderTest.java | 8 +- .../apache/logging/slf4j/Log4jMDCAdapterTest.java | 4 +- .../org/apache/logging/slf4j/Log4jMarkerTest.java | 8 +- .../apache/logging/slf4j/LoggerContextTest.java | 4 +- .../java/org/apache/logging/slf4j/LoggerTest.java | 25 ++- .../java/org/apache/logging/slf4j/MarkerTest.java | 20 +-- .../org/apache/logging/slf4j/OverflowTest.java | 4 +- .../org/apache/logging/slf4j/SerializeTest.java | 4 +- .../ThrowableConsumingMessageFactoryTest.java | 2 +- .../spring/boot/Log4j2SpringBootInitTest.java | 6 +- .../boot/Log4j2SpringBootLoggingSystemTest.java | 13 +- .../log4j/spring/boot/SpringLookupTest.java | 6 +- .../log4j/spring/boot/SpringProfileTest.java | 2 +- .../config/client/Log4j2EventListenerTest.java | 2 +- .../apache/logging/log4j/taglib/DumpTagTest.java | 40 ++--- .../log4j/taglib/ExceptionAwareTagSupportTest.java | 24 +-- .../apache/logging/log4j/taglib/LogTagTest.java | 24 +-- .../log4j/taglib/LoggerAwareTagSupportTest.java | 84 +++++----- .../logging/log4j/taglib/SetLoggerTagTest.java | 138 ++++++++--------- .../apache/logging/log4j/taglib/TagLevelTest.java | 22 +-- .../logging/log4j/taglib/TagUtilsLevelTest.java | 27 ++-- .../logging/log4j/taglib/TagUtilsScopeTest.java | 24 +-- .../apache/logging/log4j/tojul/JULLoggerTest.java | 4 +- .../org/apache/logging/log4j/tojul/LoggerTest.java | 42 ++--- .../logging/slf4j/CallerInformationTest.java | 6 +- .../apache/logging/slf4j/Log4j2Jira1688Test.java | 4 +- .../org/apache/logging/slf4j/LogBuilderTest.java | 4 +- .../logging/slf4j/LoggerContextResolver.java | 4 +- .../org/apache/logging/slf4j/LoggerResolver.java | 4 +- .../java/org/apache/logging/slf4j/LoggerTest.java | 44 +++--- .../web/Log4jServletContainerInitializerTest.java | 20 +-- .../log4j/web/Log4jServletContextListenerTest.java | 12 +- .../logging/log4j/web/Log4jServletFilterTest.java | 12 +- ...og4jShutdownOnContextDestroyedListenerTest.java | 8 +- .../log4j/web/Log4jWebInitializerImplTest.java | 40 ++--- .../org/apache/logging/log4j/web/PropertyTest.java | 6 +- .../logging/log4j/web/ServletAppenderTest.java | 4 +- .../apache/logging/log4j/web/TestAsyncServlet.java | 8 +- .../apache/logging/log4j/web/WebLookupTest.java | 6 +- 640 files changed, 5018 insertions(+), 5093 deletions(-) diff --cc log4j-api-test/src/test/java/org/apache/logging/log4j/test/junit/TempLoggingDirectoryTest.java index 61de955682,f6cef52fe6..96ebbd50d5 --- a/log4j-api-test/src/test/java/org/apache/logging/log4j/test/junit/TempLoggingDirectoryTest.java +++ b/log4j-api-test/src/test/java/org/apache/logging/log4j/test/junit/TempLoggingDirectoryTest.java @@@ -25,9 -25,9 +25,9 @@@ import org.apache.logging.log4j.test.Te import org.junit.jupiter.api.Test; @UsingTestProperties - public class TempLoggingDirectoryTest { + class TempLoggingDirectoryTest { - private static final Pattern PER_CLASS_PATH = Pattern.compile("TempLoggingDirectoryTest\\d+"); + private static final Pattern PER_CLASS_PATH = Pattern.compile("TempLoggingDirectoryTest_[0-9a-f]{8,}_\\d+"); private static final Path PER_TEST_PATH = Paths.get("testInjectedFields"); @TempLoggingDir
