[Practicalxml-commits] SF.net SVN: practicalxml:[88] trunk/src/main/java/net/sf/practicalxml/junit /DomAsserts.java

[Auto-Generated S. C. M. <pra...@li...>]

Revision: 88
          http://practicalxml.svn.sourceforge.net/practicalxml/?rev=88&view=rev
Author:   kdgregory
Date:     2009-07-15 19:28:12 +0000 (Wed, 15 Jul 2009)

Log Message:
-----------
DomAsserts - rename params for clarity

Modified Paths:
--------------
    trunk/src/main/java/net/sf/practicalxml/junit/DomAsserts.java

Modified: trunk/src/main/java/net/sf/practicalxml/junit/DomAsserts.java
===================================================================
--- trunk/src/main/java/net/sf/practicalxml/junit/DomAsserts.java	2009-07-15 19:23:56 UTC (rev 87)
+++ trunk/src/main/java/net/sf/practicalxml/junit/DomAsserts.java	2009-07-15 19:28:12 UTC (rev 88)
@@ -62,7 +62,7 @@
 
 
     /**
-     *  Asserts that an element has the given name and namespace URI.
+     *  Asserts that an element has the given local name and namespace URI.
      *  <p>
      *  If assertion fails, will display message indicating whether name or
      *  namespace was invalid.
@@ -70,32 +70,32 @@
      *  @param  expectedNSUri   The expected namespace URI. May be <code>null
      *                          </code> to assert that the element does not
      *                          have a namespace.
-     *  @param  expectedName    The expected name.
+     *  @param  localName       The expected name, sans prefix
      *  @param  elem            The element to assert.
      */
     public static void assertNamespaceAndName(
-            String expectedNSUri, String expectedName, Element elem)
+            String expectedNSUri, String localName, Element elem)
     {
         Assert.assertEquals("invalid namespace", expectedNSUri, elem.getNamespaceURI());
-        Assert.assertEquals("invalid localname", expectedName, DomUtil.getLocalName(elem));
+        Assert.assertEquals("invalid localname", localName, DomUtil.getLocalName(elem));
     }
 
 
     /**
-     *  Asserts that an element has the given name and namespace URI.
+     *  Asserts that an element has the given local name and namespace URI.
      *
      *  @param  message         Message to display if assertion fails.
      *  @param  expectedNSUri   The expected namespace URI. May be <code>null
      *                          </code> to assert that the element does not
      *                          have a namespace.
-     *  @param  expectedName    The expected name.
+     *  @param  localName       The expected name, sans prefix
      *  @param  elem            The element to assert.
      */
     public static void assertNamespaceAndName(
-            String message, String expectedNSUri, String expectedName, Element elem)
+            String message, String expectedNSUri, String localName, Element elem)
     {
         Assert.assertEquals(message, expectedNSUri, elem.getNamespaceURI());
-        Assert.assertEquals(message, expectedName, DomUtil.getLocalName(elem));
+        Assert.assertEquals(message, localName, DomUtil.getLocalName(elem));
     }
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.