Skip to content

Commit 75796ed

Browse files
modified test file
1 parent b24471d commit 75796ed

File tree

1 file changed

+26
-35
lines changed

1 file changed

+26
-35
lines changed

tests/test_base.py

Lines changed: 26 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ def test_save_load_json(tmp_path):
162162
# net.id = net.id+'_yaml'
163163
net.to_yaml_file(filenamey)
164164

165-
filenamex = str(Path(tmp_path) / f"{net.id}.xml")
166-
net.to_xml_file(filenamex)
165+
# filenamex = str(Path(tmp_path) / f"{net.id}.xml")
166+
# net.to_xml_file(filenamex)
167167

168168
from modelspec.utils import load_json, load_yaml, load_xml
169169

@@ -179,20 +179,20 @@ def test_save_load_json(tmp_path):
179179
nety = NewNetwork.from_dict(datay)
180180
str_nety = str(nety)
181181

182-
datax = load_xml(filenamex)
183-
print_v("Loaded network specification from %s" % filenamex)
182+
# datax = load_xml(filenamex)
183+
# print_v("Loaded network specification from %s" % filenamex)
184184

185-
netx = NewNetwork.from_dict(datax)
186-
str_netx = str(netx)
185+
# netx = NewNetwork.from_dict(datax)
186+
# str_netx = str(netx)
187187

188188
print("----- Before -----")
189189
print(str_orig)
190190
print("----- After via %s -----" % filenamej)
191191
print(str_netj)
192192
print("----- After via %s -----" % filenamey)
193193
print(str_nety)
194-
print("----- After via %s -----" % filenamex)
195-
print(str_netx)
194+
# print("----- After via %s -----" % filenamex)
195+
# print(str_netx)
196196

197197
print("Test JSON..")
198198
if sys.version_info[0] == 2:
@@ -210,13 +210,13 @@ def test_save_load_json(tmp_path):
210210
else:
211211
assert str_orig == str_nety
212212

213-
print("Test XML..")
214-
if sys.version_info[0] == 2:
215-
assert len(str_orig) == len(
216-
str_netx
217-
) # Order not preserved in py2, just test len
218-
else:
219-
assert str_orig == str_netx
213+
# print("Test XML..")
214+
# if sys.version_info[0] == 2:
215+
# assert len(str_orig) == len(
216+
# str_netx
217+
# ) # Order not preserved in py2, just test len
218+
# else:
219+
# assert str_orig == str_netx
220220

221221
print("Test EvaluableExpressions")
222222
for i in range(7):
@@ -318,7 +318,7 @@ class Document(Base):
318318

319319
doc.to_json()
320320
doc.to_yaml()
321-
doc.to_xml()
321+
# doc.to_xml()
322322
doc.generate_documentation(format="markdown")
323323
doc.generate_documentation(format="rst")
324324

@@ -337,18 +337,18 @@ class Node(Base):
337337
model.to_json()
338338

339339

340-
def test_ndarray_xml_metadata():
341-
import numpy as np
340+
# def test_ndarray_xml_metadata():
341+
# import numpy as np
342342

343-
@modelspec.define(eq=False)
344-
class Node(Base):
345-
id: str = field(validator=instance_of(str))
346-
metadata: Optional[Dict[str, Any]] = field(
347-
kw_only=True, default=None, validator=optional(instance_of(dict))
348-
)
343+
# @modelspec.define(eq=False)
344+
# class Node(Base):
345+
# id: str = field(validator=instance_of(str))
346+
# metadata: Optional[Dict[str, Any]] = field(
347+
# kw_only=True, default=None, validator=optional(instance_of(dict))
348+
# )
349349

350-
model = Node(id="a", metadata={"b": np.array([0])})
351-
model.to_xml()
350+
# model = Node(id="a", metadata={"b": np.array([0])})
351+
# model.to_xml()
352352

353353

354354
def test_bson_array(tmp_path):
@@ -376,12 +376,3 @@ class ArrayTestModel(Base):
376376
np.testing.assert_array_equal(model.array, m2.array)
377377
assert model.list_of_lists == m2.list_of_lists
378378
assert model.ragged_list == m2.ragged_list
379-
380-
381-
if __name__ == "__main__":
382-
test_save_load_json(".")
383-
test_generate_documentation()
384-
test_ndarray_json_metadata()
385-
test_ndarray_xml_metadata()
386-
test_generate_documentation_example()
387-
test_bson_array(".")

0 commit comments

Comments
 (0)