Skip to content

Commit b7daec6

Browse files
willemarcelwillemarcel
committed
Improve tests
1 parent 2ba4f6d commit b7daec6

File tree

3 files changed

+57
-35
lines changed

3 files changed

+57
-35
lines changed

‎vbos/datasets/fixtures/master-import.csv‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
Year,Month,Day,Type,Cluster,Indicator,Attribute,Hazard Type,Hazard Response & Recovery,Climate Change,Past Hazard Events,Blue Economy,Agriculture,International Trade,Measure,Country,National,Province,Area Council,Village,Unit,Source,Year Collected,Frequency Collection,Value
2-
2024,,,Baseline,Education,Number Schools,ecce,,,,,,,,,,Vanuatu,,,,number,Minsitry of Education and Training ,2024,Annually,1154
3-
2024,,,Baseline,Education,Number Schools,primary ,,,,,,,,,,Vanuatu,,,,number,Minsitry of Education and Training ,2024,Annually, 870
4-
2024,,,Baseline,Education,Number Schools,secondary,,,,,,,,,,Vanuatu,,,,number,Minsitry of Education and Training ,2024,Annually, 272
5-
2024,,,Baseline,Education,Number Schools,ecce,,,,,,,,,,Vanuatu,Torba,,,number,Minsitry of Education and Training ,2024,Annually, 66
6-
2024,,,Baseline,Education,Number Schools,primary ,,,,,,,,,,Vanuatu,Torba,,,number,Minsitry of Education and Training ,2024,Annually, 54
7-
2024,,,Baseline,Education,Number Schools,secondary,,,,,,,,,,Vanuatu,Torba,,,number,Minsitry of Education and Training ,2024,Annually, 20
8-
2024,,,Baseline,Education,Number Schools,ecce,,,,,,,,,,Vanuatu,Sanma,,,number,Minsitry of Education and Training ,2024,Annually, 240
9-
2024,,,Baseline,Education,Number Schools,primary ,,,,,,,,,,Vanuatu,Sanma,,,number,Minsitry of Education and Training ,2024,Annually, 182
10-
2024,,,Baseline,Education,Number Schools,secondary,,,,,,,,,,Vanuatu,Sanma,,,number,Minsitry of Education and Training ,2024,Annually, 38
11-
2024,,,Baseline,Education,Number Schools,ecce,,,,,,,,,,Vanuatu,Penama,,,number,Minsitry of Education and Training ,2024,Annually, 196
12-
2024,,,Baseline,Education,Number Schools,primary ,,,,,,,,,,Vanuatu,Penama,,,number,Minsitry of Education and Training ,2024,Annually, 124
13-
2024,,,Baseline,Education,Number Schools,secondary,,,,,,,,,,Vanuatu,Penama,,,number,Minsitry of Education and Training ,2024,Annually, 34
14-
2024,,,Baseline,Education,Number Schools,ecce,,,,,,,,,,Vanuatu,Malampa,,,number,Minsitry of Education and Training ,2024,Annually, 236
15-
2024,,,Baseline,Education,Number Schools,primary ,,,,,,,,,,Vanuatu,Malampa,,,number,Minsitry of Education and Training ,2024,Annually, 172
16-
2024,,,Baseline,Education,Number Schools,secondary,,,,,,,,,,Vanuatu,Malampa,,,number,Minsitry of Education and Training ,2024,Annually, 50
17-
2024,,,Baseline,Education,Number Schools,ecce,,,,,,,,,,Vanuatu,Shefa,,,number,Minsitry of Education and Training ,2024,Annually, 190
18-
2024,,,Baseline,Education,Number Schools,primary ,,,,,,,,,,Vanuatu,Shefa,,,number,Minsitry of Education and Training ,2024,Annually, 188
19-
2024,,,Baseline,Education,Number Schools,secondary,,,,,,,,,,Vanuatu,Shefa,,,number,Minsitry of Education and Training ,2024,Annually, 82
20-
2024,,,Baseline,Education,Number Schools,ecce,,,,,,,,,,Vanuatu,Tafea,,,number,Minsitry of Education and Training ,2024,Annually, 226
21-
2024,,,Baseline,Education,Number Schools,primary ,,,,,,,,,,Vanuatu,Tafea,,,number,Minsitry of Education and Training ,2024,Annually, 150
22-
2024,,,Baseline,Education,Number Schools,secondary,,,,,,,,,,Vanuatu,Tafea,,,number,Minsitry of Education and Training ,2024,Annually, 48
23-
2024,,,Baseline,Education,Number Schools,ecce,,,,,,,,,,Vanuatu,Torba,Torres,,number,Minsitry of Education and Training ,2024,Annually, 6
24-
2024,,,Baseline,Education,Number Schools,primary ,,,,,,,,,,Vanuatu,Torba,Torres,,number,Minsitry of Education and Training ,2024,Annually, 6
25-
2024,,,Baseline,Education,Number Schools,secondary,,,,,,,,,,Vanuatu,Torba,Torres,,number,Minsitry of Education and Training ,2024,Annually, 2
26-
2024,,,Baseline,Education,Number Schools,ecce,,,,,,,,,,Vanuatu,Torba,Ureparapara,,number,Minsitry of Education and Training ,2024,Annually, 4
27-
2024,,,Baseline,Education,Number Schools,primary ,,,,,,,,,,Vanuatu,Torba,Ureparapara,,number,Minsitry of Education and Training ,2024,Annually, 4
28-
2024,,,Baseline,Education,Number Schools,secondary,,,,,,,,,,Vanuatu,Torba,Ureparapara,,number,Minsitry of Education and Training ,2024,Annually, 2
29-
2024,,,Baseline,Education,Number Schools,ecce,,,,,,,,,,Vanuatu,Torba,Motalava,,number,Minsitry of Education and Training ,2024,Annually, 8
30-
2024,,,Baseline,Education,Number Schools,primary ,,,,,,,,,,Vanuatu,Torba,Motalava,,number,Minsitry of Education and Training ,2024,Annually, 6
31-
2024,,,Baseline,Education,Number Schools,secondary,,,,,,,,,,Vanuatu,Torba,Motalava,,number,Minsitry of Education and Training ,2024,Annually, 2
32-
2024,,,Baseline,Education,Number Schools,ecce,,,,,,,,,,Vanuatu,Torba,East Vanualava,,number,Minsitry of Education and Training ,2024,Annually, 8
2+
2024,,,Baseline,Education,Number Schools,ecce,,,,,,,,,,Vanuatu,,,,number,Ministry of Education and Training ,2024,Annually,1154
3+
2024,,,Baseline,Education,Number Schools,primary ,,,,,,,,,,Vanuatu,,,,number,Ministry of Education and Training ,2024,Annually, 870
4+
2024,,,Baseline,Education,Number Schools,secondary,,,,,,,,,,Vanuatu,,,,number,Ministry of Education and Training ,2024,Annually, 272
5+
2024,,,Baseline,Education,Number Schools,ecce,,,,,,,,,,Vanuatu,Torba,,,number,Ministry of Education and Training ,2024,Annually, 66
6+
2024,,,Baseline,Education,Number Schools,primary ,,,,,,,,,,Vanuatu,Torba,,,number,Ministry of Education and Training ,2024,Annually, 54
7+
2024,,,Baseline,Education,Number Schools,secondary,,,,,,,,,,Vanuatu,Torba,,,number,Ministry of Education and Training ,2024,Annually, 20
8+
2024,,,Baseline,Education,Number Schools,ecce,,,,,,,,,,Vanuatu,Sanma,,,number,Ministry of Education and Training ,2024,Annually, 240
9+
2024,,,Baseline,Education,Number Schools,primary ,,,,,,,,,,Vanuatu,Sanma,,,number,Ministry of Education and Training ,2024,Annually, 182
10+
2024,,,Baseline,Education,Number Schools,secondary,,,,,,,,,,Vanuatu,Sanma,,,number,Ministry of Education and Training ,2024,Annually, 38
11+
2024,,,Baseline,Education,Number Schools,ecce,,,,,,,,,,Vanuatu,Penama,,,number,Ministry of Education and Training ,2024,Annually, 196
12+
2024,,,Baseline,Education,Number Schools,primary ,,,,,,,,,,Vanuatu,Penama,,,number,Ministry of Education and Training ,2024,Annually, 124
13+
2024,,,Baseline,Education,Number Schools,secondary,,,,,,,,,,Vanuatu,Penama,,,number,Ministry of Education and Training ,2024,Annually, 34
14+
2024,,,Baseline,Education,Number Schools,ecce,,,,,,,,,,Vanuatu,Malampa,,,number,Ministry of Education and Training ,2024,Annually, 236
15+
2024,,,Baseline,Education,Number Schools,primary ,,,,,,,,,,Vanuatu,Malampa,,,number,Ministry of Education and Training ,2024,Annually, 172
16+
2024,,,Baseline,Education,Number Schools,secondary,,,,,,,,,,Vanuatu,Malampa,,,number,Ministry of Education and Training ,2024,Annually, 50
17+
2024,,,Baseline,Education,Number Schools,ecce,,,,,,,,,,Vanuatu,Shefa,,,number,Ministry of Education and Training ,2024,Annually, 190
18+
2024,,,Baseline,Education,Number Schools,primary ,,,,,,,,,,Vanuatu,Shefa,,,number,Ministry of Education and Training ,2024,Annually, 188
19+
2024,,,Baseline,Education,Number Schools,secondary,,,,,,,,,,Vanuatu,Shefa,,,number,Ministry of Education and Training ,2024,Annually, 82
20+
2024,,,Baseline,Education,Number Schools,ecce,,,,,,,,,,Vanuatu,Tafea,,,number,Ministry of Education and Training ,2024,Annually, 226
21+
2024,,,Baseline,Education,Number Schools,primary ,,,,,,,,,,Vanuatu,Tafea,,,number,Ministry of Education and Training ,2024,Annually, 150
22+
2024,,,Baseline,Education,Number Schools,secondary,,,,,,,,,,Vanuatu,Tafea,,,number,Ministry of Education and Training ,2024,Annually, 48
23+
2024,,,Baseline,Education,Number Schools,ecce,,,,,,,,,,Vanuatu,Torba,Torres,,number,Ministry of Education and Training ,2024,Annually, 6
24+
2024,,,Baseline,Education,Number Schools,primary ,,,,,,,,,,Vanuatu,Torba,Torres,,number,Ministry of Education and Training ,2024,Annually, 6
25+
2024,,,Baseline,Education,Number Schools,secondary,,,,,,,,,,Vanuatu,Torba,Torres,,number,Ministry of Education and Training ,2024,Annually, 2
26+
2024,,,Baseline,Education,Number Schools,ecce,,,,,,,,,,Vanuatu,Torba,Ureparapara,,number,Ministry of Education and Training ,2024,Annually, 4
27+
2024,,,Baseline,Education,Number Schools,primary ,,,,,,,,,,Vanuatu,Torba,Ureparapara,,number,Ministry of Education and Training ,2024,Annually, 4
28+
2024,,,Baseline,Education,Number Schools,secondary,,,,,,,,,,Vanuatu,Torba,Ureparapara,,number,Ministry of Education and Training ,2024,Annually, 2
29+
2024,,,Baseline,Education,Number Schools,ecce,,,,,,,,,,Vanuatu,Torba,Motalava,,number,Ministry of Education and Training ,2024,Annually, 8
30+
2024,,,Baseline,Education,Number Schools,primary ,,,,,,,,,,Vanuatu,Torba,Motalava,,number,Ministry of Education and Training ,2024,Annually, 6
31+
2024,,,Baseline,Education,Number Schools,secondary,,,,,,,,,,Vanuatu,Torba,Motalava,,number,Ministry of Education and Training ,2024,Annually, 2
32+
2024,,,Baseline,Education,Number Schools,ecce,,,,,,,,,,Vanuatu,Torba,East Vanualava,,number,Ministry of Education and Training ,2024,Annually, 8
3333
2024,,,Baseline,Health,Health Facility,hospital,,,,,,,,,,Vanuatu,,,,number,Ministry of Health,2024,Annually,6
3434
2024,,,Baseline,Health,Health Facility,health centre,,,,,,,,,,Vanuatu,,,,number,Ministry of Health,2024,Annually,4
3535
2024,,,Baseline,Health,Health Facility,dispensary,,,,,,,,,,Vanuatu,,,,number,Ministry of Health,2024,Annually,47

