Skip to content

Commit fcd8b55

Browse files
agarnyagarny
authored
Some minor cleaning up.
2 parents e68e1e9 + b01557d commit fcd8b55

18 files changed

+527
-527
lines changed

‎tests/bindings/python/test_file_basic.py‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515

16-
import libopencor as oc
16+
import libopencor as loc
1717
import os
1818
import platform
1919
import utils
@@ -22,20 +22,20 @@
2222

2323
expected_no_issues = []
2424
expected_non_existing_file_issues = [
25-
[oc.Issue.Type.Error, "The file does not exist."],
25+
[loc.Issue.Type.Error, "The file does not exist."],
2626
]
2727
expected_unknown_file_issues = [
2828
[
29-
oc.Issue.Type.Error,
29+
loc.Issue.Type.Error,
3030
"The file is not a CellML file, a SED-ML file, or a COMBINE archive.",
3131
],
3232
]
3333

3434

3535
def test_local_file():
36-
file = oc.File(utils.LocalFile)
36+
file = loc.File(utils.LocalFile)
3737

38-
assert file.type == oc.File.Type.IrretrievableFile
38+
assert file.type == loc.File.Type.IrretrievableFile
3939
assert file.file_name == utils.LocalFile
4040
assert file.url == ""
4141
assert file.path == utils.LocalFile
@@ -48,7 +48,7 @@ def test_existing_relative_local_file():
4848

4949
os.chdir(utils.resource_path())
5050

51-
file = oc.File(utils.Cellml2File)
51+
file = loc.File(utils.Cellml2File)
5252

5353
assert file.contents != []
5454
assert_issues(file, expected_no_issues)
@@ -58,11 +58,11 @@ def test_existing_relative_local_file():
5858

5959
def test_non_existing_relative_local_file():
6060
if platform.system() == "Windows":
61-
file = oc.File("some\\.\\relative\\..\\..\\path\\.\\..\\dir\\file.txt")
61+
file = loc.File("some\\.\\relative\\..\\..\\path\\.\\..\\dir\\file.txt")
6262
else:
63-
file = oc.File("some/./relative/../../path/./../dir/file.txt")
63+
file = loc.File("some/./relative/../../path/./../dir/file.txt")
6464

65-
assert file.type == oc.File.Type.IrretrievableFile
65+
assert file.type == loc.File.Type.IrretrievableFile
6666

6767
if platform.system() == "Windows":
6868
assert file.file_name == "dir\\file.txt"
@@ -82,11 +82,11 @@ def test_non_existing_relative_local_file():
8282

8383
def test_url_based_local_file():
8484
if platform.system() == "Windows":
85-
file = oc.File("file:///P:/some/path/file.txt")
85+
file = loc.File("file:///P:/some/path/file.txt")
8686
else:
87-
file = oc.File("file:///some/path/file.txt")
87+
file = loc.File("file:///some/path/file.txt")
8888

89-
assert file.type == oc.File.Type.IrretrievableFile
89+
assert file.type == loc.File.Type.IrretrievableFile
9090
assert file.file_name == utils.LocalFile
9191
assert file.url == ""
9292
assert file.path == utils.LocalFile
@@ -95,19 +95,19 @@ def test_url_based_local_file():
9595

9696

9797
def test_remote_file():
98-
file = oc.File(utils.RemoteFile)
98+
file = loc.File(utils.RemoteFile)
9999

100-
assert file.type == oc.File.Type.CellmlFile
100+
assert file.type == loc.File.Type.CellmlFile
101101
assert file.file_name != ""
102102
assert file.url == utils.RemoteFile
103103
assert file.path == utils.RemoteFile
104104
assert file.contents != []
105105

106106

107107
def test_local_virtual_file():
108-
file = oc.File(utils.resource_path(utils.UnknownFile), False)
108+
file = loc.File(utils.resource_path(utils.UnknownFile), False)
109109

110-
assert file.type == oc.File.Type.UnknownFile
110+
assert file.type == loc.File.Type.UnknownFile
111111
assert file.file_name == utils.resource_path(utils.UnknownFile)
112112
assert file.url == ""
113113
assert file.path == utils.resource_path(utils.UnknownFile)
@@ -118,15 +118,15 @@ def test_local_virtual_file():
118118

119119
file.contents = some_unknown_contents_list
120120

121-
assert file.type == oc.File.Type.UnknownFile
121+
assert file.type == loc.File.Type.UnknownFile
122122
assert file.contents == some_unknown_contents_list
123123
assert_issues(file, expected_unknown_file_issues)
124124

125125

126126
def test_remote_virtual_file():
127-
file = oc.File(utils.UnknownRemoteFile, False)
127+
file = loc.File(utils.UnknownRemoteFile, False)
128128

129-
assert file.type == oc.File.Type.UnknownFile
129+
assert file.type == loc.File.Type.UnknownFile
130130

