CAMEL-11194 Upgrade Checkstyle and update rules Fixes for tests that were broken by the header change.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f955f991 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f955f991 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f955f991 Branch: refs/heads/master Commit: f955f991c2efa6bec559f32f9dfb1d1026485324 Parents: f828996 Author: Zoran Regvart <[email protected]> Authored: Fri May 5 12:00:37 2017 +0200 Committer: Zoran Regvart <[email protected]> Committed: Sat May 6 18:51:43 2017 +0200 ---------------------------------------------------------------------- .../camel/util/XmlLineNumberParserTest.java | 20 ++++++++++---------- .../camel/component/validator/sentence.xsd | 2 +- .../common/message/CxfMessageHelperTest.java | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f955f991/camel-core/src/test/java/org/apache/camel/util/XmlLineNumberParserTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/util/XmlLineNumberParserTest.java b/camel-core/src/test/java/org/apache/camel/util/XmlLineNumberParserTest.java index 845fd0f..13b26c0c 100644 --- a/camel-core/src/test/java/org/apache/camel/util/XmlLineNumberParserTest.java +++ b/camel-core/src/test/java/org/apache/camel/util/XmlLineNumberParserTest.java @@ -38,8 +38,8 @@ public class XmlLineNumberParserTest extends TestCase { String lineNumber = (String) node.getUserData(XmlLineNumberParser.LINE_NUMBER); String lineNumberEnd = (String) node.getUserData(XmlLineNumberParser.LINE_NUMBER_END); - assertEquals("23", lineNumber); - assertEquals("48", lineNumberEnd); + assertEquals("24", lineNumber); + assertEquals("49", lineNumberEnd); } public void testParseCamelContext() throws Exception { @@ -54,8 +54,8 @@ public class XmlLineNumberParserTest extends TestCase { String lineNumber = (String) node.getUserData(XmlLineNumberParser.LINE_NUMBER); String lineNumberEnd = (String) node.getUserData(XmlLineNumberParser.LINE_NUMBER_END); - assertEquals("28", lineNumber); - assertEquals("46", lineNumberEnd); + assertEquals("29", lineNumber); + assertEquals("47", lineNumberEnd); } public void testParseCamelContextForceNamespace() throws Exception { @@ -73,8 +73,8 @@ public class XmlLineNumberParserTest extends TestCase { String ns = node.getNamespaceURI(); assertEquals("http://camel.apache.org/schema/spring";, ns); - assertEquals("28", lineNumber); - assertEquals("46", lineNumberEnd); + assertEquals("29", lineNumber); + assertEquals("47", lineNumberEnd); // and there are two routes list = dom.getElementsByTagName("route"); @@ -84,13 +84,13 @@ public class XmlLineNumberParserTest extends TestCase { String lineNumber1 = (String) node1.getUserData(XmlLineNumberParser.LINE_NUMBER); String lineNumberEnd1 = (String) node1.getUserData(XmlLineNumberParser.LINE_NUMBER_END); - assertEquals("30", lineNumber1); - assertEquals("36", lineNumberEnd1); + assertEquals("31", lineNumber1); + assertEquals("37", lineNumberEnd1); String lineNumber2 = (String) node2.getUserData(XmlLineNumberParser.LINE_NUMBER); String lineNumberEnd2 = (String) node2.getUserData(XmlLineNumberParser.LINE_NUMBER_END); - assertEquals("38", lineNumber2); - assertEquals("44", lineNumberEnd2); + assertEquals("39", lineNumber2); + assertEquals("45", lineNumberEnd2); } } http://git-wip-us.apache.org/repos/asf/camel/blob/f955f991/camel-core/src/test/resources/org/apache/camel/component/validator/sentence.xsd ---------------------------------------------------------------------- diff --git a/camel-core/src/test/resources/org/apache/camel/component/validator/sentence.xsd b/camel-core/src/test/resources/org/apache/camel/component/validator/sentence.xsd index 4d2e42c..2966269 100644 --- a/camel-core/src/test/resources/org/apache/camel/component/validator/sentence.xsd +++ b/camel-core/src/test/resources/org/apache/camel/component/validator/sentence.xsd @@ -22,7 +22,7 @@ xmlns:xs="http://www.w3.org/2001/XMLSchema";> <xs:simpleType name="sentence"> <xs:restriction base="xs:string"> - <xs:pattern value="[a-zA-Z�' ]*" /> + <xs:pattern value="[a-zA-Zé' ]*" /> </xs:restriction> </xs:simpleType> </xs:schema> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/f955f991/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/CxfMessageHelperTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/CxfMessageHelperTest.java b/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/CxfMessageHelperTest.java index c9ff43c..136adbb 100644 --- a/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/CxfMessageHelperTest.java +++ b/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/CxfMessageHelperTest.java @@ -108,7 +108,7 @@ public class CxfMessageHelperTest extends Assert { IOHelper.copy(is, os); is.close(); os.writeCacheTo(out); - return out.toString(); + return out.toString().replaceAll("(?s)<\\?.*\\?>", "").replaceAll("(?s)<!--.*-->", "").replaceAll("\\n", ""); }
