Skip to content

Commit a08d556

Browse files
committed
Move search test to atlas_search_ test app
1 parent d869ed0 commit a08d556

File tree

4 files changed

+26
-36
lines changed

4 files changed

+26
-36
lines changed

tests/atlas_search_/__init__.py

Whitespace-only changes.

tests/atlas_search_/models.py

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
from django.db import models
2+
3+
from django_mongodb_backend.fields import (
4+
ArrayField,
5+
EmbeddedModelField,
6+
)
7+
from django_mongodb_backend.models import EmbeddedModel
8+
9+
10+
class Writer(EmbeddedModel):
11+
name = models.CharField(max_length=10)
12+
13+
14+
class Location(EmbeddedModel):
15+
type = models.CharField(default="Point", max_length=50)
16+
coordinates = ArrayField(models.FloatField(), max_size=2)
17+
18+
19+
class Article(models.Model):
20+
headline = models.CharField(max_length=100)
21+
number = models.IntegerField()
22+
body = models.TextField()
23+
location = EmbeddedModelField(Location, null=True)
24+
plot_embedding = ArrayField(models.FloatField(), size=3, null=True)
25+
writer = EmbeddedModelField(Writer, null=True)

tests/queries_/test_search.py renamed to tests/atlas_search_/test_search.py

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def wrapper(self, fetch, *args, **kwargs):
7070

7171
@skipUnlessDBFeature("supports_atlas_search")
7272
class SearchUtilsMixin(TransactionTestCase):
73-
available_apps = ["queries_"]
73+
available_apps = None
7474

7575
assertCountEqual = _delayed_assertion(timeout=2)(TransactionTestCase.assertCountEqual)
7676
assertListEqual = _delayed_assertion(timeout=2)(TransactionTestCase.assertListEqual)
@@ -93,7 +93,6 @@ def drop_index():
9393
cls.addClassCleanup(drop_index)
9494

9595

96-
@skipUnlessDBFeature("supports_atlas_search")
9796
class SearchEqualsTests(SearchUtilsMixin):
9897
@classmethod
9998
def setUpClass(cls):
@@ -155,7 +154,6 @@ def test_function_score(self):
155154
self.assertAlmostEqual(scored.score, 1.0, places=2)
156155

157156

158-
@skipUnlessDBFeature("supports_atlas_search")
159157
class SearchAutocompleteTests(SearchUtilsMixin):
160158
@classmethod
161159
def setUpClass(cls):
@@ -235,7 +233,6 @@ def test_constant_score(self):
235233
self.assertAlmostEqual(scored.score, 10.0, places=2)
236234

237235

238-
@skipUnlessDBFeature("supports_atlas_search")
239236
class SearchExistsTests(SearchUtilsMixin):
240237
@classmethod
241238
def setUpClass(cls):
@@ -261,7 +258,6 @@ def test_constant_score(self):
261258
self.assertAlmostEqual(scored.score, 10.0, places=2)
262259

263260

264-
@skipUnlessDBFeature("supports_atlas_search")
265261
class SearchInTests(SearchUtilsMixin):
266262
@classmethod
267263
def setUpClass(cls):
@@ -290,7 +286,6 @@ def test_constant_score(self):
290286
self.assertAlmostEqual(scored.score, 10.0, places=2)
291287

292288

293-
@skipUnlessDBFeature("supports_atlas_search")
294289
class SearchPhraseTests(SearchUtilsMixin):
295290
@classmethod
296291
def setUpClass(cls):
@@ -321,7 +316,6 @@ def test_constant_score(self):
321316
self.assertAlmostEqual(scored.score, 10.0, places=2)
322317

323318

324-
@skipUnlessDBFeature("supports_atlas_search")
325319
class SearchRangeTests(SearchUtilsMixin):
326320
@classmethod
327321
def setUpClass(cls):
@@ -350,7 +344,6 @@ def test_constant_score(self):
350344
self.assertAlmostEqual(scored.score, 10.0, places=2)
351345

