- Adds a couple of new tests

- Logs PYTHONPATH

Author: Alan Christie

src/groovy/Tester.groovy

@@ -110,7 +110,8 @@ class Tester {
     boolean run() {
 
         // Log supported test file versions
-        Log.info('Setup', "Supporting test file versions: $supportedTestFileVersions")
+        Log.info('Tests', "Supporting test file versions: $supportedTestFileVersions")
+        Log.info('PYTHONPATH', System.getenv('PYTHONPATH'))
         Log.info('Stop on error', stopOnError)
 
         // Before we start - cleanup (everything)

src/python/test/pipelines_utils/test_parameter_utils.py

@@ -41,3 +41,25 @@ def test_expand_parameters(self):
         params_b = ([2, 2, 2], 'b')
         result = parameter_utils.expandParameters(params_a, params_b)
         self.assertEquals(([1, 1, 1], [2, 2, 2]), result)
+
+    def test_expand_parameters_when_unnecessary(self):
+        """Verifies expansion of multiple parameters when no expansion is needed.
+        """
+        params_a = ([1, 1, 1], 'a')
+        params_b = ([2, 2, 2], 'b')
+        result = parameter_utils.expandParameters(params_a, params_b)
+        self.assertEquals(([1, 1, 1], [2, 2, 2]), result)
+
+    def test_expand_parameters_with_real_data(self):
+        """Verifies expansion of multiple parameters with some actual values.
+        """
+        t1 = ([0.135, 0.675, 1.35], 't1')
+        t2 = ([0.135, 0.675, 1.35], 't2')
+        t3 = ([12.0, 12.0, 12.0], 't3')
+        t4 = ([0.5, 0.5, 0.5], 't4')
+        t5 = ([7.49, 8.7, 8.7], 't5')
+        t6 = ([0.347, 0.17, 0.17], 't6')
+        t7 = ([0.29, 0.23, 0.23], 't7')                                                                                                                                                                                                                                               # t_hf_a ([0.5, 0.5, 0.5], 'halflives_abs'
+        a, b, c, d, e, f, g = parameter_utils.expandParameters(t1, t2, t3, t4, t5, t6, t7)
+        self.assertEquals([0.135, 0.675, 1.35], a)
+        self.assertEquals([0.29, 0.23, 0.23], g)