1 files changed, 30 insertions, 19 deletions
diff --git a/tests/codeigniter/helpers/directory_helper_test.php b/tests/codeigniter/helpers/directory_helper_test.php
index 3937d2913..41370e6e7 100644
--- a/tests/codeigniter/helpers/directory_helper_test.php
+++ b/tests/codeigniter/helpers/directory_helper_test.php
@@ -1,41 +1,52 @@
 <?php
 
 class Directory_helper_test extends CI_TestCase {
-	
+
 	public function set_up()
 	{
 		$this->helper('directory');
 
 		vfsStreamWrapper::register();
 		vfsStreamWrapper::setRoot(new vfsStreamDirectory('testDir'));
-		
+
 		$this->_test_dir = vfsStreamWrapper::getRoot();
-	}	
-	
+	}
+
 	public function test_directory_map()
 	{
-		$structure = array('libraries' => array('benchmark.html' => '', 'database' =>
-			array('active_record.html' => '', 'binds.html' => ''), 'email.html' => '', '.hiddenfile.txt' => ''));
-		
+		$structure = array(
+			'libraries' => array(
+				'benchmark.html' => '',
+				'database' => array('active_record.html' => '', 'binds.html' => ''),
+				'email.html' => '',
+				'0' => '',
+				'.hiddenfile.txt' => ''
+			)
+		);
+
 		vfsStream::create($structure, $this->_test_dir);
 
 		// test default recursive behavior
-		$expected = array('libraries' => array('benchmark.html', 'database' =>
-			array('active_record.html', 'binds.html'), 'email.html'));
-			
-		$this->assertEquals($expected, directory_map(vfsStream::url('testDir')));
+		$expected = array(
+			'libraries/' => array(
+				'benchmark.html',
+				'database/' => array('active_record.html', 'binds.html'),
+				'email.html',
+				'0'
+			)
+		);
 
-		// test recursion depth behavior
-		$expected = array('libraries');
-			
-		$this->assertEquals($expected, directory_map(vfsStream::url('testDir'), 1));
+		$this->assertEquals($expected, directory_map(vfsStream::url('testDir')));
 
 		// test detection of hidden files
-		$expected = array('libraries' => array('benchmark.html', 'database' =>
-			array('active_record.html', 'binds.html'), 'email.html', '.hiddenfile.txt'));
-			
+		$expected['libraries/'][] = '.hiddenfile.txt';
+
 		$this->assertEquals($expected, directory_map(vfsStream::url('testDir'), FALSE, TRUE));
-  }  
+
+		// test recursion depth behavior
+		$this->assertEquals(array('libraries/'), directory_map(vfsStream::url('testDir'), 1));
+	}
+
 }
 
 /* End of file directory_helper_test.php */
 \ No newline at end of file