Skip to content

Commit 3e2d688

Browse files
committed
fix some risky tests
1 parent 5d72c4b commit 3e2d688

File tree

4 files changed

+38
-4
lines changed

4 files changed

+38
-4
lines changed

Tests/Definition/Builder/ArrayNodeDefinitionTest.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,13 +145,16 @@ public function providePrototypedArrayNodeDefaults()
145145

146146
public function testNestedPrototypedArrayNodes()
147147
{
148-
$node = new ArrayNodeDefinition('root');
149-
$node
148+
$nodeDefinition = new ArrayNodeDefinition('root');
149+
$nodeDefinition
150150
->addDefaultChildrenIfNoneSet()
151151
->prototype('array')
152152
->prototype('array')
153153
;
154-
$node->getNode();
154+
$node = $nodeDefinition->getNode();
155+
156+
$this->assertInstanceOf('Symfony\Component\Config\Definition\PrototypedArrayNode', $node);
157+
$this->assertInstanceOf('Symfony\Component\Config\Definition\PrototypedArrayNode', $node->getPrototype());
155158
}
156159

157160
public function testEnabledNodeDefaults()

Tests/Definition/Builder/TreeBuilderTest.php

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ public function testPrototypedArrayNodeUseTheCustomNodeBuilder()
7171
$root = $builder->root('override', 'array', new CustomNodeBuilder());
7272

7373
$root->prototype('bar')->end();
74+
75+
$this->assertInstanceOf('Symfony\Component\Config\Tests\Fixtures\BarNode', $root->getNode(true)->getPrototype());
7476
}
7577

7678
public function testAnExtendedNodeBuilderGetsPropagatedToTheChildren()
@@ -79,7 +81,7 @@ public function testAnExtendedNodeBuilderGetsPropagatedToTheChildren()
7981

8082
$builder->root('propagation')
8183
->children()
82-
->setNodeClass('extended', 'Symfony\Component\Config\Tests\Definition\Builder\VariableNodeDefinition')
84+
->setNodeClass('extended', 'Symfony\Component\Config\Definition\Builder\BooleanNodeDefinition')
8385
->node('foo', 'extended')->end()
8486
->arrayNode('child')
8587
->children()
@@ -88,6 +90,15 @@ public function testAnExtendedNodeBuilderGetsPropagatedToTheChildren()
8890
->end()
8991
->end()
9092
->end();
93+
94+
$node = $builder->buildTree();
95+
$children = $node->getChildren();
96+
97+
$this->assertInstanceOf('Symfony\Component\Config\Definition\BooleanNode', $children['foo']);
98+
99+
$childChildren = $children['child']->getChildren();
100+
101+
$this->assertInstanceOf('Symfony\Component\Config\Definition\BooleanNode', $childChildren['foo']);
91102
}
92103

93104
public function testDefinitionInfoGetsTransferredToNode()

Tests/Fixtures/BarNode.php

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Component\Config\Tests\Fixtures;
13+
14+
use Symfony\Component\Config\Definition\ArrayNode;
15+
16+
class BarNode extends ArrayNode
17+
{
18+
}

Tests/Fixtures/Builder/BarNodeDefinition.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@
1212
namespace Symfony\Component\Config\Tests\Definition\Builder;
1313

1414
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
15+
use Symfony\Component\Config\Tests\Fixtures\BarNode;
1516

1617
class BarNodeDefinition extends NodeDefinition
1718
{
1819
protected function createNode()
1920
{
21+
return new BarNode($this->name);
2022
}
2123
}

0 commit comments

Comments
 (0)