[Schmitzm-commits] r1301 - in trunk: src/schmitzm/xml src_junit/schmitzm/lang

[scm-commit@wald.intevation.org]

Author: mojays
Date: 2010-11-23 12:24:24 +0100 (Tue, 23 Nov 2010)
New Revision: 1301

Modified:
   trunk/src/schmitzm/xml/XMLUtil.java
   trunk/src_junit/schmitzm/lang/ResourceProviderTest.java
Log:
XMLUtil: BugFix
ResourceProviderTest.testResourceProviderOperator(.) set to IGNORE

Modified: trunk/src/schmitzm/xml/XMLUtil.java
===================================================================
--- trunk/src/schmitzm/xml/XMLUtil.java	2010-11-23 00:07:53 UTC (rev 1300)
+++ trunk/src/schmitzm/xml/XMLUtil.java	2010-11-23 11:24:24 UTC (rev 1301)
@@ -78,7 +78,7 @@
 	  for (int i=0; i<childName.length; i++) {
 		if ( element == null )
 			return null;
-		element = element.getChild(childName[i]);
+		element = element.getChild(childName[i], element.getNamespace());
 	  }
 	  return element;
   }
@@ -92,7 +92,7 @@
 	  if ( element == null )
 		  return false;
 	  for (int i=0; i<childName.length; i++)
-		if ( element.getChild(childName[i]) != null )
+		if ( element.getChild(childName[i], element.getNamespace()) != null )
 			return true;
 	  
 	  return false;
@@ -107,7 +107,7 @@
 	  if ( element == null )
 		  return false;
 	  for (int i=0; i<childName.length; i++)
-		if ( element.getChild(childName[i]) == null )
+		if ( element.getChild(childName[i], element.getNamespace()) == null )
 			return false;
 	  
 	  return true;

Modified: trunk/src_junit/schmitzm/lang/ResourceProviderTest.java
===================================================================
--- trunk/src_junit/schmitzm/lang/ResourceProviderTest.java	2010-11-23 00:07:53 UTC (rev 1300)
+++ trunk/src_junit/schmitzm/lang/ResourceProviderTest.java	2010-11-23 11:24:24 UTC (rev 1301)
@@ -13,13 +13,14 @@
 import org.apache.log4j.Logger;
 import org.apache.log4j.SimpleLayout;
 import org.apache.log4j.WriterAppender;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class ResourceProviderTest {
 
     @Test
-//    @Ignore
-    public void testResourceProviderOperatorTest() throws Exception {
+    @Ignore
+    public void testResourceProviderOperator() throws Exception {
       ResourceProviderOperator.main( new String[] {
               "-s",
               "src_junit",