Resuse MockQuery and MockContext in other unit tests

galaxyproject · Aug 11, 2023 · 49fee79 · 49fee79
1 parent 7ab7460
commit 49fee79
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 34 deletions.
diff --git a/lib/galaxy/app_unittest_utils/tools_support.py b/lib/galaxy/app_unittest_utils/tools_support.py
@@ -143,6 +143,9 @@ def flush(self):
     def add(self, object):
         self.created_objects.append(object)
 
+    def commit(self):
+        pass
+
 
 class MockQuery:
     def __init__(self, class_objects):

diff --git a/test/unit/app/jobs/test_job_wrapper.py b/test/unit/app/jobs/test_job_wrapper.py
@@ -7,7 +7,10 @@
     Type,
 )
 
-from galaxy.app_unittest_utils.tools_support import UsesApp
+from galaxy.app_unittest_utils.tools_support import (
+    MockContext,
+    UsesApp,
+)
 from galaxy.jobs import (
     JobWrapper,
     TaskWrapper,
@@ -134,39 +137,6 @@ def url_to_destination(self):
         pass
 
 
-class MockContext:
-    def __init__(self, model_objects):
-        self.expunged_all = False
-        self.model_objects = model_objects
-        self.created_objects = []
-
-    def expunge_all(self):
-        self.expunged_all = True
-
-    def query(self, clazz):
-        return MockQuery(self.model_objects.get(clazz))
-
-    def flush(self):
-        pass
-
-    def commit(self):
-        pass
-
-    def add(self, object):
-        self.created_objects.append(object)
-
-
-class MockQuery:
-    def __init__(self, class_objects):
-        self.class_objects = class_objects
-
-    def filter_by(self, **kwds):
-        return Bunch(first=lambda: None)
-
-    def get(self, id):
-        return self.class_objects.get(id, None)
-
-
 class MockTool:
     def __init__(self, app):
         self.version_string_cmd = TEST_VERSION_COMMAND