Adjust a couple more test fields that differ after an invocation depending on the environment

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1241800 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 8 insertions, 0 deletions

diff --git a/sca-java-2.x/trunk/testing/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java b/sca-java-2.x/trunk/testing/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
index dd9a689353..4545ac379e 100644
--- a/sca-java-2.x/trunk/testing/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
+++ b/sca-java-2.x/trunk/testing/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
@@ -1001,6 +1001,8 @@ public class StandardTypesDatabindingTestCase {
                 // The instance returned by service method invoked over binding.ws seems to have a gregorianCutover
                 // different from the instance passed.  Adjust the gregorianCutover as per the input instance.
                 ((GregorianCalendar)actual).setGregorianChange(((GregorianCalendar)ca[i]).getGregorianChange());
+                ((GregorianCalendar)actual).setMinimalDaysInFirstWeek(((GregorianCalendar)ca[i]).getMinimalDaysInFirstWeek());
+                ((GregorianCalendar)actual).setFirstDayOfWeek(((GregorianCalendar)ca[i]).getFirstDayOfWeek());
             }
             Assert.assertEquals(ca[i], actual);
         }
@@ -1022,6 +1024,8 @@ public class StandardTypesDatabindingTestCase {
                 // The instance returned by service method invoked over binding.ws seems to have a gregorianCutover
                 // different from the instance passed.  Adjust the gregorianCutover as per the input instance.
                 ((GregorianCalendar)actual[i]).setGregorianChange(((GregorianCalendar)ca[i]).getGregorianChange());
+                ((GregorianCalendar)actual[i]).setMinimalDaysInFirstWeek(((GregorianCalendar)ca[i]).getMinimalDaysInFirstWeek());
+                ((GregorianCalendar)actual[i]).setFirstDayOfWeek(((GregorianCalendar)ca[i]).getFirstDayOfWeek());
             }
             Assert.assertEquals(ca[i], actual[i]);
         }
diff --git a/sca-java-2.x/trunk/testing/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java b/sca-java-2.x/trunk/testing/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
index 7499978c0e..6647394e55 100644
--- a/sca-java-2.x/trunk/testing/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
+++ b/sca-java-2.x/trunk/testing/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
@@ -1000,6 +1000,8 @@ public class StandardTypesDatabindingTestCase {
                 // The instance returned by service method invoked over binding.ws seems to have a gregorianCutover
                 // different from the instance passed.  Adjust the gregorianCutover as per the input instance.
                 ((GregorianCalendar)actual).setGregorianChange(((GregorianCalendar)ca[i]).getGregorianChange());
+                ((GregorianCalendar)actual).setMinimalDaysInFirstWeek(((GregorianCalendar)ca[i]).getMinimalDaysInFirstWeek());
+                ((GregorianCalendar)actual).setFirstDayOfWeek(((GregorianCalendar)ca[i]).getFirstDayOfWeek());
             }
             Assert.assertEquals(ca[i], actual);
         }
@@ -1021,6 +1023,8 @@ public class StandardTypesDatabindingTestCase {
                 // The instance returned by service method invoked over binding.ws seems to have a gregorianCutover
                 // different from the instance passed.  Adjust the gregorianCutover as per the input instance.
                 ((GregorianCalendar)actual[i]).setGregorianChange(((GregorianCalendar)ca[i]).getGregorianChange());
+                ((GregorianCalendar)actual[i]).setMinimalDaysInFirstWeek(((GregorianCalendar)ca[i]).getMinimalDaysInFirstWeek());
+                ((GregorianCalendar)actual[i]).setFirstDayOfWeek(((GregorianCalendar)ca[i]).getFirstDayOfWeek());
             }
             Assert.assertEquals(ca[i], actual[i]);
         }