Skip to content

Commit 2d1a796

Browse files
mpsonntagmpsonntag
committed
[test] Adapt tests to new Property.values
1 parent 8156605 commit 2d1a796

7 files changed

Lines changed: 141 additions & 141 deletions

‎test/test_dtypes_integration.py‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -48,38 +48,38 @@ def test_time(self):
4848
jdoc = odml.load(self.json_file, "JSON")
4949

5050
self.assertEqual(jdoc.sections[0].properties[0].dtype, odml.dtypes.DType.time)
51-
self.assertIsInstance(jdoc.sections[0].properties[0].value[0], dt.time)
51+
self.assertIsInstance(jdoc.sections[0].properties[0].values[0], dt.time)
5252
self.assertEqual(jdoc.sections[0].properties[1].dtype, odml.dtypes.DType.time)
5353
for val in jdoc.sections[0].properties[1].value:
5454
self.assertIsInstance(val, dt.time)
55-
self.assertEqual(jdoc.sections[0].properties[1].value[2], time)
56-
self.assertEqual(jdoc.sections[0].properties[1].value[3], time)
55+
self.assertEqual(jdoc.sections[0].properties[1].values[2], time)
56+
self.assertEqual(jdoc.sections[0].properties[1].values[3], time)
5757
self.assertEqual(self.doc, jdoc)
5858

5959
# Test correct xml save and load.
6060
odml.save(self.doc, self.xml_file)
6161
xdoc = odml.load(self.xml_file)
6262

6363
self.assertEqual(xdoc.sections[0].properties[0].dtype, odml.dtypes.DType.time)
64-
self.assertIsInstance(xdoc.sections[0].properties[0].value[0], dt.time)
64+
self.assertIsInstance(xdoc.sections[0].properties[0].values[0], dt.time)
6565
self.assertEqual(xdoc.sections[0].properties[1].dtype, odml.dtypes.DType.time)
6666
for val in xdoc.sections[0].properties[1].value:
6767
self.assertIsInstance(val, dt.time)
68-
self.assertEqual(xdoc.sections[0].properties[1].value[2], time)
69-
self.assertEqual(xdoc.sections[0].properties[1].value[2], time)
68+
self.assertEqual(xdoc.sections[0].properties[1].values[2], time)
69+
self.assertEqual(xdoc.sections[0].properties[1].values[2], time)
7070
self.assertEqual(self.doc, xdoc)
7171

7272
# Test correct yaml save and load.
7373
odml.save(self.doc, self.yaml_file, "YAML")
7474
ydoc = odml.load(self.yaml_file, "YAML")
7575

7676
self.assertEqual(ydoc.sections[0].properties[0].dtype, odml.dtypes.DType.time)
77-
self.assertIsInstance(ydoc.sections[0].properties[0].value[0], dt.time)
77+
self.assertIsInstance(ydoc.sections[0].properties[0].values[0], dt.time)
7878
self.assertEqual(ydoc.sections[0].properties[1].dtype, odml.dtypes.DType.time)
7979
for val in ydoc.sections[0].properties[1].value:
8080
self.assertIsInstance(val, dt.time)
81-
self.assertEqual(ydoc.sections[0].properties[1].value[2], time)
82-
self.assertEqual(ydoc.sections[0].properties[1].value[2], time)
81+
self.assertEqual(ydoc.sections[0].properties[1].values[2], time)
82+
self.assertEqual(ydoc.sections[0].properties[1].values[2], time)
8383
self.assertEqual(self.doc, ydoc)
8484

8585
def test_date(self):
@@ -98,38 +98,38 @@ def test_date(self):
9898
jdoc = odml.load(self.json_file, "JSON")
9999

100100
self.assertEqual(jdoc.sections[0].properties[0].dtype, odml.dtypes.DType.date)
101-
self.assertIsInstance(jdoc.sections[0].properties[0].value[0], dt.date)
101+
self.assertIsInstance(jdoc.sections[0].properties[0].values[0], dt.date)
102102
self.assertEqual(jdoc.sections[0].properties[1].dtype, odml.dtypes.DType.date)
103103
for val in jdoc.sections[0].properties[1].value:
104104
self.assertIsInstance(val, dt.date)
105-
self.assertEqual(jdoc.sections[0].properties[1].value[2], date)
106-
self.assertEqual(jdoc.sections[0].properties[1].value[3], date)
105+
self.assertEqual(jdoc.sections[0].properties[1].values[2], date)
106+
self.assertEqual(jdoc.sections[0].properties[1].values[3], date)
107107
self.assertEqual(self.doc, jdoc)
108108

