Fixes #1: Expected and actual values were mixed up

Author: matthiasnoback

PhpUnit/ProcessedConfigurationEqualsConstraint.php

@@ -20,9 +20,9 @@ public function evaluate($other, $description = '', $returnResult = false)
     {
         $processedConfiguration = $this->processConfiguration($this->configurationValues);
 
-        $constraint = new \PHPUnit_Framework_Constraint_IsEqual($processedConfiguration);
+        $constraint = new \PHPUnit_Framework_Constraint_IsEqual($other);
 
-        return $constraint->evaluate($other, '', $returnResult);
+        return $constraint->evaluate($processedConfiguration, '', $returnResult);
     }
 
     public function toString()

Tests/PhpUnit/AbstractConfigurationTestCaseTest.php

@@ -17,9 +17,12 @@ protected function getConfiguration()
      */
     public function it_can_assert_that_a_configuration_is_invalid()
     {
-        $this->assertConfigurationIsInvalid(array(
-            array() // no configuration values
-        ), 'required_value');
+        $this->assertConfigurationIsInvalid(
+            array(
+                array() // no configuration values
+            ),
+            'required_value'
+        );
     }
 
     /**
@@ -29,9 +32,11 @@ public function it_fails_when_a_configuration_is_valid_when_it_should_have_been_
     {
         $this->setExpectedException('\PHPUnit_Framework_ExpectationFailedException', 'invalid');
 
-        $this->assertConfigurationIsInvalid(array(
-            array('required_value' => 'some value')
-        ));
+        $this->assertConfigurationIsInvalid(
+            array(
+                array('required_value' => 'some value')
+            )
+        );
     }
 
     /**
@@ -41,12 +46,15 @@ public function it_can_assert_that_a_processed_configuration_matches_the_expecte
     {
         $value = 'some value';
 
-        $this->assertProcessedConfigurationEquals(array(
-            array(),
-            array('required_value' => $value)
-        ), array(
-            'required_value'=> $value
-        ));
+        $this->assertProcessedConfigurationEquals(
+            array(
+                array(),
+                array('required_value' => $value)
+            ),
+            array(
+                'required_value' => $value
+            )
+        );
     }
 
     /**
@@ -57,10 +65,42 @@ public function it_fails_when_a_processed_configuration_does_not_match_the_expec
         $value = 'some value';
 
         $this->setExpectedException('\PHPUnit_Framework_ExpectationFailedException', 'equal');
-        $this->assertProcessedConfigurationEquals(array(
+        $this->assertProcessedConfigurationEquals(
+            array(
+                array('required_value' => $value)
+            ),
+            array(
+                'invalid_key' => 'invalid_value'
+            )
+        );
+    }
+
+    /**
+     * @test
+     */
+    public function it_throws_a_comparison_failed_exception_with_the_values_in_the_right_order()
+    {
+        $value = 'some value';
+
+        //$this->setExpectedException('\PHPUnit_Framework_ExpectationFailedException', 'equal');
+        $configurationValues = array(
             array('required_value' => $value)
-        ), array(
-            'invalid_key'=> 'invalid_value'
-        ));
+        );
+
+        $expectedProcessedConfigurationValues = array(
+            'invalid_key' => 'invalid_value'
+        );
+
+        try {
+            $this->assertProcessedConfigurationEquals(
+                $configurationValues,
+                $expectedProcessedConfigurationValues
+            );
+        } catch (\PHPUnit_Framework_ExpectationFailedException $exception) {
+            $this->assertSame(
+                $expectedProcessedConfigurationValues,
+                $exception->getComparisonFailure()->getExpected()
+            );
+        }
     }
 }