From baac81143e55085a457b07fac85fcba67fd3ac80 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Tue, 14 Jan 2014 14:43:39 -0600
Subject: [PATCH] Add tool execution unit test for rerun_remapping.

---
 test/unit/tools/test_execution.py | 12 ++++++++++++
 test/unit/tools_support.py        |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/test/unit/tools/test_execution.py b/test/unit/tools/test_execution.py
index 360935e1e7c..60f1961476c 100644
--- a/test/unit/tools/test_execution.py
+++ b/test/unit/tools/test_execution.py
@@ -89,6 +89,18 @@ class ToolExecutionTestCase( TestCase, UsesApp ):
             runtool_btn="dummy",
         )
         assert template == "tool_executed.mako"
+        # Didn't specify a rerun_remap_id so this should be None
+        assert self.tool_action.execution_call_args[ 0 ][ "rerun_remap_job_id" ] is None
+
+    def test_remap_job( self ):
+        self.__init_tool( SIMPLE_TOOL_CONTENTS )
+        template, template_vars = self.__handle_with_incoming(
+            param1="moo",
+            rerun_remap_job_id=self.app.security.encode_id(123),
+            runtool_btn="dummy",
+        )
+        assert template == "tool_executed.mako"
+        assert self.tool_action.execution_call_args[ 0 ][ "rerun_remap_job_id" ] == 123
 
     def test_repeat_state_updates( self ):
         self.__init_tool( REPEAT_TOOL_CONTENTS )
diff --git a/test/unit/tools_support.py b/test/unit/tools_support.py
index 59cd404770f..37d774d1a36 100644
--- a/test/unit/tools_support.py
+++ b/test/unit/tools_support.py
@@ -9,6 +9,7 @@ import tempfile
 import shutil
 
 from galaxy.util.bunch import Bunch
+from galaxy.web.security import SecurityHelper
 import galaxy.model
 from galaxy.model import mapping
 
@@ -54,6 +55,7 @@ class MockApp( object ):
                 self.model[ module_member_name ] = module_member
         self.toolbox = None
         self.object_store = None
+        self.security = SecurityHelper(id_secret="testing")
 
 
 class MockContext(object):