Add assertNotInstanceOf and assertNotSame

Author: jubianchi

README.md

@@ -81,7 +81,7 @@ $extension->addToRunner($runner);
 | `assertInfinite(mixed $variable[, string $message = ''])`                                                          | ✔         |
 | `assertFinite(mixed $variable[, string $message = ''])`                                                            | ✔         |
 | `assertInstanceOf($expected, $actual[, $message = ''])`                                                            | ✔         |
-| `assertNotInstanceOf`                                                                                              | ✘         |
+| `assertNotInstanceOf($expected, $actual[, $message = ''])`                                                         | ✘         |
 | `assertInternalType($expected, $actual[, $message = ''])`                                                          | ✔         |
 | `assertNotInternalType`                                                                                            | ✘         |
 | `assertJsonFileEqualsJsonFile`                                                                                     | ✘         |
@@ -101,7 +101,7 @@ $extension->addToRunner($runner);
 | `assertStringMatchesFormatFile`                                                                                    | ✘         |
 | `assertStringNotMatchesFormatFile`                                                                                 | ✘         |
 | `assertSame(mixed $expected, mixed $actual[, string $message = ''])`                                               | ✔         |
-| `assertNotSame`                                                                                                    | ✘         |
+| `assertNotSame(mixed $expected, mixed $actual[, string $message = ''])`                                            | ✔         |
 | `assertStringEndsWith`                                                                                             | ✘         |
 | `assertStringEndsNotWith`                                                                                          | ✘         |
 | `assertStringEqualsFile`                                                                                           | ✘         |

classes/constraints/isNotInstanceOf.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace mageekguy\atoum\phpunit\constraints;
+
+use
+	mageekguy\atoum\asserters,
+	mageekguy\atoum\exceptions\logic,
+	mageekguy\atoum\phpunit\constraint
+;
+
+class isNotInstanceOf extends constraint
+{
+	private $expected;
+
+	public function __construct($expected, $description = null)
+	{
+		$this->expected = $expected;
+		$this->description = $description;
+	}
+
+	protected function matches($actual)
+	{
+		$asserter = new asserters\object();
+
+		try
+		{
+			$asserter->setWith($actual)->isNotInstanceOf($this->expected);
+		}
+		catch (logic $exception)
+		{
+			throw new \PHPUnit_Framework_Exception($exception->getMessage());
+		}
+	}
+}

classes/constraints/notSame.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace mageekguy\atoum\phpunit\constraints;
+
+use
+	mageekguy\atoum\asserters,
+	mageekguy\atoum\phpunit\constraint
+;
+
+class notSame extends constraint
+{
+	private $expected;
+
+	public function __construct($expected, $description = null)
+	{
+		$this->expected = $expected;
+		$this->description = $description;
+	}
+
+	protected function matches($actual)
+	{
+		$asserter = new asserters\variable();
+		$asserter->setWith($actual)->isNotIdenticalTo($this->expected);
+	}
+}

tests/units/classes/constraints/equalsTest.php

@@ -23,13 +23,8 @@ public function testClass()
 	/**
 	 * @dataProvider equalProvider
 	 */
-	public function testAssertEqualsSucceeds($expected, $actual, $delta = null, $canonicalize = null, $ignoreCase = null, $skip = null)
+	public function testAssertEqualsSucceeds($expected, $actual, $delta = null, $canonicalize = null, $ignoreCase = null)
 	{
-		if ($skip !== null)
-		{
-			$this->markTestSkipped($skip);
-		}
-
 		$constraint = new testedClass($expected, null, $delta, 10, $canonicalize, $ignoreCase);
 
 		$this->assertSame($constraint, $constraint->evaluate($actual));