http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/DummyFileAttributes.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/DummyFileAttributes.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/DummyFileAttributes.java index 81e316f..c2bbb1b 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/DummyFileAttributes.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/DummyFileAttributes.java @@ -1,86 +1,86 @@ -/* - * 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.logging.log4j.core.appender.rolling.action; - -import java.nio.file.attribute.BasicFileAttributes; -import java.nio.file.attribute.FileTime; - -/** - * Test helper class: file attributes. - */ -public class DummyFileAttributes implements BasicFileAttributes { - - public FileTime lastModified; - public FileTime lastAccessTime; - public FileTime creationTime; - public boolean isRegularFile; - public boolean isDirectory; - public boolean isSymbolicLink; - public boolean isOther; - public long size; - public Object fileKey; - - public DummyFileAttributes() { - } - - @Override - public FileTime lastModifiedTime() { - return lastModified; - } - - @Override - public FileTime lastAccessTime() { - return lastAccessTime; - } - - @Override - public FileTime creationTime() { - return creationTime; - } - - @Override - public boolean isRegularFile() { - return isRegularFile; - } - - @Override - public boolean isDirectory() { - return isDirectory; - } - - @Override - public boolean isSymbolicLink() { - return isSymbolicLink; - } - - @Override - public boolean isOther() { - return isOther; - } - - @Override - public long size() { - return size; - } - - @Override - public Object fileKey() { - return fileKey; - } - -} +/* + * 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.logging.log4j.core.appender.rolling.action; + +import java.nio.file.attribute.BasicFileAttributes; +import java.nio.file.attribute.FileTime; + +/** + * Test helper class: file attributes. + */ +public class DummyFileAttributes implements BasicFileAttributes { + + public FileTime lastModified; + public FileTime lastAccessTime; + public FileTime creationTime; + public boolean isRegularFile; + public boolean isDirectory; + public boolean isSymbolicLink; + public boolean isOther; + public long size; + public Object fileKey; + + public DummyFileAttributes() { + } + + @Override + public FileTime lastModifiedTime() { + return lastModified; + } + + @Override + public FileTime lastAccessTime() { + return lastAccessTime; + } + + @Override + public FileTime creationTime() { + return creationTime; + } + + @Override + public boolean isRegularFile() { + return isRegularFile; + } + + @Override + public boolean isDirectory() { + return isDirectory; + } + + @Override + public boolean isSymbolicLink() { + return isSymbolicLink; + } + + @Override + public boolean isOther() { + return isOther; + } + + @Override + public long size() { + return size; + } + + @Override + public Object fileKey() { + return fileKey; + } + +}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfAllTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfAllTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfAllTest.java index 12d5a05..aa4884a 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfAllTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfAllTest.java @@ -1,54 +1,54 @@ -/* - * 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.logging.log4j.core.appender.rolling.action; - -import org.apache.logging.log4j.core.appender.rolling.action.IfAll; -import org.apache.logging.log4j.core.appender.rolling.action.PathCondition; -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Tests the And composite condition. - */ -public class IfAllTest { - - @Test - public void testAccept() { - final PathCondition TRUE = new FixedCondition(true); - final PathCondition FALSE = new FixedCondition(false); - assertTrue(IfAll.createAndCondition(TRUE, TRUE).accept(null, null, null)); - assertFalse(IfAll.createAndCondition(FALSE, TRUE).accept(null, null, null)); - assertFalse(IfAll.createAndCondition(TRUE, FALSE).accept(null, null, null)); - assertFalse(IfAll.createAndCondition(FALSE, FALSE).accept(null, null, null)); - } - - @Test - public void testEmptyIsFalse() { - assertFalse(IfAll.createAndCondition().accept(null, null, null)); - } - - @Test - public void testBeforeTreeWalk() { - final CountingCondition counter = new CountingCondition(true); - final IfAll and = IfAll.createAndCondition(counter, counter, counter); - and.beforeFileTreeWalk(); - assertEquals(3, counter.getBeforeFileTreeWalkCount()); - } - -} +/* + * 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.logging.log4j.core.appender.rolling.action; + +import org.apache.logging.log4j.core.appender.rolling.action.IfAll; +import org.apache.logging.log4j.core.appender.rolling.action.PathCondition; +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Tests the And composite condition. + */ +public class IfAllTest { + + @Test + public void testAccept() { + final PathCondition TRUE = new FixedCondition(true); + final PathCondition FALSE = new FixedCondition(false); + assertTrue(IfAll.createAndCondition(TRUE, TRUE).accept(null, null, null)); + assertFalse(IfAll.createAndCondition(FALSE, TRUE).accept(null, null, null)); + assertFalse(IfAll.createAndCondition(TRUE, FALSE).accept(null, null, null)); + assertFalse(IfAll.createAndCondition(FALSE, FALSE).accept(null, null, null)); + } + + @Test + public void testEmptyIsFalse() { + assertFalse(IfAll.createAndCondition().accept(null, null, null)); + } + + @Test + public void testBeforeTreeWalk() { + final CountingCondition counter = new CountingCondition(true); + final IfAll and = IfAll.createAndCondition(counter, counter, counter); + and.beforeFileTreeWalk(); + assertEquals(3, counter.getBeforeFileTreeWalkCount()); + } + +} http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfAnyTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfAnyTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfAnyTest.java index 52a8b27..ba63a27 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfAnyTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfAnyTest.java @@ -1,52 +1,52 @@ -/* - * 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.logging.log4j.core.appender.rolling.action; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Tests the Or composite condition. - */ -public class IfAnyTest { - - @Test - public void test() { - final PathCondition TRUE = new FixedCondition(true); - final PathCondition FALSE = new FixedCondition(false); - assertTrue(IfAny.createOrCondition(TRUE, TRUE).accept(null, null, null)); - assertTrue(IfAny.createOrCondition(FALSE, TRUE).accept(null, null, null)); - assertTrue(IfAny.createOrCondition(TRUE, FALSE).accept(null, null, null)); - assertFalse(IfAny.createOrCondition(FALSE, FALSE).accept(null, null, null)); - } - - @Test - public void testEmptyIsFalse() { - assertFalse(IfAny.createOrCondition().accept(null, null, null)); - } - - @Test - public void testBeforeTreeWalk() { - final CountingCondition counter = new CountingCondition(true); - final IfAny or = IfAny.createOrCondition(counter, counter, counter); - or.beforeFileTreeWalk(); - assertEquals(3, counter.getBeforeFileTreeWalkCount()); - } - -} +/* + * 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.logging.log4j.core.appender.rolling.action; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Tests the Or composite condition. + */ +public class IfAnyTest { + + @Test + public void test() { + final PathCondition TRUE = new FixedCondition(true); + final PathCondition FALSE = new FixedCondition(false); + assertTrue(IfAny.createOrCondition(TRUE, TRUE).accept(null, null, null)); + assertTrue(IfAny.createOrCondition(FALSE, TRUE).accept(null, null, null)); + assertTrue(IfAny.createOrCondition(TRUE, FALSE).accept(null, null, null)); + assertFalse(IfAny.createOrCondition(FALSE, FALSE).accept(null, null, null)); + } + + @Test + public void testEmptyIsFalse() { + assertFalse(IfAny.createOrCondition().accept(null, null, null)); + } + + @Test + public void testBeforeTreeWalk() { + final CountingCondition counter = new CountingCondition(true); + final IfAny or = IfAny.createOrCondition(counter, counter, counter); + or.beforeFileTreeWalk(); + assertEquals(3, counter.getBeforeFileTreeWalkCount()); + } + +} http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfFileNameTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfFileNameTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfFileNameTest.java index 2e84aa9..978031e 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfFileNameTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfFileNameTest.java @@ -1,131 +1,131 @@ -/* - * 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.logging.log4j.core.appender.rolling.action; - -import java.nio.file.Path; -import java.nio.file.Paths; - -import org.junit.Test; - -import static org.junit.Assert.*; - -public class IfFileNameTest { - - @Test(expected = IllegalArgumentException.class) - public void testCreateNameConditionFailsIfBothRegexAndPathAreNull() { - IfFileName.createNameCondition(null, null); - } - - @Test() - public void testCreateNameConditionAcceptsIfEitherRegexOrPathOrBothAreNonNull() { - IfFileName.createNameCondition("bar", null); - IfFileName.createNameCondition(null, "foo"); - IfFileName.createNameCondition("bar", "foo"); - } - - @Test - public void testGetSyntaxAndPattern() { - assertEquals("glob:path", IfFileName.createNameCondition("path", null).getSyntaxAndPattern()); - assertEquals("glob:path", IfFileName.createNameCondition("glob:path", null).getSyntaxAndPattern()); - assertEquals("regex:bar", IfFileName.createNameCondition(null, "bar").getSyntaxAndPattern()); - assertEquals("regex:bar", IfFileName.createNameCondition(null, "regex:bar").getSyntaxAndPattern()); - } - - @Test - public void testAcceptUsesPathPatternIfExists() { - final IfFileName filter = IfFileName.createNameCondition("path", "regex"); - final Path relativePath = Paths.get("path"); - assertTrue(filter.accept(null, relativePath, null)); - - final Path pathMatchingRegex = Paths.get("regex"); - assertFalse(filter.accept(null, pathMatchingRegex, null)); - } - - @Test - public void testAcceptUsesRegexIfNoPathPatternExists() { - final IfFileName regexFilter = IfFileName.createNameCondition(null, "regex"); - final Path pathMatchingRegex = Paths.get("regex"); - assertTrue(regexFilter.accept(null, pathMatchingRegex, null)); - - final Path noMatch = Paths.get("nomatch"); - assertFalse(regexFilter.accept(null, noMatch, null)); - } - - @Test - public void testAcceptIgnoresBasePathAndAttributes() { - final IfFileName pathFilter = IfFileName.createNameCondition("path", null); - final Path relativePath = Paths.get("path"); - assertTrue(pathFilter.accept(null, relativePath, null)); - - final IfFileName regexFilter = IfFileName.createNameCondition(null, "regex"); - final Path pathMatchingRegex = Paths.get("regex"); - assertTrue(regexFilter.accept(null, pathMatchingRegex, null)); - } - - @Test - public void testAcceptCallsNestedConditionsOnlyIfPathAccepted1() { - final CountingCondition counter = new CountingCondition(true); - final IfFileName regexFilter = IfFileName.createNameCondition(null, "regex", counter); - final Path pathMatchingRegex = Paths.get("regex"); - - assertTrue(regexFilter.accept(null, pathMatchingRegex, null)); - assertEquals(1, counter.getAcceptCount()); - assertTrue(regexFilter.accept(null, pathMatchingRegex, null)); - assertEquals(2, counter.getAcceptCount()); - assertTrue(regexFilter.accept(null, pathMatchingRegex, null)); - assertEquals(3, counter.getAcceptCount()); - - final Path noMatch = Paths.get("nomatch"); - assertFalse(regexFilter.accept(null, noMatch, null)); - assertEquals(3, counter.getAcceptCount()); // no increase - assertFalse(regexFilter.accept(null, noMatch, null)); - assertEquals(3, counter.getAcceptCount()); - assertFalse(regexFilter.accept(null, noMatch, null)); - assertEquals(3, counter.getAcceptCount()); - } - - @Test - public void testAcceptCallsNestedConditionsOnlyIfPathAccepted2() { - final CountingCondition counter = new CountingCondition(true); - final IfFileName globFilter = IfFileName.createNameCondition("glob", null, counter); - final Path pathMatchingGlob = Paths.get("glob"); - - assertTrue(globFilter.accept(null, pathMatchingGlob, null)); - assertEquals(1, counter.getAcceptCount()); - assertTrue(globFilter.accept(null, pathMatchingGlob, null)); - assertEquals(2, counter.getAcceptCount()); - assertTrue(globFilter.accept(null, pathMatchingGlob, null)); - assertEquals(3, counter.getAcceptCount()); - - final Path noMatch = Paths.get("nomatch"); - assertFalse(globFilter.accept(null, noMatch, null)); - assertEquals(3, counter.getAcceptCount()); // no increase - assertFalse(globFilter.accept(null, noMatch, null)); - assertEquals(3, counter.getAcceptCount()); - assertFalse(globFilter.accept(null, noMatch, null)); - assertEquals(3, counter.getAcceptCount()); - } - - @Test - public void testBeforeTreeWalk() { - final CountingCondition counter = new CountingCondition(true); - final IfFileName pathFilter = IfFileName.createNameCondition("path", null, counter, counter, counter); - pathFilter.beforeFileTreeWalk(); - assertEquals(3, counter.getBeforeFileTreeWalkCount()); - } -} +/* + * 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.logging.log4j.core.appender.rolling.action; + +import java.nio.file.Path; +import java.nio.file.Paths; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class IfFileNameTest { + + @Test(expected = IllegalArgumentException.class) + public void testCreateNameConditionFailsIfBothRegexAndPathAreNull() { + IfFileName.createNameCondition(null, null); + } + + @Test() + public void testCreateNameConditionAcceptsIfEitherRegexOrPathOrBothAreNonNull() { + IfFileName.createNameCondition("bar", null); + IfFileName.createNameCondition(null, "foo"); + IfFileName.createNameCondition("bar", "foo"); + } + + @Test + public void testGetSyntaxAndPattern() { + assertEquals("glob:path", IfFileName.createNameCondition("path", null).getSyntaxAndPattern()); + assertEquals("glob:path", IfFileName.createNameCondition("glob:path", null).getSyntaxAndPattern()); + assertEquals("regex:bar", IfFileName.createNameCondition(null, "bar").getSyntaxAndPattern()); + assertEquals("regex:bar", IfFileName.createNameCondition(null, "regex:bar").getSyntaxAndPattern()); + } + + @Test + public void testAcceptUsesPathPatternIfExists() { + final IfFileName filter = IfFileName.createNameCondition("path", "regex"); + final Path relativePath = Paths.get("path"); + assertTrue(filter.accept(null, relativePath, null)); + + final Path pathMatchingRegex = Paths.get("regex"); + assertFalse(filter.accept(null, pathMatchingRegex, null)); + } + + @Test + public void testAcceptUsesRegexIfNoPathPatternExists() { + final IfFileName regexFilter = IfFileName.createNameCondition(null, "regex"); + final Path pathMatchingRegex = Paths.get("regex"); + assertTrue(regexFilter.accept(null, pathMatchingRegex, null)); + + final Path noMatch = Paths.get("nomatch"); + assertFalse(regexFilter.accept(null, noMatch, null)); + } + + @Test + public void testAcceptIgnoresBasePathAndAttributes() { + final IfFileName pathFilter = IfFileName.createNameCondition("path", null); + final Path relativePath = Paths.get("path"); + assertTrue(pathFilter.accept(null, relativePath, null)); + + final IfFileName regexFilter = IfFileName.createNameCondition(null, "regex"); + final Path pathMatchingRegex = Paths.get("regex"); + assertTrue(regexFilter.accept(null, pathMatchingRegex, null)); + } + + @Test + public void testAcceptCallsNestedConditionsOnlyIfPathAccepted1() { + final CountingCondition counter = new CountingCondition(true); + final IfFileName regexFilter = IfFileName.createNameCondition(null, "regex", counter); + final Path pathMatchingRegex = Paths.get("regex"); + + assertTrue(regexFilter.accept(null, pathMatchingRegex, null)); + assertEquals(1, counter.getAcceptCount()); + assertTrue(regexFilter.accept(null, pathMatchingRegex, null)); + assertEquals(2, counter.getAcceptCount()); + assertTrue(regexFilter.accept(null, pathMatchingRegex, null)); + assertEquals(3, counter.getAcceptCount()); + + final Path noMatch = Paths.get("nomatch"); + assertFalse(regexFilter.accept(null, noMatch, null)); + assertEquals(3, counter.getAcceptCount()); // no increase + assertFalse(regexFilter.accept(null, noMatch, null)); + assertEquals(3, counter.getAcceptCount()); + assertFalse(regexFilter.accept(null, noMatch, null)); + assertEquals(3, counter.getAcceptCount()); + } + + @Test + public void testAcceptCallsNestedConditionsOnlyIfPathAccepted2() { + final CountingCondition counter = new CountingCondition(true); + final IfFileName globFilter = IfFileName.createNameCondition("glob", null, counter); + final Path pathMatchingGlob = Paths.get("glob"); + + assertTrue(globFilter.accept(null, pathMatchingGlob, null)); + assertEquals(1, counter.getAcceptCount()); + assertTrue(globFilter.accept(null, pathMatchingGlob, null)); + assertEquals(2, counter.getAcceptCount()); + assertTrue(globFilter.accept(null, pathMatchingGlob, null)); + assertEquals(3, counter.getAcceptCount()); + + final Path noMatch = Paths.get("nomatch"); + assertFalse(globFilter.accept(null, noMatch, null)); + assertEquals(3, counter.getAcceptCount()); // no increase + assertFalse(globFilter.accept(null, noMatch, null)); + assertEquals(3, counter.getAcceptCount()); + assertFalse(globFilter.accept(null, noMatch, null)); + assertEquals(3, counter.getAcceptCount()); + } + + @Test + public void testBeforeTreeWalk() { + final CountingCondition counter = new CountingCondition(true); + final IfFileName pathFilter = IfFileName.createNameCondition("path", null, counter, counter, counter); + pathFilter.beforeFileTreeWalk(); + assertEquals(3, counter.getBeforeFileTreeWalkCount()); + } +} http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfLastModifiedTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfLastModifiedTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfLastModifiedTest.java index 48d2a10..520e68d 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfLastModifiedTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfLastModifiedTest.java @@ -75,7 +75,7 @@ public class IfLastModifiedTest { assertEquals(2, counter.getAcceptCount()); assertTrue(filter.accept(null, null, attrs)); assertEquals(3, counter.getAcceptCount()); - + final long tooYoung = 33 * 1000 - 5; attrs.lastModified = FileTime.fromMillis(System.currentTimeMillis() - tooYoung); assertFalse(filter.accept(null, null, attrs)); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/PathSortByModificationTimeTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/PathSortByModificationTimeTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/PathSortByModificationTimeTest.java index 255fec4..15b2eae 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/PathSortByModificationTimeTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/PathSortByModificationTimeTest.java @@ -49,15 +49,15 @@ public class PathSortByModificationTimeTest { final DummyFileAttributes a2 = new DummyFileAttributes(); a1.lastModified = FileTime.fromMillis(100); a2.lastModified = FileTime.fromMillis(222); - + assertEquals("same path, 2nd more recent", 1, sorter.compare(path(p1, a1), path(p1, a2))); assertEquals("path ignored, 2nd more recent", 1, sorter.compare(path(p1, a1), path(p2, a2))); assertEquals("path ignored, 2nd more recent", 1, sorter.compare(path(p2, a1), path(p1, a2))); - + assertEquals("same path, 1st more recent", -1, sorter.compare(path(p1, a2), path(p1, a1))); assertEquals("path ignored, 1st more recent", -1, sorter.compare(path(p1, a2), path(p2, a1))); assertEquals("path ignored, 1st more recent", -1, sorter.compare(path(p2, a2), path(p1, a1))); - + assertEquals("same path, same time", 0, sorter.compare(path(p1, a1), path(p1, a1))); assertEquals("p2 < p1, same time", 1, sorter.compare(path(p1, a1), path(p2, a1))); assertEquals("p2 < p1, same time", -1, sorter.compare(path(p2, a1), path(p1, a1))); @@ -72,15 +72,15 @@ public class PathSortByModificationTimeTest { final DummyFileAttributes a2 = new DummyFileAttributes(); a1.lastModified = FileTime.fromMillis(100); a2.lastModified = FileTime.fromMillis(222); - + assertEquals("same path, 2nd more recent", -1, sorter.compare(path(p1, a1), path(p1, a2))); assertEquals("path ignored, 2nd more recent", -1, sorter.compare(path(p1, a1), path(p2, a2))); assertEquals("path ignored, 2nd more recent", -1, sorter.compare(path(p2, a1), path(p1, a2))); - + assertEquals("same path, 1st more recent", 1, sorter.compare(path(p1, a2), path(p1, a1))); assertEquals("path ignored, 1st more recent", 1, sorter.compare(path(p1, a2), path(p2, a1))); assertEquals("path ignored, 1st more recent", 1, sorter.compare(path(p2, a2), path(p1, a1))); - + assertEquals("same path, same time", 0, sorter.compare(path(p1, a1), path(p1, a1))); assertEquals("p1 < p2, same time", -1, sorter.compare(path(p1, a1), path(p2, a1))); assertEquals("p1 < p2, same time", 1, sorter.compare(path(p2, a1), path(p1, a1))); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/SortingVisitorTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/SortingVisitorTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/SortingVisitorTest.java index dd32a0c..35cd870 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/SortingVisitorTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/SortingVisitorTest.java @@ -36,7 +36,7 @@ import static org.junit.Assert.*; * Tests the SortingVisitor class. */ public class SortingVisitorTest { - + private Path base; private Path aaa; private Path bbb; @@ -48,14 +48,14 @@ public class SortingVisitorTest { aaa = Files.createTempFile(base, "aaa", null, new FileAttribute<?>[0]); bbb = Files.createTempFile(base, "bbb", null, new FileAttribute<?>[0]); ccc = Files.createTempFile(base, "ccc", null, new FileAttribute<?>[0]); - + // lastModified granularity is 1 sec(!) on some file systems... final long now = System.currentTimeMillis(); Files.setLastModifiedTime(aaa, FileTime.fromMillis(now)); Files.setLastModifiedTime(bbb, FileTime.fromMillis(now + 1000)); Files.setLastModifiedTime(ccc, FileTime.fromMillis(now + 2000)); } - + @After public void tearDown() throws Exception { Files.deleteIfExists(ccc); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptAppenderTest.java index b112fb7..c0a66e2 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptAppenderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptAppenderTest.java @@ -45,7 +45,7 @@ public class DefaultRouteScriptAppenderTest { @Parameterized.Parameters(name = "{0} {1}") public static Object[][] getParameters() { // @formatter:off - return new Object[][] { + return new Object[][] { { "log4j-routing-default-route-script-groovy.xml", false }, { "log4j-routing-default-route-script-javascript.xml", false }, { "log4j-routing-script-staticvars-javascript.xml", true }, http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutesScriptAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutesScriptAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutesScriptAppenderTest.java index 12b571f..f9bbbd9 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutesScriptAppenderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutesScriptAppenderTest.java @@ -51,7 +51,7 @@ public class RoutesScriptAppenderTest { @Parameterized.Parameters(name = "{0} {1}") public static Object[][] getParameters() { // @formatter:off - return new Object[][] { + return new Object[][] { { "log4j-routing-routes-script-groovy.xml", false }, { "log4j-routing-routes-script-javascript.xml", false }, { "log4j-routing-script-staticvars-javascript.xml", true }, @@ -64,7 +64,7 @@ public class RoutesScriptAppenderTest { public final LoggerContextRule loggerContextRule; private final boolean expectBindingEntries; - + public RoutesScriptAppenderTest(final String configLocation, final boolean expectBindingEntries) { this.loggerContextRule = new LoggerContextRule(configLocation); this.expectBindingEntries = expectBindingEntries; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigAutoFlushTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigAutoFlushTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigAutoFlushTest.java index d032943..d7ae4a4 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigAutoFlushTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigAutoFlushTest.java @@ -44,7 +44,7 @@ public class AsyncLoggerConfigAutoFlushTest { public void testFlushAtEndOfBatch() throws Exception { final File file = new File("target", "AsyncLoggerConfigAutoFlushTest.log"); assertTrue("Deleted old file before test", !file.exists() || file.delete()); - + final Logger log = LogManager.getLogger("com.foo.Bar"); final String msg = "Message flushed with immediate flush=false"; log.info(msg); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest2.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest2.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest2.java index 3c09ff5..6b0dc9b 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest2.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest2.java @@ -40,7 +40,7 @@ public class AsyncLoggerConfigTest2 { "AsyncLoggerConfigTest2.xml"); final File file = new File("target", "AsyncLoggerConfigTest2.log"); assertTrue("Deleted old file before test", !file.exists() || file.delete()); - + final Logger log = LogManager.getLogger("com.foo.Bar"); final String msg = "Message before reconfig"; log.info(msg); @@ -48,7 +48,7 @@ public class AsyncLoggerConfigTest2 { final LoggerContext ctx = LoggerContext.getContext(false); ctx.reconfigure(); ctx.reconfigure(); - + final String msg2 = "Message after reconfig"; log.info(msg2); CoreLoggerContexts.stopLoggerContext(file); // stop async thread http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigUseAfterShutdownTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigUseAfterShutdownTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigUseAfterShutdownTest.java index e7dcf82..a4a2513 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigUseAfterShutdownTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigUseAfterShutdownTest.java @@ -42,7 +42,7 @@ public class AsyncLoggerConfigUseAfterShutdownTest { log.info("some message"); CoreLoggerContexts.stopLoggerContext(); // stop async thread - // call the #logMessage() method to bypass the isEnabled check: + // call the #logMessage() method to bypass the isEnabled check: // before the LOG4J2-639 fix this would throw a NPE ((AbstractLogger) log).logMessage("com.foo.Bar", Level.INFO, null, new SimpleMessage("msg"), null); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerContextSelectorTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerContextSelectorTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerContextSelectorTest.java index fc5cb63..29f21a5 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerContextSelectorTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerContextSelectorTest.java @@ -27,7 +27,7 @@ import static org.junit.Assert.*; @Category(AsyncLoggers.class) public class AsyncLoggerContextSelectorTest { - + private static final String FQCN = AsyncLoggerContextSelectorTest.class.getName(); @Test http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerLocationTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerLocationTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerLocationTest.java index 5b61d8e..2642d2b 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerLocationTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerLocationTest.java @@ -41,7 +41,7 @@ public class AsyncLoggerLocationTest { public static void beforeClass() { final File file = new File("target", "AsyncLoggerLocationTest.log"); file.delete(); - + System.setProperty(Constants.LOG4J_CONTEXT_SELECTOR, AsyncLoggerContextSelector.class.getName()); System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTest.java index aad8ce7..27c6678 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerTest.java @@ -55,10 +55,10 @@ public class AsyncLoggerTest { final File file = new File("target", "AsyncLoggerTest.log"); // System.out.println(f.getAbsolutePath()); file.delete(); - + final AsyncLogger log = (AsyncLogger) LogManager.getLogger("com.foo.Bar"); assertTrue(log.getNanoClock() instanceof DummyNanoClock); - + final String msg = "Async logger msg"; log.info(msg, new InternalError("this is not a real error")); CoreLoggerContexts.stopLoggerContext(false, file); // stop async thread http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerThreadContextTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerThreadContextTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerThreadContextTest.java index 0b5ff64..76bf257 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerThreadContextTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerThreadContextTest.java @@ -56,10 +56,10 @@ public class AsyncLoggerThreadContextTest { final File file = new File("target", "AsyncLoggerTest.log"); // System.out.println(f.getAbsolutePath()); file.delete(); - + ThreadContext.push("stackvalue"); ThreadContext.put("KEY", "mapvalue"); - + final Logger log = LogManager.getLogger("com.foo.Bar"); final String msg = "Async logger msg"; log.info(msg, new InternalError("this is not a real error")); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerUseAfterShutdownTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerUseAfterShutdownTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerUseAfterShutdownTest.java index 2e4ab33..f553137 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerUseAfterShutdownTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerUseAfterShutdownTest.java @@ -57,7 +57,7 @@ public class AsyncLoggerUseAfterShutdownTest { log.info(msg, new InternalError("this is not a real error")); CoreLoggerContexts.stopLoggerContext(); // stop async thread - // call the #logMessage() method to bypass the isEnabled check: + // call the #logMessage() method to bypass the isEnabled check: // before the LOG4J2-639 fix this would throw a NPE ((AbstractLogger) log).logMessage("com.foo.Bar", Level.INFO, null, new SimpleMessage("msg"), null); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java index 53ada5b..02a1f8a 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java @@ -58,7 +58,7 @@ public class RingBufferLogEventTest { final LogEvent logEvent = new RingBufferLogEvent(); Assert.assertNotSame(logEvent, logEvent.toImmutable()); } - + @Test public void testGetLevelReturnsOffIfNullLevelSet() { final RingBufferLogEvent evt = new RingBufferLogEvent(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java index 2be6499..e9934fc 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java @@ -206,10 +206,10 @@ public class PerfTestDriver { public static void main(final String[] args) throws Exception { final long start = System.nanoTime(); - + final List<Setup> tests = selectTests(); runPerfTests(args, tests); - + System.out.printf("Done. Total duration: %.1f minutes%n", (System.nanoTime() - start) / (60.0 * 1000.0 * 1000.0 * 1000.0)); @@ -218,7 +218,7 @@ public class PerfTestDriver { private static List<Setup> selectTests() throws IOException { final List<Setup> tests = new ArrayList<>(); - + // final String CACHEDCLOCK = "-Dlog4j.Clock=CachedClock"; final String SYSCLOCK = "-Dlog4j.Clock=SystemClock"; final String ALL_ASYNC = "-DLog4jContextSelector=" + AsyncLoggerContextSelector.class.getName(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java index a9b48e7..a7cfe17 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java @@ -111,13 +111,13 @@ public class ConfigurationTest { final Configuration config = this.ctx.getConfiguration(); assertEquals(config.getRootLogger(), config.getLoggerConfig(Strings.EMPTY)); } - + @Test(expected = NullPointerException.class) public void testGetLoggerConfigNull() throws Exception { final Configuration config = this.ctx.getConfiguration(); assertEquals(config.getRootLogger(), config.getLoggerConfig(null)); } - + @Test public void testLogger() throws Exception { final Logger logger = this.ctx.getLogger(LOGGER_NAME); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/config/LoggerConfigTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/LoggerConfigTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/LoggerConfigTest.java index a7cceff..ab4acdb 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/LoggerConfigTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/LoggerConfigTest.java @@ -79,7 +79,7 @@ public class LoggerConfigTest { }; final LoggerConfig loggerConfig = createForProperties(all); final List<Property> list = loggerConfig.getPropertyList(); - assertEquals("map and list contents equal", new HashSet<>(list), + assertEquals("map and list contents equal", new HashSet<>(list), new HashSet<>(loggerConfig.getPropertyList())); final Object[] actualListHolder = new Object[1]; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilCustomProtocolTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilCustomProtocolTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilCustomProtocolTest.java index 33e0ee1..ed2db6e 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilCustomProtocolTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilCustomProtocolTest.java @@ -47,7 +47,7 @@ public class ResolverUtilCustomProtocolTest { @Rule public RuleChain chain = RuleChain.outerRule(new CleanFolders(ResolverUtilTest.WORK_DIR)); - + static class NoopURLStreamHandlerFactory implements URLStreamHandlerFactory { @Override http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java index 1c6371b..a9de08a 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java @@ -51,7 +51,7 @@ public class ResolverUtilTest { @Rule public RuleChain chain = RuleChain.outerRule(new CleanFolders(WORK_DIR)); - + @Test public void testExtractPathFromJarUrl() throws Exception { final URL url = new URL("jar:file:/C:/Users/me/.m2/repository/junit/junit/4.11/junit-4.11.jar!/org/junit/Test.class"); @@ -193,29 +193,29 @@ public class ResolverUtilTest { if (!parent.exists()) { assertTrue("Create customplugin" + suffix + " folder KO", f.getParentFile().mkdirs()); } - + final String content = new String(Files.readAllBytes(orig.toPath())) .replaceAll("FixedString", "FixedString" + suffix) .replaceAll("customplugin", "customplugin" + suffix); Files.write(f.toPath(), content.getBytes()); - + PluginManagerPackagesTest.compile(f); return workDir; } static void createJar(final URI jarURI, final File workDir, final File f) throws Exception { - final Map<String, String> env = new HashMap<>(); + final Map<String, String> env = new HashMap<>(); env.put("create", "true"); final URI uri = URI.create("jar:file://" + jarURI.getRawPath()); - try (FileSystem zipfs = FileSystems.newFileSystem(uri, env)) { + try (FileSystem zipfs = FileSystems.newFileSystem(uri, env)) { final Path path = zipfs.getPath(workDir.toPath().relativize(f.toPath()).toString()); if (path.getParent() != null) { Files.createDirectories(path.getParent()); } Files.copy(f.toPath(), - path, - StandardCopyOption.REPLACE_EXISTING ); - } + path, + StandardCopyOption.REPLACE_EXISTING ); + } } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidatingPluginWithTypedBuilderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidatingPluginWithTypedBuilderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidatingPluginWithTypedBuilderTest.java index ae236b4..2b0ebd1 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidatingPluginWithTypedBuilderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidatingPluginWithTypedBuilderTest.java @@ -48,7 +48,7 @@ public class ValidatingPluginWithTypedBuilderTest { @Test public void testNullDefaultValue() throws Exception { // @formatter:off - final ValidatingPluginWithTypedBuilder validatingPlugin = (ValidatingPluginWithTypedBuilder) + final ValidatingPluginWithTypedBuilder validatingPlugin = (ValidatingPluginWithTypedBuilder) new PluginBuilder(plugin). withConfiguration(new NullConfiguration()). withConfigurationNode(node).build(); @@ -60,7 +60,7 @@ public class ValidatingPluginWithTypedBuilderTest { public void testNonNullValue() throws Exception { node.getAttributes().put("name", "foo"); // @formatter:off - final ValidatingPluginWithTypedBuilder validatingPlugin = (ValidatingPluginWithTypedBuilder) + final ValidatingPluginWithTypedBuilder validatingPlugin = (ValidatingPluginWithTypedBuilder) new PluginBuilder(plugin). withConfiguration(new NullConfiguration()). withConfigurationNode(node).build(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java index 0488d0f..fce48e5 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java @@ -45,8 +45,8 @@ import org.junit.Test; public class DynamicThresholdFilterTest { @Rule - public final ThreadContextMapRule threadContextRule = new ThreadContextMapRule(); - + public final ThreadContextMapRule threadContextRule = new ThreadContextMapRule(); + @After public void cleanup() { final LoggerContext ctx = LoggerContext.getContext(false); @@ -88,11 +88,11 @@ public class DynamicThresholdFilterTest { filter.start(); assertTrue(filter.isStarted()); final Object [] replacements = {"one", "two", "three"}; - assertSame(Filter.Result.ACCEPT, filter.filter(null, Level.DEBUG, null, "some test message", replacements)); - assertSame(Filter.Result.ACCEPT, filter.filter(null, Level.DEBUG, null, "some test message", "one", "two", "three")); + assertSame(Filter.Result.ACCEPT, filter.filter(null, Level.DEBUG, null, "some test message", replacements)); + assertSame(Filter.Result.ACCEPT, filter.filter(null, Level.DEBUG, null, "some test message", "one", "two", "three")); ThreadContext.clearMap(); } - + @Test public void testConfig() { try (final LoggerContext ctx = Configurator.initialize("Test1", http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/LevelRangeFilterTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/LevelRangeFilterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/LevelRangeFilterTest.java index b99c6a9..336d3ce 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/LevelRangeFilterTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/LevelRangeFilterTest.java @@ -56,5 +56,5 @@ public class LevelRangeFilterTest { assertTrue(filter.isStarted()); assertSame(Filter.Result.NEUTRAL, filter.filter(null, Level.ERROR, null, (Object) null, (Throwable) null)); } - + } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventNanoTimeTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventNanoTimeTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventNanoTimeTest.java index 93d60c4..caae76b 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventNanoTimeTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventNanoTimeTest.java @@ -62,7 +62,7 @@ public class Log4jLogEventNanoTimeTest { Log4jLogEvent.setNanoClock(new DummyNanoClock(DUMMYNANOTIME)); log.info("Use dummy nano clock"); assertTrue("using SystemNanoClock", Log4jLogEvent.getNanoClock() instanceof DummyNanoClock); - + CoreLoggerContexts.stopLoggerContext(file); // stop async thread String line1; @@ -82,7 +82,7 @@ public class Log4jLogEventNanoTimeTest { assertEquals(line1Parts[0], line1Parts[1]); final long loggedNanoTime = Long.parseLong(line1Parts[0]); assertTrue("used system nano time", loggedNanoTime - before < TimeUnit.SECONDS.toNanos(1)); - + final String[] line2Parts = line2.split(" AND "); assertEquals("Use dummy nano clock", line2Parts[2]); assertEquals(String.valueOf(DUMMYNANOTIME), line2Parts[0]); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/NestedLoggingFromToStringTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/NestedLoggingFromToStringTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/NestedLoggingFromToStringTest.java index d0c35cb..e95e308 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/NestedLoggingFromToStringTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/NestedLoggingFromToStringTest.java @@ -50,7 +50,7 @@ public class NestedLoggingFromToStringTest { public static void beforeClass() { System.setProperty("log4j2.is.webapp", "false"); } - + @Rule public LoggerContextRule context = new LoggerContextRule("log4j-sync-to-list.xml"); private ListAppender listAppender; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java index d099da1..be2fd7f 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java @@ -37,7 +37,7 @@ public final class ThrowableFormatOptionsTest { /** * Runs a given test comparing against the expected values. - * + * * @param options * The list of options to parse. * @param expectedLines http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/jmx/ServerTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/jmx/ServerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/jmx/ServerTest.java index 2533869..57c8910 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/jmx/ServerTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/jmx/ServerTest.java @@ -33,7 +33,7 @@ public class ServerTest { final String ctx = "WebAppClassLoader=1320771902@4eb9613e"; // LOG4J2-492 final String ctxName = Server.escape(ctx); assertEquals("\"WebAppClassLoader=1320771902@4eb9613e\"", ctxName); - new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName)); + new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName)); // no MalformedObjectNameException = success } @@ -42,7 +42,7 @@ public class ServerTest { final String ctx = "a,b,c"; final String ctxName = Server.escape(ctx); assertEquals("\"a,b,c\"", ctxName); - new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName)); + new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName)); // no MalformedObjectNameException = success } @@ -51,7 +51,7 @@ public class ServerTest { final String ctx = "a:b:c"; final String ctxName = Server.escape(ctx); assertEquals("\"a:b:c\"", ctxName); - new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName)); + new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName)); // no MalformedObjectNameException = success } @@ -60,7 +60,7 @@ public class ServerTest { final String ctx = "a?c"; final String ctxName = Server.escape(ctx); assertEquals("\"a\\?c\"", ctxName); - new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName)); + new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName)); // no MalformedObjectNameException = success } @@ -69,7 +69,7 @@ public class ServerTest { final String ctx = "a*c"; final String ctxName = Server.escape(ctx); assertEquals("\"a\\*c\"", ctxName); - new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName)); + new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName)); // no MalformedObjectNameException = success } @@ -78,7 +78,7 @@ public class ServerTest { final String ctx = "a\\c"; final String ctxName = Server.escape(ctx); assertEquals("\"a\\\\c\"", ctxName); - new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName)); + new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName)); // no MalformedObjectNameException = success } @@ -87,7 +87,7 @@ public class ServerTest { final String ctx = "a\"c"; final String ctxName = Server.escape(ctx); assertEquals("\"a\\\"c\"", ctxName); - new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName)); + new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName)); // no MalformedObjectNameException = success } @@ -96,7 +96,7 @@ public class ServerTest { final String ctx = "a c"; final String ctxName = Server.escape(ctx); assertEquals("a c", ctxName); - new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName)); + new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName)); // no MalformedObjectNameException = success } @@ -105,7 +105,7 @@ public class ServerTest { final String ctx = "a\rc"; final String ctxName = Server.escape(ctx); assertEquals("ac", ctxName); - new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName)); + new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName)); // no MalformedObjectNameException = success } @@ -114,7 +114,7 @@ public class ServerTest { final String ctx = "a\nc"; final String ctxName = Server.escape(ctx); assertEquals("\"a\\nc\"", ctxName); - new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName)); + new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, ctxName)); // no MalformedObjectNameException = success } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/CsvLogEventLayoutTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/CsvLogEventLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/CsvLogEventLayoutTest.java index 0ee8861..078ed02 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/CsvLogEventLayoutTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/CsvLogEventLayoutTest.java @@ -49,7 +49,7 @@ public class CsvLogEventLayoutTest { static ConfigurationFactory cf = new BasicConfigurationFactory(); @Rule - public final ThreadContextRule threadContextRule = new ThreadContextRule(); + public final ThreadContextRule threadContextRule = new ThreadContextRule(); @AfterClass public static void cleanupClass() { @@ -127,7 +127,7 @@ public class CsvLogEventLayoutTest { final String quote = del == ',' ? "\"" : ""; Assert.assertTrue(event0, event0.contains(del + quote + "one=1, two=2, three=3" + quote + del)); Assert.assertTrue(event1, event1.contains(del + "INFO" + del)); - + if (hasHeaderSerializer && header == null) { Assert.fail(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutTest.java index 095bec6..e18bceb 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutTest.java @@ -45,9 +45,9 @@ import static net.javacrumbs.jsonunit.JsonAssert.assertJsonEquals; import static org.junit.Assert.assertEquals; public class GelfLayoutTest { - + static ConfigurationFactory configFactory = new BasicConfigurationFactory(); - + private static final String HOSTNAME = "TheHost"; private static final String KEY1 = "Key1"; private static final String KEY2 = "Key2"; @@ -61,7 +61,7 @@ public class GelfLayoutTest { private static final String VALUE1 = "Value1"; @Rule - public final ThreadContextRule threadContextRule = new ThreadContextRule(); + public final ThreadContextRule threadContextRule = new ThreadContextRule(); @AfterClass public static void cleanupClass() { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HtmlLayoutTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HtmlLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HtmlLayoutTest.java index 80acb1f..20a8dde 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HtmlLayoutTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HtmlLayoutTest.java @@ -46,7 +46,7 @@ public class HtmlLayoutTest { static ConfigurationFactory cf = new BasicConfigurationFactory(); @Rule - public final ThreadContextRule threadContextRule = new ThreadContextRule(); + public final ThreadContextRule threadContextRule = new ThreadContextRule(); @BeforeClass public static void setupClass() { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JsonLayoutTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JsonLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JsonLayoutTest.java index dec48ec..9dfade0 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JsonLayoutTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JsonLayoutTest.java @@ -499,19 +499,19 @@ public class JsonLayoutTest { // @formatter:off return layout.toSerializable(expected); } - + @Test public void testObjectMessageAsJsonString() { final String str = prepareJSONForObjectMessageAsJsonObjectTests(1234, false); assertTrue(str, str.contains("\"message\":\"" + this.getClass().getCanonicalName() + "$TestClass@")); } - + @Test public void testObjectMessageAsJsonObject() { final String str = prepareJSONForObjectMessageAsJsonObjectTests(1234, true); assertTrue(str, str.contains("\"message\":{\"value\":1234}")); } - + private String prepareJSONForObjectMessageAsJsonObjectTests(final int value, final boolean objectMessageAsJsonObject) { final TestClass testClass = new TestClass(); testClass.setValue(value); @@ -551,11 +551,11 @@ public class JsonLayoutTest { final String str = layout.toSerializable(LogEventFixtures.createLogEvent()); assertFalse(str.endsWith("\0")); } - + private String toPropertySeparator(final boolean compact) { return compact ? ":" : " : "; } - + private static class TestClass { private int value; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_1482_Test.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_1482_Test.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_1482_Test.java index abd1852..3c94d58 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_1482_Test.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_1482_Test.java @@ -42,7 +42,7 @@ import org.junit.experimental.categories.Category; public abstract class Log4j2_1482_Test { static final String CONFIG_LOCATION = "log4j2-1482.xml"; - + static final String FOLDER = "target/log4j2-1482"; private static final int LOOP_COUNT = 10; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java index d1bb7a8..0b9b50d 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java @@ -73,7 +73,7 @@ public class Rfc5424LayoutTest { static ConfigurationFactory cf = new BasicConfigurationFactory(); @Rule - public final ThreadContextRule threadContextRule = new ThreadContextRule(); + public final ThreadContextRule threadContextRule = new ThreadContextRule(); @BeforeClass public static void setupClass() { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java index 0d5205d..da20507 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java @@ -59,7 +59,7 @@ public class SerializedLayoutTest { static boolean useObjectInputStream = false; @Rule - public final ThreadContextRule threadContextRule = new ThreadContextRule(); + public final ThreadContextRule threadContextRule = new ThreadContextRule(); @BeforeClass public static void setupClass() { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java index b5bea03..d9bd5b0 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java @@ -55,7 +55,7 @@ public class SyslogLayoutTest { static ConfigurationFactory cf = new BasicConfigurationFactory(); @Rule - public final ThreadContextRule threadContextRule = new ThreadContextRule(); + public final ThreadContextRule threadContextRule = new ThreadContextRule(); @BeforeClass public static void setupClass() { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XmlLayoutTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XmlLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XmlLayoutTest.java index 4ee8f1e..9d97f6a 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XmlLayoutTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XmlLayoutTest.java @@ -61,7 +61,7 @@ public class XmlLayoutTest { private static final String markerTag = "<Marker name=\"EVENT\"/>"; @Rule - public final ThreadContextRule threadContextRule = new ThreadContextRule(); + public final ThreadContextRule threadContextRule = new ThreadContextRule(); @AfterClass public static void cleanupClass() { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsJmxLookupTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsJmxLookupTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsJmxLookupTest.java index be1f587..22583d3 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsJmxLookupTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsJmxLookupTest.java @@ -22,9 +22,9 @@ import org.junit.Test; /** * Tests {@link JmxRuntimeInputArgumentsLookup} from the command line, not a JUnit test. - * + * * From an IDE or CLI: --file foo.txt - * + * * @since 2.1 */ public class MainInputArgumentsJmxLookupTest { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsLookupTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsLookupTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsLookupTest.java index 6150afd..966c6fd 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsLookupTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsLookupTest.java @@ -23,9 +23,9 @@ import org.apache.logging.log4j.core.config.Configurator; /** * Tests {@link org.apache.logging.log4j.core.lookup.MainMapLookup#MAIN_SINGLETON} from the command line, not a real * JUnit test. - * + * * From an IDE or CLI: --file foo.txt - * + * * @since 2.4 */ public class MainInputArgumentsLookupTest { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsMapLookup.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsMapLookup.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsMapLookup.java index f6bad22..1ec64a8 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsMapLookup.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsMapLookup.java @@ -20,7 +20,7 @@ import java.util.Map; /** * Work in progress, saved for future experimentation. - * + * * TODO The goal is to use the Sun debugger API to find the main arg values on the stack. */ public class MainInputArgumentsMapLookup extends MapLookup { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MarkerLookupConfigTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MarkerLookupConfigTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MarkerLookupConfigTest.java index 62f8897..e3ce8d4 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MarkerLookupConfigTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MarkerLookupConfigTest.java @@ -31,7 +31,7 @@ import org.junit.Test; /** * Tests {@link MarkerLookup} with a configuration file. - * + * * @since 2.4 */ public class MarkerLookupConfigTest { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MarkerLookupTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MarkerLookupTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MarkerLookupTest.java index d26f895..fac33d4 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MarkerLookupTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MarkerLookupTest.java @@ -29,7 +29,7 @@ import org.junit.Test; /** * Tests {@link MarkerLookup}. - * + * * @since 2.4 */ public class MarkerLookupTest { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DisableAnsiTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DisableAnsiTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DisableAnsiTest.java index 7fea6fe..b841ea4 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DisableAnsiTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DisableAnsiTest.java @@ -55,5 +55,5 @@ public class DisableAnsiTest { assertEquals("Incorrect number of messages. Should be 1 is " + msgs.size(), 1, msgs.size()); assertTrue("Replacement failed - expected ending " + EXPECTED + ", actual " + msgs.get(0), msgs.get(0).endsWith(EXPECTED)); } - + } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverterTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverterTest.java index 445b893..bcb9b1c 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverterTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverterTest.java @@ -159,7 +159,7 @@ public class ExtendedThrowablePatternConverterTest { final String expected = sw.toString(); //.replaceAll("\r", Strings.EMPTY); assertEquals(expected, result); } - + @Test public void testFiltersAndSeparator() { final ExtendedThrowablePatternConverter exConverter = ExtendedThrowablePatternConverter.newInstance(null, http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/HighlightConverterTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/HighlightConverterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/HighlightConverterTest.java index 0987f76..442c5ab 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/HighlightConverterTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/HighlightConverterTest.java @@ -53,7 +53,7 @@ public class HighlightConverterTest { converter.format(event, buffer); assertEquals("\u001B[32mINFO : message in a bottle\u001B[m", buffer.toString()); } - + @Test public void testLevelNamesBad() { final String colorName = "red"; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MdcPatternConverterTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MdcPatternConverterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MdcPatternConverterTest.java index 00e97f7..4cb6c7d 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MdcPatternConverterTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MdcPatternConverterTest.java @@ -36,7 +36,7 @@ import org.junit.Test; public class MdcPatternConverterTest { @Rule - public final ThreadContextMapRule threadContextRule = new ThreadContextMapRule(); + public final ThreadContextMapRule threadContextRule = new ThreadContextMapRule(); @Before public void setup() { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/NdcPatternConverterTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/NdcPatternConverterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/NdcPatternConverterTest.java index 92557ec..4088a17 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/NdcPatternConverterTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/NdcPatternConverterTest.java @@ -31,7 +31,7 @@ import org.junit.Test; public class NdcPatternConverterTest { @Rule - public final ThreadContextStackRule threadContextRule = new ThreadContextStackRule(); + public final ThreadContextStackRule threadContextRule = new ThreadContextStackRule(); @Test public void testEmpty() { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/NoConsoleNoAnsiTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/NoConsoleNoAnsiTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/NoConsoleNoAnsiTest.java index cc9ac03..ee29c6f 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/NoConsoleNoAnsiTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/NoConsoleNoAnsiTest.java @@ -57,5 +57,5 @@ public class NoConsoleNoAnsiTest { assertEquals("Incorrect number of messages. Should be 1 is " + msgs.size(), 1, msgs.size()); assertTrue("Replacement failed - expected ending " + EXPECTED + ", actual " + msgs.get(0), msgs.get(0).endsWith(EXPECTED)); } - + } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest2.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest2.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest2.java index 45c0a8b..22f9c28 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest2.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest2.java @@ -74,7 +74,7 @@ public class PatternParserTest2 { /** * Format file name. - * + * * @param buf string buffer to which formatted file name is appended, may not be null. * @param objects objects to be evaluated in formatting, may not be null. */ http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/30970229/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java index f357111..16b08d9 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java @@ -46,7 +46,7 @@ public class RegexReplacementTest { public static LoggerContextRule context = new LoggerContextRule(CONFIG); @Rule - public final ThreadContextMapRule threadContextRule = new ThreadContextMapRule(); + public final ThreadContextMapRule threadContextRule = new ThreadContextMapRule(); @Before public void setUp() throws Exception {
