summaryrefslogtreecommitdiffstats
path: root/java/sca
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2008-09-10 21:55:29 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2008-09-10 21:55:29 +0000
commit06311e4378707d656bea53063292552f339ac93c (patch)
treeb70a16526166561272da2c4df6b61befa72f651c /java/sca
parent7eb314beabe18ec5fd5f9a1e8e12e4f405d56e1f (diff)
TUSCANY-2302: Apply patch from Kevan Miller for Exception thrown during SimpleTypeMapperExtensionTestCase
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@694019 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca')
-rw-r--r--java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java b/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
index e4b443e2fb..562c22354c 100644
--- a/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
+++ b/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
@@ -50,9 +50,11 @@ public class SimpleTypeMapperExtensionTestCase extends TestCase {
SAMPLE_VALUES.put("duration", new String[] {"P8M3DT7H33M2S", "P5Y2M10DT15H"});
SAMPLE_VALUES.put("float", new String[] {"3.1415292", "INF", "NaN"});
SAMPLE_VALUES.put("gDay", "---11");
- if (System.getProperty("java.vendor").toUpperCase().contains("SUN") && System.getProperty("java.version")
- .contains("1.5.0")) {
- // Work around a bug in SUN JDK
+ if (System.getProperty("java.vendor").toUpperCase().contains("SUN") && System.getProperty("java.version").contains("1.5.0")
+ ||
+ System.getProperty("java.vendor").toUpperCase().contains("APPLE INC.") && System.getProperty("java.version").contains("1.5.0")) {
+
+ // Work around a bug in SUN JDK (including Mac OS JDK)
SAMPLE_VALUES.put("gMonth", "--02--");
} else {
SAMPLE_VALUES.put("gMonth", "--02");