109109
# Test correct xml save and load.
110110
odml.save(self.doc, self.xml_file)
111111
xdoc = odml.load(self.xml_file)
112112

113113
self.assertEqual(xdoc.sections[0].properties[0].dtype, odml.dtypes.DType.date)
114-
self.assertIsInstance(xdoc.sections[0].properties[0].value[0], dt.date)
114+
self.assertIsInstance(xdoc.sections[0].properties[0].values[0], dt.date)
115115
self.assertEqual(xdoc.sections[0].properties[1].dtype, odml.dtypes.DType.date)
116116
for val in xdoc.sections[0].properties[1].value:
117117
self.assertIsInstance(val, dt.date)
118-
self.assertEqual(xdoc.sections[0].properties[1].value[2], date)
119-
self.assertEqual(xdoc.sections[0].properties[1].value[2], date)
118+
self.assertEqual(xdoc.sections[0].properties[1].values[2], date)
119+
self.assertEqual(xdoc.sections[0].properties[1].values[2], date)
120120
self.assertEqual(self.doc, xdoc)
121121

122122
# Test correct yaml save and load.
123123
odml.save(self.doc, self.yaml_file, "YAML")
124124
ydoc = odml.load(self.yaml_file, "YAML")
125125

126126
self.assertEqual(ydoc.sections[0].properties[0].dtype, odml.dtypes.DType.date)
127-
self.assertIsInstance(ydoc.sections[0].properties[0].value[0], dt.date)
127+
self.assertIsInstance(ydoc.sections[0].properties[0].values[0], dt.date)
128128
self.assertEqual(ydoc.sections[0].properties[1].dtype, odml.dtypes.DType.date)
129129
for val in ydoc.sections[0].properties[1].value:
130130
self.assertIsInstance(val, dt.date)
131-
self.assertEqual(ydoc.sections[0].properties[1].value[2], date)
132-
self.assertEqual(ydoc.sections[0].properties[1].value[2], date)
131+
self.assertEqual(ydoc.sections[0].properties[1].values[2], date)
132+
self.assertEqual(ydoc.sections[0].properties[1].values[2], date)
133133
self.assertEqual(self.doc, ydoc)
134134

135135
def test_datetime(self):
@@ -148,38 +148,38 @@ def test_datetime(self):
148148
jdoc = odml.load(self.json_file, "JSON")
149149

150150
self.assertEqual(jdoc.sections[0].properties[0].dtype, odml.dtypes.DType.datetime)
151-
self.assertIsInstance(jdoc.sections[0].properties[0].value[0], dt.datetime)
151+
self.assertIsInstance(jdoc.sections[0].properties[0].values[0], dt.datetime)
152152
self.assertEqual(jdoc.sections[0].properties[1].dtype, odml.dtypes.DType.datetime)
153153
for val in jdoc.sections[0].properties[1].value:
154154
self.assertIsInstance(val, dt.datetime)
155-
self.assertEqual(jdoc.sections[0].properties[1].value[2], date_time)
156-
self.assertEqual(jdoc.sections[0].properties[1].value[3], date_time)
155+
self.assertEqual(jdoc.sections[0].properties[1].values[2], date_time)
156+
self.assertEqual(jdoc.sections[0].properties[1].values[3], date_time)
157157
self.assertEqual(self.doc, jdoc)
158158

159159
# Test correct xml save and load.
160160
odml.save(self.doc, self.xml_file)
161161
xdoc = odml.load(self.xml_file)
162162

163163
self.assertEqual(xdoc.sections[0].properties[0].dtype, odml.dtypes.DType.datetime)
164-
self.assertIsInstance(xdoc.sections[0].properties[0].value[0], dt.datetime)
164+
self.assertIsInstance(xdoc.sections[0].properties[0].values[0], dt.datetime)
165165
self.assertEqual(xdoc.sections[0].properties[1].dtype, odml.dtypes.DType.datetime)
166166
for val in xdoc.sections[0].properties[1].value:
167167
self.assertIsInstance(val, dt.datetime)
168-
self.assertEqual(xdoc.sections[0].properties[1].value[2], date_time)
169-
self.assertEqual(xdoc.sections[0].properties[1].value[2], date_time)
168+
self.assertEqual(xdoc.sections[0].properties[1].values[2], date_time)
169+
self.assertEqual(xdoc.sections[0].properties[1].values[2], date_time)
170170
self.assertEqual(self.doc, xdoc)
171171

