aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-08-06 09:08:10 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-08-06 09:08:24 +0100
commit9df9c709cca58917d2f32a1214b41d604ed81e25 (patch)
tree9413d4209b3dbb59e97342321d8e3c3df6d56996
parent60146013fb821055b05cf41441a92a855b96b725 (diff)
downloadpaludis-9df9c709cca58917d2f32a1214b41d604ed81e25.tar.gz
paludis-9df9c709cca58917d2f32a1214b41d604ed81e25.tar.xz
Fix more
-rw-r--r--python/additional_tests.cc6
-rwxr-xr-xpython/formatter_TEST.py6
-rwxr-xr-xpython/metadata_key_TEST.py8
3 files changed, 10 insertions, 10 deletions
diff --git a/python/additional_tests.cc b/python/additional_tests.cc
index 73e3c5a..9cf737e 100644
--- a/python/additional_tests.cc
+++ b/python/additional_tests.cc
@@ -322,7 +322,7 @@ namespace formatter
{
}
- void test_formatter_restrict_spec_tree(const PlainTextSpecTree::ItemFormatter &)
+ void test_formatter_plain_text_spec_tree(const PlainTextSpecTree::ItemFormatter &)
{
}
@@ -366,7 +366,7 @@ void expose_additional_tests()
bp::def("test_metadata_license_spec_tree_key", &metadata_key::test_metadata_spec_tree_key<LicenseSpecTree>);
bp::def("test_metadata_provide_spec_tree_key", &metadata_key::test_metadata_spec_tree_key<ProvideSpecTree>);
bp::def("test_metadata_dependency_spec_tree_key", &metadata_key::test_metadata_spec_tree_key<DependencySpecTree>);
- bp::def("test_metadata_restrict_spec_tree_key", &metadata_key::test_metadata_spec_tree_key<RestrictSpecTree>);
+ bp::def("test_metadata_plain_text_spec_tree_key", &metadata_key::test_metadata_spec_tree_key<PlainTextSpecTree>);
bp::def("test_metadata_fetchable_uri_spec_tree_key", &metadata_key::test_metadata_spec_tree_key<FetchableURISpecTree>);
bp::def("test_metadata_simple_uri_spec_tree_key", &metadata_key::test_metadata_spec_tree_key<SimpleURISpecTree>);
bp::def("test_metadata_section_key", &metadata_key::test_metadata_section_key);
@@ -388,7 +388,7 @@ void expose_additional_tests()
bp::def("test_formatter_license_spec_tree", &formatter::test_formatter_license_spec_tree);
bp::def("test_formatter_provide_spec_tree", &formatter::test_formatter_provide_spec_tree);
bp::def("test_formatter_dependency_spec_tree", &formatter::test_formatter_dependency_spec_tree);
- bp::def("test_formatter_restrict_spec_tree", &formatter::test_formatter_restrict_spec_tree);
+ bp::def("test_formatter_plain_text_spec_tree", &formatter::test_formatter_plain_text_spec_tree);
bp::def("test_formatter_simple_uri_spec_tree", &formatter::test_formatter_simple_uri_spec_tree);
bp::def("test_formatter_fetchable_uri_spec_tree", &formatter::test_formatter_fetchable_uri_spec_tree);
}
diff --git a/python/formatter_TEST.py b/python/formatter_TEST.py
index 6833fb3..14afcad 100755
--- a/python/formatter_TEST.py
+++ b/python/formatter_TEST.py
@@ -39,7 +39,7 @@ class TestCase_01_StringifyFormatter(unittest.TestCase):
test_formatter_license_spec_tree(f)
test_formatter_provide_spec_tree(f)
test_formatter_dependency_spec_tree(f)
- test_formatter_restrict_spec_tree(f)
+ test_formatter_plain_text_spec_tree(f)
test_formatter_simple_uri_spec_tree(f)
test_formatter_fetchable_uri_spec_tree(f)
@@ -57,7 +57,7 @@ class TestCase_02_PythonFormatter(unittest.TestCase):
test_formatter_license_spec_tree(f)
test_formatter_provide_spec_tree(f)
test_formatter_dependency_spec_tree(f)
- test_formatter_restrict_spec_tree(f)
+ test_formatter_plain_text_spec_tree(f)
test_formatter_simple_uri_spec_tree(f)
test_formatter_fetchable_uri_spec_tree(f)
@@ -225,7 +225,7 @@ class TestCase_03_Formatters_suclassing(unittest.TestCase):
test_formatter_license_spec_tree(f)
test_formatter_provide_spec_tree(f)
test_formatter_dependency_spec_tree(f)
- test_formatter_restrict_spec_tree(f)
+ test_formatter_plain_text_spec_tree(f)
test_formatter_simple_uri_spec_tree(f)
test_formatter_fetchable_uri_spec_tree(f)
diff --git a/python/metadata_key_TEST.py b/python/metadata_key_TEST.py
index 4268326..d0752fa 100755
--- a/python/metadata_key_TEST.py
+++ b/python/metadata_key_TEST.py
@@ -237,10 +237,10 @@ class TestCase_02_MetadataKeys_suclassing(unittest.TestCase):
test_metadata_dependency_spec_tree_key(TestKey())
- def test_13_restrict_spec_tree(self):
- class TestKey(MetadataRestrictSpecTreeKey):
+ def test_13_plain_text_spec_tree(self):
+ class TestKey(MetadataPlainTextSpecTreeKey):
def __init__(self):
- MetadataRestrictSpecTreeKey.__init__(self, "raw", "human", MetadataKeyType.NORMAL)
+ MetadataPlainTextSpecTreeKey.__init__(self, "raw", "human", MetadataKeyType.NORMAL)
def value(self):
return AllDepSpec()
@@ -255,7 +255,7 @@ class TestCase_02_MetadataKeys_suclassing(unittest.TestCase):
#return f.format_plain_text_dep_spec_plain(PlainTextDepSpec("foo"))
return "str"
- test_metadata_restrict_spec_tree_key(TestKey())
+ test_metadata_plain_text_spec_tree_key(TestKey())
def test_14_fetchable_uri_spec_tree(self):
class TestKey(MetadataFetchableURISpecTreeKey):