131131
if platform.system() == "Windows":
132132
assert file.file_name == "\\some\\path\\file"
@@ -142,30 +142,30 @@ def test_remote_virtual_file():
142142

143143
file.contents = some_unknown_contents_list
144144

145-
assert file.type == oc.File.Type.UnknownFile
145+
assert file.type == loc.File.Type.UnknownFile
146146
assert file.contents == some_unknown_contents_list
147147
assert_issues(file, expected_unknown_file_issues)
148148

149149

150150
def test_file_manager():
151-
file_manager = oc.FileManager.instance()
151+
file_manager = loc.FileManager.instance()
152152

153153
assert file_manager.has_files == False
154154
assert file_manager.file_count == 0
155155
assert len(file_manager.files) == 0
156156
assert file_manager.file(0) == None
157157
assert file_manager.file(utils.LocalFile) == None
158158

159-
local_file = oc.File(utils.LocalFile)
160-
same_file_manager = oc.FileManager.instance()
159+
local_file = loc.File(utils.LocalFile)
160+
same_file_manager = loc.FileManager.instance()
161161

162162
assert same_file_manager.has_files == True
163163
assert same_file_manager.file_count == 1
164164
assert len(file_manager.files) == 1
165165
assert file_manager.file(0) == local_file
166166
assert same_file_manager.file(utils.LocalFile) == local_file
167167

168-
remote_file = oc.File(utils.RemoteFile)
168+
remote_file = loc.File(utils.RemoteFile)
169169

170170
assert file_manager.has_files == True
171171
assert file_manager.file_count == 2

‎tests/bindings/python/test_file_coverage.py‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,60 +13,60 @@
1313
# limitations under the License.
1414

1515

16-
import libopencor as oc
16+
import libopencor as loc
1717
import utils
1818

1919

2020
def test_empty_file():
21-
file = oc.File(utils.LocalFile)
21+
file = loc.File(utils.LocalFile)
2222

2323
file.contents = utils.string_to_list(utils.NoContents)
2424

25-
assert file.type == oc.File.Type.UnknownFile
25+
assert file.type == loc.File.Type.UnknownFile
2626

2727

2828
def test_file_with_null_character():
29-
file = oc.File(utils.LocalFile)
29+
file = loc.File(utils.LocalFile)
3030

3131
file.contents = utils.string_to_list("\0")
3232

33-
assert file.type == oc.File.Type.UnknownFile
33+
assert file.type == loc.File.Type.UnknownFile
3434

3535

3636
def test_sedml_file_with_no_parent():
37-
file = oc.File(utils.Sedml2File)
37+
file = loc.File(utils.Sedml2File)
3838

3939
file.contents = utils.string_to_list(utils.SomeSedmlContents)
4040

4141

4242
def test_irretrievable_remote_file():
43-
oc.File(utils.IrretrievableRemoteFile)
43+
loc.File(utils.IrretrievableRemoteFile)
4444

4545

4646
def test_same_local_file():
47-
file1 = oc.File(utils.LocalFile)
48-
file2 = oc.File(utils.LocalFile)
47+
file1 = loc.File(utils.LocalFile)
48+
file2 = loc.File(utils.LocalFile)
4949

5050
assert file1.__subclasshook__ == file2.__subclasshook__
5151

5252

5353
def test_same_remote_file():
54-
file1 = oc.File(utils.RemoteFile)
55-
file2 = oc.File(utils.RemoteFile)
54+
file1 = loc.File(utils.RemoteFile)
55+
file2 = loc.File(utils.RemoteFile)
5656

5757
assert file1.__subclasshook__ == file2.__subclasshook__
5858

5959

6060
def test_do_not_retrieve_contents():
61-
file = oc.File(utils.RemoteFile, False)
61+
file = loc.File(utils.RemoteFile, False)
6262

63-
assert file.type == oc.File.Type.UnknownFile
63+
assert file.type == loc.File.Type.UnknownFile
6464
assert file.contents == []
6565

6666

6767
def test_unmanage_file_with_children():
68-
file = oc.File(utils.resource_path(utils.Combine2Archive))
69-
file_manager = oc.FileManager.instance()
68+
file = loc.File(utils.resource_path(utils.Combine2Archive))
69+
file_manager = loc.FileManager.instance()
7070

7171
assert file_manager.file_count == 3
7272

‎tests/bindings/python/test_file_i18n.py‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -12,57 +12,57 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
import libopencor as oc
15+
import libopencor as loc
1616
import platform
1717
import utils
1818

1919

