| @@ -259,51 +259,51 @@ class TestTemplate(TreeEqualityTestCase): | |||||
| node39.add("1", "e") | node39.add("1", "e") | ||||
| node40.add("d", "h", before="b") | node40.add("d", "h", before="b") | ||||
| self.assertEquals("{{a|b=c|d|e=f}}", node1) | |||||
| self.assertEquals("{{a|b=c|d|g}}", node2) | |||||
| self.assertEquals("{{a|b=c|d|e=foo|bar}}", node3) | |||||
| self.assertEqual("{{a|b=c|d|e=f}}", node1) | |||||
| self.assertEqual("{{a|b=c|d|g}}", node2) | |||||
| self.assertEqual("{{a|b=c|d|e=foo|bar}}", node3) | |||||
| self.assertIsInstance(node3.params[2].value.get(1), HTMLEntity) | self.assertIsInstance(node3.params[2].value.get(1), HTMLEntity) | ||||
| self.assertEquals("{{a|e=f|b=c|d}}", node4) | |||||
| self.assertEquals("{{a|b=c|f=g| d =e}}", node5) | |||||
| self.assertEquals("{{a|b=c|b=d|f=g|b=e}}", node6) | |||||
| self.assertEquals("{{a|b=c|d}}", node7) | |||||
| self.assertEquals("{{a|b=c|e=f|d}}", node8) | |||||
| self.assertEquals("{{a|b=c|e=f|d}}", node9) | |||||
| self.assertEquals("{{a|b=c|e}}", node10) | |||||
| self.assertEquals("{{a|b=c|d=foo=bar}}", node11) | |||||
| self.assertEquals("{{a|b=c|foo=bar}}", node12) | |||||
| self.assertEqual("{{a|e=f|b=c|d}}", node4) | |||||
| self.assertEqual("{{a|b=c|f=g| d =e}}", node5) | |||||
| self.assertEqual("{{a|b=c|b=d|f=g|b=e}}", node6) | |||||
| self.assertEqual("{{a|b=c|d}}", node7) | |||||
| self.assertEqual("{{a|b=c|e=f|d}}", node8) | |||||
| self.assertEqual("{{a|b=c|e=f|d}}", node9) | |||||
| self.assertEqual("{{a|b=c|e}}", node10) | |||||
| self.assertEqual("{{a|b=c|d=foo=bar}}", node11) | |||||
| self.assertEqual("{{a|b=c|foo=bar}}", node12) | |||||
| self.assertIsInstance(node12.params[1].value.get(1), HTMLEntity) | self.assertIsInstance(node12.params[1].value.get(1), HTMLEntity) | ||||
| self.assertEquals("{{a|\nb = c|\nd = e|\nf = g|\nh = i}}", node13) | |||||
| self.assertEquals("{{a\n|b =c\n|d = e|f =g\n|h = i\n|j =k\n}}", node14) | |||||
| self.assertEquals("{{a|b = c\n|\nd = e|\nf =g |h =i}}", node15) | |||||
| self.assertEquals("{{a|\nb = c|\nd = e|\nf = g|h=i}}", node16) | |||||
| self.assertEquals("{{a|\nb = c|\nd = e|\nf = g| i}}", node17) | |||||
| self.assertEquals("{{a\n|b =c\n|d = e|f =g\n|h = i\n|k\n}}", node18) | |||||
| self.assertEquals("{{a|b = c\n|\nd = e|\nf =g |i}}", node19) | |||||
| self.assertEquals("{{a|\nb = c|\nd = e|\nf = g|i}}", node20) | |||||
| self.assertEquals("{{a|b|c}}", node21) | |||||
| self.assertEquals("{{a|b|3=c}}", node22) | |||||
| self.assertEquals("{{a|b|c=d}}", node23) | |||||
| self.assertEquals("{{a|b|c|d|e|f}}", node24) | |||||
| self.assertEquals("{{a|b|c|4=d|5=e|f}}", node25) | |||||
| self.assertEquals("{{a|b|c|4=d|5=e|6=f}}", node26) | |||||
| self.assertEquals("{{a|b|c=foo=bar}}", node27) | |||||
| self.assertEquals("{{a|b|foo=bar}}", node28) | |||||
| self.assertEqual("{{a|\nb = c|\nd = e|\nf = g|\nh = i}}", node13) | |||||
| self.assertEqual("{{a\n|b =c\n|d = e|f =g\n|h = i\n|j =k\n}}", node14) | |||||
| self.assertEqual("{{a|b = c\n|\nd = e|\nf =g |h =i}}", node15) | |||||
| self.assertEqual("{{a|\nb = c|\nd = e|\nf = g|h=i}}", node16) | |||||
| self.assertEqual("{{a|\nb = c|\nd = e|\nf = g| i}}", node17) | |||||
| self.assertEqual("{{a\n|b =c\n|d = e|f =g\n|h = i\n|k\n}}", node18) | |||||
| self.assertEqual("{{a|b = c\n|\nd = e|\nf =g |i}}", node19) | |||||
| self.assertEqual("{{a|\nb = c|\nd = e|\nf = g|i}}", node20) | |||||
| self.assertEqual("{{a|b|c}}", node21) | |||||
| self.assertEqual("{{a|b|3=c}}", node22) | |||||
| self.assertEqual("{{a|b|c=d}}", node23) | |||||
| self.assertEqual("{{a|b|c|d|e|f}}", node24) | |||||
| self.assertEqual("{{a|b|c|4=d|5=e|f}}", node25) | |||||
| self.assertEqual("{{a|b|c|4=d|5=e|6=f}}", node26) | |||||
| self.assertEqual("{{a|b|c=foo=bar}}", node27) | |||||
| self.assertEqual("{{a|b|foo=bar}}", node28) | |||||
| self.assertIsInstance(node28.params[1].value.get(1), HTMLEntity) | self.assertIsInstance(node28.params[1].value.get(1), HTMLEntity) | ||||
| self.assertEquals("{{a|b=d}}", node29) | |||||
| self.assertEquals("{{a|foo=bar}}", node30) | |||||
| self.assertEqual("{{a|b=d}}", node29) | |||||
| self.assertEqual("{{a|foo=bar}}", node30) | |||||
| self.assertIsInstance(node30.params[0].value.get(1), HTMLEntity) | self.assertIsInstance(node30.params[0].value.get(1), HTMLEntity) | ||||
| self.assertEquals("{{a|1=foo=bar}}", node31) | |||||
| self.assertEquals("{{a|foo=bar}}", node32) | |||||
| self.assertEqual("{{a|1=foo=bar}}", node31) | |||||
| self.assertEqual("{{a|foo=bar}}", node32) | |||||
| self.assertIsInstance(node32.params[0].value.get(1), HTMLEntity) | self.assertIsInstance(node32.params[0].value.get(1), HTMLEntity) | ||||
| self.assertEquals("{{a|\nb = c|\nd = foo|\nf = g}}", node33) | |||||
| self.assertEquals("{{a\n|b =c\n|d = e|f =foo\n|h = i\n}}", node34) | |||||
| self.assertEquals("{{a|b = c\n|\nd = e|\nf =foo }}", node35) | |||||
| self.assertEquals("{{a|\nb = c |\nd =foo|\nf = g }}", node36) | |||||
| self.assertEquals("{{a|b=k|d=e|i=j}}", node37) | |||||
| self.assertEquals("{{a|1=e|x=y|2=d}}", node38) | |||||
| self.assertEquals("{{a|x=y|e|d}}", node39) | |||||
| self.assertEquals("{{a|b=c|d=h|f=g}}", node40) | |||||
| self.assertEqual("{{a|\nb = c|\nd = foo|\nf = g}}", node33) | |||||
| self.assertEqual("{{a\n|b =c\n|d = e|f =foo\n|h = i\n}}", node34) | |||||
| self.assertEqual("{{a|b = c\n|\nd = e|\nf =foo }}", node35) | |||||
| self.assertEqual("{{a|\nb = c |\nd =foo|\nf = g }}", node36) | |||||
| self.assertEqual("{{a|b=k|d=e|i=j}}", node37) | |||||
| self.assertEqual("{{a|1=e|x=y|2=d}}", node38) | |||||
| self.assertEqual("{{a|x=y|e|d}}", node39) | |||||
| self.assertEqual("{{a|b=c|d=h|f=g}}", node40) | |||||
| def test_remove(self): | def test_remove(self): | ||||
| """test Template.remove()""" | """test Template.remove()""" | ||||