You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bloodhound.apache.org by rj...@apache.org on 2013/07/16 07:26:57 UTC
svn commit: r1503560 - in
/bloodhound/trunk/bloodhound_search/bhsearch/tests: ./ search_resources/
Author: rjollos
Date: Tue Jul 16 05:26:56 2013
New Revision: 1503560
URL: http://svn.apache.org/r1503560
Log:
Move import of unittest or unittest2 to package initialization module to simplify code following [1502759] and [1476926].
Modified:
bloodhound/trunk/bloodhound_search/bhsearch/tests/__init__.py
bloodhound/trunk/bloodhound_search/bhsearch/tests/api.py
bloodhound/trunk/bloodhound_search/bhsearch/tests/base.py
bloodhound/trunk/bloodhound_search/bhsearch/tests/index_with_whoosh.py
bloodhound/trunk/bloodhound_search/bhsearch/tests/query_parser.py
bloodhound/trunk/bloodhound_search/bhsearch/tests/query_suggestion.py
bloodhound/trunk/bloodhound_search/bhsearch/tests/real_index_view.py
bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/base.py
bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/changeset_search.py
bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/milestone_search.py
bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/ticket_search.py
bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/wiki_search.py
bloodhound/trunk/bloodhound_search/bhsearch/tests/security.py
bloodhound/trunk/bloodhound_search/bhsearch/tests/web_ui.py
bloodhound/trunk/bloodhound_search/bhsearch/tests/whoosh_backend.py
Modified: bloodhound/trunk/bloodhound_search/bhsearch/tests/__init__.py
URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/tests/__init__.py?rev=1503560&r1=1503559&r2=1503560&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/tests/__init__.py (original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/tests/__init__.py Tue Jul 16 05:26:56 2013
@@ -17,10 +17,10 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-import sys
-if sys.version_info[:2] < (2, 7):
+
+try:
import unittest2 as unittest
-else:
+except ImportError:
import unittest
from bhsearch.tests import (whoosh_backend, index_with_whoosh, web_ui,
Modified: bloodhound/trunk/bloodhound_search/bhsearch/tests/api.py
URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/tests/api.py?rev=1503560&r1=1503559&r2=1503560&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/tests/api.py (original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/tests/api.py Tue Jul 16 05:26:56 2013
@@ -17,13 +17,13 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-import unittest
import shutil
from bhsearch.api import BloodhoundSearchApi, ASC, SortInstruction
from bhsearch.query_parser import DefaultQueryParser
-from bhsearch.tests.base import BaseBloodhoundSearchTest
from bhsearch.search_resources.ticket_search import TicketSearchParticipant
+from bhsearch.tests import unittest
+from bhsearch.tests.base import BaseBloodhoundSearchTest
from bhsearch.whoosh_backend import WhooshBackend
Modified: bloodhound/trunk/bloodhound_search/bhsearch/tests/base.py
URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/tests/base.py?rev=1503560&r1=1503559&r2=1503560&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/tests/base.py (original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/tests/base.py Tue Jul 16 05:26:56 2013
@@ -23,22 +23,19 @@ Test utils methods
"""
import contextlib
import shutil
-import sys
import tempfile
-if sys.version_info[:2] < (2, 7):
- import unittest2 as unittest
-else:
- import unittest
-
-from bhsearch.web_ui import BloodhoundSearchModule
-from trac.ticket import Ticket, Milestone
from trac.test import EnvironmentStub, Mock, MockPerm
+from trac.ticket import Ticket, Milestone
from trac.web import Href, arg_list_to_args
from trac.wiki import WikiPage
+from bhsearch.tests import unittest
+from bhsearch.web_ui import BloodhoundSearchModule
+
BASE_PATH = "/main/"
+
class BaseBloodhoundSearchTest(unittest.TestCase):
def setUp(self, enabled=None, create_req=False, enable_security=False):
Modified: bloodhound/trunk/bloodhound_search/bhsearch/tests/index_with_whoosh.py
URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/tests/index_with_whoosh.py?rev=1503560&r1=1503559&r2=1503560&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/tests/index_with_whoosh.py (original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/tests/index_with_whoosh.py Tue Jul 16 05:26:56 2013
@@ -18,14 +18,16 @@
# specific language governing permissions and limitations
# under the License.
-import unittest
import shutil
+
from bhsearch.api import BloodhoundSearchApi
from bhsearch.search_resources.milestone_search import MilestoneIndexer
-from bhsearch.tests.base import BaseBloodhoundSearchTest
from bhsearch.search_resources.ticket_search import TicketIndexer
+from bhsearch.tests import unittest
+from bhsearch.tests.base import BaseBloodhoundSearchTest
from bhsearch.whoosh_backend import WhooshBackend
+
class IndexWhooshTestCase(BaseBloodhoundSearchTest):
def setUp(self):
super(IndexWhooshTestCase, self).setUp()
Modified: bloodhound/trunk/bloodhound_search/bhsearch/tests/query_parser.py
URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/tests/query_parser.py?rev=1503560&r1=1503559&r2=1503560&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/tests/query_parser.py (original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/tests/query_parser.py Tue Jul 16 05:26:56 2013
@@ -18,10 +18,11 @@
# specific language governing permissions and limitations
# under the License.
-import unittest
-from bhsearch.tests.base import BaseBloodhoundSearchTest
-from bhsearch.query_parser import DefaultQueryParser
from trac.test import Mock
+
+from bhsearch.query_parser import DefaultQueryParser
+from bhsearch.tests import unittest
+from bhsearch.tests.base import BaseBloodhoundSearchTest
from whoosh import query
Modified: bloodhound/trunk/bloodhound_search/bhsearch/tests/query_suggestion.py
URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/tests/query_suggestion.py?rev=1503560&r1=1503559&r2=1503560&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/tests/query_suggestion.py (original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/tests/query_suggestion.py Tue Jul 16 05:26:56 2013
@@ -18,11 +18,10 @@
# specific language governing permissions and limitations
# under the License.
-import unittest
-from bhsearch.tests.base import BaseBloodhoundSearchTest
-
from bhsearch.api import BloodhoundSearchApi
from bhsearch.query_suggestion import SuggestionFields
+from bhsearch.tests import unittest
+from bhsearch.tests.base import BaseBloodhoundSearchTest
from bhsearch.web_ui import RequestParameters, RequestContext
from bhsearch.whoosh_backend import WhooshBackend
Modified: bloodhound/trunk/bloodhound_search/bhsearch/tests/real_index_view.py
URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/tests/real_index_view.py?rev=1503560&r1=1503559&r2=1503560&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/tests/real_index_view.py (original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/tests/real_index_view.py Tue Jul 16 05:26:56 2013
@@ -17,16 +17,18 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-import unittest
-from bhsearch.web_ui import RequestParameters
+
import os
-from bhsearch.tests.base import BaseBloodhoundSearchTest
-from bhsearch.whoosh_backend import WhooshBackend
from trac.test import EnvironmentStub, Mock, MockPerm
-from whoosh import query
from trac.web import Href, arg_list_to_args
+from bhsearch.tests import unittest
+from bhsearch.tests.base import BaseBloodhoundSearchTest
+from bhsearch.web_ui import RequestParameters
+from bhsearch.whoosh_backend import WhooshBackend
+from whoosh import query
+
class RealIndexTestCase(BaseBloodhoundSearchTest):
"""
Modified: bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/base.py
URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/base.py?rev=1503560&r1=1503559&r2=1503560&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/base.py (original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/base.py Tue Jul 16 05:26:56 2013
@@ -18,17 +18,14 @@
# specific language governing permissions and limitations
# under the License.
-import sys
-if sys.version_info[:2] < (2, 7):
- import unittest2 as unittest
-else:
- import unittest
+from trac.test import MockPerm
+from trac.web import Href
+from trac.wiki import format_to_html
from bhsearch.search_resources.base import SimpleSearchWikiSyntaxFormatter
+from bhsearch.tests import unittest
from bhsearch.tests.base import BaseBloodhoundSearchTest
-from trac.web import Href
-from trac.test import MockPerm
-from trac.wiki import format_to_html
+
class SimpleSearchWikiSyntaxFormatterTestCase(BaseBloodhoundSearchTest):
def setUp(self):
Modified: bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/changeset_search.py
URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/changeset_search.py?rev=1503560&r1=1503559&r2=1503560&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/changeset_search.py (original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/changeset_search.py Tue Jul 16 05:26:56 2013
@@ -17,17 +17,18 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-import unittest
+
+from trac.core import Component, implements
+from trac.versioncontrol import Changeset
+from trac.versioncontrol.api import (
+ IRepositoryConnector, Repository, RepositoryManager)
from bhsearch.api import BloodhoundSearchApi
from bhsearch.search_resources.changeset_search import (
ChangesetSearchParticipant)
+from bhsearch.tests import unittest
from bhsearch.tests.base import BaseBloodhoundSearchTest
from bhsearch.whoosh_backend import WhooshBackend
-from trac.core import Component, implements
-from trac.versioncontrol.api import (IRepositoryConnector, RepositoryManager,
- Repository)
-from trac.versioncontrol import Changeset
class ChangesetIndexerEventsTestCase(BaseBloodhoundSearchTest):
Modified: bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/milestone_search.py
URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/milestone_search.py?rev=1503560&r1=1503559&r2=1503560&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/milestone_search.py (original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/milestone_search.py Tue Jul 16 05:26:56 2013
@@ -17,16 +17,16 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-import unittest
+
+from trac.ticket import Milestone
from bhsearch.api import BloodhoundSearchApi
from bhsearch.search_resources.milestone_search import (
MilestoneSearchParticipant)
+from bhsearch.tests import unittest
from bhsearch.tests.base import BaseBloodhoundSearchTest
from bhsearch.whoosh_backend import WhooshBackend
-from trac.ticket import Milestone
-
class MilestoneIndexerEventsTestCase(BaseBloodhoundSearchTest):
DUMMY_MILESTONE_NAME = "dummyName"
Modified: bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/ticket_search.py
URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/ticket_search.py?rev=1503560&r1=1503559&r2=1503560&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/ticket_search.py (original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/ticket_search.py Tue Jul 16 05:26:56 2013
@@ -17,13 +17,15 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-import unittest
+
+from trac.ticket.model import Component
+
from bhsearch.api import BloodhoundSearchApi
+from bhsearch.search_resources.ticket_search import TicketIndexer
+from bhsearch.tests import unittest
+from bhsearch.tests.base import BaseBloodhoundSearchTest
from bhsearch.whoosh_backend import WhooshBackend
-from bhsearch.tests.base import BaseBloodhoundSearchTest
-from bhsearch.search_resources.ticket_search import TicketIndexer
-from trac.ticket.model import Component
class TicketIndexerTestCase(BaseBloodhoundSearchTest):
def setUp(self):
Modified: bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/wiki_search.py
URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/wiki_search.py?rev=1503560&r1=1503559&r2=1503560&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/wiki_search.py (original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/wiki_search.py Tue Jul 16 05:26:56 2013
@@ -18,16 +18,16 @@
# specific language governing permissions and limitations
# under the License.
import shutil
-import unittest
+
+from trac.wiki import WikiSystem, WikiPage
from bhsearch.api import BloodhoundSearchApi
from bhsearch.query_parser import DefaultQueryParser
-from bhsearch.tests.base import BaseBloodhoundSearchTest
-from bhsearch.whoosh_backend import WhooshBackend
from bhsearch.search_resources.wiki_search import (
WikiIndexer, WikiSearchParticipant)
-
-from trac.wiki import WikiSystem, WikiPage
+from bhsearch.tests import unittest
+from bhsearch.tests.base import BaseBloodhoundSearchTest
+from bhsearch.whoosh_backend import WhooshBackend
class WikiIndexerSilenceOnExceptionTestCase(BaseBloodhoundSearchTest):
Modified: bloodhound/trunk/bloodhound_search/bhsearch/tests/security.py
URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/tests/security.py?rev=1503560&r1=1503559&r2=1503560&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/tests/security.py (original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/tests/security.py Tue Jul 16 05:26:56 2013
@@ -24,17 +24,16 @@ system backend.
"""
import contextlib
import os
-import unittest
from sqlite3 import OperationalError
-from trac.perm import (PermissionSystem, DefaultPermissionPolicy,
- PermissionCache)
+from trac.perm import (DefaultPermissionPolicy, PermissionCache,
+ PermissionSystem)
-from multiproduct.api import MultiProductSystem, ProductEnvironment
-
-from bhsearch.tests.base import BaseBloodhoundSearchTest
from bhsearch.api import BloodhoundSearchApi
+from bhsearch.tests import unittest
+from bhsearch.tests.base import BaseBloodhoundSearchTest
from bhsearch.whoosh_backend import WhooshBackend
+from multiproduct.api import MultiProductSystem, ProductEnvironment
# TODO: Convince trac to register modules without these imports
from trac.wiki import web_ui
Modified: bloodhound/trunk/bloodhound_search/bhsearch/tests/web_ui.py
URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/tests/web_ui.py?rev=1503560&r1=1503559&r2=1503560&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/tests/web_ui.py (original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/tests/web_ui.py Tue Jul 16 05:26:56 2013
@@ -17,31 +17,28 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-import sys
-if sys.version_info[:2] < (2, 7):
- import unittest2 as unittest
-else:
- import unittest
from urllib import urlencode, unquote, unquote_plus
+from trac.core import TracError
+from trac.search.web_ui import SearchModule as TracSearchModule
+from trac.test import Mock, MockPerm
+from trac.util import format_datetime
+from trac.util.datefmt import FixedOffset
+from trac.web import Href, RequestDone, arg_list_to_args, parse_arg_list
+
from bhsearch import web_ui
from bhsearch.api import ASC, DESC, SortInstruction
+from bhsearch.tests import unittest
from bhsearch.tests.base import BaseBloodhoundSearchTest
-from bhsearch.web_ui import RequestParameters, BloodhoundSearchModule
+from bhsearch.web_ui import BloodhoundSearchModule, RequestParameters
from bhsearch.whoosh_backend import WhooshBackend
-from trac.test import Mock, MockPerm
-from trac.core import TracError
-from trac.search.web_ui import SearchModule as TracSearchModule
-from trac.util.datefmt import FixedOffset
-from trac.util import format_datetime
-from trac.web import Href, arg_list_to_args, parse_arg_list, RequestDone
-
BASE_PATH = "/main/"
BHSEARCH_URL = BASE_PATH + "bhsearch"
DEFAULT_DOCS_PER_PAGE = 10
+
class WebUiTestCaseWithWhoosh(BaseBloodhoundSearchTest):
def setUp(self):
super(WebUiTestCaseWithWhoosh, self).setUp(
Modified: bloodhound/trunk/bloodhound_search/bhsearch/tests/whoosh_backend.py
URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/tests/whoosh_backend.py?rev=1503560&r1=1503559&r2=1503560&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/tests/whoosh_backend.py (original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/tests/whoosh_backend.py Tue Jul 16 05:26:56 2013
@@ -20,23 +20,20 @@
from datetime import datetime
import os
import shutil
-import sys
import tempfile
-if sys.version_info[:2] < (2, 7):
- import unittest2 as unittest
-else:
- import unittest
+
+from trac.util.datefmt import FixedOffset, utc
from bhsearch.api import ASC, DESC, SCORE, SortInstruction
from bhsearch.query_parser import DefaultQueryParser
+from bhsearch.tests import unittest
from bhsearch.tests.base import BaseBloodhoundSearchTest
-from bhsearch.whoosh_backend import (WhooshBackend,
- WhooshEmptyFacetErrorWorkaround)
-from trac.util.datefmt import FixedOffset, utc
-from whoosh import index, sorting, query
-from whoosh.fields import Schema, ID, TEXT, KEYWORD
-from whoosh.qparser import MultifieldPlugin, QueryParser, WhitespacePlugin, \
- PhrasePlugin, MultifieldParser
+from bhsearch.whoosh_backend import WhooshBackend, \
+ WhooshEmptyFacetErrorWorkaround
+from whoosh import index, query, sorting
+from whoosh.fields import ID, KEYWORD, TEXT, Schema
+from whoosh.qparser import MultifieldParser, MultifieldPlugin, PhrasePlugin, \
+ QueryParser, WhitespacePlugin
class WhooshBackendTestCase(BaseBloodhoundSearchTest):