updated unit test for file matrix to reflect updates in directory structure and class...

git-svn-id: http://code.elgg.org/elgg/trunk@7166 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/tests/objects/filestore.php b/engine/tests/objects/filestore.php
index 050a7f97dca1f0303c4499140cc29625b0608470..9732f0af415cc32f38590aa97dec2f486553af54 100644 (file)
--- a/engine/tests/objects/filestore.php
+++ b/engine/tests/objects/filestore.php
@@ -48,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
@@ -98,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);
        }
 }