camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject [07/13] git commit: CAMEL-7220 Fixed CS errors
Date Fri, 12 Sep 2014 15:40:25 GMT
CAMEL-7220 Fixed CS errors


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

Branch: refs/heads/camel-2.14.x
Commit: ff33ae7579012cf58abc208c8cc988617625435b
Parents: 65384fa
Author: Willem Jiang <willem.jiang@gmail.com>
Authored: Fri Sep 12 23:15:29 2014 +0800
Committer: Willem Jiang <willem.jiang@gmail.com>
Committed: Fri Sep 12 23:39:12 2014 +0800

----------------------------------------------------------------------
 .../camel/component/schematron/SchematronComponentTest.java | 6 ------
 .../camel/component/schematron/SchematronEndpointTest.java  | 2 +-
 .../camel/component/schematron/SchematronProducerTest.java  | 5 +++--
 .../schematron/processor/SchematronProcessorTest.java       | 9 ++++-----
 .../schematron/processor/TemplatesFactoryTest.java          | 4 ++--
 .../org/apache/camel/component/schematron/util/Utils.java   | 6 +++---
 6 files changed, 13 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/ff33ae75/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronComponentTest.java
----------------------------------------------------------------------
diff --git a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronComponentTest.java
b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronComponentTest.java
index 70f8ac2..9f34291 100644
--- a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronComponentTest.java
+++ b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronComponentTest.java
@@ -22,13 +22,8 @@ import org.apache.camel.component.schematron.constant.Constants;
 import org.apache.camel.component.schematron.util.Utils;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.commons.io.IOUtils;
-import org.custommonkey.xmlunit.Diff;
-import org.custommonkey.xmlunit.DifferenceListener;
-import org.custommonkey.xmlunit.IgnoreTextAndAttributeValuesDifferenceListener;
 import org.junit.Test;
 
-import static junit.framework.Assert.assertEquals;
-
 /**
  * Schematron Component Test.
  */
@@ -44,7 +39,6 @@ public class SchematronComponentTest extends CamelTestSupport {
         mock.expectedMinimumMessageCount(1);
 
         String payload = IOUtils.toString(ClassLoader.getSystemResourceAsStream("xml/article-1.xml"));
-        String expected = IOUtils.toString(ClassLoader.getSystemResourceAsStream("report/article-1-report.xml"));
         template.sendBody("direct:start", payload);
         assertMockEndpointsSatisfied();
         String result = mock.getExchanges().get(0).getIn().getHeader(Constants.VALIDATION_REPORT,
String.class);

http://git-wip-us.apache.org/repos/asf/camel/blob/ff33ae75/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronEndpointTest.java
----------------------------------------------------------------------
diff --git a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronEndpointTest.java
b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronEndpointTest.java
index 6ac1389..28744b6 100644
--- a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronEndpointTest.java
+++ b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronEndpointTest.java
@@ -21,8 +21,8 @@ import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.Producer;
-import org.apache.camel.component.schematron.exception.SchematronValidationException;
 import org.apache.camel.component.schematron.constant.Constants;
+import org.apache.camel.component.schematron.exception.SchematronValidationException;
 import org.apache.camel.impl.DefaultExchange;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.commons.io.IOUtils;

http://git-wip-us.apache.org/repos/asf/camel/blob/ff33ae75/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronProducerTest.java
b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronProducerTest.java
index 5bdf9a7..169f7f2 100644
--- a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronProducerTest.java
+++ b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronProducerTest.java
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.component.schematron;
 
+import javax.xml.transform.Templates;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.component.schematron.constant.Constants;
@@ -24,11 +26,10 @@ import org.apache.camel.impl.DefaultExchange;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import javax.xml.transform.Templates;
 
 /**
  * Schematron Producer Unit Test.
- * <p/>
+ * 
  */
 public class SchematronProducerTest extends CamelTestSupport {
 

http://git-wip-us.apache.org/repos/asf/camel/blob/ff33ae75/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/processor/SchematronProcessorTest.java
----------------------------------------------------------------------
diff --git a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/processor/SchematronProcessorTest.java
b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/processor/SchematronProcessorTest.java
index 198a176..78b42d7 100644
--- a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/processor/SchematronProcessorTest.java
+++ b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/processor/SchematronProcessorTest.java
@@ -16,15 +16,15 @@
  */
 package org.apache.camel.component.schematron.processor;
 
+import javax.xml.transform.Templates;
+
 import org.apache.camel.component.schematron.util.Utils;
 import org.apache.commons.io.IOUtils;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.xml.transform.Templates;
-
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
 
 /**
  * SchematronEngine Unit Test.
@@ -38,8 +38,7 @@ public class SchematronProcessorTest {
 
         String payload = IOUtils.toString(ClassLoader.getSystemResourceAsStream("xml/article-1.xml"));
         logger.info("Validating payload: {}", payload);
-        String expected = IOUtils.toString(ClassLoader.getSystemResourceAsStream("report/article-1-report.xml"));
-
+       
         // validate
         String result = getProcessor("sch/schematron-1.sch").validate(payload);
         logger.info("Schematron Report: {}", result);

http://git-wip-us.apache.org/repos/asf/camel/blob/ff33ae75/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/processor/TemplatesFactoryTest.java
----------------------------------------------------------------------
diff --git a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/processor/TemplatesFactoryTest.java
b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/processor/TemplatesFactoryTest.java
index 5c536ee..e302740 100644
--- a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/processor/TemplatesFactoryTest.java
+++ b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/processor/TemplatesFactoryTest.java
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.component.schematron.processor;
 
+import javax.xml.transform.Templates;
+
 import org.junit.Assert;
 import org.junit.Test;
 
-import javax.xml.transform.Templates;
-
 /**
  * TemplateFactory Unit Test.
  *

http://git-wip-us.apache.org/repos/asf/camel/blob/ff33ae75/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/util/Utils.java
----------------------------------------------------------------------
diff --git a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/util/Utils.java
b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/util/Utils.java
index 1754e44..18fd576 100644
--- a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/util/Utils.java
+++ b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/util/Utils.java
@@ -16,6 +16,9 @@
  */
 package org.apache.camel.component.schematron.util;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.component.schematron.constant.Constants;
 import org.custommonkey.xmlunit.SimpleNamespaceContext;
@@ -23,12 +26,9 @@ import org.custommonkey.xmlunit.XMLUnit;
 import org.custommonkey.xmlunit.XpathEngine;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * Utility Class.
- * <p/>
  */
 public final class Utils {
 


Mime
View raw message