Reorganise projecttest.py and improve test coverages

CHANGELOG.md

@@ -8,6 +8,7 @@
 - #119, #928 Fix IndexError in rename and find occurrences when a `from` import is the last thing in a module without a trailing newline (@mcepl)
 - #921 Patch the else suite of try statements that also have a finally (@marlon-costa-dc)
 - #937 Preserve non-ASCII argument expressions and default values when changing function signatures (@Jinyong-Li)
+- #950 Reorganise projecttest.py and improve test coverages (@lieryan)
 
 # Release 1.15.1
 

rope/base/project.py

@@ -55,14 +55,14 @@ def get_resource(self, resource_name: str) -> Resource:
         path = self._get_resource_path(resource_name)
         if not os.path.exists(path):
             raise exceptions.ResourceNotFoundError(
-                "Resource <%s> does not exist" % resource_name
+                f"Resource <{resource_name}> does not exist"
             )
         elif os.path.isfile(path):
             return File(self, resource_name)
         elif os.path.isdir(path):
             return Folder(self, resource_name)
         else:
-            raise exceptions.ResourceNotFoundError("Unknown resource " + resource_name)
+            raise exceptions.ResourceNotFoundError(f"Unknown resource {resource_name}")
 
     def get_python_path_folders(self) -> list[Folder]:
         result = []
@@ -132,7 +132,7 @@ def get_relative_module(
     ) -> pyobjectsdef.PyPackage | pyobjectsdef.PyModule:
         module = self.find_relative_module(name, folder, level)
         if module is None:
-            raise ModuleNotFoundError("Module %s not found" % name)
+            raise ModuleNotFoundError(f"Module {name} not found")
         return self.pycore.resource_to_pyobject(module)
 
     def find_relative_module(
@@ -284,7 +284,7 @@ def get_module(
             return pymod
         module = self.find_module(name, folder)
         if module is None:
-            raise ModuleNotFoundError("Module %s not found" % name)
+            raise ModuleNotFoundError(f"Module {name} not found")
         return self.pycore.resource_to_pyobject(module)
 
     def get_files(self) -> list[Resource]:

ropetest/conftest.py

@@ -5,6 +5,7 @@
 
 import pytest
 
+import rope.base.project
 from rope.base import resources
 from ropetest import testutils
 
@@ -47,10 +48,16 @@ def session_venv_python_executable(session_venv):
     yield python_executable
 
 
+@pytest.fixture
+def no_project():
+    return rope.base.project.get_no_project()
+
+
 @pytest.fixture
 def project(session_venv, session_venv_site_packages):
     project = testutils.sample_project(
         python_path=[str(session_venv_site_packages)],
+        ropefolder=None,
     )
     yield project
     testutils.remove_project(project)

ropetest/contrib/autoimport/conftest.py

@@ -5,6 +5,15 @@
 from ropetest import testutils
 
 
+@pytest.fixture
+def project(session_venv, session_venv_site_packages):
+    project = testutils.sample_project(
+        python_path=[str(session_venv_site_packages)],
+    )
+    yield project
+    testutils.remove_project(project)
+
+
 @pytest.fixture
 def mod1(project):
     mod1 = testutils.create_module(project, "mod1")