CAMEL-8217 Fixed the CS error of XmlJsonOptionsTest
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fe622002 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fe622002 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fe622002 Branch: refs/heads/master Commit: fe622002717f502a9b0a3d4246e6f9909b92268d Parents: fb16ab6 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Thu Jan 8 15:10:41 2015 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Thu Jan 8 15:10:41 2015 +0800 ---------------------------------------------------------------------- .../dataformat/xmljson/XmlJsonOptionsTest.java | 44 ++++++++++---------- 1 file changed, 23 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/fe622002/components/camel-xmljson/src/test/java/org/apache/camel/dataformat/xmljson/XmlJsonOptionsTest.java ---------------------------------------------------------------------- diff --git a/components/camel-xmljson/src/test/java/org/apache/camel/dataformat/xmljson/XmlJsonOptionsTest.java b/components/camel-xmljson/src/test/java/org/apache/camel/dataformat/xmljson/XmlJsonOptionsTest.java index 9242f0f..ee85f03 100644 --- a/components/camel-xmljson/src/test/java/org/apache/camel/dataformat/xmljson/XmlJsonOptionsTest.java +++ b/components/camel-xmljson/src/test/java/org/apache/camel/dataformat/xmljson/XmlJsonOptionsTest.java @@ -140,9 +140,9 @@ public class XmlJsonOptionsTest extends AbstractJsonTestSupport { assertEquals("Root element must have namespace attributes", 2, document.getDocumentElement().getAttributes().getLength()); mockXML.assertIsSatisfied(); } - - @Test - public void testTypeHintsToJSON() throws Exception { + + @Test + public void testTypeHintsToJSON() throws Exception { InputStream inStream = getClass().getClassLoader().getResourceAsStream("org/apache/camel/dataformat/xmljson/testMessage5-typeHints.xml"); String in = context.getTypeConverter().convertTo(String.class, inStream); @@ -157,10 +157,10 @@ public class XmlJsonOptionsTest extends AbstractJsonTestSupport { assertEquals("root.b must be boolean", Boolean.TRUE, obj.getJSONObject("root").get("b")); mockJSON.assertIsSatisfied(); - } - - @Test - public void testTypeHintsToXML() throws Exception { + } + + @Test + public void testTypeHintsToXML() throws Exception { InputStream inStream = getClass().getClassLoader().getResourceAsStream("org/apache/camel/dataformat/xmljson/testMessage5-typeHints.json"); String in = context.getTypeConverter().convertTo(String.class, inStream); @@ -172,13 +172,15 @@ public class XmlJsonOptionsTest extends AbstractJsonTestSupport { Document document = context.getTypeConverter().convertTo(Document.class, marshalled); assertEquals("Element a should exists", 1, document.getDocumentElement().getElementsByTagName("a").getLength()); assertNotNull("Element a should have attribute type", document.getDocumentElement().getElementsByTagName("a").item(0).getAttributes().getNamedItem("type")); - assertEquals("Element a should have attribute type with value number", "number", document.getDocumentElement().getElementsByTagName("a").item(0).getAttributes().getNamedItem("type").getTextContent()); - assertEquals("Element b should have attribute type with value boolean", "boolean", document.getDocumentElement().getElementsByTagName("b").item(0).getAttributes().getNamedItem("type").getTextContent()); + assertEquals("Element a should have attribute type with value number", "number", + document.getDocumentElement().getElementsByTagName("a").item(0).getAttributes().getNamedItem("type").getTextContent()); + assertEquals("Element b should have attribute type with value boolean", + "boolean", document.getDocumentElement().getElementsByTagName("b").item(0).getAttributes().getNamedItem("type").getTextContent()); mockXML.assertIsSatisfied(); - } - - @Test - public void testPrefixedTypeHintsToJSON() throws Exception { + } + + @Test + public void testPrefixedTypeHintsToJSON() throws Exception { InputStream inStream = getClass().getClassLoader().getResourceAsStream("org/apache/camel/dataformat/xmljson/testMessage6-prefixedTypeHints.xml"); String in = context.getTypeConverter().convertTo(String.class, inStream); @@ -193,7 +195,7 @@ public class XmlJsonOptionsTest extends AbstractJsonTestSupport { assertEquals("root.b must be boolean", Boolean.TRUE, obj.getJSONObject("root").get("b")); mockJSON.assertIsSatisfied(); - } + } @Override @@ -226,18 +228,18 @@ public class XmlJsonOptionsTest extends AbstractJsonTestSupport { // from JSON to XML from("direct:unmarshalNS").unmarshal(namespacesFormat).to("mock:xmlNS"); - XmlJsonDataFormat typeHintsFormat = new XmlJsonDataFormat(); + XmlJsonDataFormat typeHintsFormat = new XmlJsonDataFormat(); typeHintsFormat.setForceTopLevelObject(true); - typeHintsFormat.setTypeHints("YES"); - // from XML to JSON + typeHintsFormat.setTypeHints("YES"); + // from XML to JSON from("direct:marshalTypeHints").marshal(typeHintsFormat).to("mock:jsonTypeHints"); // from JSON to XML from("direct:unmarshalTypeHints").unmarshal(typeHintsFormat).to("mock:xmlTypeHints"); - - XmlJsonDataFormat prefixedTypeHintsFormat = new XmlJsonDataFormat(); + + XmlJsonDataFormat prefixedTypeHintsFormat = new XmlJsonDataFormat(); prefixedTypeHintsFormat.setForceTopLevelObject(true); - prefixedTypeHintsFormat.setTypeHints("WITH_PREFIX"); - // from XML to JSON + prefixedTypeHintsFormat.setTypeHints("WITH_PREFIX"); + // from XML to JSON from("direct:marshalPrefixedTypeHints").marshal(prefixedTypeHintsFormat).to("mock:jsonPrefixedTypeHints"); }
