@@ -1157,7 +1157,7 @@ abstract class PHPUnit_Framework_Assert * @param string $message * @since Method available since Release 3.5.0 */ - public static function assertNotStringMatchesFormat($format, $string, $message = '') + public static function assertStringNotMatchesFormat($format, $string, $message = '') { if (!is_string($format)) { throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string'); PHPUnit/Framework/Assert.php @@ -4373,6 +4373,42 @@ class Framework_AssertTest extends PHPUnit_Framework_TestCase } /** + * @covers PHPUnit_Framework_Assert::assertStringMatchesFormat + */ + public function testAssertStringMatchesFormat() + { + $this->assertStringMatchesFormat('*%s*', '***'); + + try { + $this->assertStringMatchesFormat('*%s*', '**'); + } + + catch (PHPUnit_Framework_AssertionFailedError $e) { + return; + } + + $this->fail(); + } + + /** + * @covers PHPUnit_Framework_Assert::assertStringNotMatchesFormat + */ + public function testAssertStringNotMatchesFormat() + { + $this->assertStringNotMatchesFormat('*%s*', '**'); + + try { + $this->assertStringMatchesFormat('*%s*', '**'); + } + + catch (PHPUnit_Framework_AssertionFailedError $e) { + return; + } + + $this->fail(); + } + + /** * @covers PHPUnit_Framework_Assert::markTestIncomplete */ public function testMarkTestIncomplete() PHPUnit/Tests/Framework/AssertTest.php @@ -1723,6 +1723,76 @@ class Framework_ConstraintTest extends PHPUnit_Framework_TestCase } /** + * @covers PHPUnit_Framework_Constraint_StringMatches + * @covers PHPUnit_Framework_Assert::matches + * @covers PHPUnit_Framework_Constraint::count + */ + public function testConstraintStringMatches() + { + $constraint = PHPUnit_Framework_Assert::matches('*%s*'); + $this->assertFalse($constraint->evaluate('**')); + $this->assertTrue($constraint->evaluate('***')); + $this->assertEquals('matches PCRE pattern "/^\*.+?\*$/s"', $constraint->toString()); + $this->assertEquals(1, count($constraint)); + } + + /** + * @covers PHPUnit_Framework_Constraint_StringMatches + * @covers PHPUnit_Framework_Assert::matches + * @covers PHPUnit_Framework_Constraint::count + */ + public function testConstraintStringMatches2() + { + $constraint = PHPUnit_Framework_Assert::matches('*%i*'); + $this->assertFalse($constraint->evaluate('**')); + $this->assertTrue($constraint->evaluate('*0*')); + $this->assertEquals('matches PCRE pattern "/^\*[+\-]?[0-9]+\*$/s"', $constraint->toString()); + $this->assertEquals(1, count($constraint)); + } + + /** + * @covers PHPUnit_Framework_Constraint_StringMatches + * @covers PHPUnit_Framework_Assert::matches + * @covers PHPUnit_Framework_Constraint::count + */ + public function testConstraintStringMatches3() + { + $constraint = PHPUnit_Framework_Assert::matches('*%d*'); + $this->assertFalse($constraint->evaluate('**')); + $this->assertTrue($constraint->evaluate('*0*')); + $this->assertEquals('matches PCRE pattern "/^\*[0-9]+\*$/s"', $constraint->toString()); + $this->assertEquals(1, count($constraint)); + } + + /** + * @covers PHPUnit_Framework_Constraint_StringMatches + * @covers PHPUnit_Framework_Assert::matches + * @covers PHPUnit_Framework_Constraint::count + */ + public function testConstraintStringMatches4() + { + $constraint = PHPUnit_Framework_Assert::matches('*%x*'); + $this->assertFalse($constraint->evaluate('**')); + $this->assertTrue($constraint->evaluate('*0f0f0f*')); + $this->assertEquals('matches PCRE pattern "/^\*[0-9a-fA-F]+\*$/s"', $constraint->toString()); + $this->assertEquals(1, count($constraint)); + } + + /** + * @covers PHPUnit_Framework_Constraint_StringMatches + * @covers PHPUnit_Framework_Assert::matches + * @covers PHPUnit_Framework_Constraint::count + */ + public function testConstraintStringMatches5() + { + $constraint = PHPUnit_Framework_Assert::matches('*%f*'); + $this->assertFalse($constraint->evaluate('**')); + $this->assertTrue($constraint->evaluate('*1.0*')); + $this->assertEquals('matches PCRE pattern "/^\*[+\-]?\.?[0-9]+\.?[0-9]*(E-?[0-9]+)?\*$/s"', $constraint->toString()); + $this->assertEquals(1, count($constraint)); + } + + /** * @covers PHPUnit_Framework_Constraint_StringStartsWith * @covers PHPUnit_Framework_Assert::stringStartsWith * @covers PHPUnit_Framework_Constraint::count PHPUnit/Tests/Framework/ConstraintTest.php @@ -13,11 +13,11 @@ PHPUnit_TextUI_Command::main(); --EXPECTF-- PHPUnit %s by Sebastian Bergmann. -FFFFFFFFFF +FFFFFFFFFFF Time: %i %s -There were 10 failures: +There were 11 failures: 1) FailureTest::testAssertArrayEqualsArray message @@ -82,13 +82,24 @@ Failed asserting that two strings are equal. %s:%i -7) FailureTest::testAssertNumericEqualsNumeric +7) FailureTest::testAssertStringMatchesFormat +message +Failed asserting that two strings are equal. +--- Expected ++++ Actual +@@ @@ +-*%s* ++** + +%s:%i + +8) FailureTest::testAssertNumericEqualsNumeric message Failed asserting that <integer:2> matches expected <integer:1>. %s:%i -8) FailureTest::testAssertTextSameText +9) FailureTest::testAssertTextSameText message --- Expected +++ Actual @@ -98,17 +109,17 @@ message %s:%i -9) FailureTest::testAssertObjectSameObject +10) FailureTest::testAssertObjectSameObject message Failed asserting that two variables reference the same object. %s:%i -10) FailureTest::testAssertObjectSameNull +11) FailureTest::testAssertObjectSameNull message <null> does not match expected type "object". %s:%i FAILURES! -Tests: 10, Assertions: 10, Failures: 10. +Tests: 11, Assertions: 11, Failures: 11. PHPUnit/Tests/TextUI/failure-isolation.phpt @@ -15,11 +15,11 @@ PHPUnit_TextUI_Command::main(); PHPUnit %s by Sebastian Bergmann. FailureTest -FFFFFFFFFF +FFFFFFFFFFF Time: %i %s -There were 10 failures: +There were 11 failures: 1) FailureTest::testAssertArrayEqualsArray message @@ -84,13 +84,24 @@ Failed asserting that two strings are equal. %s:%i -7) FailureTest::testAssertNumericEqualsNumeric +7) FailureTest::testAssertStringMatchesFormat +message +Failed asserting that two strings are equal. +--- Expected ++++ Actual +@@ @@ +-*%s* ++** + +%s:%i + +8) FailureTest::testAssertNumericEqualsNumeric message Failed asserting that <integer:2> matches expected <integer:1>. %s:%i -8) FailureTest::testAssertTextSameText +9) FailureTest::testAssertTextSameText message --- Expected +++ Actual @@ -100,17 +111,17 @@ message %s:%i -9) FailureTest::testAssertObjectSameObject +10) FailureTest::testAssertObjectSameObject message Failed asserting that two variables reference the same object. %s:%i -10) FailureTest::testAssertObjectSameNull +11) FailureTest::testAssertObjectSameNull message <null> does not match expected type "object". %s:%i FAILURES! -Tests: 10, Assertions: 10, Failures: 10. +Tests: 11, Assertions: 11, Failures: 11. PHPUnit/Tests/TextUI/failure-verbose-isolation.phpt @@ -14,11 +14,11 @@ PHPUnit_TextUI_Command::main(); PHPUnit %s by Sebastian Bergmann. FailureTest -FFFFFFFFFF +FFFFFFFFFFF Time: %i %s -There were 10 failures: +There were 11 failures: 1) FailureTest::testAssertArrayEqualsArray message @@ -33,12 +33,14 @@ Failed asserting that two arrays are equal. ) %s:%i +%s:%i 2) FailureTest::testAssertIntegerEqualsInteger message Failed asserting that <integer:2> matches expected <integer:1>. %s:%i +%s:%i 3) FailureTest::testAssertObjectEqualsObject message @@ -53,12 +55,14 @@ Failed asserting that two objects are equal. ) %s:%i +%s:%i 4) FailureTest::testAssertNullEqualsString message Failed asserting that <string:bar> matches expected <null>. %s:%i +%s:%i 5) FailureTest::testAssertStringEqualsString message @@ -70,6 +74,7 @@ Failed asserting that two strings are equal. +bar %s:%i +%s:%i 6) FailureTest::testAssertTextEqualsText message @@ -82,14 +87,28 @@ Failed asserting that two strings are equal. +baz %s:%i +%s:%i -7) FailureTest::testAssertNumericEqualsNumeric +7) FailureTest::testAssertStringMatchesFormat +message +Failed asserting that two strings are equal. +--- Expected ++++ Actual +@@ @@ +-*%s* ++** + +%s:%i +%s:%i + +8) FailureTest::testAssertNumericEqualsNumeric message Failed asserting that <integer:2> matches expected <integer:1>. %s:%i +%s:%i -8) FailureTest::testAssertTextSameText +9) FailureTest::testAssertTextSameText message --- Expected +++ Actual @@ -98,18 +117,21 @@ message +bar %s:%i +%s:%i -9) FailureTest::testAssertObjectSameObject +10) FailureTest::testAssertObjectSameObject message Failed asserting that two variables reference the same object. %s:%i +%s:%i -10) FailureTest::testAssertObjectSameNull +11) FailureTest::testAssertObjectSameNull message <null> does not match expected type "object". %s:%i +%s:%i FAILURES! -Tests: 10, Assertions: 10, Failures: 10. +Tests: 11, Assertions: 11, Failures: 11. PHPUnit/Tests/TextUI/failure-verbose.phpt @@ -12,11 +12,11 @@ PHPUnit_TextUI_Command::main(); --EXPECTF-- PHPUnit %s by Sebastian Bergmann. -FFFFFFFFFF +FFFFFFFFFFF Time: %i %s -There were 10 failures: +There were 11 failures: 1) FailureTest::testAssertArrayEqualsArray message @@ -87,14 +87,26 @@ Failed asserting that two strings are equal. %s:%i %s:%i -7) FailureTest::testAssertNumericEqualsNumeric +7) FailureTest::testAssertStringMatchesFormat +message +Failed asserting that two strings are equal. +--- Expected ++++ Actual +@@ @@ +-*%s* ++** + +%s:%i +%s:%i + +8) FailureTest::testAssertNumericEqualsNumeric message Failed asserting that <integer:2> matches expected <integer:1>. %s:%i %s:%i -8) FailureTest::testAssertTextSameText +9) FailureTest::testAssertTextSameText message --- Expected +++ Actual @@ -105,14 +117,14 @@ message %s:%i %s:%i -9) FailureTest::testAssertObjectSameObject +10) FailureTest::testAssertObjectSameObject message Failed asserting that two variables reference the same object. %s:%i %s:%i -10) FailureTest::testAssertObjectSameNull +11) FailureTest::testAssertObjectSameNull message <null> does not match expected type "object". @@ -120,4 +132,4 @@ message %s:%i FAILURES! -Tests: 10, Assertions: 10, Failures: 10. +Tests: 11, Assertions: 11, Failures: 11. PHPUnit/Tests/TextUI/failure.phpt @@ -37,6 +37,11 @@ class FailureTest extends PHPUnit_Framework_TestCase $this->assertEquals("foo\nbar\n", "foo\nbaz\n", 'message'); } + public function testAssertStringMatchesFormat() + { + $this->assertStringMatchesFormat('*%s*', '**', 'message'); + } + public function testAssertNumericEqualsNumeric() { $this->assertEquals(1, 2, 'message'); PHPUnit/Tests/_files/FailureTest.php 52d64f5853bbbe31e99621ae23b27bfd9ae748a7 sb sb@c4a080f7-5c17-0410-a942-8af0f0140c7b http://github.com/bkw/phpunit/commit/6ec9e1ac6647bde5259c7985120dffa98cc83da6 6ec9e1ac6647bde5259c7985120dffa98cc83da6 2009-11-15T00:04:28-08:00 2009-11-15T00:04:28-08:00 - Leftover from [5330]. git-svn-id: svn://svn.phpunit.de/phpunit/phpunit/trunk@5331 c4a080f7-5c17-0410-a942-8af0f0140c7b 9fcd66578f4644beffe23367f1c35edbbc1db77c sb sb@c4a080f7-5c17-0410-a942-8af0f0140c7b