From e345bcab98c9f5b4a74ca4654e3754eba38166e3 Mon Sep 17 00:00:00 2001
From: Sergey Golitsynskiy <sgolitsynskiy@gmail.com>
Date: Sun, 21 Jul 2019 19:41:10 -0400
Subject: [PATCH 1/3] Remove some test interdependencies in unit/tools

Factor out BaseParameterTestCase into a helper module.
---
 test/unit/tools/test_column_parameters.py |  2 +-
 test/unit/tools/test_data_parameters.py   |  2 +-
 test/unit/tools/test_parameter_parsing.py | 22 +---------------------
 test/unit/tools/test_select_parameters.py |  2 +-
 test/unit/tools/util.py                   | 23 +++++++++++++++++++++++
 5 files changed, 27 insertions(+), 24 deletions(-)
 create mode 100644 test/unit/tools/util.py

diff --git a/test/unit/tools/test_column_parameters.py b/test/unit/tools/test_column_parameters.py
index 19fc9ea4029..4cbb39d131f 100644
--- a/test/unit/tools/test_column_parameters.py
+++ b/test/unit/tools/test_column_parameters.py
@@ -3,7 +3,7 @@ test_select_parameters.py.
 """
 from galaxy import model
 from galaxy.util import bunch
-from .test_parameter_parsing import BaseParameterTestCase
+from .util import BaseParameterTestCase
 from ..tools_support import datatypes_registry
 
 
diff --git a/test/unit/tools/test_data_parameters.py b/test/unit/tools/test_data_parameters.py
index 6d18fe3458a..a89425c03b6 100644
--- a/test/unit/tools/test_data_parameters.py
+++ b/test/unit/tools/test_data_parameters.py
@@ -1,5 +1,5 @@
 from galaxy import model
-from .test_parameter_parsing import BaseParameterTestCase
+from .util import BaseParameterTestCase
 from ..unittest_utils import galaxy_mock
 
 
diff --git a/test/unit/tools/test_parameter_parsing.py b/test/unit/tools/test_parameter_parsing.py
index f858ca00e40..bdf9c9de65d 100644
--- a/test/unit/tools/test_parameter_parsing.py
+++ b/test/unit/tools/test_parameter_parsing.py
@@ -1,11 +1,7 @@
 from unittest import TestCase
-from xml.etree.ElementTree import XML
 
-from galaxy import model
-from galaxy.tools.parameters import basic
 from galaxy.tools.parameters.meta import process_key
-from galaxy.util import bunch
-from ..tools_support import UsesApp
+from .util import BaseParameterTestCase
 
 
 class ProcessKeyTestCase(TestCase):
@@ -46,22 +42,6 @@ class ProcessKeyTestCase(TestCase):
         self.assertEqual(nested_dict, expected_dict)
 
 
-class BaseParameterTestCase(TestCase, UsesApp):
-
-    def setUp(self):
-        self.setup_app()
-        self.mock_tool = bunch.Bunch(
-            app=self.app,
-            tool_type="default",
-            valid_input_states=model.Dataset.valid_input_states,
-        )
-
-    def _parameter_for(self, **kwds):
-        content = kwds["xml"]
-        param_xml = XML(content)
-        return basic.ToolParameter.build(self.mock_tool, param_xml)
-
-
 class ParameterParsingTestCase(BaseParameterTestCase):
     """ Test the parsing of XML for most parameter types - in many
     ways these are not very good tests since they break the abstraction
diff --git a/test/unit/tools/test_select_parameters.py b/test/unit/tools/test_select_parameters.py
index 28cfe50e33d..f00e64d6f40 100644
--- a/test/unit/tools/test_select_parameters.py
+++ b/test/unit/tools/test_select_parameters.py
@@ -1,7 +1,7 @@
 from galaxy import model
 from galaxy.tools.parameters import basic
 from galaxy.util import bunch
-from .test_parameter_parsing import BaseParameterTestCase
+from .util import BaseParameterTestCase
 
 
 class SelectToolParameterTestCase(BaseParameterTestCase):
diff --git a/test/unit/tools/util.py b/test/unit/tools/util.py
new file mode 100644
index 00000000000..384de1052de
--- /dev/null
+++ b/test/unit/tools/util.py
@@ -0,0 +1,23 @@
+from unittest import TestCase
+from xml.etree.ElementTree import XML
+
+from galaxy import model
+from galaxy.tools.parameters import basic
+from galaxy.util import bunch
+from ..tools_support import UsesApp
+
+
+class BaseParameterTestCase(TestCase, UsesApp):
+
+    def setUp(self):
+        self.setup_app()
+        self.mock_tool = bunch.Bunch(
+            app=self.app,
+            tool_type="default",
+            valid_input_states=model.Dataset.valid_input_states,
+        )
+
+    def _parameter_for(self, **kwds):
+        content = kwds["xml"]
+        param_xml = XML(content)
+        return basic.ToolParameter.build(self.mock_tool, param_xml)

From f060d3c1f2aef8f182d7eeb1b1357c2e5ebdef61 Mon Sep 17 00:00:00 2001
From: Sergey Golitsynskiy <sgolitsynskiy@gmail.com>
Date: Sun, 21 Jul 2019 21:33:27 -0400
Subject: [PATCH 2/3] [Commit to squash] (restart tests)

---
 test/unit/tools/util.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/unit/tools/util.py b/test/unit/tools/util.py
index 384de1052de..6535683124e 100644
--- a/test/unit/tools/util.py
+++ b/test/unit/tools/util.py
@@ -7,6 +7,7 @@ from galaxy.util import bunch
 from ..tools_support import UsesApp
 
 
+
 class BaseParameterTestCase(TestCase, UsesApp):
 
     def setUp(self):

From a3c4d753b902f8a0eb96d626f46903c50e6150b7 Mon Sep 17 00:00:00 2001
From: Sergey Golitsynskiy <sgolitsynskiy@gmail.com>
Date: Sun, 21 Jul 2019 21:35:31 -0400
Subject: [PATCH 3/3] [Commit to squash] (restart test/undo prev edit)

---
 test/unit/tools/util.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/unit/tools/util.py b/test/unit/tools/util.py
index 6535683124e..384de1052de 100644
--- a/test/unit/tools/util.py
+++ b/test/unit/tools/util.py
@@ -7,7 +7,6 @@ from galaxy.util import bunch
 from ..tools_support import UsesApp
 
 
-
 class BaseParameterTestCase(TestCase, UsesApp):
 
     def setUp(self):