From 845a197e8a820dfffe03ba70dedf5ad5cd7b9dce Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Sun, 6 Sep 2015 15:26:35 +0200 Subject: [PATCH] Fix nodes load. Signed-off-by: Hugues Peccatte --- libraries/navigation/nodes/NodeProcedureContainer.php | 2 +- test/classes/navigation/PMA_NodeFactory_test.php | 2 +- test/classes/navigation/PMA_Node_test.php | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/navigation/nodes/NodeProcedureContainer.php b/libraries/navigation/nodes/NodeProcedureContainer.php index 8eb2fd95c6..21acc48454 100644 --- a/libraries/navigation/nodes/NodeProcedureContainer.php +++ b/libraries/navigation/nodes/NodeProcedureContainer.php @@ -39,7 +39,7 @@ class NodeProcedureContainer extends NodeDatabaseChildContainer $new_label = _pgettext('Create new procedure', 'New'); $new = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\Node', + 'Node', $new_label ); $new->isNew = true; diff --git a/test/classes/navigation/PMA_NodeFactory_test.php b/test/classes/navigation/PMA_NodeFactory_test.php index d49f957e18..06567ca363 100644 --- a/test/classes/navigation/PMA_NodeFactory_test.php +++ b/test/classes/navigation/PMA_NodeFactory_test.php @@ -67,7 +67,7 @@ class NodeFactory_Test extends PHPUnit_Framework_TestCase public function testGroupContainer() { $node = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\Node', 'default', Node::CONTAINER, true + 'Node', 'default', Node::CONTAINER, true ); $this->assertEquals('default', $node->name); $this->assertEquals(Node::CONTAINER, $node->type); diff --git a/test/classes/navigation/PMA_Node_test.php b/test/classes/navigation/PMA_Node_test.php index 9a999762f6..45d06d931a 100644 --- a/test/classes/navigation/PMA_Node_test.php +++ b/test/classes/navigation/PMA_Node_test.php @@ -102,7 +102,7 @@ class Node_Test extends PHPUnit_Framework_TestCase { $parent = NodeFactory::getInstance(); $empty_container = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\Node', 'empty', Node::CONTAINER + 'Node', 'empty', Node::CONTAINER ); $child = NodeFactory::getInstance(); // test with no children @@ -156,7 +156,7 @@ class Node_Test extends PHPUnit_Framework_TestCase $this->assertEquals($parent->numChildren(), 1); // add a container, this one doesn't count wither $container = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\Node', 'default', Node::CONTAINER + 'Node', 'default', Node::CONTAINER ); $parent->addChild($container); $this->assertEquals($parent->numChildren(), 1); @@ -240,7 +240,7 @@ class Node_Test extends PHPUnit_Framework_TestCase $firstChild = NodeFactory::getInstance(); $parent->addChild($firstChild); $secondChild = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\Node', 'default', Node::CONTAINER + 'Node', 'default', Node::CONTAINER ); $parent->addChild($secondChild); // Empty Node::CONTAINER type node should not be considered in hasSiblings() @@ -284,7 +284,7 @@ class Node_Test extends PHPUnit_Framework_TestCase public function testGetWhereClause() { $method = new ReflectionMethod( - 'PMA\libraries\navigation\nodes\Node', '_getWhereClause' + 'Node', '_getWhereClause' ); $method->setAccessible(true);