Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
dunglas committed Dec 21, 2013
1 parent edcc79c commit b8f16fb
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 26 deletions.
8 changes: 4 additions & 4 deletions Tests/Filter/BooleanFilterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class BooleanFilterTest extends FilterWithQueryBuilderTest
{
public function testFilterEmpty()
{
$filter = new BooleanFilter;
$filter = new BooleanFilter();
$filter->initialize('field_name', array('field_options' => array('class' => 'FooBar')));

$builder = new ProxyQuery($this->getQueryBuilder());
Expand All @@ -38,7 +38,7 @@ public function testFilterEmpty()

public function testFilterNo()
{
$filter = new BooleanFilter;
$filter = new BooleanFilter();
$filter->initialize('field_name', array('field_options' => array('class' => 'FooBar')));

$builder = new ProxyQuery($this->getQueryBuilder());
Expand All @@ -50,7 +50,7 @@ public function testFilterNo()

public function testFilterYes()
{
$filter = new BooleanFilter;
$filter = new BooleanFilter();
$filter->initialize('field_name', array('field_options' => array('class' => 'FooBar')));

$builder = new ProxyQuery($this->getQueryBuilder());
Expand All @@ -62,7 +62,7 @@ public function testFilterYes()

public function testFilterArray()
{
$filter = new BooleanFilter;
$filter = new BooleanFilter();
$filter->initialize('field_name', array('field_options' => array('class' => 'FooBar')));

$builder = new ProxyQuery($this->getQueryBuilder());
Expand Down
6 changes: 3 additions & 3 deletions Tests/Filter/CallbackFilterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public function testFilterClosure()
{
$builder = new ProxyQuery($this->getQueryBuilder());

$filter = new CallbackFilter;
$filter = new CallbackFilter();
$filter->initialize('field_name', array(
'callback' => function($builder, $alias, $field, $value) {
return true;
Expand All @@ -37,7 +37,7 @@ public function testFilterMethod()
{
$builder = new ProxyQuery($this->getQueryBuilder());

$filter = new CallbackFilter;
$filter = new CallbackFilter();
$filter->initialize('field_name', array(
'callback' => array($this, 'customCallback')
));
Expand All @@ -59,7 +59,7 @@ public function testFilterException()
{
$builder = new ProxyQuery($this->getQueryBuilder());

$filter = new CallbackFilter;
$filter = new CallbackFilter();
$filter->initialize('field_name', array());

$filter->filter($builder, 'alias', 'field', 'myValue');
Expand Down
8 changes: 4 additions & 4 deletions Tests/Filter/ChoiceFilterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class ChoiceFilterTest extends FilterWithQueryBuilderTest
{
public function testFilterEmpty()
{
$filter = new ChoiceFilter;
$filter = new ChoiceFilter();
$filter->initialize('field_name', array('field_options' => array('class' => 'FooBar')));

$builder = new ProxyQuery($this->getQueryBuilder());
Expand All @@ -34,7 +34,7 @@ public function testFilterEmpty()

public function testFilterArray()
{
$filter = new ChoiceFilter;
$filter = new ChoiceFilter();
$filter->initialize('field_name', array('field_options' => array('class' => 'FooBar')));

$builder = new ProxyQuery($this->getQueryBuilder());
Expand All @@ -46,7 +46,7 @@ public function testFilterArray()

public function testFilterScalar()
{
$filter = new ChoiceFilter;
$filter = new ChoiceFilter();
$filter->initialize('field_name', array('field_options' => array('class' => 'FooBar')));

$builder = new ProxyQuery($this->getQueryBuilder());
Expand All @@ -58,7 +58,7 @@ public function testFilterScalar()

public function testFilterZero()
{
$filter = new ChoiceFilter;
$filter = new ChoiceFilter();
$filter->initialize('field_name', array('field_options' => array('class' => 'FooBar')));

$builder = new ProxyQuery($this->getQueryBuilder());
Expand Down
14 changes: 7 additions & 7 deletions Tests/Filter/ModelFilterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public function getFieldDescription(array $options)

public function testFilterEmpty()
{
$filter = new ModelFilter;
$filter = new ModelFilter();
$filter->initialize('field_name', array('field_options' => array('class' => 'FooBar')));

$builder = new ProxyQuery($this->getQueryBuilder());
Expand All @@ -56,7 +56,7 @@ public function testFilterEmpty()

public function testFilterArray()
{
$filter = new ModelFilter;
$filter = new ModelFilter();
$filter->initialize('field_name', array('field_options' => array('class' => 'FooBar'), 'field_mapping' => true));

$builder = new ProxyQuery($this->getQueryBuilder());
Expand All @@ -72,7 +72,7 @@ public function testFilterArray()

public function testFilterScalar()
{
$filter = new ModelFilter;
$filter = new ModelFilter();
$filter->initialize('field_name', array('field_options' => array('class' => 'FooBar'), 'field_mapping' => true));

$builder = new ProxyQuery($this->getQueryBuilder());
Expand All @@ -87,7 +87,7 @@ public function testFilterScalar()
*/
public function testAssociationWithInvalidMapping()
{
$filter = new ModelFilter;
$filter = new ModelFilter();
$filter->initialize('field_name', array('mapping_type' => 'foo', 'field_mapping' => true));

$builder = new ProxyQuery($this->getQueryBuilder());
Expand All @@ -100,7 +100,7 @@ public function testAssociationWithInvalidMapping()
*/
public function testAssociationWithValidMappingAndEmptyFieldName()
{
$filter = new ModelFilter;
$filter = new ModelFilter();
$filter->initialize('field_name', array('mapping_type' => ClassMetadataInfo::ONE, 'field_mapping' => true));

$builder = new ProxyQuery($this->getQueryBuilder());
Expand All @@ -111,7 +111,7 @@ public function testAssociationWithValidMappingAndEmptyFieldName()

public function testAssociationWithValidMapping()
{
$filter = new ModelFilter;
$filter = new ModelFilter();
$filter->initialize('field_name', array(
'mapping_type' => ClassMetadataInfo::ONE,
'field_name' => 'field_name',
Expand All @@ -129,7 +129,7 @@ public function testAssociationWithValidMapping()

public function testAssociationWithValidParentAssociationMappings()
{
$filter = new ModelFilter;
$filter = new ModelFilter();
$filter->initialize('field_name', array(
'mapping_type' => ClassMetadataInfo::ONE,
'field_name' => 'field_name',
Expand Down
6 changes: 3 additions & 3 deletions Tests/Filter/NumberFilterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class NumberFilterTest extends FilterWithQueryBuilderTest
{
public function testFilterEmpty()
{
$filter = new NumberFilter;
$filter = new NumberFilter();
$filter->initialize('field_name', array('field_options' => array('class' => 'FooBar')));

$builder = new ProxyQuery($this->getQueryBuilder());
Expand All @@ -33,7 +33,7 @@ public function testFilterEmpty()

public function testFilterInvalidOperator()
{
$filter = new NumberFilter;
$filter = new NumberFilter();
$filter->initialize('field_name', array('field_options' => array('class' => 'FooBar')));

$builder = new ProxyQuery($this->getQueryBuilder());
Expand All @@ -45,7 +45,7 @@ public function testFilterInvalidOperator()

public function testFilter()
{
$filter = new NumberFilter;
$filter = new NumberFilter();
$filter->initialize('field_name', array('field_options' => array('class' => 'FooBar')));

$builder = new ProxyQuery($this->getQueryBuilder());
Expand Down
10 changes: 5 additions & 5 deletions Tests/Filter/StringFilterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class StringFilterTest extends FilterWithQueryBuilderTest
{
public function testEmpty()
{
$filter = new StringFilter;
$filter = new StringFilter();
$filter->initialize('field_name', array('field_options' => array('class' => 'FooBar')));

$builder = new ProxyQuery($this->getQueryBuilder());
Expand All @@ -33,7 +33,7 @@ public function testEmpty()

public function testContains()
{
$filter = new StringFilter;
$filter = new StringFilter();
$filter->initialize('field_name', array('format' => '%s'));

$builder = new ProxyQuery($this->getQueryBuilder());
Expand All @@ -47,7 +47,7 @@ public function testContains()

public function testNotContains()
{
$filter = new StringFilter;
$filter = new StringFilter();
$filter->initialize('field_name', array('format' => '%s'));

$builder = new ProxyQuery($this->getQueryBuilder());
Expand All @@ -58,7 +58,7 @@ public function testNotContains()

public function testEquals()
{
$filter = new StringFilter;
$filter = new StringFilter();
$filter->initialize('field_name', array('format' => '%s'));

$builder = new ProxyQuery($this->getQueryBuilder());
Expand All @@ -69,7 +69,7 @@ public function testEquals()

public function testEqualsWithValidParentAssociationMappings()
{
$filter = new StringFilter;
$filter = new StringFilter();
$filter->initialize('field_name', array(
'format' => '%s',
'field_name' => 'field_name',
Expand Down
3 changes: 3 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
"symfony/symfony": "~2.2",
"sonata-project/core-bundle": "~2.2@dev"
},
"require-dev": {
"jmikola/geojson": "~1.0"
},
"autoload": {
"psr-0": {"Sonata\\DoctrineMongoDBAdminBundle": ""}
},
Expand Down

0 comments on commit b8f16fb

Please sign in to comment.