refactoring

This commit is contained in:
frankknoll
2023-10-10 08:57:12 +02:00
parent 0eed549b46
commit fde9844b88

View File

@@ -1,5 +1,7 @@
import unittest import unittest
from intensivstationen.KreisOptionsSetter import KreisOptionsSetter from intensivstationen.KreisOptionsSetter import KreisOptionsSetter
from TestHelper import TestHelper
class KreisOptionsSetterTest(unittest.TestCase): class KreisOptionsSetterTest(unittest.TestCase):
@@ -28,7 +30,7 @@ class KreisOptionsSetterTest(unittest.TestCase):
'<option value="Aichach-Friedberg">Aichach-Friedberg</option>']) '<option value="Aichach-Friedberg">Aichach-Friedberg</option>'])
# Then # Then
assertEqualHTML( TestHelper.assertEqualHTML(
htmlActual, htmlActual,
''' '''
<html> <html>
@@ -42,33 +44,3 @@ class KreisOptionsSetterTest(unittest.TestCase):
</body> </body>
</html> </html>
''') ''')
# FK-TODO: delegate to use TestHelper.assertEqualHTML()
# adapted from https://stackoverflow.com/questions/8006909/pretty-print-assertequal-for-html-strings
def assertEqualHTML(string1, string2, file1='', file2=''):
u'''
Compare two unicode strings containing HTML.
A human friendly diff goes to logging.error() if they
are not equal, and an exception gets raised.
'''
from bs4 import BeautifulSoup as bs
import difflib
def short(mystr):
max = 20
if len(mystr) > max:
return mystr[:max]
return mystr
p = []
for mystr, file in [(string1, file1), (string2, file2)]:
if not isinstance(mystr, str):
raise Exception(u'string ist not unicode: %r %s' %
(short(mystr), file))
soup = bs(mystr)
pretty = soup.prettify()
p.append(pretty)
if p[0] != p[1]:
for line in difflib.unified_diff(p[0].splitlines(), p[1].splitlines(), fromfile=file1, tofile=file2):
display(line)
display(p[0], ' != ', p[1])
raise Exception('Not equal %s %s' % (file1, file2))