Merge pull request #35 from symfony-cmf/xml_schema_test

More Xml schema test improvements

Author: wouterj

src/Symfony/Cmf/Component/Testing/Unit/Constraint/SchemaAcceptsXml.php

@@ -47,18 +47,22 @@ public function toString() { }
     protected function failureDescription($schemaFile)
     {
         return sprintf(
-            '"%s" is accepted by the XML schema "%s"',
-            \PHPUnit_Util_Type::export($this->xml[$this->failingElement]),
+            "Xml is accepted by the XML schema \"%s\"",
             $schemaFile
         );
     }
 
     protected function additionalFailureDescription($schema)
     {
-        $str = '';
+        $str = "\n".$this->xml[$this->failingElement]->saveXml()."\n\n";
 
         foreach ($this->errors as $error) {
-            $str .= $error->message.($error->file ? ' in'.$error->file : '').' on line '.$error->line."\n";
+            $error = trim($error->message).($error->file ? ' in'.$error->file : '').' on line '.$error->line."\n";
+
+            // avoid repeating same error
+            if (false === strpos($str, $error)) {
+                $str .= $error;
+            }
         }
 
         return $str;

src/Symfony/Cmf/Component/Testing/Unit/XmlSchemaTestCase.php

@@ -5,6 +5,20 @@
 class XmlSchemaTestCase extends \PHPUnit_Framework_TestCase
 {
     public static function assertSchemaAcceptsXml($xmlDoms, $schemaPath, $message = '')
+    {
+        return self::assertThat($schemaPath, self::getSchemaAcceptsXmlConstraint($xmlDoms), $message);
+    }
+
+    public static function assertSchemaRefusesXml($xmlDoms, $schemaPath, $message = '')
+    {
+        return self::assertThat(
+            $schemaPath,
+            new \PHPUnit_Framework_Constraint_Not(self::getSchemaAcceptsXmlConstraint($xmlDoms)),
+            $message
+        );
+    }
+
+    private static function getSchemaAcceptsXmlConstraint($xmlDoms)
     {
         if (!is_array($xmlDoms)) {
             $xmlDoms = array($xmlDoms);
@@ -26,6 +40,6 @@ public static function assertSchemaAcceptsXml($xmlDoms, $schemaPath, $message =
             return $dom;
         }, $xmlDoms);
 
-        return self::assertThat($schemaPath, new Constraint\SchemaAcceptsXml($xmlDoms), $message);
+        return new Constraint\SchemaAcceptsXml($xmlDoms);
     }
 }

tests/Unit/XmlSchemaTestCaseTest.php

@@ -12,4 +12,12 @@ public function testAcceptsSingleDomsWithoutArray()
         $dom->loadXML('<container><config xmlns="http://cmf.symfony.com/schema/dic/foo" required="f"/></container>');
         $this->assertSchemaAcceptsXml($dom, __DIR__.'/../Fixtures/schema/schema1.xsd');
     }
+
+    public function testNegativeAssertion()
+    {
+        $dom = new \DomDocument();
+        $dom->loadXML('<container><config xmlns="http://cmf.symfony.com/schema/dic/foo" /></container>');
+
+        $this->assertSchemaRefusesXml($dom, __DIR__.'/../Fixtures/schema/schema1.xsd');
+    }
 }