Skip to content

Commit 8950735

Browse files
RKrahlRKrahl
committed
Add checks to the tests in test_06_ingest.py to verify that the
prescribed values are actually set as expected
1 parent b450b7b commit 8950735

1 file changed

Lines changed: 48 additions & 0 deletions

File tree

‎tests/test_06_ingest.py‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,10 @@ class MyIngestReader(IngestReader):
104104
metadata = gettestdata("metadata-4.4-inl.xml"),
105105
checks = {
106106
"testingest_inl_1": [
107+
("SELECT ds.complete FROM Dataset ds WHERE ds.id = %d",
108+
False),
109+
("SELECT ds.type.name FROM Dataset ds WHERE ds.id = %d",
110+
"raw"),
107111
("SELECT ds.description FROM Dataset ds WHERE ds.id = %d",
108112
"Dy01Cp02 at 2.7 K"),
109113
("SELECT ds.startDate FROM Dataset ds WHERE ds.id = %d",
@@ -120,6 +124,10 @@ class MyIngestReader(IngestReader):
120124
2.74103),
121125
],
122126
"testingest_inl_2": [
127+
("SELECT ds.complete FROM Dataset ds WHERE ds.id = %d",
128+
False),
129+
("SELECT ds.type.name FROM Dataset ds WHERE ds.id = %d",
130+
"raw"),
123131
("SELECT ds.description FROM Dataset ds WHERE ds.id = %d",
124132
"Dy01Cp02 at 5.1 K"),
125133
("SELECT ds.startDate FROM Dataset ds WHERE ds.id = %d",
@@ -143,6 +151,10 @@ class MyIngestReader(IngestReader):
143151
metadata = gettestdata("metadata-5.0-inl.xml"),
144152
checks = {
145153
"testingest_inl5_1": [
154+
("SELECT ds.complete FROM Dataset ds WHERE ds.id = %d",
155+
False),
156+
("SELECT ds.type.name FROM Dataset ds WHERE ds.id = %d",
157+
"raw"),
146158
("SELECT ds.description FROM Dataset ds WHERE ds.id = %d",
147159
"Dy01Cp02 at 2.7 K"),
148160
("SELECT ds.startDate FROM Dataset ds WHERE ds.id = %d",
@@ -167,6 +179,10 @@ class MyIngestReader(IngestReader):
167179
2.74103),
168180
],
169181
"testingest_inl5_2": [
182+
("SELECT ds.complete FROM Dataset ds WHERE ds.id = %d",
183+
False),
184+
("SELECT ds.type.name FROM Dataset ds WHERE ds.id = %d",
185+
"raw"),
170186
("SELECT ds.description FROM Dataset ds WHERE ds.id = %d",
171187
"Dy01Cp02 at 5.1 K"),
172188
("SELECT ds.startDate FROM Dataset ds WHERE ds.id = %d",
@@ -201,6 +217,10 @@ class MyIngestReader(IngestReader):
201217
metadata = gettestdata("metadata-4.4-sep.xml"),
202218
checks = {
203219
"testingest_sep_1": [
220+
("SELECT ds.complete FROM Dataset ds WHERE ds.id = %d",
221+
False),
222+
("SELECT ds.type.name FROM Dataset ds WHERE ds.id = %d",
223+
"raw"),
204224
("SELECT ds.description FROM Dataset ds WHERE ds.id = %d",
205225
"Dy01Cp02 at 2.7 K"),
206226
("SELECT ds.startDate FROM Dataset ds WHERE ds.id = %d",
@@ -217,6 +237,10 @@ class MyIngestReader(IngestReader):
217237
2.74103),
218238
],
219239
"testingest_sep_2": [
240+
("SELECT ds.complete FROM Dataset ds WHERE ds.id = %d",
241+
False),
242+
("SELECT ds.type.name FROM Dataset ds WHERE ds.id = %d",
243+
"raw"),
220244
("SELECT ds.description FROM Dataset ds WHERE ds.id = %d",
221245
"Dy01Cp02 at 5.1 K"),
222246
("SELECT ds.startDate FROM Dataset ds WHERE ds.id = %d",
@@ -240,6 +264,10 @@ class MyIngestReader(IngestReader):
240264
metadata = gettestdata("metadata-5.0-sep.xml"),
241265
checks = {
242266
"testingest_sep5_1": [
267+
("SELECT ds.complete FROM Dataset ds WHERE ds.id = %d",
268+
False),
269+
("SELECT ds.type.name FROM Dataset ds WHERE ds.id = %d",
270+
"raw"),
243271
("SELECT ds.description FROM Dataset ds WHERE ds.id = %d",
244272
"Dy01Cp02 at 2.7 K"),
245273
("SELECT ds.startDate FROM Dataset ds WHERE ds.id = %d",
@@ -264,6 +292,10 @@ class MyIngestReader(IngestReader):
264292
2.74103),
265293
],
266294
"testingest_sep5_2": [
295+
("SELECT ds.complete FROM Dataset ds WHERE ds.id = %d",
296+
False),
297+
("SELECT ds.type.name FROM Dataset ds WHERE ds.id = %d",
298+
"raw"),
267299
("SELECT ds.description FROM Dataset ds WHERE ds.id = %d",
268300
"Dy01Cp02 at 5.1 K"),
269301
("SELECT ds.startDate FROM Dataset ds WHERE ds.id = %d",
@@ -299,6 +331,10 @@ class MyIngestReader(IngestReader):
299331
metadata = gettestdata("metadata-sample.xml"),
300332
checks = {
301333
"testingest_sample_1": [
334+
("SELECT ds.complete FROM Dataset ds WHERE ds.id = %d",
335+
False),
336+
("SELECT ds.type.name FROM Dataset ds WHERE ds.id = %d",
337+
"raw"),
302338
("SELECT ds.description FROM Dataset ds WHERE ds.id = %d",
303339
"ab3465 at 2.7 K"),
304340
("SELECT ds.startDate FROM Dataset ds WHERE ds.id = %d",
@@ -313,6 +349,10 @@ class MyIngestReader(IngestReader):
313349
"ab3465"),
314350
],
315351
"testingest_sample_2": [
352+
("SELECT ds.complete FROM Dataset ds WHERE ds.id = %d",
353+
False),
354+
("SELECT ds.type.name FROM Dataset ds WHERE ds.id = %d",
355+
"raw"),
316356
("SELECT ds.description FROM Dataset ds WHERE ds.id = %d",
317357
"ab3465 at 5.1 K"),
318358
("SELECT ds.startDate FROM Dataset ds WHERE ds.id = %d",
@@ -327,6 +367,10 @@ class MyIngestReader(IngestReader):
327367
"ab3465"),
328368
],
329369
"testingest_sample_3": [
370+
("SELECT ds.complete FROM Dataset ds WHERE ds.id = %d",
371+
False),
372+
("SELECT ds.type.name FROM Dataset ds WHERE ds.id = %d",
373+
"raw"),
330374
("SELECT ds.description FROM Dataset ds WHERE ds.id = %d",
331375
"ab3466 at 2.7 K"),
332376
("SELECT ds.startDate FROM Dataset ds WHERE ds.id = %d",
@@ -341,6 +385,10 @@ class MyIngestReader(IngestReader):
341385
"ab3466"),
342386
],
343387
"testingest_sample_4": [
388+
("SELECT ds.complete FROM Dataset ds WHERE ds.id = %d",
389+
False),
390+
("SELECT ds.type.name FROM Dataset ds WHERE ds.id = %d",
391+
"raw"),
344392
("SELECT ds.description FROM Dataset ds WHERE ds.id = %d",
345393
"reference"),
346394
("SELECT ds.startDate FROM Dataset ds WHERE ds.id = %d",

0 commit comments

Comments
 (0)