? .settings
? foo.php
? shiz.patch
? test.patch
Index: modules/simpletest/drupal_web_test_case.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/drupal_web_test_case.php,v
retrieving revision 1.224
diff -u -p -r1.224 drupal_web_test_case.php
--- modules/simpletest/drupal_web_test_case.php	8 Jul 2010 12:22:59 -0000	1.224
+++ modules/simpletest/drupal_web_test_case.php	15 Jul 2010 22:52:21 -0000
@@ -2117,7 +2117,7 @@ class DrupalWebTestCase extends DrupalTe
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
   protected function assertLink($label, $index = 0, $message = '', $group = 'Other') {
-    $links = $this->xpath('//a[normalize-space(text())=:label]', array(':label' => $label));
+    $links = $this->xpath('//a[normalize-space(text())=:label]|//a[.//*[normalize-space(text())=:label]]', array(':label' => $label));
     $message = ($message ?  $message : t('Link with label %label found.', array('%label' => $label)));
     return $this->assert(isset($links[$index]), $message, $group);
   }
@@ -2137,7 +2137,7 @@ class DrupalWebTestCase extends DrupalTe
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
   protected function assertNoLink($label, $message = '', $group = 'Other') {
-    $links = $this->xpath('//a[normalize-space(text())=:label]', array(':label' => $label));
+    $links = $this->xpath('//a[normalize-space(text())=:label]|//a[.//*[normalize-space(text())=:label]]', array(':label' => $label));
     $message = ($message ?  $message : t('Link with label %label not found.', array('%label' => $label)));
     return $this->assert(empty($links), $message, $group);
   }
@@ -2199,7 +2199,7 @@ class DrupalWebTestCase extends DrupalTe
    */
   protected function clickLink($label, $index = 0) {
     $url_before = $this->getUrl();
-    $urls = $this->xpath('//a[normalize-space(text())=:label]', array(':label' => $label));
+    $urls = $this->xpath('//a[normalize-space(text())=:label]|//a[.//*[normalize-space(text())=:label]]', array(':label' => $label));
 
     if (isset($urls[$index])) {
       $url_target = $this->getAbsoluteUrl($urls[$index]['href']);