svn commit: r1593102 - in /logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/spi: DefaultThreadContextStackTest.java MutableThreadContextStackTest.java

[ggregory]

Author: ggregory
Date: Wed May  7 18:18:38 2014
New Revision: 1593102

URL: http://svn.apache.org/r1593102
Log:
Implement equals() and hashCode(); for XML and JSON receiver testing.

Modified:
    
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextStackTest.java
    
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/spi/MutableThreadContextStackTest.java

Modified: 
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextStackTest.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextStackTest.java?rev=1593102&r1=1593101&r2=1593102&view=diff
==============================================================================
--- 
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextStackTest.java
 (original)
+++ 
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/spi/DefaultThreadContextStackTest.java
 Wed May  7 18:18:38 2014
@@ -36,6 +36,16 @@ public class DefaultThreadContextStackTe
     }
 
     @Test
+    public void testEqualsVsMutable() {
+        final DefaultThreadContextStack stack1 = createStack();
+        final MutableThreadContextStack stack2 = 
MutableThreadContextStackTest.createStack();
+        assertEquals(stack1, stack1);
+        assertEquals(stack2, stack2);
+        assertEquals(stack1, stack2);
+        assertEquals(stack2, stack1);
+    }
+
+    @Test
     public void testHashCodeVsSameKind() {
         final DefaultThreadContextStack stack1 = createStack();
         final DefaultThreadContextStack stack2 = createStack();
@@ -43,6 +53,13 @@ public class DefaultThreadContextStackTe
     }
 
     @Test
+    public void testHashCodeVsMutable() {
+        final DefaultThreadContextStack stack1 = createStack();
+        final MutableThreadContextStack stack2 = 
MutableThreadContextStackTest.createStack();
+        assertEquals(stack1.hashCode(), stack2.hashCode());
+    }
+
+    @Test
     public void testDoesNothingIfConstructedWithUseStackIsFalse() {
         final DefaultThreadContextStack stack = new 
DefaultThreadContextStack(false);
         stack.clear();
@@ -160,7 +177,7 @@ public class DefaultThreadContextStackTe
     /**
      * @return
      */
-    private DefaultThreadContextStack createStack() {
+    static DefaultThreadContextStack createStack() {
         final DefaultThreadContextStack stack = new 
DefaultThreadContextStack(true);
         stack.clear();
         assertTrue(stack.isEmpty());

Modified: 
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/spi/MutableThreadContextStackTest.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/spi/MutableThreadContextStackTest.java?rev=1593102&r1=1593101&r2=1593102&view=diff
==============================================================================
--- 
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/spi/MutableThreadContextStackTest.java
 (original)
+++ 
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/spi/MutableThreadContextStackTest.java
 Wed May  7 18:18:38 2014
@@ -164,7 +164,7 @@ public class MutableThreadContextStackTe
     /**
      * @return
      */
-    private MutableThreadContextStack createStack() {
+    static MutableThreadContextStack createStack() {
         final MutableThreadContextStack stack1 = new 
MutableThreadContextStack(new ArrayList<String>());
         stack1.clear();
         assertTrue(stack1.isEmpty());