Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

- Merge [3820].

  • Loading branch information...
commit 3ebaf5bfb0fbea0bd79ec978fe1603d0772ee1f7 1 parent f69fc5e
Sebastian Bergmann authored
Showing with 22 additions and 8 deletions.
  1. +22 −8 PHPUnit/Tests/Framework/AssertTest.php
30 PHPUnit/Tests/Framework/AssertTest.php
View
@@ -3026,20 +3026,34 @@ public function testAssertSelectRegExpContentPresentFalse()
$this->assertSelectRegExp($selector, $regexp, FALSE, $this->html);
}
- /**
- * @expectedException PHPUnit_Framework_IncompleteTestError incomplete 0
- */
public function testMarkTestIncomplete()
{
- $this->markTestIncomplete('incomplete');
+ try {
+ $this->markTestIncomplete('incomplete');
+ }
+
+ catch (PHPUnit_Framework_IncompleteTestError $e) {
+ $this->assertEquals('incomplete', $e->getMessage());
+
+ return;
+ }
+
+ $this->fail();
}
- /**
- * @expectedException PHPUnit_Framework_SkippedTestError
- */
public function testMarkTestSkipped()
{
- $this->markTestSkipped();
+ try {
+ $this->markTestSkipped('skipped');
+ }
+
+ catch (PHPUnit_Framework_SkippedTestError $e) {
+ $this->assertEquals('skipped', $e->getMessage());
+
+ return;
+ }
+
+ $this->fail();
}
}
?>
Please sign in to comment.
Something went wrong with that request. Please try again.