marcus/scour
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Unittests: Run python-modernize

Browse source
This commit is contained in:
Eduard Braun 2015-12-06 21:20:05 +01:00
parent 391ff77659
commit 320bdda6e9
2 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
testcss.py
View file

@ -19,9 +19,13 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from __future__ import absolute_import
import unittest import unittest
from scour.yocto_css import parseCssString from scour.yocto_css import parseCssString
class Blank(unittest.TestCase): class Blank(unittest.TestCase):
def runTest(self): def runTest(self):
r = parseCssString('') r = parseCssString('')

17
testscour.py
View file

@ -20,11 +20,18 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from __future__ import absolute_import
import six
from six.moves import map, range
import unittest import unittest
import xml.dom.minidom import xml.dom.minidom
from scour.svg_regex import svg_parser from scour.svg_regex import svg_parser
from scour.scour import scourXmlFile, scourString, parse_args, makeWellFormed from scour.scour import scourXmlFile, scourString, parse_args, makeWellFormed
SVGNS = 'http://www.w3.org/2000/svg' SVGNS = 'http://www.w3.org/2000/svg'
# I couldn't figure out how to get ElementTree to work with the following XPath # I couldn't figure out how to get ElementTree to work with the following XPath
@ -591,7 +598,7 @@ class ChangeQuadToShorthandInPath(unittest.TestCase):
class HandleNonAsciiUtf8(unittest.TestCase): class HandleNonAsciiUtf8(unittest.TestCase):
def runTest(self): def runTest(self):
doc = scour.scourXmlFile('unittests/utf8.svg') doc = scour.scourXmlFile('unittests/utf8.svg')
desc = unicode(doc.getElementsByTagNameNS(SVGNS, 'desc')[0].firstChild.wholeText).strip() desc = six.text_type(doc.getElementsByTagNameNS(SVGNS, 'desc')[0].firstChild.wholeText).strip()
self.assertEquals( desc, u'ú', self.assertEquals( desc, u'ú',
'Did not handle non-ASCII characters' ) 'Did not handle non-ASCII characters' )
@ -1066,7 +1073,7 @@ class RemoveMetadataOption(unittest.TestCase):
class EnableCommentStrippingOption(unittest.TestCase): class EnableCommentStrippingOption(unittest.TestCase):
def runTest(self): def runTest(self):
docStr = file('unittests/comment-beside-xml-decl.svg').read() docStr = open('unittests/comment-beside-xml-decl.svg').read()
docStr = scour.scourString(docStr, docStr = scour.scourString(docStr,
scour.parse_args(['--enable-comment-stripping'])[0]) scour.parse_args(['--enable-comment-stripping'])[0])
self.assertEquals(docStr.find('<!--'), -1, self.assertEquals(docStr.find('<!--'), -1,
@ -1074,7 +1081,7 @@ class EnableCommentStrippingOption(unittest.TestCase):
class StripXmlPrologOption(unittest.TestCase): class StripXmlPrologOption(unittest.TestCase):
def runTest(self): def runTest(self):
docStr = file('unittests/comment-beside-xml-decl.svg').read() docStr = open('unittests/comment-beside-xml-decl.svg').read()
docStr = scour.scourString(docStr, docStr = scour.scourString(docStr,
scour.parse_args(['--strip-xml-prolog'])[0]) scour.parse_args(['--strip-xml-prolog'])[0])
self.assertEquals(docStr.find('<?xml'), -1, self.assertEquals(docStr.find('<?xml'), -1,
@ -1157,7 +1164,7 @@ class GradientReferencedByStyleCDATA(unittest.TestCase):
class ShortenIDsInStyleCDATA(unittest.TestCase): class ShortenIDsInStyleCDATA(unittest.TestCase):
def runTest(self): def runTest(self):
docStr = file('unittests/style-cdata.svg').read() docStr = open('unittests/style-cdata.svg').read()
docStr = scour.scourString(docStr, docStr = scour.scourString(docStr,
scour.parse_args(['--shorten-ids'])[0]) scour.parse_args(['--shorten-ids'])[0])
self.assertEquals(docStr.find('somethingreallylong'), -1, self.assertEquals(docStr.find('somethingreallylong'), -1,
@ -1366,5 +1373,5 @@ class DuplicateGradientsUpdateStyle(unittest.TestCase):
if __name__ == '__main__': if __name__ == '__main__':
testcss = __import__('testcss') testcss = __import__('testcss')
scour = __import__('__main__') scour = __import__('__main__')
suite = unittest.TestSuite( map(unittest.defaultTestLoader.loadTestsFromModule, [testcss, scour]) ) suite = unittest.TestSuite( list(map(unittest.defaultTestLoader.loadTestsFromModule, [testcss, scour])) )
unittest.main(defaultTest="suite") unittest.main(defaultTest="suite")