~jcsackett/charmworld/bac-tag-constraints

« back to all changes in this revision

Viewing changes to charmworld/views/tests/test_search.py

  • Committer: Tarmac
  • Author(s): Brad Crittenden
  • Date: 2013-08-01 20:59:27 UTC
  • mfrom: (325.1.9 bundle-search)
  • Revision ID: tarmac-20130801205927-lcbxxxb2bba92akt
[r=abentley][bug=][author=bac] Provide support for bundles in searching. The display of search results in the web app still only shows charms.

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
RETURN_VAL = {
19
19
    'results': [],
20
20
    'search_time': 0.0,
21
 
    'charm_total': 0,
 
21
    'result_total': 0,
22
22
    'matches': 0,
23
23
}
24
24
 
29
29
           autospec=True, return_value=RETURN_VAL)
30
30
    def test_search(self, mock):
31
31
        terms = {"search_text": 'foo'}
32
 
        keys = ['charm_total', 'results', 'search_time']
 
32
        keys = ['result_total', 'results', 'search_time']
33
33
        request = self.getRequest(params=terms)
34
34
        response = search.search(request)
35
35
 
36
36
        mock.assert_called_with(request)
37
37
        self.assertEqual(keys, sorted(response.keys()))
38
 
        self.assertEqual(0, response['charm_total'])
 
38
        self.assertEqual(0, response['result_total'])
39
39
        self.assertEqual([], response['results'])
40
40
        self.assertEqual(0.0, response['search_time'])
41
41
 
74
74
        self.index_client.index_charm(charm)
75
75
        terms = {"search_text": 'foo'}
76
76
        request = self.getRequest(params=terms)
77
 
        keys = ['charm_total', 'matches', 'matches_human_readable_estimate',
78
 
                'results', 'results_size', 'search_time']
 
77
        keys = sorted([
 
78
            'charm_total',
 
79
            'matches',
 
80
            'matches_human_readable_estimate',
 
81
            'results',
 
82
            'results_size',
 
83
            'search_time'])
79
84
        json = search.search_json(request).json
80
 
 
81
85
        self.assertEqual(keys, sorted(json.keys()))
82
86
        self.assertEqual(1, json['charm_total'])
83
87
        self.assertEqual(1, json['matches'])