Skip to content

Commit 3ef2db8

Browse files
committed
Closes #14629: Add filter tests for all q and description filters
1 parent 3bacee1 commit 3ef2db8

File tree

9 files changed

+1445
-266
lines changed

9 files changed

+1445
-266
lines changed

netbox/circuits/tests/test_filtersets.py

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ def setUpTestData(cls):
2525
ASN.objects.bulk_create(asns)
2626

2727
providers = (
28-
Provider(name='Provider 1', slug='provider-1'),
29-
Provider(name='Provider 2', slug='provider-2'),
28+
Provider(name='Provider 1', slug='provider-1', description='foobar1'),
29+
Provider(name='Provider 2', slug='provider-2', description='foobar2'),
3030
Provider(name='Provider 3', slug='provider-3'),
3131
Provider(name='Provider 4', slug='provider-4'),
3232
Provider(name='Provider 5', slug='provider-5'),
@@ -74,6 +74,10 @@ def setUpTestData(cls):
7474
CircuitTermination(circuit=circuits[1], site=sites[0], term_side='A'),
7575
))
7676

77+
def test_q(self):
78+
params = {'q': 'foobar1'}
79+
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
80+
7781
def test_name(self):
7882
params = {'name': ['Provider 1', 'Provider 2']}
7983
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
@@ -82,6 +86,10 @@ def test_slug(self):
8286
params = {'slug': ['provider-1', 'provider-2']}
8387
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
8488

89+
def test_description(self):
90+
params = {'description': ['foobar1', 'foobar2']}
91+
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
92+
8593
def test_asn_id(self): # ASN object assignment
8694
asns = ASN.objects.all()[:2]
8795
params = {'asn_id': [asns[0].pk, asns[1].pk]}
@@ -122,6 +130,10 @@ def setUpTestData(cls):
122130
CircuitType(name='Circuit Type 3', slug='circuit-type-3'),
123131
))
124132

133+
def test_q(self):
134+
params = {'q': 'foobar1'}
135+
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
136+
125137
def test_name(self):
126138
params = {'name': ['Circuit Type 1']}
127139
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
@@ -227,6 +239,10 @@ def setUpTestData(cls):
227239
))
228240
CircuitTermination.objects.bulk_create(circuit_terminations)
229241

242+
def test_q(self):
243+
params = {'q': 'foobar1'}
244+
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
245+
230246
def test_cid(self):
231247
params = {'cid': ['Test Circuit 1', 'Test Circuit 2']}
232248
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
@@ -369,6 +385,10 @@ def setUpTestData(cls):
369385

370386
Cable(a_terminations=[circuit_terminations[0]], b_terminations=[circuit_terminations[1]]).save()
371387

388+
def test_q(self):
389+
params = {'q': 'foobar1'}
390+
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
391+
372392
def test_term_side(self):
373393
params = {'term_side': 'A'}
374394
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 7)
@@ -440,6 +460,10 @@ def setUpTestData(cls):
440460
)
441461
ProviderNetwork.objects.bulk_create(provider_networks)
442462

463+
def test_q(self):
464+
params = {'q': 'foobar1'}
465+
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
466+
443467
def test_name(self):
444468
params = {'name': ['Provider Network 1', 'Provider Network 2']}
445469
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
@@ -477,6 +501,10 @@ def setUpTestData(cls):
477501
)
478502
ProviderAccount.objects.bulk_create(provider_accounts)
479503

504+
def test_q(self):
505+
params = {'q': 'foobar1'}
506+
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
507+
480508
def test_name(self):
481509
params = {'name': ['Provider Account 1', 'Provider Account 2']}
482510
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)

netbox/core/tests/test_filtersets.py

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,16 @@ def setUpTestData(cls):
2121
type=DataSourceTypeChoices.LOCAL,
2222
source_url='file:///var/tmp/source1/',
2323
status=DataSourceStatusChoices.NEW,
24-
enabled=True
24+
enabled=True,
25+
description='foobar1'
2526
),
2627
DataSource(
2728
name='Data Source 2',
2829
type=DataSourceTypeChoices.LOCAL,
2930
source_url='file:///var/tmp/source2/',
3031
status=DataSourceStatusChoices.SYNCING,
31-
enabled=True
32+
enabled=True,
33+
description='foobar2'
3234
),
3335
DataSource(
3436
name='Data Source 3',
@@ -40,10 +42,18 @@ def setUpTestData(cls):
4042
)
4143
DataSource.objects.bulk_create(data_sources)
4244

45+
def test_q(self):
46+
params = {'q': 'foobar1'}
47+
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
48+
4349
def test_name(self):
4450
params = {'name': ['Data Source 1', 'Data Source 2']}
4551
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
4652

53+
def test_description(self):
54+
params = {'description': ['foobar1', 'foobar2']}
55+
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
56+
4757
def test_type(self):
4858
params = {'type': [DataSourceTypeChoices.LOCAL]}
4959
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
@@ -97,6 +107,10 @@ def setUpTestData(cls):
97107
)
98108
DataFile.objects.bulk_create(data_files)
99109

110+
def test_q(self):
111+
params = {'q': 'file1.txt'}
112+
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
113+
100114
def test_source(self):
101115
sources = DataSource.objects.all()
102116
params = {'source_id': [sources[0].pk, sources[1].pk]}

0 commit comments

Comments
 (0)