Changeset 25812

Show
Ignore:
Timestamp:
01/05/2009 05:50:08 PM (20 months ago)
Author:
exarkun
Message:

continue trying to be smarter about xml comparison

Location:
branches/minidom-lore-3560-2/twisted
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/minidom-lore-3560-2/twisted/lore/test/test_lore.py

    r25810 r25812  
    6060    linkrel = "" 
    6161 
     62    def assertXMLEqual(self, first, second): 
     63        """ 
     64        Verify that two strings represent the same XML document. 
     65        """ 
     66        self.assertEqual( 
     67            microdom.parseString(first).toxml(), 
     68            microdom.parseString(second).toxml()) 
     69 
     70 
    6271    def assertEqualFiles1(self, exp, act): 
    6372        if (exp == act): return True 
    … …  
    98107        htmlGenerator(simple.path, self.linkrel) 
    99108 
    100         self.assertEqual( 
     109        self.assertXMLEqual( 
    101110            """\ 
    102111<?xml version="1.0" ?><!DOCTYPE html  PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN'  'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'><html lang="en" xmlns="http://www.w3.org/1999/xhtml"> 
    … …  
    129138        htmlGenerator = factory.generate_html(options, filenameGenerator) 
    130139        htmlGenerator(self.file, self.linkrel) 
    131         self.assertEqual( 
     140        self.assertXMLEqual( 
    132141            """\ 
    133142<?xml version="1.0" ?><!DOCTYPE html  PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN'  'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'><html lang="en" xmlns="http://www.w3.org/1999/xhtml"> 
    … …  
    160169 
    161170        tree.doFile(simple.path, self.linkrel, d['ext'], d['baseurl'], templ, d) 
    162         self.assertEqual( 
     171        self.assertXMLEqual( 
    163172            """\ 
    164173<?xml version="1.0" ?><!DOCTYPE html  PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN'  'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'><html lang="en" xmlns="http://www.w3.org/1999/xhtml"> 
    … …  
    192201        tree.doFile(self.file, self.linkrel, d['ext'], d['baseurl'], templ, d, filenameGenerator) 
    193202 
    194         self.assertEqual( 
     203        self.assertXMLEqual( 
    195204            """\ 
    196205<?xml version="1.0" ?><!DOCTYPE html  PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN'  'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'><html lang="en" xmlns="http://www.w3.org/1999/xhtml"> 
    … …  
    222231                   d['ext'], d['baseurl'], d) 
    223232 
    224         self.assertEqual( 
     233        self.assertXMLEqual( 
    225234            """\ 
    226235<?xml version="1.0" ?><!DOCTYPE html  PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN'  'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'><html lang="en" xmlns="http://www.w3.org/1999/xhtml"> 
    … …  
    277286            self.file, d['ext'], d['baseurl'], d) 
    278287 
    279         self.assertEqual( 
     288        self.assertXMLEqual( 
    280289            template.toxml(), 
    281290            """\ 
    … …  
    305314        p = process.getProcessor(default, "html", options) 
    306315        p(input.path, self.linkrel) 
    307         self.assertEqual( 
     316        self.assertXMLEqual( 
    308317            """\ 
    309318<?xml version="1.0" ?><!DOCTYPE html  PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN'  'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'><html lang="en" xmlns="http://www.w3.org/1999/xhtml"> 
    … …  
    358367                    self.linkrel, '.html', d['baseurl'], templ, d) 
    359368 
    360         self.assertEqual( 
     369        self.assertXMLEqual( 
    361370            """\ 
    362371<?xml version="1.0" ?><!DOCTYPE html  PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN'  'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'><html lang="en" xmlns="http://www.w3.org/1999/xhtml"> 
    … …  
    10231032 
    10241033        document = tree.parseFileAndReport(path.path) 
    1025         self.assertEqual( 
     1034        self.assertXMLEqual( 
    10261035            document.toxml(), 
    10271036            '<?xml version="1.0" ?><foo bar="baz">hello</foo>') 

  • branches/minidom-lore-3560-2/twisted/python/test/test_release.py

    r25811 r25812  
    699699        out1 = self.howtoDir.child('one.html') 
    700700        out2 = self.howtoDir.child('two.html') 
    701         self.assertEquals(out1.getContent(), output1) 
    702         self.assertEquals(out2.getContent(), output2) 
     701        self.assertXMLEqual(out1.getContent(), output1) 
     702        self.assertXMLEqual(out2.getContent(), output2) 
    703703 
    704704