[ZPT] CVS: Packages/TAL - test_htmltalparser.py:1.12

Mon, 9 Apr 2001 22:14:30 -0400 (EDT)

Update of /cvs-repository/Packages/TAL/test
In directory korak:/tmp/cvs-serv26487

Modified Files:
	test_htmltalparser.py 
Log Message:
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.

--- Updated File test_htmltalparser.py in package Packages/TAL --
--- test_htmltalparser.py	2001/04/07 19:51:55	1.11
+++ test_htmltalparser.py	2001/04/10 02:14:29	1.12
@@ -127,7 +127,7 @@
 
     def check_code_short_endtags(self):
         self._run_check("""<html><img/></html>""", [
-            ('rawtext', '<html><img/></html>'),
+            ('rawtext', '<html><img /></html>'),
             ])
 
 
@@ -137,9 +137,9 @@
         self._run_check("", [])
 
     def check_define_macro(self):
-        macro = [('startTag', 'p',
-                  [('metal:define-macro', 'M', 'metal')]),
-                 ('rawtext', 'booh</p>')]
+        macro = self.initial_program + [
+            ('startTag', 'p', [('metal:define-macro', 'M', 'metal')]),
+            ('rawtext', 'booh</p>')]
         program = [
             ('setPosition', (1, 0)),
             ('defineMacro', 'M', macro),
@@ -157,7 +157,7 @@
             ])
 
     def check_define_slot(self):
-        macro = [
+        macro = self.initial_program + [
             ('startTag', 'p', [('metal:define-macro', 'M', 'metal')]),
             ('rawtext', 'foo'),
             ('setPosition', (1, 29)),



