@@ -32,37 +32,7 @@ def test_convert_xml(self):
3232 VC (self .xmlfile ).write_to_file (self .outfile )
3333 self .assertTrue (os .path .exists (self .outfile ))
3434
35- doc = load (self .outfile )
36-
37- repo = "http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml"
38- self .assertEqual (doc .repository , repo )
39- self .assertEqual (doc .author , "author" )
40- self .assertEqual (doc .version , "v1.13" )
41- self .assertEqual (len (doc .sections ), 3 )
42-
43- sec = doc .sections ["sec_one" ]
44- self .assertEqual (sec .definition , "def s1" )
45- self .assertEqual (sec .reference , "ref s1" )
46- self .assertEqual (sec .type , "mainsec" )
47- self .assertEqual (len (sec .sections ), 1 )
48- self .assertEqual (len (sec .properties ), 3 )
49-
50- prop = sec .properties ["prop_one" ]
51- self .assertEqual (prop .definition , "def prop1" )
52- self .assertEqual (prop .dependency , "dep p1" )
53- self .assertEqual (prop .dependency_value , "dep val p1" )
54- self .assertEqual (prop .reference , "ref val 1" )
55- self .assertEqual (prop .uncertainty , "11" )
56- self .assertEqual (prop .unit , "arbitrary" )
57- self .assertEqual (prop .value_origin , "filename val 1" )
58- self .assertEqual (prop .dtype , "string" )
59- self .assertEqual (len (prop .value ), 3 )
60-
61- prop = sec .properties ["prop_two" ]
62- self .assertEqual (len (prop .value ), 8 )
63-
64- prop = sec .properties ["prop_three" ]
65- self .assertEqual (len (prop .value ), 0 )
35+ self .check_result ()
6636
6737 def test_convert_yaml (self ):
6838 with self .assertRaises (Exception ):
@@ -71,38 +41,7 @@ def test_convert_yaml(self):
7141 VC (self .yamlfile ).write_to_file (self .outfile , "YAML" )
7242 self .assertTrue (os .path .exists (self .outfile ))
7343
74- doc = load (self .outfile )
75-
76- # Test document attribute export
77- self .assertEqual (doc .author , "author" )
78- self .assertEqual (doc .version , "v1.13" )
79- repo = "http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml"
80- self .assertEqual (doc .repository , repo )
81- self .assertEqual (len (doc .sections ), 3 )
82-
83- sec = doc .sections ["sec_one" ]
84- self .assertEqual (sec .definition , "def s1" )
85- self .assertEqual (sec .reference , "ref s1" )
86- self .assertEqual (sec .type , "mainsec" )
87- self .assertEqual (len (sec .sections ), 1 )
88- self .assertEqual (len (sec .properties ), 3 )
89-
90- prop = sec .properties ["prop_one" ]
91- self .assertEqual (prop .definition , "def prop1" )
92- self .assertEqual (prop .dependency , "dep p1" )
93- self .assertEqual (prop .dependency_value , "dep val p1" )
94- self .assertEqual (prop .reference , "ref val 1" )
95- self .assertEqual (prop .uncertainty , "11" )
96- self .assertEqual (prop .unit , "arbitrary" )
97- self .assertEqual (prop .value_origin , "filename val 1" )
98- self .assertEqual (prop .dtype , "string" )
99- self .assertEqual (len (prop .value ), 3 )
100-
101- prop = sec .properties ["prop_two" ]
102- self .assertEqual (len (prop .value ), 8 )
103-
104- prop = sec .properties ["prop_three" ]
105- self .assertEqual (len (prop .value ), 0 )
44+ self .check_result ()
10645
10746 def test_convert_json (self ):
10847 with self .assertRaises (Exception ):
@@ -111,6 +50,9 @@ def test_convert_json(self):
11150 VC (self .jsonfile ).write_to_file (self .outfile , "JSON" )
11251 self .assertTrue (os .path .exists (self .outfile ))
11352
53+ self .check_result ()
54+
55+ def check_result (self ):
11456 doc = load (self .outfile )
11557
11658 # Test document attribute export
0 commit comments