From f42525ba1d6f7b500171338347e2fbcbde320087 Mon Sep 17 00:00:00 2001
From: Zach Mullen <zach.mullen@kitware.com>
Date: Fri, 18 Nov 2011 13:25:34 -0500
Subject: [PATCH] BUG: refs #0352. Fix test so it won't collide with changes in
 next

---
 core/controllers/UploadController.php                   | 2 +-
 core/tests/controllers/UploadDownloadControllerTest.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/controllers/UploadController.php b/core/controllers/UploadController.php
index 1dd5c9194..ae67aeba6 100644
--- a/core/controllers/UploadController.php
+++ b/core/controllers/UploadController.php
@@ -246,7 +246,7 @@ public function saveuploadedAction()
     if($this->isTestingEnv())
       {
       //simulate file upload
-      $path = $this->_getParam('path');
+      $path = $this->_getParam('testpath');
       $filename = basename($path);
       $file_size = filesize($path);
       }
diff --git a/core/tests/controllers/UploadDownloadControllerTest.php b/core/tests/controllers/UploadDownloadControllerTest.php
index bc892bc5a..f4c0d86fd 100644
--- a/core/tests/controllers/UploadDownloadControllerTest.php
+++ b/core/tests/controllers/UploadDownloadControllerTest.php
@@ -176,7 +176,7 @@ function testSaveuploadedAction()
     $this->params = array();
     $this->params['parent'] = $userDao->getPublicFolder()->getKey();
     $this->params['license'] = 0;
-    $this->params['path'] = BASE_PATH.'/tests/testfiles/search.png'; //testing mode param
+    $this->params['testpath'] = BASE_PATH.'/tests/testfiles/search.png'; //testing mode param
     $this->dispatchUrI('/upload/saveuploaded', $userDao);
 
     $search = $this->Item->getItemsFromSearch('search.png', $userDao);
@@ -186,7 +186,7 @@ function testSaveuploadedAction()
     $this->resetAll();
     $this->params['parent'] = $userDao->getPublicFolder()->getKey();
     $this->params['license'] = 0;
-    $this->params['path'] = BASE_PATH.'/tests/testfiles/empty.txt'; //testing mode param
+    $this->params['testpath'] = BASE_PATH.'/tests/testfiles/empty.txt'; //testing mode param
     $this->dispatchUrI('/upload/saveuploaded', $userDao);
 
     $search = $this->Item->getItemsFromSearch('empty.txt', $userDao);