Fixed unit test for debug extension

tonypiper · Dec 12, 2010 · 404950e · 404950e
1 parent c69e73a
commit 404950e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/lib/Twig/Extensions/Node/Debug.php b/lib/Twig/Extensions/Node/Debug.php
@@ -38,7 +38,7 @@ public function compile($compiler)
             ->indent()
         ;
 
-        if (null === $this->expr) {
+        if (null === $this->getNode('expr')) {
             // remove embedded templates (macros) from the context
             $compiler
                 ->write("\$vars = array();\n")
@@ -56,7 +56,7 @@ public function compile($compiler)
         } else {
             $compiler
                 ->write("print_r(")
-                ->subcompile($this->expr)
+                ->subcompile($this->getNode('expr'))
                 ->raw(");\n")
             ;
         }

diff --git a/test/Twig/Tests/Node/DebugTest.php b/test/Twig/Tests/Node/DebugTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-require_once dirname(__FILE__).'/TestCase.php';
+require_once TWIG_LIBRARY_PATH.'/../test/Twig/Tests/Node/TestCase.php';
 
 class Twig_Tests_Node_DebugTest extends Twig_Tests_Node_TestCase
 {
@@ -19,11 +19,11 @@ class Twig_Tests_Node_DebugTest extends Twig_Tests_Node_TestCase
     public function testConstructor()
     {
         $expr = new Twig_Node_Expression_Name('foo', 0);
-        $node = new Twig_Node_Debug($expr, 0);
-        $this->assertEquals($expr, $node->expr);
+        $node = new Twig_Extensions_Node_Debug($expr, 0);
+        $this->assertEquals($expr, $node->getNode('expr'));
 
-        $node = new Twig_Node_Debug(null, 0);
-        $this->assertEquals(null, $node->expr);
+        $node = new Twig_Extensions_Node_Debug(null, 0);
+        $this->assertEquals(null, $node->getNode('expr'));
     }
 
     /**
@@ -39,7 +39,7 @@ public function getTests()
     {
         $tests = array();
 
-        $tests[] = array(new Twig_Node_Debug(null, 0), <<<EOF
+        $tests[] = array(new Twig_Extensions_Node_Debug(null, 0), <<<EOF
 if (\$this->env->isDebug()) {
     \$vars = array();
     foreach (\$context as \$key => \$value) {
@@ -53,7 +53,7 @@ public function getTests()
         );
 
         $expr = new Twig_Node_Expression_Name('foo', 0);
-        $node = new Twig_Node_Debug($expr, 0);
+        $node = new Twig_Extensions_Node_Debug($expr, 0);
 
         $tests[] = array($node, <<<EOF
 if (\$this->env->isDebug()) {