172172
# Test correct yaml save and load.
173173
odml.save(self.doc, self.yaml_file, "YAML")
174174
ydoc = odml.load(self.yaml_file, "YAML")
175175

176176
self.assertEqual(ydoc.sections[0].properties[0].dtype, odml.dtypes.DType.datetime)
177-
self.assertIsInstance(ydoc.sections[0].properties[0].value[0], dt.datetime)
177+
self.assertIsInstance(ydoc.sections[0].properties[0].values[0], dt.datetime)
178178
self.assertEqual(ydoc.sections[0].properties[1].dtype, odml.dtypes.DType.datetime)
179179
for val in ydoc.sections[0].properties[1].value:
180180
self.assertIsInstance(val, dt.datetime)
181-
self.assertEqual(ydoc.sections[0].properties[1].value[2], date_time)
182-
self.assertEqual(ydoc.sections[0].properties[1].value[2], date_time)
181+
self.assertEqual(ydoc.sections[0].properties[1].values[2], date_time)
182+
self.assertEqual(ydoc.sections[0].properties[1].values[2], date_time)
183183
self.assertEqual(self.doc, ydoc)
184184

185185
def test_int(self):
@@ -193,23 +193,23 @@ def test_int(self):
193193
jdoc = odml.load(self.json_file, "JSON")
194194

195195
self.assertEqual(jdoc.sections[0].properties[0].dtype, odml.dtypes.DType.int)
196-
self.assertEqual(jdoc.sections[0].properties[0].value, val_odml)
196+
self.assertEqual(jdoc.sections[0].properties[0].values, val_odml)
197197
self.assertEqual(self.doc, jdoc)
198198

199199
# Test correct xml save and load.
200200
odml.save(self.doc, self.xml_file)
201201
xdoc = odml.load(self.xml_file)
202202

203203
self.assertEqual(xdoc.sections[0].properties[0].dtype, odml.dtypes.DType.int)
204-
self.assertEqual(xdoc.sections[0].properties[0].value, val_odml)
204+
self.assertEqual(xdoc.sections[0].properties[0].values, val_odml)
205205
self.assertEqual(self.doc, xdoc)
206206

207207
# Test correct yaml save and load.
208208
odml.save(self.doc, self.yaml_file, "YAML")
209209
ydoc = odml.load(self.yaml_file, "YAML")
210210

211211
self.assertEqual(ydoc.sections[0].properties[0].dtype, odml.dtypes.DType.int)
212-
self.assertEqual(ydoc.sections[0].properties[0].value, val_odml)
212+
self.assertEqual(ydoc.sections[0].properties[0].values, val_odml)
213213
self.assertEqual(self.doc, ydoc)
214214

215215
def test_float(self):
@@ -224,23 +224,23 @@ def test_float(self):
224224
jdoc = odml.load(self.json_file, "JSON")
225225

226226
self.assertEqual(jdoc.sections[0].properties[0].dtype, odml.dtypes.DType.float)
227-
self.assertEqual(jdoc.sections[0].properties[0].value, val_odml)
227+
self.assertEqual(jdoc.sections[0].properties[0].values, val_odml)
228228
self.assertEqual(self.doc, jdoc)
229229

230230
# Test correct xml save and load.
231231
odml.save(self.doc, self.xml_file)
232232
xdoc = odml.load(self.xml_file)
233233

234234
self.assertEqual(xdoc.sections[0].properties[0].dtype, odml.dtypes.DType.float)
235-
self.assertEqual(xdoc.sections[0].properties[0].value, val_odml)
235+
self.assertEqual(xdoc.sections[0].properties[0].values, val_odml)
236236
self.assertEqual(self.doc, xdoc)
237237

238238
# Test correct yaml save and load.
239239
odml.save(self.doc, self.yaml_file, "YAML")
240240
ydoc = odml.load(self.yaml_file, "YAML")
241241

