Skip to content

Commit

Permalink
remove explicit test_suite functions
Browse files Browse the repository at this point in the history
  • Loading branch information
hannosch committed Mar 25, 2012
1 parent c79f6ab commit 99e8a62
Show file tree
Hide file tree
Showing 10 changed files with 7 additions and 71 deletions.
7 changes: 0 additions & 7 deletions src/Products/PluginIndexes/BooleanIndex/tests.py
Expand Up @@ -216,10 +216,3 @@ def test_migration(self):
self.assertEqual(index._index_value, 0)
self.assertEqual(index._index_length.value, 19)
self.assertEqual(list(index._index), range(80, 99))


def test_suite():
from unittest import TestSuite, makeSuite
suite = TestSuite()
suite.addTest(makeSuite(TestBooleanIndex))
return suite
10 changes: 2 additions & 8 deletions src/Products/PluginIndexes/DateIndex/tests/test_DateIndex.py
Expand Up @@ -15,11 +15,11 @@

import unittest


class Dummy:

def __init__(self, name, date):

self._name = name
self._name = name
self._date = date

def name(self):
Expand Down Expand Up @@ -274,9 +274,3 @@ def test_removal(self):
{'date': 1072742900}, [values[7]])
index.index_object(7, None)
self.assertFalse(7 in index.documentToKeyMap().keys())


def test_suite():
suite = unittest.TestSuite()
suite.addTest( unittest.makeSuite( DI_Tests ) )
return suite
Expand Up @@ -17,9 +17,9 @@
class Dummy(object):

def __init__(self, name, start, stop):
self._name = name
self._name = name
self._start = start
self._stop = stop
self._stop = stop

def name(self):
return self._name
Expand Down Expand Up @@ -246,9 +246,3 @@ def test_resultset(self):
results, used = index._apply_index({'work': 11},
resultset=IISet([0, 5, 7]))
self.assertEqual(set(results), set([0, 5]))


def test_suite():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(DRI_Tests))
return suite
6 changes: 0 additions & 6 deletions src/Products/PluginIndexes/FieldIndex/tests/testFieldIndex.py
Expand Up @@ -229,9 +229,3 @@ def testRange(self):
r2, ignore = index._apply_index(record)
r2 = list(r2.keys())
assert r2 == r


def test_suite():
return unittest.TestSuite((
unittest.makeSuite(FieldIndexTests),
))
Expand Up @@ -239,9 +239,3 @@ def test_value_removes(self):
to_index = Dummy('')
self._index._index_object(10, to_index, attr='foo')
self.assertFalse(self._index._unindex.get(10))


def test_suite():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestKeywordIndex))
return suite
10 changes: 2 additions & 8 deletions src/Products/PluginIndexes/PathIndex/tests/testPathIndex.py
Expand Up @@ -16,9 +16,9 @@
import unittest



class Dummy:
def __init__( self, path):

def __init__(self, path):
self.path = path

def getPhysicalPath(self):
Expand Down Expand Up @@ -527,9 +527,3 @@ def test__search_w_level_0(self):
self.assertEqual(list(index._search('bb', 1)), [1])
self.assertEqual(list(index._search('aa/bb', 0)), [1])
self.assertEqual(list(index._search('aa/bb', 1)), [])


def test_suite():
return unittest.TestSuite((
unittest.makeSuite(PathIndexTests),
))
6 changes: 0 additions & 6 deletions src/Products/PluginIndexes/TopicIndex/tests/testTopicIndex.py
Expand Up @@ -86,9 +86,3 @@ def testRemoval(self):
self.TI.index_object(1, Obj('1','doc2'))
self._searchOr('doc1',[2])
self._searchOr('doc2', [1,3,4])


def test_suite():
return unittest.TestSuite((
unittest.makeSuite(TestTopicIndex),
))
6 changes: 0 additions & 6 deletions src/Products/PluginIndexes/UUIDIndex/tests.py
Expand Up @@ -131,9 +131,3 @@ def test_non_unique(self):
# second index call fails and logs
self._index.index_object(1, obj)
self._checkApply({'foo': 'a'}, [(0, obj)])


def test_suite():
return unittest.TestSuite((
unittest.makeSuite(UUIDIndexTests),
))
9 changes: 1 addition & 8 deletions src/Products/PluginIndexes/common/tests/test_UnIndex.py
Expand Up @@ -10,11 +10,10 @@
# FOR A PARTICULAR PURPOSE
#
#############################################################################
""" Tests for common UnIndex features.
"""

import unittest


class UnIndexTests(unittest.TestCase):

def _getTargetClass(self):
Expand Down Expand Up @@ -71,9 +70,3 @@ def interesting(self):

dummy.exc = TypeError
self.assertEquals(idx._get_object_datum(dummy, 'interesting'), _marker)


def test_suite():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(UnIndexTests))
return suite
8 changes: 0 additions & 8 deletions src/Products/PluginIndexes/common/tests/test_util.py
Expand Up @@ -10,8 +10,6 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
"""Unit tests for util module.
"""

import unittest

Expand Down Expand Up @@ -76,9 +74,3 @@ def test_get_not_string_list(self):
parser = self._makeOne(request, 'path', ('query', 'not'))
self.assertEqual(parser.get('keys'), ['foo'])
self.assertEqual(parser.get('not'), ['bar', 'baz'])


def test_suite():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(parseIndexRequestTests))
return suite

0 comments on commit 99e8a62

Please sign in to comment.