Merge pull request #1048 from open-orchestra/update_functional_test_u…

…pdata_search_annotation update functional test
open-orchestra · Oct 7, 2016 · 8b8555c · 8b8555c
2 parents 4f8fe39 + ec59560
commit 8b8555c
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 39 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/OpenOrchestra/Tests/Functional/Mapping/Metadata/Driver/AbstractDriverTest.php b/src/OpenOrchestra/Tests/Functional/Mapping/Metadata/Driver/AbstractDriverTest.php
@@ -56,11 +56,17 @@ protected function assertMetadata(ClassMetadata $metadata)
     {
         $this->assertInstanceOf('Metadata\ClassMetadata', $metadata);
         $propertiesMetadata = $metadata->propertyMetadata;
-
         $this->assertArrayHasKey('fakeProperty1', $propertiesMetadata);
-        $this->assertPropertyMetadata($propertiesMetadata['fakeProperty1'], 'fake_property1', 'fakeType', 'fakeProperty1');
         $this->assertArrayHasKey('fakeProperty2', $propertiesMetadata);
-        $this->assertPropertyMetadata($propertiesMetadata['fakeProperty2'], array("fake_property2", "fake_property_multi"), 'string', 'fakeProperty2');
+        $propertyMetadataFakeProperty1 = $propertiesMetadata['fakeProperty1']->propertySearchMetadata[0];
+        $this->assertPropertyMetadata($propertyMetadataFakeProperty1, 'fake_property1', 'fakeType', 'fakeProperty1');
+
+        $this->assertCount(2, $propertiesMetadata['fakeProperty2']->propertySearchMetadata);
+        $propertyMetadataFakeProperty2 = $propertiesMetadata['fakeProperty2']->propertySearchMetadata[0];
+        $this->assertPropertyMetadata($propertyMetadataFakeProperty2, array("fake_property2", "fake_property_multi"), 'string', 'fakeProperty2');
+        $propertyMetadataFakeProperty2Other = $propertiesMetadata['fakeProperty2']->propertySearchMetadata[1];
+        $this->assertPropertyMetadata($propertyMetadataFakeProperty2Other, "fake_property3", 'string', 'fakeProperty2');
+
     }
 
     /**

diff --git a/src/OpenOrchestra/Tests/Functional/Mapping/Metadata/Driver/FakeClass/FakeClassMetadata.php b/src/OpenOrchestra/Tests/Functional/Mapping/Metadata/Driver/FakeClass/FakeClassMetadata.php
@@ -20,6 +20,7 @@ class FakeClassMetadata
 
     /**
      * @ORCHESTRA\Search(key={"fake_property2", "fake_property_multi"})
+     * @ORCHESTRA\Search(key="fake_property3")
      */
     protected $fakeProperty2;
 }
diff --git a/src/OpenOrchestra/Tests/Functional/Mapping/Metadata/Driver/xml/FakeClassMetadata.xml b/src/OpenOrchestra/Tests/Functional/Mapping/Metadata/Driver/xml/FakeClassMetadata.xml
@@ -1,6 +1,9 @@
 <search-mapping>
     <class name="OpenOrchestra\FunctionalTests\Mapping\Metadata\Driver\FakeClass\FakeClassMetadata">
         <field field="fakeProperty1" key="fake_property1" type="fakeType" />
-        <field field="fakeProperty2" key="fake_property2, fake_property_multi"/>
+        <field field="fakeProperty2">
+            <search key="fake_property2, fake_property_multi"/>
+            <search key="fake_property3"/>
+        </field>
     </class>
 </search-mapping>
diff --git a/src/OpenOrchestra/Tests/Functional/Mapping/Metadata/Driver/yml/FakeClassMetadata.yml b/src/OpenOrchestra/Tests/Functional/Mapping/Metadata/Driver/yml/FakeClassMetadata.yml
@@ -5,4 +5,7 @@ OpenOrchestra\FunctionalTests\Mapping\Metadata\Driver\FakeClass\FakeClassMetadat
             type: fakeType
             field: fakeProperty1
         fakeProperty2:
-            key: [fake_property2, fake_property_multi]
+            -
+              key: [fake_property2, fake_property_multi]
+            -
+              key: fake_property3