242242
self.assertEqual(ydoc.sections[0].properties[0].dtype, odml.dtypes.DType.float)
243-
self.assertEqual(ydoc.sections[0].properties[0].value, val_odml)
243+
self.assertEqual(ydoc.sections[0].properties[0].values, val_odml)
244244
self.assertEqual(self.doc, ydoc)
245245

246246
def test_str(self):
@@ -258,29 +258,29 @@ def test_str(self):
258258
jdoc = odml.load(self.json_file, "JSON")
259259

260260
self.assertEqual(jdoc.sections[0].properties[0].dtype, odml.dtypes.DType.string)
261-
self.assertEqual(jdoc.sections[0].properties[0].value, [val_in])
261+
self.assertEqual(jdoc.sections[0].properties[0].values, [val_in])
262262
self.assertEqual(jdoc.sections[0].properties[1].dtype, odml.dtypes.DType.string)
263-
self.assertEqual(jdoc.sections[0].properties[1].value, vals_odml)
263+
self.assertEqual(jdoc.sections[0].properties[1].values, vals_odml)
264264
self.assertEqual(self.doc, jdoc)
265265

266266
# Test correct xml save and load.
267267
odml.save(self.doc, self.xml_file)
268268
xdoc = odml.load(self.xml_file)
269269

270270
self.assertEqual(xdoc.sections[0].properties[0].dtype, odml.dtypes.DType.string)
271-
self.assertEqual(xdoc.sections[0].properties[0].value, [val_in])
271+
self.assertEqual(xdoc.sections[0].properties[0].values, [val_in])
272272
self.assertEqual(xdoc.sections[0].properties[1].dtype, odml.dtypes.DType.string)
273-
self.assertEqual(xdoc.sections[0].properties[1].value, vals_odml)
273+
self.assertEqual(xdoc.sections[0].properties[1].values, vals_odml)
274274
self.assertEqual(self.doc, xdoc)
275275

276276
# Test correct yaml save and load.
277277
odml.save(self.doc, self.yaml_file, "YAML")
278278
ydoc = odml.load(self.yaml_file, "YAML")
279279

280280
self.assertEqual(ydoc.sections[0].properties[0].dtype, odml.dtypes.DType.string)
281-
self.assertEqual(ydoc.sections[0].properties[0].value, [val_in])
281+
self.assertEqual(ydoc.sections[0].properties[0].values, [val_in])
282282
self.assertEqual(ydoc.sections[0].properties[1].dtype, odml.dtypes.DType.string)
283-
self.assertEqual(ydoc.sections[0].properties[1].value, vals_odml)
283+
self.assertEqual(ydoc.sections[0].properties[1].values, vals_odml)
284284
self.assertEqual(self.doc, ydoc)
285285

286286
def test_bool(self):
@@ -298,29 +298,29 @@ def test_bool(self):
298298
jdoc = odml.load(self.json_file, "JSON")
299299

300300
self.assertEqual(jdoc.sections[0].properties[0].dtype, odml.dtypes.DType.boolean)
301-
self.assertEqual(jdoc.sections[0].properties[0].value, [val_in])
301+
self.assertEqual(jdoc.sections[0].properties[0].values, [val_in])
302302
self.assertEqual(jdoc.sections[0].properties[1].dtype, odml.dtypes.DType.boolean)
303-
self.assertEqual(jdoc.sections[0].properties[1].value, vals_odml)
303+
self.assertEqual(jdoc.sections[0].properties[1].values, vals_odml)
304304
self.assertEqual(self.doc, jdoc)
305305

306306
# Test correct xml save and load.
307307
odml.save(self.doc, self.xml_file)
308308
xdoc = odml.load(self.xml_file)
309309

310310
self.assertEqual(xdoc.sections[0].properties[0].dtype, odml.dtypes.DType.boolean)
311-
self.assertEqual(xdoc.sections[0].properties[0].value, [val_in])
311+
self.assertEqual(xdoc.sections[0].properties[0].values, [val_in])
312312
self.assertEqual(xdoc.sections[0].properties[1].dtype, odml.dtypes.DType.boolean)
313-
self.assertEqual(xdoc.sections[0].properties[1].value, vals_odml)
313+
self.assertEqual(xdoc.sections[0].properties[1].values, vals_odml)
314314
self.assertEqual(self.doc, xdoc)
315315

316316
# Test correct yaml save and load.
317317
odml.save(self.doc, self.yaml_file, "YAML")
318318
ydoc = odml.load(self.yaml_file, "YAML")
319319

