[Solar-svn] Revision 2637

[pmjones at solarphp.com]

Branch: updated Solar_FilterTest to reflect new branch method names


Modified: branches/orm/tests/Solar/FilterTest.php
===================================================================
--- branches/orm/tests/Solar/FilterTest.php	2007-07-27 20:54:08 UTC (rev 2636)
+++ branches/orm/tests/Solar/FilterTest.php	2007-07-27 20:54:54 UTC (rev 2637)
@@ -182,23 +182,23 @@
         $this->assertSame($after, 'abc');
     }
     
-    public function testSanitizeRegex()
+    public function testSanitizePregReplace()
     {
         $filter = Solar::factory('Solar_Filter');
         $filter->setRequire(true);
         
         $before = 'abc 123 ,./';
-        $after = $filter->sanitizeRegex($before, '/[^a-z]/', '@');
+        $after = $filter->sanitizePregReplace($before, '/[^a-z]/', '@');
         $this->assertSame($after, 'abc@@@@@@@@');
     }
     
-    public function testSanitizeReplace()
+    public function testSanitizeStrReplace()
     {
         $filter = Solar::factory('Solar_Filter');
         $filter->setRequire(true);
         
         $before = 'abc 123 ,./';
-        $after = $filter->sanitizeReplace($before, ' ', '@');
+        $after = $filter->sanitizeStrReplace($before, ' ', '@');
         $this->assertSame($after, 'abc at 123@,./');
     }
     
@@ -1333,7 +1333,7 @@
         }
     }
     
-    public function testValidateRegex()
+    public function testValidatePregMatch()
     {
         $filter = Solar::factory('Solar_Filter');
         $filter->setRequire(true);
@@ -1349,7 +1349,7 @@
             '-123',
         );
         foreach ($test as $val) {
-            $this->assertTrue($filter->validateRegex($val, $expr));
+            $this->assertTrue($filter->validatePregMatch($val, $expr));
         }
         
         // bad, or are blank
@@ -1361,7 +1361,7 @@
             '0000123.456000',
         );
         foreach ($test as $val) {
-            $this->assertFalse($filter->validateRegex($val, $expr));
+            $this->assertFalse($filter->validatePregMatch($val, $expr));
         }
         
         // blanks allowed
@@ -1375,7 +1375,7 @@
             '-123',
         );
         foreach ($test as $val) {
-            $this->assertTrue($filter->validateRegex($val, $expr));
+            $this->assertTrue($filter->validatePregMatch($val, $expr));
         }
 
     }