Commit in servicemix/base/src/test/java/org/servicemix on MAIN
SpringTestSupport.java+11-61.3 -> 1.4
tidied up test case

servicemix/base/src/test/java/org/servicemix
SpringTestSupport.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- SpringTestSupport.java	30 Aug 2005 19:13:45 -0000	1.3
+++ SpringTestSupport.java	31 Aug 2005 10:28:45 -0000	1.4
@@ -40,7 +40,7 @@
 import java.util.List;
 
 /**
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
  */
 public abstract class SpringTestSupport extends TestCase {
     protected transient Log log = LogFactory.getLog(getClass());
@@ -92,12 +92,17 @@
         CachedXPathAPI cachedXPathAPI = new CachedXPathAPI();
         NodeIterator iterator = cachedXPathAPI.selectNodeIterator(node, xpath);
         Node root = iterator.nextNode();
-        Element element = (Element) root;
-        if (element == null) {
-            return "";
+        if (root instanceof Element) {
+            Element element = (Element) root;
+            if (element == null) {
+                return "";
+            }
+            String text = DOMUtil.getElementText(element);
+            return text;
+        }
+        else {
+            return root.getNodeValue();
         }
-        String text = DOMUtil.getElementText(element);
-        return text;
     }
 
     protected Source getSourceFromClassPath(String fileOnClassPath) {
CVSspam 0.2.8



Reply via email to