[jboss-svn-commits] JBoss Common SVN: r2846 - jbossxb/trunk/src/test/java/org/jboss/test/xml.

[jboss-svn-commits at lists.jboss.org]

Author: darran.lofthouse at jboss.com
Date: 2008-05-22 12:13:20 -0400 (Thu, 22 May 2008)
New Revision: 2846

Modified:
   jbossxb/trunk/src/test/java/org/jboss/test/xml/SoapEncUnitTestCase.java
Log:
[JBXB-142] SoapEncUnitTestCase - Incorrect Timezone Handling.

Modified: jbossxb/trunk/src/test/java/org/jboss/test/xml/SoapEncUnitTestCase.java
===================================================================
--- jbossxb/trunk/src/test/java/org/jboss/test/xml/SoapEncUnitTestCase.java	2008-05-13 12:51:50 UTC (rev 2845)
+++ jbossxb/trunk/src/test/java/org/jboss/test/xml/SoapEncUnitTestCase.java	2008-05-22 16:13:20 UTC (rev 2846)
@@ -29,6 +29,7 @@
 import java.math.BigInteger;
 import java.net.URL;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.Arrays;
 import java.util.TimeZone;
@@ -135,8 +136,9 @@
       SchemaBinding schema = XsdBinder.bind(xsdPath, RESOLVER);
       Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
       Object o = unmarshaller.unmarshal(new StringReader(XML), schema);
+      
       assertNotNull(o);
-      assertTrue(o instanceof AllStruct);
+      assertTrue(o instanceof AllStruct);            
       assertEquals(AllStruct.INSTANCE, o);
    }
 
@@ -202,16 +204,17 @@
          struct.setVarByte((byte)Byte.MIN_VALUE);
          struct.setVarQName(new QName("String2"));
 
-         Calendar varDateTime = (Calendar)new GregorianCalendar(96, 5, 1);
-         int offset = varDateTime.get(Calendar.ZONE_OFFSET) + varDateTime.get(Calendar.DST_OFFSET);
-         StringBuffer buf = new StringBuffer();
-         buf.append("GMT");
-         if(offset > 0)
-         {
-            buf.append('+');
-         }
-         buf.append(offset);
-         varDateTime.setTimeZone(TimeZone.getTimeZone(buf.toString()));
+         // This calendar is for 31st May 96 (Not 1996) at 23:00:00.000
+         // Care needs to be taken to ensure GMT.
+         Calendar varDateTime = new GregorianCalendar();
+         varDateTime.setTimeZone(TimeZone.getTimeZone("GMT"));
+         varDateTime.set(Calendar.YEAR, 96);
+         varDateTime.set(Calendar.MONTH, 4);
+         varDateTime.set(Calendar.DAY_OF_MONTH, 31);
+         varDateTime.set(Calendar.HOUR_OF_DAY, 23);
+         varDateTime.set(Calendar.MINUTE, 0);
+         varDateTime.set(Calendar.SECOND, 0);
+         varDateTime.set(Calendar.MILLISECOND, 0);      
          struct.setVarDateTime(varDateTime);
 
          struct.setVarSoapString("String3");