1 files changed, 10 insertions, 15 deletions

diff --git a/engine/tests/objects/filestore.php b/engine/tests/objects/filestore.php
index a262a7c3f..9732f0af4 100644
--- a/engine/tests/objects/filestore.php
+++ b/engine/tests/objects/filestore.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Test
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 class ElggCoreFilestoreTest extends ElggCoreUnitTest {
 
@@ -50,12 +48,8 @@ class ElggCoreFilestoreTest extends ElggCoreUnitTest {
 		$user = $this->createTestUser();
 		$created = date('Y/m/d', $user->time_created);
 		
-		// check matrix with username
-		$user_dir = $this->filestore->make_file_matrix($user->username);
-		$this->assertIdentical($user_dir, "$created/$user->guid/");
-		
 		// check matrix with guid
-		$guid_dir = $this->filestore->make_file_matrix($user->guid);
+		$guid_dir = $this->filestore->makeFileMatrix($user->guid);
 		$this->assertIdentical($guid_dir, "$created/$user->guid/");
 		
 		// clean up user
@@ -69,18 +63,23 @@ class ElggCoreFilestoreTest extends ElggCoreUnitTest {
 		$user = $this->createTestUser();
 		$created = date('Y/m/d', $user->time_created);
 		
-		// setup a test file; no need to save
+		// setup a test file
 		$file = new ElggFile();
 		$file->owner_guid = $user->guid;
 		$file->setFilename('testing/filestore.txt');
+		$file->open('write');
+		$file->write('Testing!');
+		$this->assertTrue($file->close());
 		
 		// ensure filename and path is expected
 		$filename = $file->getFilenameOnFilestore($file);
 		$filepath = "$CONFIG->dataroot$created/$user->guid/testing/filestore.txt";
 		$this->assertIdentical($filename, $filepath);
+		$this->assertTrue(file_exists($filepath));
 		
-		// clean up user
+		// ensure file removed on user delete
 		$user->delete();
+		$this->assertFalse(file_exists($filepath));
 	}
 
 
@@ -95,11 +94,7 @@ class ElggCoreFilestoreTest extends ElggCoreUnitTest {
 }
 
 class ElggDiskFilestoreTest extends ElggDiskFilestore {
-	public function make_file_matrix($filename) {
-		return parent::make_file_matrix($filename);
-	}
-	
-	public function user_file_matrix($guid) {
-		return parent::user_file_matrix($guid);
+	public function makeFileMatrix($guid) {
+		return parent::makeFileMatrix($guid);
 	}
 }