From afd07dc5704c316217b71106e0c80f69bb301e8a Mon Sep 17 00:00:00 2001
From: Jordan Stout <j@jrdn.org>
Date: Tue, 26 Mar 2013 10:37:33 -0700
Subject: [PATCH] fixed failing tests
---
Tests/Formatter/MarkdownFormatterTest.php | 4 ++--
Tests/Formatter/SimpleFormatterTest.php | 4 ++--
Tests/Parser/JmsMetadataParserTest.php | 19 ++++++++++++++++++-
3 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/Tests/Formatter/MarkdownFormatterTest.php b/Tests/Formatter/MarkdownFormatterTest.php
index 7f9de03..9572048 100644
--- a/Tests/Formatter/MarkdownFormatterTest.php
+++ b/Tests/Formatter/MarkdownFormatterTest.php
@@ -250,13 +250,13 @@ nested[parent][nested]:
* required: false
* description: No description.
-nested[parent][nestedArray][]:
+nested[parent][nested_array][]:
* type: array of objects (JmsNested)
* required: false
* description: No description.
-nestedArray[]:
+nested_array[]:
* type: array of objects (JmsNested)
* required: false
diff --git a/Tests/Formatter/SimpleFormatterTest.php b/Tests/Formatter/SimpleFormatterTest.php
index 4de4e89..105e822 100644
--- a/Tests/Formatter/SimpleFormatterTest.php
+++ b/Tests/Formatter/SimpleFormatterTest.php
@@ -345,7 +345,7 @@ With multiple lines.',
'description' => 'No description.',
'readonly' => false,
),
- 'nestedArray' =>
+ 'nested_array' =>
array (
'dataType' => 'array of objects (JmsNested)',
'required' => false,
@@ -356,7 +356,7 @@ With multiple lines.',
),
),
),
- 'nestedArray' =>
+ 'nested_array' =>
array (
'dataType' => 'array of objects (JmsNested)',
'required' => false,
diff --git a/Tests/Parser/JmsMetadataParserTest.php b/Tests/Parser/JmsMetadataParserTest.php
index 0f7d5b2..95d9673 100644
--- a/Tests/Parser/JmsMetadataParserTest.php
+++ b/Tests/Parser/JmsMetadataParserTest.php
@@ -44,6 +44,23 @@ class JmsMetadataParserTest extends \PHPUnit_Framework_TestCase
$metadata->addPropertyMetadata($propertyMetadataBar);
$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();
$metadataFactory->expects($this->once())
@@ -51,7 +68,7 @@ class JmsMetadataParserTest extends \PHPUnit_Framework_TestCase
->with($input)
->will($this->returnValue($metadata));
- $jmsMetadataParser = new JmsMetadataParser($metadataFactory, $docCommentExtractor);
+ $jmsMetadataParser = new JmsMetadataParser($metadataFactory, $propertyNamingStrategy, $docCommentExtractor);
$output = $jmsMetadataParser->parse($input);