You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2014/06/05 08:22:49 UTC

[4/5] git commit: CAMEL-7479: Make unit tests run with any JVM system locale

CAMEL-7479: Make unit tests run with any JVM system locale

Use SAX validation error code instead of the localized error message in
assert statements, so that the tests run with any JVM system locale.

Signed-off-by: Gregor Zurowski <gr...@zurowski.org>


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0d0d56aa
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0d0d56aa
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0d0d56aa

Branch: refs/heads/camel-2.13.x
Commit: 0d0d56aa6b0baa9b409db7381b05ab7b294d3ccd
Parents: 7a5e7a5
Author: Gregor Zurowski <gr...@zurowski.org>
Authored: Thu Jun 5 00:20:45 2014 -0400
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jun 5 07:37:53 2014 +0200

----------------------------------------------------------------------
 .../converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java | 4 ++--
 .../camel/converter/jaxb/JaxbDataFormatSchemaValidationTest.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/0d0d56aa/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java
index 4575fcc..8af1321 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java
@@ -76,7 +76,7 @@ public class JaxbDataFormatSchemaValidationSpringTest extends CamelSpringTestSup
             assertIsInstanceOf(IOException.class, cause);
             assertTrue(cause.getMessage().contains("javax.xml.bind.MarshalException"));
             assertTrue(cause.getMessage().contains("org.xml.sax.SAXParseException"));
-            assertTrue(cause.getMessage().contains("Invalid content was found"));
+            assertTrue(cause.getMessage().contains("cvc-complex-type.2.4.a"));
         }
     }
 
@@ -119,7 +119,7 @@ public class JaxbDataFormatSchemaValidationSpringTest extends CamelSpringTestSup
             assertIsInstanceOf(IOException.class, cause);
             assertTrue(cause.getMessage().contains("javax.xml.bind.UnmarshalException"));
             assertTrue(cause.getMessage().contains("org.xml.sax.SAXParseException"));
-            assertTrue(cause.getMessage().contains("The content of element 'person' is not complete"));
+            assertTrue(cause.getMessage().contains("cvc-complex-type.2.4.b"));
         }
     }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/0d0d56aa/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTest.java
index f6c1a2f..ccd87b5 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTest.java
@@ -75,7 +75,7 @@ public class JaxbDataFormatSchemaValidationTest extends CamelTestSupport {
             assertIsInstanceOf(IOException.class, cause);
             assertTrue(cause.getMessage().contains("javax.xml.bind.MarshalException"));
             assertTrue(cause.getMessage().contains("org.xml.sax.SAXParseException"));
-            assertTrue(cause.getMessage().contains("Invalid content was found"));
+            assertTrue(cause.getMessage().contains("cvc-complex-type.2.4.a"));
         }
     }
 
@@ -118,7 +118,7 @@ public class JaxbDataFormatSchemaValidationTest extends CamelTestSupport {
             assertIsInstanceOf(IOException.class, cause);
             assertTrue(cause.getMessage().contains("javax.xml.bind.UnmarshalException"));
             assertTrue(cause.getMessage().contains("org.xml.sax.SAXParseException"));
-            assertTrue(cause.getMessage().contains("The content of element 'person' is not complete"));
+            assertTrue(cause.getMessage().contains("cvc-complex-type.2.4.b"));
         }
     }