Refactor XML document readers to use org.xml.sax.Attributes.getQName(). For these readers, this is more correct than getLocalName(), which can return an empty string in some JVM implementations.

Kerry Kimbrough · Kerry Kimbrough · commit c7d3524d11d7 · 2016-02-18T18:17:27.000-06:00
diff --git a/tcases-lib/src/main/java/org/cornutum/tcases/generator/io/GeneratorSetDocReader.java b/tcases-lib/src/main/java/org/cornutum/tcases/generator/io/GeneratorSetDocReader.java
@@ -124,11 +124,11 @@ public void validateAttributes( String elementName, Attributes attributes) throw
       Set<String> validAttributes = getValidAttributes();
       for( int i = attributes.getLength() - 1; i >= 0; i--)
         {
-        if( !validAttributes.contains( attributes.getLocalName(i)))
+        if( !validAttributes.contains( attributes.getQName(i)))
           {
           throw
             new SAXParseException
-            ( "Attribute=" + attributes.getLocalName(i)
+            ( "Attribute=" + attributes.getQName(i)
               + " is not allowed for " + elementName + " elements",
               getDocumentLocator());
           }
diff --git a/tcases-lib/src/main/java/org/cornutum/tcases/io/SystemInputDocReader.java b/tcases-lib/src/main/java/org/cornutum/tcases/io/SystemInputDocReader.java
@@ -125,11 +125,11 @@ public void validateAttributes( String elementName, Attributes attributes) throw
       Set<String> validAttributes = getValidAttributes();
       for( int i = attributes.getLength() - 1; i >= 0; i--)
         {
-        if( !validAttributes.contains( attributes.getLocalName(i)))
+        if( !validAttributes.contains( attributes.getQName(i)))
           {
           throw
             new SAXParseException
-            ( "Attribute=" + attributes.getLocalName(i)
+            ( "Attribute=" + attributes.getQName(i)
               + " is not allowed for " + elementName + " elements",
               getDocumentLocator());
           }
diff --git a/tcases-lib/src/main/java/org/cornutum/tcases/io/SystemTestDocReader.java b/tcases-lib/src/main/java/org/cornutum/tcases/io/SystemTestDocReader.java
@@ -206,11 +206,11 @@ public void validateAttributes( String elementName, Attributes attributes) throw
       Set<String> validAttributes = getValidAttributes();
       for( int i = attributes.getLength() - 1; i >= 0; i--)
         {
-        if( !validAttributes.contains( attributes.getLocalName(i)))
+        if( !validAttributes.contains( attributes.getQName(i)))
           {
           throw
             new SAXParseException
-            ( "Attribute=" + attributes.getLocalName(i)
+            ( "Attribute=" + attributes.getQName(i)
               + " is not allowed for " + elementName + " elements",
               getDocumentLocator());
           }

Original file line number	Diff line number	Diff line change
`@@ -124,11 +124,11 @@ public void validateAttributes( String elementName, Attributes attributes) throw`
`124`	`124`	`Set<String> validAttributes = getValidAttributes();`
`125`	`125`	`for( int i = attributes.getLength() - 1; i >= 0; i--)`
`126`	`126`	`{`
`127`		`- if( !validAttributes.contains( attributes.getLocalName(i)))`
	`127`	`+ if( !validAttributes.contains( attributes.getQName(i)))`
`128`	`128`	`{`
`129`	`129`	`throw`
`130`	`130`	`new SAXParseException`
`131`		`- ( "Attribute=" + attributes.getLocalName(i)`
	`131`	`+ ( "Attribute=" + attributes.getQName(i)`
`132`	`132`	`+ " is not allowed for " + elementName + " elements",`
`133`	`133`	`getDocumentLocator());`
`134`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,11 +125,11 @@ public void validateAttributes( String elementName, Attributes attributes) throw`
`125`	`125`	`Set<String> validAttributes = getValidAttributes();`
`126`	`126`	`for( int i = attributes.getLength() - 1; i >= 0; i--)`
`127`	`127`	`{`
`128`		`- if( !validAttributes.contains( attributes.getLocalName(i)))`
	`128`	`+ if( !validAttributes.contains( attributes.getQName(i)))`
`129`	`129`	`{`
`130`	`130`	`throw`
`131`	`131`	`new SAXParseException`
`132`		`- ( "Attribute=" + attributes.getLocalName(i)`
	`132`	`+ ( "Attribute=" + attributes.getQName(i)`
`133`	`133`	`+ " is not allowed for " + elementName + " elements",`
`134`	`134`	`getDocumentLocator());`
`135`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -206,11 +206,11 @@ public void validateAttributes( String elementName, Attributes attributes) throw`
`206`	`206`	`Set<String> validAttributes = getValidAttributes();`
`207`	`207`	`for( int i = attributes.getLength() - 1; i >= 0; i--)`
`208`	`208`	`{`
`209`		`- if( !validAttributes.contains( attributes.getLocalName(i)))`
	`209`	`+ if( !validAttributes.contains( attributes.getQName(i)))`
`210`	`210`	`{`
`211`	`211`	`throw`
`212`	`212`	`new SAXParseException`
`213`		`- ( "Attribute=" + attributes.getLocalName(i)`
	`213`	`+ ( "Attribute=" + attributes.getQName(i)`
`214`	`214`	`+ " is not allowed for " + elementName + " elements",`
`215`	`215`	`getDocumentLocator());`
`216`	`216`	`}`