[utilities COMMIT] in /java-support/trunk/src: main/java/net/shibboleth/utilities/java/support/xml/ElementSupport.jav...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Jan 17 10:42:42 2012
New Revision: 207

URL: http://svn.shibboleth.net/view/utilities?rev=207&view=rev
Log:
The rest of testing for ElementSupport.  Fix wrong annotation in ElementSupport and overeager initialization in AttributeSupport

Added:
    java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/xml/elementSupportTest.xml   (with props)
Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/ElementSupport.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/AttributeSupportTest.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/ElementSupportTest.java

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/ElementSupport.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/ElementSupport.java?rev=207&r1=206&r2=207&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/ElementSupport.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/ElementSupport.java Tue Jan 17 10:42:42 2012
@@ -360,7 +360,7 @@
      * 
      * @return child elements indexed by namespace qualifed tag name, never null
      */
-    @Nonnull public static Map<QName, List<Element>> getIndexedChildElements(@Nonnull final Element root) {
+    @Nonnull public static Map<QName, List<Element>> getIndexedChildElements(@Nullable final Element root) {
         if (root == null) {
             return Collections.emptyMap();
         }

Modified: java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/AttributeSupportTest.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/AttributeSupportTest.java?rev=207&r1=206&r2=207&view=diff
==============================================================================
--- java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/AttributeSupportTest.java (original)
+++ java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/AttributeSupportTest.java Tue Jan 17 10:42:42 2012
@@ -72,7 +72,7 @@
     // Reset before each method.
     private Document document;
 
-    private BasicParserPool parserPool = new BasicParserPool();
+    private BasicParserPool parserPool;
 
     @BeforeTest public void setUp() throws XMLParserException, ComponentInitializationException, SAXException,
             IOException, ResourceException {

Modified: java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/ElementSupportTest.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/ElementSupportTest.java?rev=207&r1=206&r2=207&view=diff
==============================================================================
--- java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/ElementSupportTest.java (original)
+++ java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/ElementSupportTest.java Tue Jan 17 10:42:42 2012
@@ -26,6 +26,7 @@
 import javax.xml.parsers.DocumentBuilder;
 
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.resource.ClasspathResource;
 import net.shibboleth.utilities.java.support.resource.ResourceException;
 
@@ -37,7 +38,8 @@
 import org.xml.sax.SAXException;
 
 /**
- *
+ * Test {@link ElementSupport}. These tests use {@link Test#dependsOnMethods()} to ensure that we suppress a test if
+ * functionality it relies on has not been tested correctly. This avoids false failures.
  */
 public class ElementSupportTest {
 
@@ -55,7 +57,9 @@
 
     private BasicParserPool parserPool;
 
-    private Document testFile;
+    private Document testFileDocument;
+
+    private Document testerDocument;
 
     private Element rootElement;
 
@@ -70,8 +74,9 @@
             ClasspathResource resource =
                     new ClasspathResource("data/net/shibboleth/utilities/java/support/xml/elementSupportTest.xml");
             resource.initialize();
-            testFile = builder.parse(resource.getInputStream());
-            rootElement = (Element) testFile.getFirstChild();
+            testFileDocument = builder.parse(resource.getInputStream());
+            rootElement = (Element) testFileDocument.getFirstChild();
+            testerDocument = builder.newDocument();
 
         } finally {
             parserPool.returnBuilder(builder);
@@ -169,7 +174,7 @@
 
     }
 
-    @Test public void testGetElementContentAsQName() {
+    @Test(dependsOnMethods = {"testGetChildElementsByTagName"}) public void testGetElementContentAsQName() {
         Assert.assertNull(ElementSupport.getElementContentAsQName(null),

[... 236 lines stripped ...]