Author: ggregory
Date: Thu May 8 13:18:11 2014
New Revision: 1593268
URL: http://svn.apache.org/r1593268
Log:
Add MarkerManager.clear() for proper and sane testing. Also prefix test methods
with "test" instead of using the postfix "Test".
Added:
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/helpers/
Modified:
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/MarkerManager.java
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/MarkerTest.java
Modified:
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/MarkerManager.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/MarkerManager.java?rev=1593268&r1=1593267&r2=1593268&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/MarkerManager.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/MarkerManager.java
Thu May 8 13:18:11 2014
@@ -33,6 +33,13 @@ public final class MarkerManager {
}
/**
+ * Clears all markers.
+ */
+ public static void clear() {
+ markerMap.clear();
+ }
+
+ /**
* Retrieve a Marker or create a Marker that has no parent.
* @param name The name of the Marker.
* @return The Marker with the specified name.
Modified:
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/MarkerTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/MarkerTest.java?rev=1593268&r1=1593267&r2=1593268&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/MarkerTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/MarkerTest.java
Thu May 8 13:18:11 2014
@@ -16,8 +16,11 @@
*/
package org.apache.logging.log4j;
+import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
/**
@@ -25,8 +28,30 @@ import static org.junit.Assert.assertTru
*/
public class MarkerTest {
+ @Before
+ public void setUp() {
+ MarkerManager.clear();
+ }
+
+ @Test
+ public void testGetMarker() {
+ Marker expected = MarkerManager.getMarker("A");
+ assertNull(expected.getParents());
+ }
+
+ @Test
+ public void testGetMarkerWithParents() {
+ Marker expected = MarkerManager.getMarker("A");
+ final Marker p1 = MarkerManager.getMarker("P1");
+ p1.addParents(MarkerManager.getMarker("PP1"));
+ final Marker p2 = MarkerManager.getMarker("P2");
+ expected.addParents(p1);
+ expected.addParents(p2);
+ assertEquals(2, expected.getParents().length);
+ }
+
@Test
- public void markerTest() {
+ public void testMarker() {
final Marker parent = MarkerManager.getMarker("PARENT");
final Marker test1 =
MarkerManager.getMarker("TEST1").setParents(parent);
final Marker test2 =
MarkerManager.getMarker("TEST2").addParents(parent);
@@ -35,7 +60,7 @@ public class MarkerTest {
}
@Test
- public void multipleParentsTest() {
+ public void testMultipleParents() {
final Marker parent1 = MarkerManager.getMarker("PARENT1");
final Marker parent2 = MarkerManager.getMarker("PARENT2");
final Marker test1 =
MarkerManager.getMarker("TEST1").setParents(parent1, parent2);
@@ -47,7 +72,7 @@ public class MarkerTest {
}
@Test
- public void addToExistingParentsTest() {
+ public void testAddToExistingParents() {
final Marker parent = MarkerManager.getMarker("PARENT");
final Marker existing = MarkerManager.getMarker("EXISTING");
final Marker test1 =
MarkerManager.getMarker("TEST1").setParents(existing);
@@ -58,7 +83,7 @@ public class MarkerTest {
@Test
- public void duplicateParentsTest() {
+ public void testDuplicateParents() {
final Marker parent = MarkerManager.getMarker("PARENT");
final Marker existing = MarkerManager.getMarker("EXISTING");
final Marker test1 =
MarkerManager.getMarker("TEST1").setParents(existing);
