ENH: refs #0306. Fix UploadDownload test

Author: zachmullen

core/controllers/UploadController.php

@@ -190,7 +190,8 @@ function gethttpuploadoffsetAction()
 
     $this->Component->Httpupload->setTmpDirectory($this->getTempDirectory());
     $this->Component->Httpupload->setTokenParamName('uploadUniqueIdentifier');
-    $this->Component->Httpupload->getOffset($params);
+    $offset = $this->Component->Httpupload->getOffset($params);
+    echo '[OK]'.$offset['offset'];
     } //end gethttpuploadoffset
 
   /**
@@ -208,7 +209,7 @@ function gethttpuploaduniqueidentifierAction()
       throw new Zend_Exception('You have to be logged in to do that');
       }
 
-    if($this->userSession->JavaUpload->parent)
+    if(!isset($params['testingmode']) && $this->userSession->JavaUpload->parent)
       {
       $folderId = $this->userSession->JavaUpload->parent;
       }
@@ -257,7 +258,7 @@ function processjavauploadAction()
       throw new Zend_Exception('User id does not match upload token user id');
       }
 
-    if($this->userSession->JavaUpload->parent)
+    if(!isset($params['testingmode']) && $this->userSession->JavaUpload->parent)
       {
       $expectedParentId = $this->userSession->JavaUpload->parent;
       }
@@ -279,7 +280,7 @@ function processjavauploadAction()
 
     if(!empty($data['path']) && file_exists($data['path']) && $data['size'] > 0)
       {
-      if(isset($this->userSession->JavaUpload->parent))
+      if(!isset($params['testingmode']) && isset($this->userSession->JavaUpload->parent))
         {
         $parent = $this->userSession->JavaUpload->parent;
         }
@@ -310,7 +311,6 @@ function processjavauploadAction()
       }
     } //end processjavaupload
 
-
   /** save an uploaded file */
   public function saveuploadedAction()
     {

core/tests/controllers/UploadDownloadControllerTest.php

@@ -26,14 +26,22 @@ public function setUp()
   function testGethttpuploadoffsetAction()
     {
     $this->setupDatabase(array('default'));
-    $identifier = BASE_PATH.'/tmp/misc/httpupload.png';
+
+    $usersFile = $this->loadData('User', 'default');
+    $userDao = $this->User->load($usersFile[0]->getKey());
+    $dir = BASE_PATH.'/tmp/misc/'.$userDao->getUserId().'/'.$userDao->getPrivatefolderId();
+    $identifier = $dir.'/httpupload.png';
+    if(!file_exists($dir))
+      {
+      mkdir($dir, 0700, true);
+      }
     if(file_exists($identifier))
       {
       unlink($identifier);
       }
     copy(BASE_PATH.'/tests/testfiles/search.png', $identifier);
-    $page = 'upload/gethttpuploadoffset/?uploadUniqueIdentifier=httpupload.png&testingmode=1';
-    $this->dispatchUrI($page);
+    $page = 'upload/gethttpuploadoffset/?uploadUniqueIdentifier='.$userDao->getUserId().'/'.$userDao->getPrivatefolderId().'/httpupload.png&testingmode=1';
+    $this->dispatchUrI($page, $userDao);
 
     $content = $this->getBody();
     if(strpos($content, '[OK]') === false)
@@ -50,14 +58,17 @@ function testGethttpuploadoffsetAction()
   function testGethttpuploaduniqueidentifierAction()
     {
     $this->setupDatabase(array('default'));
+
+    $usersFile = $this->loadData('User', 'default');
+    $userDao = $this->User->load($usersFile[0]->getKey());
     $identifier = BASE_PATH.'/tmp/misc/httpupload.png';
     if(file_exists($identifier))
       {
       unlink($identifier);
       }
     copy(BASE_PATH.'/tests/testfiles/search.png', $identifier);
     $page = 'upload/gethttpuploaduniqueidentifier/?filename=httpupload.png&testingmode=1';
-    $this->dispatchUrI($page);
+    $this->dispatchUrI($page, $userDao);
     $content = $this->getBody();
     if(strpos($content, '[OK]') === false)
       {
@@ -73,9 +84,14 @@ function testGethttpuploaduniqueidentifierAction()
   function testProcessjavauploadAction()
     {
     $this->setupDatabase(array('default'));
+
+    $usersFile = $this->loadData('User', 'default');
+    $userDao = $this->User->load($usersFile[0]->getKey());
+    $subdir = $userDao->getUserId().'/'.$userDao->getPrivatefolderId();
+    $dir = BASE_PATH.'/tmp/misc/'.$subdir;
     $fileBase = BASE_PATH.'/tests/testfiles/search.png';
     $file = BASE_PATH.'/tmp/misc/testing_file.png';
-    $identifier = BASE_PATH.'/tmp/misc/httpupload.png';
+    $identifier = $dir.'/httpupload.png';
 
     if(file_exists($identifier))
       {
@@ -87,13 +103,8 @@ function testProcessjavauploadAction()
     fclose($ident);
     chmod($identifier, 0777);
 
-    $params = 'testingmode=1&filename=search.png&path='.$file.'&length='.filesize($file).'&uploadUniqueIdentifier='.basename($identifier);
-    $page = $this->webroot.'item/process_http_upload/'.$this->item.'?'.$params;
-
+    $params = 'testingmode=1&filename=search.png&localinput='.$file.'&length='.filesize($file).'&uploadUniqueIdentifier='.$subdir.'/httpupload.png';
     $page = 'upload/processjavaupload/?'.$params;
-
-    $usersFile = $this->loadData('User', 'default');
-    $userDao = $this->User->load($usersFile[0]->getKey());
     $this->dispatchUrI($page, $userDao);
 
     $search = $this->Item->getItemsFromSearch('search.png', $userDao);