Fixes to file not found error

orekit_jpype/pyhelpers.py

@@ -124,7 +124,7 @@ s
 
         datafile = File(filename)
         if not datafile.exists():
-            logging.warning('File or folder:', datafile.getAbsolutePath(), ' not found')
+            logging.warning(f"File or folder: {datafile.getAbsolutePath()} not found")
             logging.warning("""
 
             The Orekit library relies on some external data for physical models.
@@ -140,7 +140,8 @@ s
             orekit.pyhelpers.download_orekit_data_curdir()
 
             """)
-            raise FileNotFoundError('File or folder:', datafile.getAbsolutePath(), ' not found')
+            
+            raise FileNotFoundError(datafile.getAbsolutePath())
 
 
     logging.debug('Loading Orekit data from:', datafile.getAbsolutePath())
@@ -150,7 +151,7 @@ s
         crawler = ZipJarCrawler(datafile)
     else:
         logging.warning('Could not load orekit data from filename: ', filename)
-        raise FileNotFoundError('Could not load orekit data from filename: ', filename)   
+        raise FileNotFoundError(filename)   
     
     DM.clearProviders()
     DM.clearLoadedDataNames()

test/PyhelpersTest.py

@@ -25,17 +25,15 @@ def test_setup_orekit_data_from_folder():
 
     clear_factories()
 
-def test_setup_orekit_data_from_invalid_folder(capsys):
+def test_setup_orekit_data_from_invalid_folder():
     filename = "wrong_folder"
-    setup_orekit_data(filenames=filename, from_pip_library=False)
     datafile = File(filename)
     assert datafile.exists() == False
 
-    err_msg_expected = f'File or folder: {datafile.getAbsolutePath()}  not found'
-    captured = capsys.readouterr()
-    err_msg_actual = captured.out
-    assert err_msg_actual.startswith(err_msg_expected)
-
+    with pytest.raises(FileNotFoundError) as e:
+        setup_orekit_data(filenames=filename, from_pip_library=False)
+    
+    assert str(e.value) == datafile.getAbsolutePath()
     clear_factories()
 
 def test_setup_orekit_data_default_args():