Changeset 2452 for branches/0.11/tests2

Timestamp:

05/02/08 10:08:34 (8 months ago)

Author:

david

Message:

routing test cases can now have an 'exportFailure' array with a list of tests that are expected to fail; as a result, the test case for #502 does not appear as failed anymore

Location:

branches/0.11/tests2/routing

Files:

• WebRoutingTest.php (modified) (1 diff)
• cases/Apache22ModuleSubdir.case.php (modified) (1 diff)

branches/0.11/tests2/routing/WebRoutingTest.php

@@ -34 +34 @@
     $this->_r = new AgaviWebRouting();
     $this->_r->initialize($ctx);
-    $this->assertEquals($export['prefix'], $this->_r->getPrefix(), '[' . $export['message'] . '] getPrefix() ('.$export['prefix'].':'.$this->_r->getPrefix().')');
-    $this->assertEquals($export['input'], $this->_r->getInput(), '[' . $export['message'] . '] getInput()('.$export['input'].':'.$this->_r->getInput().')');
-    $this->assertEquals($export['basePath'], $this->_r->getBasePath(), '[' . $export['message'] . '] getBasePath()');
-    $this->assertEquals($export['baseHref'], $this->_r->getBaseHref(), '[' . $export['message'] . '] getBaseHref()');
+    
+    if(!isset($export['expectFailure'])) {
+      $export['expectFailure'] = array();
+    }
+    
+    if(in_array('prefix', $export['expectFailure'])) {
+      $assertMethod = 'assertNotEquals';
+    } else {
+      $assertMethod = 'assertEquals';
+    }
+    $this->$assertMethod($export['prefix'], $this->_r->getPrefix(), '[' . $export['message'] . '] getPrefix() ('.$export['prefix'].':'.$this->_r->getPrefix().')');
+    
+    if(in_array('input', $export['expectFailure'])) {
+      $assertMethod = 'assertNotEquals';
+    } else {
+      $assertMethod = 'assertEquals';
+    }
+    $this->$assertMethod($export['input'], $this->_r->getInput(), '[' . $export['message'] . '] getInput()('.$export['input'].':'.$this->_r->getInput().')');
+    
+    if(in_array('basePath', $export['expectFailure'])) {
+      $assertMethod = 'assertNotEquals';
+    } else {
+      $assertMethod = 'assertEquals';
+    }
+    $this->$assertMethod($export['basePath'], $this->_r->getBasePath(), '[' . $export['message'] . '] getBasePath()');
+    
+    if(in_array('baseHref', $export['expectFailure'])) {
+      $assertMethod = 'assertNotEquals';
+    } else {
+      $assertMethod = 'assertEquals';
+    }
+    $this->$assertMethod($export['baseHref'], $this->_r->getBaseHref(), '[' . $export['message'] . '] getBaseHref()');
   }
 

branches/0.11/tests2/routing/cases/Apache22ModuleSubdir.case.php

@@ -597 +597 @@
   ),
   array(
+    'expectFailure' => array(
+      'prefix',
+      'input',
+      'basePath',
+      'baseHref',
+    ),
     'message' => 'Sub-directory, rewritten, called path in dir with two slashes; THIS TEST IS EXPECTED TO FAIL, SEE #502!',
     'input' => '/fubar',