Browse files

fixed tests

  • Loading branch information...
1 parent 3b1f269 commit 4bdb3a93a854c7ad69c9843c18786c016c467a54 @arnaud-lb arnaud-lb committed Nov 12, 2011
View
40 test/Twig/Tests/ExpressionParserTest.php
@@ -64,7 +64,6 @@ public function getFailingTestsForArray()
{
return array(
array('{{ [1, "a": "b"] }}'),
- array('{{ {a: "b"} }}'),
array('{{ {"a": "b", 2} }}'),
);
}
@@ -74,49 +73,72 @@ public function getTestsForArray()
return array(
// simple array
array('{{ [1, 2] }}', new Twig_Node_Expression_Array(array(
+ new Twig_Node_Expression_Constant(0, 1),
+ new Twig_Node_Expression_Constant(1, 1),
+
new Twig_Node_Expression_Constant(1, 1),
new Twig_Node_Expression_Constant(2, 1),
), 1),
),
// array with trailing ,
array('{{ [1, 2, ] }}', new Twig_Node_Expression_Array(array(
+ new Twig_Node_Expression_Constant(0, 1),
+ new Twig_Node_Expression_Constant(1, 1),
+
new Twig_Node_Expression_Constant(1, 1),
new Twig_Node_Expression_Constant(2, 1),
), 1),
),
// simple hash
array('{{ {"a": "b", "b": "c"} }}', new Twig_Node_Expression_Array(array(
- 'a' => new Twig_Node_Expression_Constant('b', 1),
- 'b' => new Twig_Node_Expression_Constant('c', 1),
+ new Twig_Node_Expression_Constant('a', 1),
+ new Twig_Node_Expression_Constant('b', 1),
+
+ new Twig_Node_Expression_Constant('b', 1),
+ new Twig_Node_Expression_Constant('c', 1),
), 1),
),
// hash with trailing ,
array('{{ {"a": "b", "b": "c", } }}', new Twig_Node_Expression_Array(array(
- 'a' => new Twig_Node_Expression_Constant('b', 1),
- 'b' => new Twig_Node_Expression_Constant('c', 1),
+ new Twig_Node_Expression_Constant('a', 1),
+ new Twig_Node_Expression_Constant('b', 1),
+
+ new Twig_Node_Expression_Constant('b', 1),
+ new Twig_Node_Expression_Constant('c', 1),
), 1),
),
// hash in an array
array('{{ [1, {"a": "b", "b": "c"}] }}', new Twig_Node_Expression_Array(array(
+ new Twig_Node_Expression_Constant(0, 1),
+ new Twig_Node_Expression_Constant(1, 1),
+
new Twig_Node_Expression_Constant(1, 1),
new Twig_Node_Expression_Array(array(
- 'a' => new Twig_Node_Expression_Constant('b', 1),
- 'b' => new Twig_Node_Expression_Constant('c', 1),
+ new Twig_Node_Expression_Constant('a', 1),
+ new Twig_Node_Expression_Constant('b', 1),
+
+ new Twig_Node_Expression_Constant('b', 1),
+ new Twig_Node_Expression_Constant('c', 1),
), 1),
), 1),
),
// array in a hash
array('{{ {"a": [1, 2], "b": "c"} }}', new Twig_Node_Expression_Array(array(
- 'a' => new Twig_Node_Expression_Array(array(
+ new Twig_Node_Expression_Constant('a', 1),
+ new Twig_Node_Expression_Array(array(
+ new Twig_Node_Expression_Constant(0, 1),
+ new Twig_Node_Expression_Constant(1, 1),
+
new Twig_Node_Expression_Constant(1, 1),
new Twig_Node_Expression_Constant(2, 1),
), 1),
- 'b' => new Twig_Node_Expression_Constant('c', 1),
+ new Twig_Node_Expression_Constant('b', 1),
+ new Twig_Node_Expression_Constant('c', 1),
), 1),
),
);
View
3 test/Twig/Tests/Fixtures/expressions/array.test
@@ -43,3 +43,6 @@ bar
FOO,BAR,
1,2
+
+1,foo,c,1foo
+a,b,c,d
View
11 test/Twig/Tests/Node/Expression/ArrayTest.php
@@ -18,10 +18,10 @@ class Twig_Tests_Node_Expression_ArrayTest extends Twig_Tests_Node_TestCase
*/
public function testConstructor()
{
- $elements = array('foo' => $foo = new Twig_Node_Expression_Constant('bar', 0));
+ $elements = array(new Twig_Node_Expression_Constant('foo', 0), $foo = new Twig_Node_Expression_Constant('bar', 0));
$node = new Twig_Node_Expression_Array($elements, 0);
- $this->assertEquals($foo, $node->getNode('foo'));
+ $this->assertEquals($foo, $node->getNode(1));
}
/**
@@ -36,8 +36,11 @@ public function testCompile($node, $source, $environment = null)
public function getTests()
{
$elements = array(
- 'foo' => new Twig_Node_Expression_Constant('bar', 0),
- 'bar' => new Twig_Node_Expression_Constant('foo', 0),
+ new Twig_Node_Expression_Constant('foo', 0),
+ new Twig_Node_Expression_Constant('bar', 0),
+
+ new Twig_Node_Expression_Constant('bar', 0),
+ new Twig_Node_Expression_Constant('foo', 0),
);
$node = new Twig_Node_Expression_Array($elements, 0);
View
4 test/Twig/Tests/Node/IncludeTest.php
@@ -25,7 +25,7 @@ public function testConstructor()
$this->assertEquals($expr, $node->getNode('expr'));
$this->assertFalse($node->getAttribute('only'));
- $vars = new Twig_Node_Expression_Array(array('foo' => new Twig_Node_Expression_Constant(true, 0)), 0);
+ $vars = new Twig_Node_Expression_Array(array(new Twig_Node_Expression_Constant('foo', 0), new Twig_Node_Expression_Constant(true, 0)), 0);
$node = new Twig_Node_Include($expr, $vars, true, false, 0);
$this->assertEquals($vars, $node->getNode('variables'));
$this->assertTrue($node->getAttribute('only'));
@@ -62,7 +62,7 @@ public function getTests()
);
$expr = new Twig_Node_Expression_Constant('foo.twig', 0);
- $vars = new Twig_Node_Expression_Array(array('foo' => new Twig_Node_Expression_Constant(true, 0)), 0);
+ $vars = new Twig_Node_Expression_Array(array(new Twig_Node_Expression_Constant('foo', 0), new Twig_Node_Expression_Constant(true, 0)), 0);
$node = new Twig_Node_Include($expr, $vars, false, false, 0);
$tests[] = array($node, '$this->env->loadTemplate("foo.twig")->display(array_merge($context, array("foo" => true)));');

0 comments on commit 4bdb3a9

Please sign in to comment.