352346

353-
@skipUnlessDBFeature("supports_atlas_search")
354347
class SearchRegexTests(SearchUtilsMixin):
355348
@classmethod
356349
def setUpClass(cls):
@@ -388,7 +381,6 @@ def test_constant_score(self):
388381
self.assertAlmostEqual(scored.score, 10.0, places=2)
389382

390383

391-
@skipUnlessDBFeature("supports_atlas_search")
392384
class SearchTextTests(SearchUtilsMixin):
393385
@classmethod
394386
def setUpClass(cls):
@@ -437,7 +429,6 @@ def test_constant_score(self):
437429
self.assertAlmostEqual(scored.score, 10.0, places=2)
438430

439431

440-
@skipUnlessDBFeature("supports_atlas_search")
441432
class SearchWildcardTests(SearchUtilsMixin):
442433
@classmethod
443434
def setUpClass(cls):
@@ -471,7 +462,6 @@ def test_constant_score(self):
471462
self.assertAlmostEqual(scored.score, 10.0, places=2)
472463

473464

474-
@skipUnlessDBFeature("supports_atlas_search")
475465
class SearchGeoShapeTests(SearchUtilsMixin):
476466
@classmethod
477467
def setUpClass(cls):
@@ -524,7 +514,6 @@ def test_constant_score(self):
524514
self.assertAlmostEqual(scored.score, 10.0, places=2)
525515

526516

527-
@skipUnlessDBFeature("supports_atlas_search")
528517
class SearchGeoWithinTests(SearchUtilsMixin):
529518
@classmethod
530519
def setUpClass(cls):
@@ -579,7 +568,6 @@ def test_constant_score(self):
579568
self.assertAlmostEqual(scored.score, 10.0, places=2)
580569

581570

582-
@skipUnlessDBFeature("supports_atlas_search")
583571
@unittest.expectedFailure
584572
class SearchMoreLikeThisTests(SearchUtilsMixin):
585573
@classmethod
@@ -620,7 +608,6 @@ def test_search_more_like_this(self):
620608
self.assertQuerySetEqual(qs.all, [self.article1, self.article2], lambda a: a.headline)
621609

622610

623-
@skipUnlessDBFeature("supports_atlas_search")
624611
class CompoundSearchTests(SearchUtilsMixin):
625612
@classmethod
626613
def setUpClass(cls):
@@ -784,7 +771,6 @@ def test_search_and_filter(self):
784771
self.assertCountEqual(qs.all, [self.icy_moons])
785772

786773

787-
@skipUnlessDBFeature("supports_atlas_search")
788774
class SearchVectorTests(SearchUtilsMixin):
789775
@classmethod
790776
def setUpClass(cls):

tests/queries_/models.py

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
from django.db import models
22

33
from django_mongodb_backend.fields import (
4-
ArrayField,
5-
EmbeddedModelField,
64
ObjectIdAutoField,
75
ObjectIdField,
86
)
9-
from django_mongodb_backend.models import EmbeddedModel
107

118

129
class Author(models.Model):
@@ -59,21 +56,3 @@ class Meta:
5956

6057
def __str__(self):
6158
return str(self.pk)
62-
63-
64-
class Writer(EmbeddedModel):
65-
name = models.CharField(max_length=10)
66-
67-
68-
class Location(EmbeddedModel):
69-
type = models.CharField(default="Point", max_length=50)
70-
coordinates = ArrayField(models.FloatField(), max_size=2)
71-
72-
73-
class Article(models.Model):
74-
headline = models.CharField(max_length=100)
75-
number = models.IntegerField()
76-
body = models.TextField()
77-
location = EmbeddedModelField(Location, null=True)
78-
plot_embedding = ArrayField(models.FloatField(), size=3, null=True)
79-
writer = EmbeddedModelField(Writer, null=True)

0 commit comments

Comments
 (0)