320320
self.assertEqual(ydoc.sections[0].properties[0].dtype, odml.dtypes.DType.boolean)
321-
self.assertEqual(ydoc.sections[0].properties[0].value, [val_in])
321+
self.assertEqual(ydoc.sections[0].properties[0].values, [val_in])
322322
self.assertEqual(ydoc.sections[0].properties[1].dtype, odml.dtypes.DType.boolean)
323-
self.assertEqual(ydoc.sections[0].properties[1].value, vals_odml)
323+
self.assertEqual(ydoc.sections[0].properties[1].values, vals_odml)
324324
self.assertEqual(self.doc, ydoc)
325325

326326
def test_tuple(self):
@@ -337,21 +337,21 @@ def test_tuple(self):
337337
jdoc = odml.load(self.json_file, "JSON")
338338

339339
self.assertEqual(jdoc.sections[0].properties[0].dtype, val_type)
340-
self.assertEqual(jdoc.sections[0].properties[0].value, [val_odml])
340+
self.assertEqual(jdoc.sections[0].properties[0].values, [val_odml])
341341
self.assertEqual(self.doc, jdoc)
342342

343343
# Test correct xml save and load.
344344
odml.save(self.doc, self.xml_file)
345345
xdoc = odml.load(self.xml_file)
346346

347347
self.assertEqual(xdoc.sections[0].properties[0].dtype, val_type)
348-
self.assertEqual(xdoc.sections[0].properties[0].value, [val_odml])
348+
self.assertEqual(xdoc.sections[0].properties[0].values, [val_odml])
349349
self.assertEqual(self.doc, xdoc)
350350

351351
# Test correct yaml save and load.
352352
odml.save(self.doc, self.yaml_file, "YAML")
353353
ydoc = odml.load(self.yaml_file, "YAML")
354354

355355
self.assertEqual(ydoc.sections[0].properties[0].dtype, val_type)
356-
self.assertEqual(ydoc.sections[0].properties[0].value, [val_odml])
356+
self.assertEqual(ydoc.sections[0].properties[0].values, [val_odml])
357357
self.assertEqual(self.doc, ydoc)

‎test/test_dumper.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ def setUp(self):
1818

1919
self.doc = odml.Document(author='Rave', version='1.0')
2020
s1 = odml.Section(name='Cell')
21-
p1 = odml.Property(name='Type', value='Rechargeable')
21+
p1 = odml.Property(name='Type', values='Rechargeable')
2222
s1.append(p1)
2323

2424
s2 = odml.Section(name='Electrolyte')
25-
p2 = odml.Property(name='Composition', value='Ni-Cd')
25+
p2 = odml.Property(name='Composition', values='Ni-Cd')
2626
s2.append(p2)
2727
s1.append(s2)
2828

2929
s3 = odml.Section(name='Electrode')
30-
p3 = odml.Property(name='Material', value='Nickel')
31-
p4 = odml.Property(name='Models', value=['AA', 'AAA'])
30+
p3 = odml.Property(name='Material', values='Nickel')
31+
p4 = odml.Property(name='Models', values=['AA', 'AAA'])
3232
s3.append(p3)
3333
s3.append(p4)
3434
s2.append(s3)
@@ -42,12 +42,12 @@ def test_dump_doc(self):
4242
output = [x.strip() for x in self.captured_stdout.getvalue().split('\n') if x]
4343
expected_output = []
4444
expected_output.append("*Cell ()")
45-
expected_output.append(":Type (value=Rechargeable, dtype='string')")
45+
expected_output.append(":Type (values=Rechargeable, dtype='string')")
4646
expected_output.append("*Electrolyte ()")
47-
expected_output.append(":Composition (value=Ni-Cd, dtype='string')")
47+
expected_output.append(":Composition (values=Ni-Cd, dtype='string')")
4848
expected_output.append("*Electrode ()")
49-
expected_output.append(":Material (value=Nickel, dtype='string')")
50-
expected_output.append(":Models (value=[AA,AAA], dtype='string')")
49+
expected_output.append(":Material (values=Nickel, dtype='string')")
50+
expected_output.append(":Models (values=[AA,AAA], dtype='string')")
5151
self.assertEqual(len(output), len(expected_output))
5252
for i in range(len(output)):
5353
self.assertEqual(output[i], expected_output[i])

0 commit comments

Comments
 (0)