Python: improved our tests.

Author: agarny

tests/bindings/python/test_file_basic.py

@@ -159,51 +159,52 @@ def test_remote_virtual_file():
 def test_file_manager():
     file_manager = loc.FileManager.instance()
 
-    assert file_manager.has_files == False
+    assert not file_manager.has_files
     assert file_manager.file_count == 0
-    assert len(file_manager.files) == 0
-    assert file_manager.file(0) == None
-    assert file_manager.file(utils.LocalFile) == None
+    assert len(file_manager) == 0
+    assert file_manager.file(0) is None
+    assert file_manager.file(utils.LocalFile) is None
 
     local_file = loc.File(utils.LocalFile)
     same_file_manager = loc.FileManager.instance()
 
-    assert same_file_manager.has_files == True
+    assert same_file_manager.has_files
     assert same_file_manager.file_count == 1
-    assert len(file_manager.files) == 1
+    assert len(file_manager) == 1
+    assert list(file_manager) == [local_file]
     assert file_manager.file(0) == local_file
     assert same_file_manager.file(utils.LocalFile) == local_file
 
     remote_file = loc.File(utils.RemoteFile)
 
-    assert file_manager.has_files == True
+    assert file_manager.has_files
     assert file_manager.file_count == 2
-    assert len(file_manager.files) == 2
+    assert len(file_manager) == 2
     assert file_manager.file(1) == remote_file
     assert file_manager.file(utils.RemoteFile) == remote_file
 
     same_file_manager.unmanage(local_file)
 
-    assert same_file_manager.has_files == True
+    assert same_file_manager.has_files
     assert same_file_manager.file_count == 1
-    assert len(file_manager.files) == 1
-    assert file_manager.file(1) == None
-    assert same_file_manager.file(utils.LocalFile) == None
+    assert len(file_manager) == 1
+    assert file_manager.file(1) is None
+    assert same_file_manager.file(utils.LocalFile) is None
 
     same_file_manager.manage(local_file)
 
-    assert same_file_manager.has_files == True
+    assert same_file_manager.has_files
     assert same_file_manager.file_count == 2
-    assert len(file_manager.files) == 2
+    assert len(file_manager) == 2
     assert file_manager.file(1) == local_file
     assert same_file_manager.file(utils.LocalFile) == local_file
 
     file_manager.reset()
 
-    assert file_manager.has_files == False
+    assert not file_manager.has_files
     assert file_manager.file_count == 0
-    assert len(file_manager.files) == 0
-    assert file_manager.file(0) == None
-    assert file_manager.file(1) == None
-    assert file_manager.file(utils.RemoteFile) == None
-    assert file_manager.file(utils.UnknownFile) == None
+    assert len(file_manager) == 0
+    assert file_manager.file(0) is None
+    assert file_manager.file(1) is None
+    assert file_manager.file(utils.RemoteFile) is None
+    assert file_manager.file(utils.UnknownFile) is None

tests/bindings/python/test_file_child.py

@@ -21,7 +21,7 @@
 def do_test_dataset(number, specific_child_file_names):
     file = File(utils.resource_path("api/file/dataset_" + str(number) + ".omex"))
 
-    assert file.has_child_files == True
+    assert file.has_child_files
     assert file.child_file_count == len(specific_child_file_names) + 1
     assert len(file.child_file_names) == len(specific_child_file_names) + 1
     assert len(file.child_files) == len(specific_child_file_names) + 1
@@ -49,7 +49,7 @@ def do_test_dataset(number, specific_child_file_names):
 def test_type_no_child_files():
     file = File(utils.resource_path(utils.UnknownFile))
 
-    assert file.has_child_files == False
+    assert not file.has_child_files
     assert file.child_file_count == 0
     assert len(file.child_file_names) == 0
     assert len(file.child_files) == 0

tests/bindings/python/test_logger_coverage.py

@@ -38,8 +38,16 @@ def test_issues():
 def test_issue():
     file = loc.File(utils.resource_path(utils.ErrorCellmlFile))
 
-    assert file.issue(0) != None
-    assert file.issue(file.issue_count) == None
+    assert file.issue(0) is not None
+    assert file.issue(file.issue_count) is None
+
+
+def test_issue_str():
+    file = loc.File(utils.resource_path(utils.ErrorCellmlFile))
+    issue = file.issue(0)
+
+    assert issue is not None
+    assert str(issue) == issue.description
 
 
 def test_has_errors():
@@ -63,8 +71,8 @@ def test_errors():
 def test_error():
     file = loc.File(utils.resource_path(utils.ErrorCellmlFile))
 
-    assert file.error(0) != None
-    assert file.error(file.error_count) == None
+    assert file.error(0) is not None
+    assert file.error(file.error_count) is None
 
 
 def test_has_warnings():
@@ -89,5 +97,5 @@ def test_warning():
     file = loc.File(utils.resource_path(utils.Sedml2File))
     document = loc.SedDocument(file)
 
-    assert document.warning(0) != None
-    assert document.warning(document.warning_count) == None
+    assert document.warning(0) is not None
+    assert document.warning(document.warning_count) is None

tests/bindings/python/test_sed_basic.py

@@ -21,11 +21,11 @@
 def test_no_file():
     document = loc.SedDocument()
 
-    assert document.has_issues == False
+    assert not document.has_issues
 
     document = loc.SedDocument(None)
 
-    assert document.has_issues == False
+    assert not document.has_issues
 
 
 def test_unknown_file():
@@ -46,53 +46,53 @@ def test_cellml_file():
     file = loc.File(utils.resource_path(utils.Cellml2File))
     document = loc.SedDocument(file)
 
-    assert document.has_issues == False
+    assert not document.has_issues
 
 
 def test_sedml_file():
     file = loc.File(utils.resource_path(utils.Sedml2File))
     document = loc.SedDocument(file)
 
-    assert document.has_issues == True
+    assert document.has_issues
 
     needed_file = loc.File(utils.resource_path(utils.Cellml2File))
 
     document = loc.SedDocument(file)
 
-    assert document.has_issues == False
+    assert not document.has_issues
 
 
 def test_sedml_file_with_absolute_cellml_file():
     file = loc.File(utils.resource_path("api/sed/absolute_cellml_file.sedml"))
     document = loc.SedDocument(file)
 
-    assert document.has_issues == True
+    assert document.has_issues
 
     needed_file = loc.File(utils.LocalFile)
 
     document = loc.SedDocument(file)
 
-    assert document.has_issues == False
+    assert not document.has_issues
 
 
 def test_sedml_file_with_remote_cellml_file():
     file = loc.File(utils.resource_path("api/sed/remote_cellml_file.sedml"))
     document = loc.SedDocument(file)
 
-    assert document.has_issues == True
+    assert document.has_issues
 
     needed_file = loc.File(utils.RemoteFile)
 
     document = loc.SedDocument(file)
 
-    assert document.has_issues == False
+    assert not document.has_issues
 
 
 def test_combine_archive():
     file = loc.File(utils.resource_path(utils.Combine2Archive))
     document = loc.SedDocument(file)
 
-    assert document.has_issues == False
+    assert not document.has_issues
 
 
 def test_combine_archive_with_no_manifest_file():