Change the expected code for macro definitions to include version and

mode opcodes. Fix check_code_short_endtags(), which should have used <img /> since the previous batch of changes.

Change the expected code for macro definitions to include version and
mode opcodes. Fix check_code_short_endtags(), which should have used <img /> since the previous batch of changes.
a52a0cab · Guido van Rossum · 990a78a9 · a52a0cab · a52a0cab
Commit a52a0cab authored Apr 10, 2001 by Guido van Rossum
Showing with 10 additions and 10 deletions

lib/python/TAL/test/test_htmltalparser.py lib/python/TAL/test/test_htmltalparser.py +5 -5

lib/python/TAL/tests/test_htmltalparser.py lib/python/TAL/tests/test_htmltalparser.py +5 -5

No files found.
--- a/lib/python/TAL/test/test_htmltalparser.py
+++ b/lib/python/TAL/test/test_htmltalparser.py
@@ -127,7 +127,7 @@ class HTMLTALParserTestCases(TestCaseBase):
    def check_code_short_endtags(self):
        self._run_check("""<html><img/></html>""", [
-            ('rawtext', '<html><img/></html>'),
+            ('rawtext', '<html><img /></html>'),
            ])
@@ -137,9 +137,9 @@ class METALGeneratorTestCases(TestCaseBase):
        self._run_check("", [])
    def check_define_macro(self):
-        macro = [('startTag', 'p',
+        macro = self.initial_program + [
-                  [('metal:define-macro', 'M', 'metal')]),
+            ('startTag', 'p', [('metal:define-macro', 'M', 'metal')]),
-                 ('rawtext', 'booh</p>')]
+            ('rawtext', 'booh</p>')]
        program = [
            ('setPosition', (1, 0)),
            ('defineMacro', 'M', macro),
@@ -157,7 +157,7 @@ class METALGeneratorTestCases(TestCaseBase):
            ])
    def check_define_slot(self):
-        macro = [
+        macro = self.initial_program + [
            ('startTag', 'p', [('metal:define-macro', 'M', 'metal')]),
            ('rawtext', 'foo'),
            ('setPosition', (1, 29)),

--- a/lib/python/TAL/tests/test_htmltalparser.py
+++ b/lib/python/TAL/tests/test_htmltalparser.py
@@ -127,7 +127,7 @@ class HTMLTALParserTestCases(TestCaseBase):
    def check_code_short_endtags(self):
        self._run_check("""<html><img/></html>""", [
-            ('rawtext', '<html><img/></html>'),
+            ('rawtext', '<html><img /></html>'),
            ])
@@ -137,9 +137,9 @@ class METALGeneratorTestCases(TestCaseBase):
        self._run_check("", [])
    def check_define_macro(self):
-        macro = [('startTag', 'p',
+        macro = self.initial_program + [
-                  [('metal:define-macro', 'M', 'metal')]),
+            ('startTag', 'p', [('metal:define-macro', 'M', 'metal')]),
-                 ('rawtext', 'booh</p>')]
+            ('rawtext', 'booh</p>')]
        program = [
            ('setPosition', (1, 0)),
            ('defineMacro', 'M', macro),
@@ -157,7 +157,7 @@ class METALGeneratorTestCases(TestCaseBase):
            ])
    def check_define_slot(self):
-        macro = [
+        macro = self.initial_program + [
            ('startTag', 'p', [('metal:define-macro', 'M', 'metal')]),
            ('rawtext', 'foo'),
            ('setPosition', (1, 29)),