Merge pull request #158 from j/test-fixes

fixed failing tests
This commit is contained in:
William Durand 2013-03-26 13:38:28 -07:00
commit 86e47fe785
3 changed files with 22 additions and 5 deletions

View File

@ -250,13 +250,13 @@ nested[parent][nested]:
* required: false * required: false
* description: No description. * description: No description.
nested[parent][nestedArray][]: nested[parent][nested_array][]:
* type: array of objects (JmsNested) * type: array of objects (JmsNested)
* required: false * required: false
* description: No description. * description: No description.
nestedArray[]: nested_array[]:
* type: array of objects (JmsNested) * type: array of objects (JmsNested)
* required: false * required: false

View File

@ -345,7 +345,7 @@ With multiple lines.',
'description' => 'No description.', 'description' => 'No description.',
'readonly' => false, 'readonly' => false,
), ),
'nestedArray' => 'nested_array' =>
array ( array (
'dataType' => 'array of objects (JmsNested)', 'dataType' => 'array of objects (JmsNested)',
'required' => false, 'required' => false,
@ -356,7 +356,7 @@ With multiple lines.',
), ),
), ),
), ),
'nestedArray' => 'nested_array' =>
array ( array (
'dataType' => 'array of objects (JmsNested)', 'dataType' => 'array of objects (JmsNested)',
'required' => false, 'required' => false,

View File

@ -44,6 +44,23 @@ class JmsMetadataParserTest extends \PHPUnit_Framework_TestCase
$metadata->addPropertyMetadata($propertyMetadataBar); $metadata->addPropertyMetadata($propertyMetadataBar);
$metadata->addPropertyMetadata($propertyMetadataBaz); $metadata->addPropertyMetadata($propertyMetadataBaz);
$propertyNamingStrategy = $this->getMock('JMS\Serializer\Naming\PropertyNamingStrategyInterface');
$propertyNamingStrategy
->expects($this->at(0))
->method('translateName')
->will($this->returnValue('foo'));
$propertyNamingStrategy
->expects($this->at(1))
->method('translateName')
->will($this->returnValue('bar'));
$propertyNamingStrategy
->expects($this->at(2))
->method('translateName')
->will($this->returnValue('baz'));
$input = new JmsNested(); $input = new JmsNested();
$metadataFactory->expects($this->once()) $metadataFactory->expects($this->once())
@ -51,7 +68,7 @@ class JmsMetadataParserTest extends \PHPUnit_Framework_TestCase
->with($input) ->with($input)
->will($this->returnValue($metadata)); ->will($this->returnValue($metadata));
$jmsMetadataParser = new JmsMetadataParser($metadataFactory, $docCommentExtractor); $jmsMetadataParser = new JmsMetadataParser($metadataFactory, $propertyNamingStrategy, $docCommentExtractor);
$output = $jmsMetadataParser->parse($input); $output = $jmsMetadataParser->parse($input);