@@ -21,7 +21,7 @@ def setUp(self):
21
21
self .yaml_writer = odmlparser .ODMLWriter (parser = 'YAML' )
22
22
self .json_writer = odmlparser .ODMLWriter (parser = 'JSON' )
23
23
24
- self .odml_doc = self .xml_reader .fromFile (self .basefile )
24
+ self .odml_doc = self .xml_reader .from_file (self .basefile )
25
25
26
26
27
27
def tearDown (self ):
@@ -38,36 +38,36 @@ def tearDown(self):
38
38
def test_xml (self ):
39
39
40
40
self .xml_writer .write_file (self .odml_doc , self .xml_file )
41
- xml_doc = self .xml_reader .fromFile (open (self .xml_file ))
41
+ xml_doc = self .xml_reader .from_file (open (self .xml_file ))
42
42
43
43
self .assertEqual (xml_doc , self .odml_doc )
44
44
45
45
def test_yaml (self ):
46
46
47
47
self .yaml_writer .write_file (self .odml_doc , self .yaml_file )
48
- yaml_doc = self .yaml_reader .fromFile (open (self .yaml_file ))
48
+ yaml_doc = self .yaml_reader .from_file (open (self .yaml_file ))
49
49
50
50
self .assertEqual (yaml_doc , self .odml_doc )
51
51
52
52
53
53
def test_json (self ):
54
54
55
55
self .json_writer .write_file (self .odml_doc , self .json_file )
56
- json_doc = self .json_reader .fromFile (open (self .json_file ))
56
+ json_doc = self .json_reader .from_file (open (self .json_file ))
57
57
58
58
self .assertEqual (json_doc , self .odml_doc )
59
59
60
60
61
61
def test_json_yaml_xml (self ):
62
62
63
63
self .json_writer .write_file (self .odml_doc , self .json_file )
64
- json_doc = self .json_reader .fromFile (open (self .json_file ))
64
+ json_doc = self .json_reader .from_file (open (self .json_file ))
65
65
66
66
self .yaml_writer .write_file (json_doc , self .yaml_file )
67
- yaml_doc = self .yaml_reader .fromFile (open (self .yaml_file ))
67
+ yaml_doc = self .yaml_reader .from_file (open (self .yaml_file ))
68
68
69
69
self .xml_writer .write_file (yaml_doc , self .xml_file )
70
- xml_doc = self .xml_reader .fromFile (open (self .xml_file ))
70
+ xml_doc = self .xml_reader .from_file (open (self .xml_file ))
71
71
72
72
self .assertEqual (json_doc , self .odml_doc )
73
73
self .assertEqual (json_doc , yaml_doc )
0 commit comments