From 7853e207451a69081573624856025f2a3f750f83 Mon Sep 17 00:00:00 2001 From: Ben Kurtovic Date: Fri, 3 May 2013 23:43:57 -0400 Subject: [PATCH] Move wrap() and wraptext() TO _test_tree_equality. --- tests/_test_tree_equality.py | 4 ++++ tests/test_argument.py | 6 +----- tests/test_builder.py | 6 +----- tests/test_heading.py | 6 +----- tests/test_html_entity.py | 6 +----- tests/test_parameter.py | 6 +----- tests/test_template.py | 6 +----- tests/test_wikilink.py | 6 +----- 8 files changed, 11 insertions(+), 35 deletions(-) diff --git a/tests/_test_tree_equality.py b/tests/_test_tree_equality.py index 758a72e..a12bd68 100644 --- a/tests/_test_tree_equality.py +++ b/tests/_test_tree_equality.py @@ -26,8 +26,12 @@ from unittest import TestCase from mwparserfromhell.nodes import (Argument, Comment, Heading, HTMLEntity, Tag, Template, Text, Wikilink) from mwparserfromhell.nodes.extras import Attribute, Parameter +from mwparserfromhell.smart_list import SmartList from mwparserfromhell.wikicode import Wikicode +wrap = lambda L: Wikicode(SmartList(L)) +wraptext = lambda t: wrap([Text(t)]) + class TreeEqualityTestCase(TestCase): """A base test case with support for comparing the equality of node trees. diff --git a/tests/test_argument.py b/tests/test_argument.py index e0524c4..ae5ae62 100644 --- a/tests/test_argument.py +++ b/tests/test_argument.py @@ -25,12 +25,8 @@ import unittest from mwparserfromhell.compat import str from mwparserfromhell.nodes import Argument, Text -from mwparserfromhell.smart_list import SmartList -from mwparserfromhell.wikicode import Wikicode -from ._test_tree_equality import TreeEqualityTestCase - -wrap = lambda L: Wikicode(SmartList(L)) +from ._test_tree_equality import TreeEqualityTestCase, wrap class TestArgument(TreeEqualityTestCase): """Test cases for the Argument node.""" diff --git a/tests/test_builder.py b/tests/test_builder.py index 1e578ed..76917e8 100644 --- a/tests/test_builder.py +++ b/tests/test_builder.py @@ -28,12 +28,8 @@ from mwparserfromhell.nodes import (Argument, Comment, Heading, HTMLEntity, from mwparserfromhell.nodes.extras import Attribute, Parameter from mwparserfromhell.parser import tokens from mwparserfromhell.parser.builder import Builder -from mwparserfromhell.smart_list import SmartList -from mwparserfromhell.wikicode import Wikicode -from ._test_tree_equality import TreeEqualityTestCase - -wrap = lambda L: Wikicode(SmartList(L)) +from ._test_tree_equality import TreeEqualityTestCase, wrap class TestBuilder(TreeEqualityTestCase): """Tests for the builder, which turns tokens into Wikicode objects.""" diff --git a/tests/test_heading.py b/tests/test_heading.py index a0e78e5..88603a8 100644 --- a/tests/test_heading.py +++ b/tests/test_heading.py @@ -25,12 +25,8 @@ import unittest from mwparserfromhell.compat import str from mwparserfromhell.nodes import Heading, Text -from mwparserfromhell.smart_list import SmartList -from mwparserfromhell.wikicode import Wikicode -from ._test_tree_equality import TreeEqualityTestCase - -wrap = lambda L: Wikicode(SmartList(L)) +from ._test_tree_equality import TreeEqualityTestCase, wrap class TestHeading(TreeEqualityTestCase): """Test cases for the Heading node.""" diff --git a/tests/test_html_entity.py b/tests/test_html_entity.py index a7a9669..b6b4394 100644 --- a/tests/test_html_entity.py +++ b/tests/test_html_entity.py @@ -25,12 +25,8 @@ import unittest from mwparserfromhell.compat import str from mwparserfromhell.nodes import HTMLEntity -from mwparserfromhell.smart_list import SmartList -from mwparserfromhell.wikicode import Wikicode -from ._test_tree_equality import TreeEqualityTestCase - -wrap = lambda L: Wikicode(SmartList(L)) +from ._test_tree_equality import TreeEqualityTestCase, wrap class TestHTMLEntity(TreeEqualityTestCase): """Test cases for the HTMLEntity node.""" diff --git a/tests/test_parameter.py b/tests/test_parameter.py index b46ad71..8e85eda 100644 --- a/tests/test_parameter.py +++ b/tests/test_parameter.py @@ -26,12 +26,8 @@ import unittest from mwparserfromhell.compat import str from mwparserfromhell.nodes import Text from mwparserfromhell.nodes.extras import Parameter -from mwparserfromhell.smart_list import SmartList -from mwparserfromhell.wikicode import Wikicode -from ._test_tree_equality import TreeEqualityTestCase - -wrap = lambda L: Wikicode(SmartList(L)) +from ._test_tree_equality import TreeEqualityTestCase, wrap class TestParameter(TreeEqualityTestCase): """Test cases for the Parameter node extra.""" diff --git a/tests/test_template.py b/tests/test_template.py index 31ed33b..81b7382 100644 --- a/tests/test_template.py +++ b/tests/test_template.py @@ -26,12 +26,8 @@ import unittest from mwparserfromhell.compat import str from mwparserfromhell.nodes import HTMLEntity, Template, Text from mwparserfromhell.nodes.extras import Parameter -from mwparserfromhell.smart_list import SmartList -from mwparserfromhell.wikicode import Wikicode -from ._test_tree_equality import TreeEqualityTestCase +from ._test_tree_equality import TreeEqualityTestCase, wrap, wraptext -wrap = lambda L: Wikicode(SmartList(L)) -wraptext = lambda t: wrap([Text(t)]) pgens = lambda k, v: Parameter(wraptext(k), wraptext(v), showkey=True) pgenh = lambda k, v: Parameter(wraptext(k), wraptext(v), showkey=False) diff --git a/tests/test_wikilink.py b/tests/test_wikilink.py index 422489f..7c02744 100644 --- a/tests/test_wikilink.py +++ b/tests/test_wikilink.py @@ -25,12 +25,8 @@ import unittest from mwparserfromhell.compat import str from mwparserfromhell.nodes import Text, Wikilink -from mwparserfromhell.smart_list import SmartList -from mwparserfromhell.wikicode import Wikicode -from ._test_tree_equality import TreeEqualityTestCase - -wrap = lambda L: Wikicode(SmartList(L)) +from ._test_tree_equality import TreeEqualityTestCase, wrap class TestWikilink(TreeEqualityTestCase): """Test cases for the Wikilink node."""