Skip to content

Commit 7a8136a

Browse files
committed
Improve unit test.
1 parent a71083f commit 7a8136a

File tree

1 file changed

+18
-6
lines changed

1 file changed

+18
-6
lines changed

tests/queries_/test_search.py

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,12 @@ def setUp(self):
104104
"equals_headline_index",
105105
{"mappings": {"dynamic": False, "fields": {"headline": {"type": "token"}}}},
106106
)
107-
self.cross = Article.objects.create(headline="cross", number=1, body="body")
107+
self.article = Article.objects.create(headline="cross", number=1, body="body")
108+
Article.objects.create(headline="other thing", number=2, body="body")
108109

109110
def test_search_equals(self):
110111
qs = Article.objects.annotate(score=SearchEquals(path="headline", value="cross"))
111-
self.wait_for_assertion(lambda: self.assertCountEqual(qs.all(), [self.cross]))
112+
self.wait_for_assertion(lambda: self.assertCountEqual(qs.all(), [self.article]))
112113

113114
def tearDown(self):
114115
self._tear_down(Article)
@@ -139,6 +140,7 @@ def setUp(self):
139140
self.article = Article.objects.create(
140141
headline="crossing and something", number=2, body="river"
141142
)
143+
Article.objects.create(headline="Some random text", number=3, body="river")
142144

143145
def tearDown(self):
144146
self._tear_down(Article)
@@ -170,7 +172,7 @@ def setUp(self):
170172
"in_headline_index",
171173
{"mappings": {"dynamic": False, "fields": {"headline": {"type": "token"}}}},
172174
)
173-
self.cross = Article.objects.create(headline="cross", number=1, body="a")
175+
self.article = Article.objects.create(headline="cross", number=1, body="a")
174176
Article.objects.create(headline="road", number=2, body="b")
175177

176178
def tearDown(self):
@@ -179,7 +181,7 @@ def tearDown(self):
179181

180182
def test_search_in(self):
181183
qs = Article.objects.annotate(score=SearchIn(path="headline", value=["cross", "river"]))
182-
self.wait_for_assertion(lambda: self.assertCountEqual(qs.all(), [self.cross]))
184+
self.wait_for_assertion(lambda: self.assertCountEqual(qs.all(), [self.article]))
183185

184186

185187
class SearchPhraseTest(SearchUtilsMixin):
@@ -189,17 +191,18 @@ def setUp(self):
189191
"phrase_body_index",
190192
{"mappings": {"dynamic": False, "fields": {"body": {"type": "string"}}}},
191193
)
192-
self.irrelevant = Article.objects.create(
194+
self.article = Article.objects.create(
193195
headline="irrelevant", number=1, body="the quick brown fox"
194196
)
197+
Article.objects.create(headline="cheetah", number=2, body="fastest animal")
195198

196199
def tearDown(self):
197200
self._tear_down(Article)
198201
super().tearDown()
199202

200203
def test_search_phrase(self):
201204
qs = Article.objects.annotate(score=SearchPhrase(path="body", query="quick brown"))
202-
self.wait_for_assertion(lambda: self.assertCountEqual(qs.all(), [self.irrelevant]))
205+
self.wait_for_assertion(lambda: self.assertCountEqual(qs.all(), [self.article]))
203206

204207

205208
class SearchRangeTest(SearchUtilsMixin):
@@ -234,6 +237,7 @@ def setUp(self):
234237
},
235238
)
236239
self.article = Article.objects.create(headline="hello world", number=1, body="abc")
240+
Article.objects.create(headline="hola mundo", number=2, body="abc")
237241

238242
def tearDown(self):
239243
self._tear_down(Article)
@@ -256,6 +260,7 @@ def setUp(self):
256260
self.article = Article.objects.create(
257261
headline="ignored", number=1, body="The lazy dog sleeps"
258262
)
263+
Article.objects.create(headline="ignored", number=2, body="The sleepy bear")
259264

260265
def tearDown(self):
261266
self._tear_down(Article)
@@ -287,6 +292,7 @@ def setUp(self):
287292
},
288293
)
289294
self.article = Article.objects.create(headline="dark-knight", number=1, body="")
295+
Article.objects.create(headline="batman", number=2, body="")
290296

291297
def tearDown(self):
292298
self._tear_down(Article)
@@ -312,6 +318,9 @@ def setUp(self):
312318
self.article = Article.objects.create(
313319
headline="any", number=1, body="", location={"type": "Point", "coordinates": [40, 5]}
314320
)
321+
Article.objects.create(
322+
headline="any", number=2, body="", location={"type": "Point", "coordinates": [400, 50]}
323+
)
315324

316325
def tearDown(self):
317326
self._tear_down(Article)
@@ -338,6 +347,9 @@ def setUp(self):
338347
self.article = Article.objects.create(
339348
headline="geo", number=2, body="", location={"type": "Point", "coordinates": [40, 5]}
340349
)
350+
Article.objects.create(
351+
headline="geo2", number=3, body="", location={"type": "Point", "coordinates": [-40, -5]}
352+
)
341353

342354
def tearDown(self):
343355
self._tear_down(Article)

0 commit comments

Comments
 (0)