Fix some tests related to access order and make sorting explicit

schmittjoh · May 6, 2016 · f677457 · f677457
1 parent 216821c
commit f677457
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 19 deletions.
diff --git a/src/JMS/Serializer/Metadata/ClassMetadata.php b/src/JMS/Serializer/Metadata/ClassMetadata.php
@@ -266,12 +266,13 @@ private function sortProperties()
 
             case self::ACCESSOR_ORDER_CUSTOM:
                 $order = $this->customOrder;
-                uksort($this->propertyMetadata, function($a, $b) use ($order) {
+                $currentSorting = $this->propertyMetadata ? array_combine(array_keys($this->propertyMetadata), range(1, count($this->propertyMetadata))) : [];
+                uksort($this->propertyMetadata, function($a, $b) use ($order, $currentSorting) {
                     $existsA = isset($order[$a]);
                     $existsB = isset($order[$b]);
 
                     if ( ! $existsA && ! $existsB) {
-                        return 0;
+                        return $currentSorting[$a] - $currentSorting[$b];
                     }
 
                     if ( ! $existsA) {

diff --git a/tests/JMS/Serializer/Tests/Metadata/ClassMetadataTest.php b/tests/JMS/Serializer/Tests/Metadata/ClassMetadataTest.php
@@ -23,30 +23,40 @@
 
 class ClassMetadataTest extends \PHPUnit_Framework_TestCase
 {
-    public function testSetAccessorOrder()
+    public function getAccessOrderCases()
+    {
+        return [
+            [array('b', 'a'), array('b', 'a')],
+            [array('a', 'b'), array('a', 'b')],
+            [array('b'), array('b', 'a')],
+            [array('a'), array('a', 'b')],
+            [array('foo', 'bar'), array('b', 'a')],
+        ];
+    }
+
+    /**
+     * @dataProvider getAccessOrderCases
+     */
+    public function testSetAccessorOrderCustom(array $order, array $expected)
     {
         $metadata = new ClassMetadata('JMS\Serializer\Tests\Metadata\PropertyMetadataOrder');
         $metadata->addPropertyMetadata(new PropertyMetadata('JMS\Serializer\Tests\Metadata\PropertyMetadataOrder', 'b'));
         $metadata->addPropertyMetadata(new PropertyMetadata('JMS\Serializer\Tests\Metadata\PropertyMetadataOrder', 'a'));
         $this->assertEquals(array('b', 'a'), array_keys($metadata->propertyMetadata));
 
-        $metadata->setAccessorOrder(ClassMetadata::ACCESSOR_ORDER_ALPHABETICAL);
-        $this->assertEquals(array('a', 'b'), array_keys($metadata->propertyMetadata));
-
-        $metadata->setAccessorOrder(ClassMetadata::ACCESSOR_ORDER_CUSTOM, array('b', 'a'));
-        $this->assertEquals(array('b', 'a'), array_keys($metadata->propertyMetadata));
-
-        $metadata->setAccessorOrder(ClassMetadata::ACCESSOR_ORDER_CUSTOM, array('a', 'b'));
-        $this->assertEquals(array('a', 'b'), array_keys($metadata->propertyMetadata));
+        $metadata->setAccessorOrder(ClassMetadata::ACCESSOR_ORDER_CUSTOM, $order);
+        $this->assertEquals($expected, array_keys($metadata->propertyMetadata));
+    }
 
-        $metadata->setAccessorOrder(ClassMetadata::ACCESSOR_ORDER_CUSTOM, array('b'));
+    public function testSetAccessorOrderAlphabetical()
+    {
+        $metadata = new ClassMetadata('JMS\Serializer\Tests\Metadata\PropertyMetadataOrder');
+        $metadata->addPropertyMetadata(new PropertyMetadata('JMS\Serializer\Tests\Metadata\PropertyMetadataOrder', 'b'));
+        $metadata->addPropertyMetadata(new PropertyMetadata('JMS\Serializer\Tests\Metadata\PropertyMetadataOrder', 'a'));
         $this->assertEquals(array('b', 'a'), array_keys($metadata->propertyMetadata));
 
-        $metadata->setAccessorOrder(ClassMetadata::ACCESSOR_ORDER_CUSTOM, array('a'));
+        $metadata->setAccessorOrder(ClassMetadata::ACCESSOR_ORDER_ALPHABETICAL);
         $this->assertEquals(array('a', 'b'), array_keys($metadata->propertyMetadata));
-
-        $metadata->setAccessorOrder(ClassMetadata::ACCESSOR_ORDER_CUSTOM, array('foo', 'bar'));
-        $this->assertEquals(array('b', 'a'), array_keys($metadata->propertyMetadata));
     }
 
     /**

diff --git a/tests/JMS/Serializer/Tests/Serializer/JsonSerializationTest.php b/tests/JMS/Serializer/Tests/Serializer/JsonSerializationTest.php
@@ -77,7 +77,7 @@ protected function getContent($key)
             $outputs['groups_foo'] = '{"foo":"foo","foobar":"foobar"}';
             $outputs['groups_foobar'] = '{"foo":"foo","foobar":"foobar","bar":"bar"}';
             $outputs['groups_default'] = '{"bar":"bar","none":"none"}';
-            $outputs['virtual_properties'] = '{"exist_field":"value","test":"other-name","virtual_value":"value","typed_virtual_property":1}';
+            $outputs['virtual_properties'] = '{"exist_field":"value","virtual_value":"value","test":"other-name","typed_virtual_property":1}';
             $outputs['virtual_properties_low'] = '{"low":1}';
             $outputs['virtual_properties_high'] = '{"high":8}';
             $outputs['virtual_properties_all'] = '{"low":1,"high":8}';

diff --git a/tests/JMS/Serializer/Tests/Serializer/xml/virtual_properties.xml b/tests/JMS/Serializer/Tests/Serializer/xml/virtual_properties.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <result>
   <exist_field><![CDATA[value]]></exist_field>
-  <test><![CDATA[other-name]]></test>
   <virtual_value><![CDATA[value]]></virtual_value>
+  <test><![CDATA[other-name]]></test>
   <typed_virtual_property>1</typed_virtual_property>
 </result>
diff --git a/tests/JMS/Serializer/Tests/Serializer/yml/virtual_properties.yml b/tests/JMS/Serializer/Tests/Serializer/yml/virtual_properties.yml
@@ -1,4 +1,4 @@
 exist_field: value
-test: other-name
 virtual_value: value
+test: other-name
 typed_virtual_property: 1