Unittests: Account for b979fe19e5 (fix one test and add two more)

- Unused XML namespace declarations *are supposed* to be removed
- XML namespace declarations that are used as prefix for elements/attributes *must not* be removed

testscour.py

@@ -931,12 +931,26 @@ class WellFormedXMLAmpersandInTextContent(unittest.TestCase):
 		self.assertTrue( wellformed.find('<desc>Peanut Butter &amp; Jelly</desc>') != -1,
 			'Improperly serialized &amp; in text content')
 
-class WellFormedXMLNamespacePrefix(unittest.TestCase):
+class WellFormedXMLNamespacePrefixRemoveUnused(unittest.TestCase):
 	def runTest(self):
 		with open('unittests/xml-well-formed.svg') as f:
 			wellformed = scour.scourString(f.read())
-		self.assertTrue( wellformed.find('xmlns:foo=') != -1,
+		self.assertTrue( wellformed.find('xmlns:foo=') == -1,
-			'Improperly serialized namespace prefix declarations')
+			'Improperly serialized namespace prefix declarations: Unused namespace decaration not removed')
+
+class WellFormedXMLNamespacePrefixKeepUsedElementPrefix(unittest.TestCase):
+	def runTest(self):
+		with open('unittests/xml-well-formed.svg') as f:
+			wellformed = scour.scourString(f.read())
+		self.assertTrue( wellformed.find('xmlns:bar=') != -1,
+			'Improperly serialized namespace prefix declarations: Used element prefix removed')
+
+class WellFormedXMLNamespacePrefixKeepUsedAttributePrefix(unittest.TestCase):
+	def runTest(self):
+		with open('unittests/xml-well-formed.svg') as f:
+			wellformed = scour.scourString(f.read())
+		self.assertTrue( wellformed.find('xmlns:baz=') != -1,
+			'Improperly serialized namespace prefix declarations: Used attribute prefix removed')
 
 class NamespaceDeclPrefixesInXMLWhenNotInDefaultNamespace(unittest.TestCase):
 	def runTest(self):

unittests/xml-well-formed.svg

@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:foo="http://foo/">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:foo="http://foo/" xmlns:bar="http://bar/" xmlns:baz="http://baz/">
 	<!-- &lt;Jack &amp; Jill&gt; -->
 	<title>2 &lt; 5</title>
 	<desc>Peanut Butter &amp; Jelly</desc>
 	<glyph id="lt" unicode="&lt;"/>
 	<glyph id="amp" unicode="&amp;"/>
+	<glyph id="gt" unicode="&gt;" bar:attr="xyz"/>
+	<baz:glyph id="quot" unicode="&quot;"/>
 	<text x="50" y="50">&#x389;TML &#x26; CSS</text>
 </svg>