svn commit: r1154530 - /commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java

[joehni]

Author: joehni
Date: Sat Aug  6 15:43:07 2011
New Revision: 1154530

URL: http://svn.apache.org/viewvc?rev=1154530&view=rev
Log:
Ignore assertions for IBM JDK 1.6.0 in 
ToStringBuilderTest.testReflectionHierarchyArrayList because the test makes 
assumptions on the internal representation of an ArrayList (LANG-727).

Modified:
    
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java

Modified: 
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java?rev=1154530&r1=1154529&r2=1154530&view=diff
==============================================================================
--- 
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java
 (original)
+++ 
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java
 Sat Aug  6 15:43:07 2011
@@ -24,6 +24,8 @@ import java.util.List;
 
 import org.junit.Test;
 
+import org.apache.commons.lang3.SystemUtils;
+
 /**
  * Unit tests for {@link org.apache.commons.lang3.builder.ToStringBuilder}.
  *
@@ -320,13 +322,27 @@ public class ToStringBuilderTest {
     }
 
     // Reflection hierarchy tests
-
     @Test
     public void testReflectionHierarchyArrayList() {
         List<Object> base = new ArrayList<Object>();
         String baseStr = this.toBaseString(base);
-        assertEquals(baseStr + 
"[elementData={<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>},size=0,modCount=0]",
 ToStringBuilder.reflectionToString(base, null, true));
-        assertEquals(baseStr + "[size=0]", 
ToStringBuilder.reflectionToString(base, null, false));
+        // note, the test data depends on the internal representation of the 
ArrayList, which may differ between JDK versions and vendors
+        String expectedWithTransients = baseStr + 
"[elementData={<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>},size=0,modCount=0]";
+        String toStringWithTransients = 
ToStringBuilder.reflectionToString(base, null, true);
+        if (!expectedWithTransients.equals(toStringWithTransients)) {
+            // representation different for IBM JDK 1.6.0, LANG-727
+            if (!("IBM Corporation".equals(SystemUtils.JAVA_VENDOR) && 
"1.6".equals(SystemUtils.JAVA_SPECIFICATION_VERSION))) {
+                assertEquals(expectedWithTransients, toStringWithTransients);
+            }
+        }
+        String expectedWithoutTransients = baseStr + "[size=0]";
+        String toStringWithoutTransients = 
ToStringBuilder.reflectionToString(base, null, false);
+        if (!expectedWithoutTransients.equals(toStringWithoutTransients)) {
+            // representation different for IBM JDK 1.6.0, LANG-727
+            if (!("IBM Corporation".equals(SystemUtils.JAVA_VENDOR) && 
"1.6".equals(SystemUtils.JAVA_SPECIFICATION_VERSION))) {
+                assertEquals(expectedWithoutTransients, 
toStringWithoutTransients);
+            }
+        }
         this.validateNullToStringStyleRegistry();
     }