Author: andrej
Date: Sat Apr  6 10:51:51 2013
New Revision: 1465222

URL: http://svn.apache.org/r1465222
Log:
changing bhsearch unit-tests debug output from stdout to env.log

Modified:
    bloodhound/trunk/bloodhound_search/bhsearch/tests/base.py
    bloodhound/trunk/bloodhound_search/bhsearch/tests/index_with_whoosh.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/web_ui.py
    bloodhound/trunk/bloodhound_search/bhsearch/tests/whoosh_backend.py

Modified: bloodhound/trunk/bloodhound_search/bhsearch/tests/base.py
URL: 
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/tests/base.py?rev=1465222&r1=1465221&r2=1465222&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/tests/base.py (original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/tests/base.py Sat Apr  6 
10:51:51 2013
@@ -24,7 +24,6 @@ Test utils methods
 import unittest
 import tempfile
 import shutil
-from pprint import pprint
 
 from bhsearch.web_ui import BloodhoundSearchModule
 from trac.ticket import Ticket, Milestone
@@ -57,8 +56,7 @@ class BaseBloodhoundSearchTest(unittest.
         self.env.reset_db()
 
     def print_result(self, result):
-        print "Received result:"
-        pprint(result.__dict__)
+        self.env.log.debug("Received result: %s", result.__dict__)
 
     def create_dummy_ticket(self, summary = None):
         if not summary:
@@ -118,11 +116,9 @@ class BaseBloodhoundSearchTest(unittest.
         # pylint: disable=unused-variable
         url, data, x = BloodhoundSearchModule(self.env).process_request(
             self.req)
-        print "Received url: %s data:" % url
-        pprint(data)
+        self.env.log.debug("Received url: %s data: %s", url, data)
         if data.has_key("results"):
-            print "results :"
-            pprint(data["results"].__dict__)
+            self.env.log.debug("results: %s", data["results"].__dict__)
         return data
 
 

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=1465222&r1=1465221&r2=1465222&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/tests/index_with_whoosh.py 
(original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/tests/index_with_whoosh.py Sat 
Apr  6 10:51:51 2013
@@ -47,9 +47,7 @@ class IndexWhooshTestCase(BaseBloodhound
 
     def test_that_ticket_indexed_when_inserted_in_db(self):
         ticket = self.create_dummy_ticket()
-        ticket_id = ticket.insert()
-        print "Created ticket #%s" % ticket_id
-
+        ticket.insert()
         results = self.search_api.query("*:*")
         self.print_result(results)
         self.assertEqual(1, results.hits)

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=1465222&r1=1465221&r2=1465222&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/base.py 
(original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/tests/search_resources/base.py 
Sat Apr  6 10:51:51 2013
@@ -85,11 +85,10 @@ class SimpleSearchWikiSyntaxFormatterTes
 
     def _call_format(self, wiki_content):
         result = self.text_formatter.format(wiki_content)
-        print "Input text:"
-        print wiki_content
-        print "-------------------------"
-        print "Formatted text:"
-        print result
+        self.env.log.debug(
+            "Input text:\n%s\nFormatted text:\n%s",
+            wiki_content,
+            result)
         return result
 
     @unittest.skip("Use for debug purposes only")

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=1465222&r1=1465221&r2=1465222&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
 Sat Apr  6 10:51:51 2013
@@ -97,21 +97,20 @@ class ChangesetSearchParticipantTestCase
 
     def test_can_get_default_grid_fields(self):
         grid_fields = self.changeset_search.get_default_view_fields("grid")
-        print grid_fields
+        self.env.log.debug("grid_fields: %s", grid_fields)
         self.assertGreater(len(grid_fields), 0)
 
     def test_can_get_default_facets(self):
         default_facets = self.changeset_search.get_default_facets()
-        print default_facets
+        self.env.log.debug("default_facets: %s", default_facets)
         self.assertIsNotNone(default_facets)
 
     def test_can_get_is_grid_view_defaults(self):
         default_grid_fields = self.changeset_search.get_default_view_fields(
             "grid")
-        print default_grid_fields
+        self.env.log.debug("default_grid_fields: %s", default_grid_fields)
         self.assertIsNotNone(default_grid_fields)
 
-
 class DummyRepositoryConnector(Component):
     implements(IRepositoryConnector)
 

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=1465222&r1=1465221&r2=1465222&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
 Sat Apr  6 10:51:51 2013
@@ -199,18 +199,18 @@ class MilestoneSearchParticipantTestCase
 
     def test_can_get_default_grid_fields(self):
         grid_fields = self.milestone_search.get_default_view_fields("grid")
-        print grid_fields
+        self.env.log.debug("grid_fields: %s", grid_fields)
         self.assertGreater(len(grid_fields), 0)
 
     def test_can_get_default_facets(self):
         default_facets = self.milestone_search.get_default_facets()
-        print default_facets
+        self.env.log.debug("default_facets: %s", default_facets)
         self.assertIsNotNone(default_facets)
 
     def test_can_get_is_grid_view_defaults(self):
         default_grid_fields = self.milestone_search.get_default_view_fields(
             "grid")
-        print default_grid_fields
+        self.env.log.debug("default_grid_fields: %s", default_grid_fields)
         self.assertIsNotNone(default_grid_fields)
 
 def suite():

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=1465222&r1=1465221&r2=1465222&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/tests/web_ui.py (original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/tests/web_ui.py Sat Apr  6 
10:51:51 2013
@@ -102,7 +102,8 @@ class WebUiTestCaseWithWhoosh(BaseBloodh
         #assert
         self.assertEqual(1, len(result_items))
         result_datetime = result_items[0]["date"]
-        print "Ticket time: %s, Returned time: %s" % (
+        self.env.log.debug(
+            "Ticket time: %s, Returned time: %s",
             ticket_time,
             result_datetime)
         self.assertEqual(format_datetime(ticket_time), result_items[0]["date"])
@@ -288,7 +289,7 @@ class WebUiTestCaseWithWhoosh(BaseBloodh
         facet_counts = data["facet_counts"]
 
         milestone_facet_count = facet_counts["milestone"]
-        print unquote(milestone_facet_count[None]["href"])
+        self.env.log.debug(unquote(milestone_facet_count[None]["href"]))
 
     def test_can_handle_multiple_same(self):
         #arrange
@@ -304,7 +305,7 @@ class WebUiTestCaseWithWhoosh(BaseBloodh
 
         component_facet_count = facet_counts["component"]
         c1_href = component_facet_count["c1"]["href"]
-        print unquote(c1_href)
+        self.env.log.debug(unquote(c1_href))
         self.assertEquals(
             1,
             self._count_parameter_in_url(c1_href, "fq", 'component:"c1"'))
@@ -625,7 +626,6 @@ class WebUiTestCaseWithWhoosh(BaseBloodh
 
         for row in data["results"].items:
             title = row["title"]
-            print id, title
             self.assertIn(id, str(title))
 
     def test_that_id_is_highlighted_in_title(self):
@@ -635,7 +635,6 @@ class WebUiTestCaseWithWhoosh(BaseBloodh
         data = self.process_request()
         row = data["results"].items[0]
         title = row["title"]
-        print id, title
         self.assertIn('<em>%s</em>' % id, str(title))
 
     def test_that_content_summary_is_trimmed(self):
@@ -878,7 +877,6 @@ class RequestParametersTest(unittest.Tes
         href = RequestParameters(self.req).create_href(
             sort=SortInstruction("field1", ASC))
         href = unquote(href)
-        print href
         self.assertIn("sort=field1+asc", href)
 
     def test_can_create_href_with_multiple_sort(self):
@@ -888,7 +886,6 @@ class RequestParametersTest(unittest.Tes
                 SortInstruction("field2", DESC),
             ])
         href = unquote(href)
-        print href
         self.assertIn("sort=field1+asc,+field2+desc", href)
 
     def _evaluate_sort(self, sort_condition):

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=1465222&r1=1465221&r2=1465222&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/tests/whoosh_backend.py 
(original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/tests/whoosh_backend.py Sat Apr 
 6 10:51:51 2013
@@ -470,8 +470,6 @@ class WhooshFunctionalityTestCase(unitte
                 maptype=sorting.Count,
             )
             facets = self._load_facets(r)
-            print len(r) == 2
-        print facets
         self.assertEquals(
             {'status': {None: 1, 'New': 1}, 'type': {'type1': 1, 'type2': 1}},
             facets)
@@ -646,7 +644,6 @@ class WhooshEmptyFacetErrorWorkaroundTes
             query_parameters)
 
         result_filter = query_parameters["filter"]
-        print result_filter
         self.assertEquals('(type:ticket AND milestone:empty)',
             str(result_filter))
 
@@ -658,8 +655,8 @@ class WhooshEmptyFacetErrorWorkaroundTes
             query_parameters)
 
         result_filter = query_parameters["filter"]
-        print result_filter
-        self.assertEquals('(type:ticket AND milestone:aaa)', 
str(result_filter))
+        self.assertEquals('(type:ticket AND milestone:aaa)',
+            str(result_filter))
 
 def suite():
     test_suite = unittest.TestSuite()


Reply via email to