minor #13108 [Serializer] Fix XmlFileLoader test (dunglas)

fabpot · fabpot · commit 9280c6272ad5 · 2014-12-25T11:06:03.000+01:00
This PR was merged into the 2.7 branch. Discussion ---------- [Serializer] Fix XmlFileLoader test | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT | Doc PR | not yet Fix a bug in `XmlFileLoaderTest` tests. Commits ------- efd39cf [Serializer] Fix XmlFileLoader test
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/serialization.xml b/src/Symfony/Component/Serializer/Tests/Fixtures/serialization.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" ?>
 
-<serializer xmlns="http://symfony.com/schema/dic/serializer"
+<serializer xmlns="http://symfony.com/schema/dic/serializer-mapping"
                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                    xsi:schemaLocation="http://symfony.com/schema/dic/serializer http://symfony.com/schema/dic/constraint-mapping/serializer-1.0.xsd">
+                    xsi:schemaLocation="http://symfony.com/schema/dic/serializer-mapping http://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd">
 
     <class name="Symfony\Component\Serializer\Tests\Fixtures\GroupDummy">
         <attribute name="foo">
-            <group name="group1" />
-            <group name="group2" />
+            <group>group1</group>
+            <group>group2</group>
         </attribute>
 
         <attribute name="bar">
-            <group name="group2" />
+            <group>group2</group>
         </attribute>
     </class>
 
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/serialization.yml b/src/Symfony/Component/Serializer/Tests/Fixtures/serialization.yml
diff --git a/src/Symfony/Component/Serializer/Tests/Mapping/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/Serializer/Tests/Mapping/Loader/XmlFileLoaderTest.php
@@ -25,7 +25,7 @@ class XmlFileLoaderTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->loader = new XmlFileLoader(__DIR__.'/../../Fixtures/serializer.xml');
+        $this->loader = new XmlFileLoader(__DIR__.'/../../Fixtures/serialization.xml');
         $this->metadata = new ClassMetadata('Symfony\Component\Serializer\Tests\Fixtures\GroupDummy');
     }
 
diff --git a/src/Symfony/Component/Serializer/Tests/Mapping/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/Serializer/Tests/Mapping/Loader/YamlFileLoaderTest.php
@@ -25,7 +25,7 @@ class YamlFileLoaderTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->loader = new YamlFileLoader(__DIR__.'/../../Fixtures/serializer.yml');
+        $this->loader = new YamlFileLoader(__DIR__.'/../../Fixtures/serialization.yml');
         $this->metadata = new ClassMetadata('Symfony\Component\Serializer\Tests\Fixtures\GroupDummy');
     }
 

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class XmlFileLoaderTest extends \PHPUnit_Framework_TestCase`
`25`	`25`
`26`	`26`	`public function setUp()`
`27`	`27`	`{`
`28`		`- $this->loader = new XmlFileLoader(__DIR__.'/../../Fixtures/serializer.xml');`
	`28`	`+ $this->loader = new XmlFileLoader(__DIR__.'/../../Fixtures/serialization.xml');`
`29`	`29`	`$this->metadata = new ClassMetadata('Symfony\Component\Serializer\Tests\Fixtures\GroupDummy');`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class YamlFileLoaderTest extends \PHPUnit_Framework_TestCase`
`25`	`25`
`26`	`26`	`public function setUp()`
`27`	`27`	`{`
`28`		`- $this->loader = new YamlFileLoader(__DIR__.'/../../Fixtures/serializer.yml');`
	`28`	`+ $this->loader = new YamlFileLoader(__DIR__.'/../../Fixtures/serialization.yml');`
`29`	`29`	`$this->metadata = new ClassMetadata('Symfony\Component\Serializer\Tests\Fixtures\GroupDummy');`
`30`	`30`	`}`
`31`	`31`