‎vbos/datasets/management/commands/import_datasets.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,13 @@ def handle(self, *args, **options):
3232
type,
3333
) not in datasets:
3434
TabularDataset.objects.create(
35-
name=row["Indicator"],
36-
cluster=Cluster.objects.get_or_create(name=row["Cluster"])[0],
35+
name=row["Indicator"].strip(),
36+
cluster=Cluster.objects.get_or_create(
37+
name=row["Cluster"].strip()
38+
)[0],
3739
type=type,
38-
unit=row["Unit"],
39-
source=row["Source"],
40+
unit=row["Unit"].strip(),
41+
source=row["Source"].strip(),
4042
)
4143
datasets.append(
4244
(

‎vbos/datasets/test/test_management_commands.py‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,27 @@ def test_import(self):
1818
self.assertIn(
1919
"2 datasets created from {}.".format(self.filename), self.out.getvalue()
2020
)
21+
self.assertEqual(
22+
TabularDataset.objects.get(name="Number Schools").unit, "number"
23+
)
24+
self.assertEqual(
25+
TabularDataset.objects.get(name="Health Facility").unit, "number"
26+
)
27+
self.assertEqual(
28+
TabularDataset.objects.get(name="Number Schools").source,
29+
"Ministry of Education and Training",
30+
)
31+
self.assertEqual(
32+
TabularDataset.objects.get(name="Health Facility").source,
33+
"Ministry of Health",
34+
)
2135
self.assertEqual(TabularItem.objects.count(), 63)
36+
self.assertEqual(
37+
TabularItem.objects.filter(dataset__name="Number Schools").count(), 31
38+
)
39+
self.assertEqual(
40+
TabularItem.objects.filter(dataset__name="Health Facility").count(), 32
41+
)
2242
self.assertIn(
2343
"63 tabular items created",
2444
self.out.getvalue(),

0 commit comments

Comments
 (0)