[pLog-svn] r5293 - plog/branches/lifetype-1.2/class/test/tests/file

[jondaley at devel.lifetype.net]

Author: jondaley
Date: 2007-04-09 09:26:00 -0400 (Mon, 09 Apr 2007)
New Revision: 5293

Modified:
   plog/branches/lifetype-1.2/class/test/tests/file/file_test.class.php
Log:
Fixed file_test to actually test the code... I wondered why I had been able to use such easier code than Mark expected.  The second parameter was being passed into basename() instead of the test.  Too bad PHP doesn't give errors when you pass an invalid number of parameters.

Modified: plog/branches/lifetype-1.2/class/test/tests/file/file_test.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/test/tests/file/file_test.class.php	2007-04-09 02:50:20 UTC (rev 5292)
+++ plog/branches/lifetype-1.2/class/test/tests/file/file_test.class.php	2007-04-09 13:26:00 UTC (rev 5293)
@@ -13,17 +13,19 @@
 		function testBasename()
 		{
 			// test for chinese file name
-			$this->assertTrue( File::basename( "./gallery/1/中文檔名.jpg", "中文檔名.jpg" ));
-			$this->assertTrue( File::basename( ".\\gallery\\1\\中文檔名.jpg", "中文檔名.jpg" ));
+			$this->assertEquals("中文檔名.jpg", File::basename( "./gallery/1/中文檔名.jpg"));
+			$this->assertEquals("中文檔名.jpg", File::basename( ".\\gallery\\1\\中文檔名.jpg"));
 			// test for english file name
-			$this->assertTrue( File::basename( "./gallery/1/english.jpg", "english.jpg" ));
-			$this->assertTrue( File::basename( ".\\gallery\\1\\english.jpg", "english.jpg" ));
+			$this->assertEquals("english.jpg", File::basename( "./gallery/1/english.jpg"));
+			$this->assertEquals("english.jpg", File::basename( ".\\gallery\\1\\english.jpg"));
+			$this->assertEquals("english.jpg", File::basename( ".\\gallery\1\english.jpg"));
 			// test for file name with space
-			$this->assertTrue( File::basename( "./gallery/1/中文 name.jpg", "中文 name.jpg" ));
-			$this->assertTrue( File::basename( ".\\gallery\\1\\中文 name.jpg", "中文 name.jpg" ));
+			$this->assertEquals("中文 name.jpg", File::basename("./gallery/1/中文 name.jpg"));
+			$this->assertEquals("中文 name.jpg", File::basename( ".\\gallery\\1\\中文 name.jpg"));
 			// test for multiple slashes
-			$this->assertTrue( File::basename( "/./////gallery/////1/中文 name.jpg", "中文 name.jpg" ));
-			$this->assertTrue( File::basename( "\.\\\\\gallery\\\\\1\中文 name.jpg", "中文 name.jpg" ));
+			$this->assertEquals("中文 name.jpg", File::basename( "/./////gallery/////1/中文 name.jpg"));
+			$this->assertEquals("中文 name.jpg", File::basename( "\.\\\\\gallery\\\\\1\中文 name.jpg"));
+			$this->assertEquals("中文 name.jpg", File::basename( "\.\\\\\gallery\\\\\1\\中文 name.jpg"));
 		}
 	}
 ?>
\ No newline at end of file