You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/03/22 02:44:28 UTC
git commit: CAMEL-7319 Fixed the dead code of
XPathTest.testUsingJavaExtensions
Repository: camel
Updated Branches:
refs/heads/master 459cf47fe -> aef0426c9
CAMEL-7319 Fixed the dead code of XPathTest.testUsingJavaExtensions
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/aef0426c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/aef0426c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/aef0426c
Branch: refs/heads/master
Commit: aef0426c9be010b757c41587a3506e0a053e2aea
Parents: 459cf47
Author: Willem Jiang <wi...@gmail.com>
Authored: Sat Mar 22 09:43:42 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Sat Mar 22 09:43:42 2014 +0800
----------------------------------------------------------------------
.../org/apache/camel/builder/xml/XPathTest.java | 29 ++++++++++++--------
1 file changed, 18 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/aef0426c/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java b/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
index 99eb53e..08ec4ff 100644
--- a/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
+++ b/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
@@ -268,24 +268,31 @@ public class XPathTest extends ContextTestSupport {
}
public void testUsingJavaExtensions() throws Exception {
- Object instance;
+ Object instance = null;
// we may not have Xalan on the classpath
try {
instance = Class.forName("org.apache.xalan.extensions.XPathFunctionResolverImpl").newInstance();
-
- if (instance instanceof XPathFunctionResolver) {
- XPathFunctionResolver functionResolver = (XPathFunctionResolver)instance;
-
- XPathBuilder builder = xpath("java:" + getClass().getName() + ".func(string(/header/value))").namespace("java", "http://xml.apache.org/xalan/java").functionResolver(functionResolver);
-
- String xml = "<header><value>12</value></header>";
- Object value = assertExpression(builder, xml, "modified12");
- log.debug("Evaluated xpath: " + builder.getText() + " on XML: " + xml + " result: " + value);
- }
} catch (Throwable e) {
+
log.debug("Could not find Xalan on the classpath so ignoring this test case: " + e);
}
+ if (instance instanceof XPathFunctionResolver) {
+ XPathFunctionResolver functionResolver = (XPathFunctionResolver)instance;
+
+ XPathBuilder builder = xpath("java:" + getClass().getName() + ".func(string(/header/value))")
+ .namespace("java", "http://xml.apache.org/xalan/java").functionResolver(functionResolver)
+ .stringResult();
+
+ String xml = "<header><value>12</value></header>";
+ // it can throw the exception if we put the xalan into the test class path
+ assertExpression(builder, xml, "modified12");
+ }
+
+ }
+
+ public static String func(String message) {
+ return "modified" + message;
}
protected Object assertExpression(String xpath, String xml, String expected) {