2020
def test_arabic_files():
2121
assert (
22-
oc.File(utils.resource_path("i18n/ملف/file.cellml")).type
23-
== oc.File.Type.CellmlFile
22+
loc.File(utils.resource_path("i18n/ملف/file.cellml")).type
23+
== loc.File.Type.CellmlFile
2424
)
2525
assert (
26-
oc.File(utils.resource_path("i18n/ملف/file.sedml")).type
27-
== oc.File.Type.SedmlFile
26+
loc.File(utils.resource_path("i18n/ملف/file.sedml")).type
27+
== loc.File.Type.SedmlFile
2828
)
2929
assert (
30-
oc.File(utils.resource_path("i18n/ملف/file.sedml")).type
31-
== oc.File.Type.SedmlFile
30+
loc.File(utils.resource_path("i18n/ملف/file.sedml")).type
31+
== loc.File.Type.SedmlFile
3232
)
3333
assert (
34-
oc.File(utils.resource_path("i18n/ملف/file.omex")).type
35-
== oc.File.Type.CombineArchive
34+
loc.File(utils.resource_path("i18n/ملف/file.omex")).type
35+
== loc.File.Type.CombineArchive
3636
)
3737

3838

3939
def test_chinese_files():
4040
assert (
41-
oc.File(utils.resource_path("i18n/文件夹/file.cellml")).type
42-
== oc.File.Type.CellmlFile
41+
loc.File(utils.resource_path("i18n/文件夹/file.cellml")).type
42+
== loc.File.Type.CellmlFile
4343
)
4444
assert (
45-
oc.File(utils.resource_path("i18n/文件夹/file.sedml")).type
46-
== oc.File.Type.SedmlFile
45+
loc.File(utils.resource_path("i18n/文件夹/file.sedml")).type
46+
== loc.File.Type.SedmlFile
4747
)
4848
assert (
49-
oc.File(utils.resource_path("i18n/文件夹/file.omex")).type
50-
== oc.File.Type.CombineArchive
49+
loc.File(utils.resource_path("i18n/文件夹/file.omex")).type
50+
== loc.File.Type.CombineArchive
5151
)
5252

5353

5454
def test_hindi_files():
5555
assert (
56-
oc.File(utils.resource_path("i18n/फोल्डर/file.cellml")).type
57-
== oc.File.Type.CellmlFile
56+
loc.File(utils.resource_path("i18n/फोल्डर/file.cellml")).type
57+
== loc.File.Type.CellmlFile
5858
)
5959
assert (
60-
oc.File(utils.resource_path("i18n/फोल्डर/file.sedml")).type
61-
== oc.File.Type.SedmlFile
60+
loc.File(utils.resource_path("i18n/फोल्डर/file.sedml")).type
61+
== loc.File.Type.SedmlFile
6262
)
6363
assert (
64-
oc.File(utils.resource_path("i18n/फोल्डर/file.omex")).type
65-
== oc.File.Type.CombineArchive
64+
loc.File(utils.resource_path("i18n/फोल्डर/file.omex")).type
65+
== loc.File.Type.CombineArchive
6666
)
6767

6868

@@ -71,31 +71,31 @@ def test_japanese_files():
7171

7272
if platform.system() == "Darwin":
7373
assert (
74-
oc.File(utils.resource_path("i18n/フォルダ/file.cellml")).type
75-
== oc.File.Type.CellmlFile
74+
loc.File(utils.resource_path("i18n/フォルダ/file.cellml")).type
75+
== loc.File.Type.CellmlFile
7676
)
7777
assert (
78-
oc.File(utils.resource_path("i18n/フォルダ/file.sedml")).type
79-
== oc.File.Type.SedmlFile
78+
loc.File(utils.resource_path("i18n/フォルダ/file.sedml")).type
79+
== loc.File.Type.SedmlFile
8080
)
8181
assert (
82-
oc.File(utils.resource_path("i18n/フォルダ/file.omex")).type
83-
== oc.File.Type.CombineArchive
82+
loc.File(utils.resource_path("i18n/フォルダ/file.omex")).type
83+
== loc.File.Type.CombineArchive
8484
)
8585
else:
8686
pass
8787

8888

8989
def test_russian_files():
9090
assert (
91-
oc.File(utils.resource_path("i18n/папка/file.cellml")).type
92-
== oc.File.Type.CellmlFile
91+
loc.File(utils.resource_path("i18n/папка/file.cellml")).type
92+
== loc.File.Type.CellmlFile
9393
)
9494
assert (
95-
oc.File(utils.resource_path("i18n/папка/file.sedml")).type
96-
== oc.File.Type.SedmlFile
95+
loc.File(utils.resource_path("i18n/папка/file.sedml")).type
96+
== loc.File.Type.SedmlFile
9797
)
9898
assert (
99-
oc.File(utils.resource_path("i18n/папка/file.omex")).type
100-
== oc.File.Type.CombineArchive
99+
loc.File(utils.resource_path("i18n/папка/file.omex")).type
100+
== loc.File.Type.CombineArchive
101101
)

0 commit comments

Comments
 (0)