From 3539b017404d868a65917543eae88382fc55c977 Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Sun, 6 Sep 2015 14:57:38 +0200 Subject: [PATCH] Fix nodes load. Signed-off-by: Hugues Peccatte --- libraries/navigation/NavigationTree.php | 38 +++++++++---------- .../navigation/nodes/NodeColumnContainer.php | 2 +- .../nodes/NodeDatabaseContainer.php | 2 +- .../navigation/nodes/NodeEventContainer.php | 2 +- .../nodes/NodeFunctionContainer.php | 2 +- .../navigation/nodes/NodeIndexContainer.php | 2 +- .../navigation/nodes/NodeTableContainer.php | 2 +- .../navigation/nodes/NodeTriggerContainer.php | 2 +- .../navigation/nodes/NodeViewContainer.php | 2 +- .../navigation/PMA_NavigationTree_test.php | 7 ---- .../navigation/PMA_NodeFactory_test.php | 2 +- .../PMA_Node_Column_Container_test.php | 2 +- .../navigation/PMA_Node_Column_test.php | 2 +- .../PMA_Node_DatabaseChild_test.php | 2 +- .../navigation/PMA_Node_Database_test.php | 8 ++-- .../PMA_Node_Event_Container_test.php | 2 +- .../navigation/PMA_Node_Event_test.php | 2 +- .../PMA_Node_Function_Container_test.php | 2 +- .../navigation/PMA_Node_Function_test.php | 2 +- .../PMA_Node_Index_Container_test.php | 2 +- .../navigation/PMA_Node_Index_test.php | 2 +- .../PMA_Node_Procedure_Container_test.php | 2 +- .../navigation/PMA_Node_Procedure_test.php | 2 +- .../PMA_Node_Table_Container_test.php | 2 +- .../navigation/PMA_Node_Table_test.php | 4 +- .../PMA_Node_Trigger_Container_test.php | 2 +- .../navigation/PMA_Node_Trigger_test.php | 2 +- .../PMA_Node_View_Container_test.php | 2 +- .../classes/navigation/PMA_Node_View_test.php | 2 +- test/classes/navigation/PMA_Node_test.php | 10 ++--- 30 files changed, 55 insertions(+), 62 deletions(-) diff --git a/libraries/navigation/NavigationTree.php b/libraries/navigation/NavigationTree.php index e832c0e3dd..cc5a673259 100644 --- a/libraries/navigation/NavigationTree.php +++ b/libraries/navigation/NavigationTree.php @@ -144,7 +144,7 @@ class NavigationTree $this->_searchClause2 = $_REQUEST['searchClause2']; } // Initialise the tree by creating a root node - $node = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeDatabaseContainer', 'root'); + $node = NodeFactory::getInstance('NodeDatabaseContainer', 'root'); $this->_tree = $node; if ($GLOBALS['cfg']['NavigationTreeEnableGrouping'] && $GLOBALS['cfg']['ShowDatabasesNavigationAsTree'] @@ -282,7 +282,7 @@ class NavigationTree ); $hiddenCounts = $this->_tree->getNavigationHidingData(); foreach ($data as $db) { - $node = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeDatabase', $db); + $node = NodeFactory::getInstance('NodeDatabase', $db); if (isset($hiddenCounts[$db])) { $node->setHiddenCount($hiddenCounts[$db]); } @@ -374,31 +374,31 @@ class NavigationTree switch ($container->real_name) { case 'events': $node = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\NodeEvent', + 'NodeEvent', $item ); break; case 'functions': $node = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\NodeFunction', + 'NodeFunction', $item ); break; case 'procedures': $node = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\NodeProcedure', + 'NodeProcedure', $item ); break; case 'tables': $node = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\NodeTable', + 'NodeTable', $item ); break; case 'views': $node = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\NodeView', + 'NodeView', $item ); break; @@ -432,7 +432,7 @@ class NavigationTree } $node = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\NodeTable', + 'NodeTable', $path[0] ); if ($type2 == $container->real_name) { @@ -465,19 +465,19 @@ class NavigationTree switch ($container->real_name) { case 'indexes': $node = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\NodeIndex', + 'NodeIndex', $item ); break; case 'columns': $node = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\NodeColumn', + 'NodeColumn', $item ); break; case 'triggers': $node = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\NodeTrigger', + 'NodeTrigger', $item ); break; @@ -519,17 +519,17 @@ class NavigationTree if ($table->hasChildren(true) == 0) { if ($table->getPresence('columns')) { $retval['columns'] = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\NodeColumn_Container' + 'NodeColumnContainer' ); } if ($table->getPresence('indexes')) { $retval['indexes'] = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\NodeIndex_Container' + 'NodeIndexContainer' ); } if ($table->getPresence('triggers')) { $retval['triggers'] = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\NodeTrigger_Container' + 'NodeTriggerContainer' ); } // Add all new Nodes to the tree @@ -601,27 +601,27 @@ class NavigationTree if ($db->hasChildren(true) == 0) { if (!in_array('tables', $hidden) && $db->getPresence('tables')) { $retval['tables'] = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\NodeTable_Container' + 'NodeTableContainer' ); } if (!in_array('views', $hidden) && $db->getPresence('views')) { $retval['views'] = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\NodeView_Container' + 'NodeViewContainer' ); } if (!in_array('functions', $hidden) && $db->getPresence('functions')) { $retval['functions'] = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\NodeFunction_Container' + 'NodeFunctionContainer' ); } if (!in_array('procedures', $hidden) && $db->getPresence('procedures')) { $retval['procedures'] = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\NodeProcedure_Container' + 'NodeProcedureContainer' ); } if (!in_array('events', $hidden) && $db->getPresence('events')) { $retval['events'] = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\NodeEvent_Container' + 'NodeEventContainer' ); } // Add all new Nodes to the tree diff --git a/libraries/navigation/nodes/NodeColumnContainer.php b/libraries/navigation/nodes/NodeColumnContainer.php index 6bfc5dcc7d..f55a56e893 100644 --- a/libraries/navigation/nodes/NodeColumnContainer.php +++ b/libraries/navigation/nodes/NodeColumnContainer.php @@ -41,7 +41,7 @@ class NodeColumnContainer extends Node $new_label = _pgettext('Create new column', 'New'); $new = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\Node', + 'Node', $new_label ); $new->isNew = true; diff --git a/libraries/navigation/nodes/NodeDatabaseContainer.php b/libraries/navigation/nodes/NodeDatabaseContainer.php index 1dcd4e6d42..b636748cef 100644 --- a/libraries/navigation/nodes/NodeDatabaseContainer.php +++ b/libraries/navigation/nodes/NodeDatabaseContainer.php @@ -32,7 +32,7 @@ class NodeDatabaseContainer extends Node && $GLOBALS['cfg']['ShowCreateDb'] !== false ) { $new = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\Node', + 'Node', _pgettext('Create new database', 'New') ); $new->isNew = true; diff --git a/libraries/navigation/nodes/NodeEventContainer.php b/libraries/navigation/nodes/NodeEventContainer.php index 255be23478..a244231fb5 100644 --- a/libraries/navigation/nodes/NodeEventContainer.php +++ b/libraries/navigation/nodes/NodeEventContainer.php @@ -33,7 +33,7 @@ class NodeEventContainer extends NodeDatabaseChildContainer $this->real_name = 'events'; $new = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\Node', + 'Node', _pgettext('Create new event', 'New') ); $new->isNew = true; diff --git a/libraries/navigation/nodes/NodeFunctionContainer.php b/libraries/navigation/nodes/NodeFunctionContainer.php index 34b9a74868..523d6b62c0 100644 --- a/libraries/navigation/nodes/NodeFunctionContainer.php +++ b/libraries/navigation/nodes/NodeFunctionContainer.php @@ -39,7 +39,7 @@ class NodeFunctionContainer extends NodeDatabaseChildContainer $new_label = _pgettext('Create new function', 'New'); $new = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\Node', + 'Node', $new_label ); $new->isNew = true; diff --git a/libraries/navigation/nodes/NodeIndexContainer.php b/libraries/navigation/nodes/NodeIndexContainer.php index a37a66d63a..8398729f77 100644 --- a/libraries/navigation/nodes/NodeIndexContainer.php +++ b/libraries/navigation/nodes/NodeIndexContainer.php @@ -36,7 +36,7 @@ class NodeIndexContainer extends Node $new_label = _pgettext('Create new index', 'New'); $new = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\Node', + 'Node', $new_label ); $new->isNew = true; diff --git a/libraries/navigation/nodes/NodeTableContainer.php b/libraries/navigation/nodes/NodeTableContainer.php index bd88d844d2..8928fb017e 100644 --- a/libraries/navigation/nodes/NodeTableContainer.php +++ b/libraries/navigation/nodes/NodeTableContainer.php @@ -37,7 +37,7 @@ class NodeTableContainer extends NodeDatabaseChildContainer $new_label = _pgettext('Create new table', 'New'); $new = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\Node', + 'Node', $new_label ); $new->isNew = true; diff --git a/libraries/navigation/nodes/NodeTriggerContainer.php b/libraries/navigation/nodes/NodeTriggerContainer.php index 728a9aa472..5d1e643af7 100644 --- a/libraries/navigation/nodes/NodeTriggerContainer.php +++ b/libraries/navigation/nodes/NodeTriggerContainer.php @@ -35,7 +35,7 @@ class NodeTriggerContainer extends Node $this->real_name = 'triggers'; $new = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\Node', + 'Node', _pgettext('Create new trigger', 'New') ); $new->isNew = true; diff --git a/libraries/navigation/nodes/NodeViewContainer.php b/libraries/navigation/nodes/NodeViewContainer.php index df945c472b..89dfbe77e9 100644 --- a/libraries/navigation/nodes/NodeViewContainer.php +++ b/libraries/navigation/nodes/NodeViewContainer.php @@ -37,7 +37,7 @@ class NodeViewContainer extends NodeDatabaseChildContainer $new_label = _pgettext('Create new view', 'New'); $new = NodeFactory::getInstance( - 'PMA\libraries\navigation\nodes\Node', + 'Node', $new_label ); $new->isNew = true; diff --git a/test/classes/navigation/PMA_NavigationTree_test.php b/test/classes/navigation/PMA_NavigationTree_test.php index 025db164e3..8d7a74b1ef 100644 --- a/test/classes/navigation/PMA_NavigationTree_test.php +++ b/test/classes/navigation/PMA_NavigationTree_test.php @@ -16,17 +16,10 @@ use PMA\libraries\Theme; $GLOBALS['server'] = 0; $GLOBALS['cfg']['Server']['DisableIS'] = false; - - require_once 'libraries/database_interface.inc.php'; require_once 'libraries/relation.lib.php'; require_once 'libraries/url_generating.lib.php'; require_once 'libraries/php-gettext/gettext.inc'; -require_once 'libraries/navigation/NavigationTree.php'; -require_once 'libraries/navigation/NodeFactory.php'; - - - require_once 'libraries/check_user_privileges.lib.php'; /** diff --git a/test/classes/navigation/PMA_NodeFactory_test.php b/test/classes/navigation/PMA_NodeFactory_test.php index 60d3d34dd3..d49f957e18 100644 --- a/test/classes/navigation/PMA_NodeFactory_test.php +++ b/test/classes/navigation/PMA_NodeFactory_test.php @@ -53,7 +53,7 @@ class NodeFactory_Test extends PHPUnit_Framework_TestCase */ public function testDefaultContainer() { - $node = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\Node', 'default', Node::CONTAINER); + $node = NodeFactory::getInstance('Node', 'default', Node::CONTAINER); $this->assertEquals('default', $node->name); $this->assertEquals(Node::CONTAINER, $node->type); $this->assertEquals(false, $node->is_group); diff --git a/test/classes/navigation/PMA_Node_Column_Container_test.php b/test/classes/navigation/PMA_Node_Column_Container_test.php index 2dbafa47d5..afba75464c 100644 --- a/test/classes/navigation/PMA_Node_Column_Container_test.php +++ b/test/classes/navigation/PMA_Node_Column_Container_test.php @@ -39,7 +39,7 @@ class Node_Column_Container_Test extends PHPUnit_Framework_TestCase */ public function testConstructor() { - $parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeColumn_Container'); + $parent = NodeFactory::getInstance('NodeColumnContainer'); $this->assertArrayHasKey( 'text', $parent->links diff --git a/test/classes/navigation/PMA_Node_Column_test.php b/test/classes/navigation/PMA_Node_Column_test.php index 53666460bc..64b5d79adc 100644 --- a/test/classes/navigation/PMA_Node_Column_test.php +++ b/test/classes/navigation/PMA_Node_Column_test.php @@ -39,7 +39,7 @@ class Node_Column_Test extends PHPUnit_Framework_TestCase */ public function testConstructor() { - $parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeColumn'); + $parent = NodeFactory::getInstance('NodeColumn'); $this->assertArrayHasKey( 'text', $parent->links diff --git a/test/classes/navigation/PMA_Node_DatabaseChild_test.php b/test/classes/navigation/PMA_Node_DatabaseChild_test.php index c81ebf8e24..b1bf3dd725 100644 --- a/test/classes/navigation/PMA_Node_DatabaseChild_test.php +++ b/test/classes/navigation/PMA_Node_DatabaseChild_test.php @@ -66,7 +66,7 @@ class Node_DatabaseChildTest extends PHPUnit_Framework_TestCase */ public function testGetHtmlForControlButtons() { - $parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeDatabase', 'parent'); + $parent = NodeFactory::getInstance('NodeDatabase', 'parent'); $parent->addChild($this->object); $this->object->expects($this->once()) ->method('getItemType') diff --git a/test/classes/navigation/PMA_Node_Database_test.php b/test/classes/navigation/PMA_Node_Database_test.php index 203a73228f..47c8384fd6 100644 --- a/test/classes/navigation/PMA_Node_Database_test.php +++ b/test/classes/navigation/PMA_Node_Database_test.php @@ -45,7 +45,7 @@ class Node_Database_Test extends PHPUnit_Framework_TestCase */ public function testConstructor() { - $parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeDatabase'); + $parent = NodeFactory::getInstance('NodeDatabase'); $this->assertArrayHasKey( 'text', $parent->links @@ -64,7 +64,7 @@ class Node_Database_Test extends PHPUnit_Framework_TestCase */ public function testGetPresence() { - $parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeDatabase'); + $parent = NodeFactory::getInstance('NodeDatabase'); $this->assertEquals( 2, $parent->getPresence('tables') @@ -94,7 +94,7 @@ class Node_Database_Test extends PHPUnit_Framework_TestCase */ public function testGetData() { - $parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeDatabase'); + $parent = NodeFactory::getInstance('NodeDatabase'); $tables = $parent->getData('tables', 0); $this->assertContains( @@ -130,7 +130,7 @@ class Node_Database_Test extends PHPUnit_Framework_TestCase */ public function testHiddenCount() { - $parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeDatabase'); + $parent = NodeFactory::getInstance('NodeDatabase'); $parent->setHiddenCount(3); $this->assertEquals( diff --git a/test/classes/navigation/PMA_Node_Event_Container_test.php b/test/classes/navigation/PMA_Node_Event_Container_test.php index b87856dae5..690c56c6ff 100644 --- a/test/classes/navigation/PMA_Node_Event_Container_test.php +++ b/test/classes/navigation/PMA_Node_Event_Container_test.php @@ -39,7 +39,7 @@ class Node_Event_Container_Test extends PHPUnit_Framework_TestCase */ public function testConstructor() { - $parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeEvent_Container'); + $parent = NodeFactory::getInstance('NodeEventContainer'); $this->assertArrayHasKey( 'text', $parent->links diff --git a/test/classes/navigation/PMA_Node_Event_test.php b/test/classes/navigation/PMA_Node_Event_test.php index cf6a5ec4b0..8729fc6ab5 100644 --- a/test/classes/navigation/PMA_Node_Event_test.php +++ b/test/classes/navigation/PMA_Node_Event_test.php @@ -38,7 +38,7 @@ class Node_Event_Test extends PHPUnit_Framework_TestCase */ public function testConstructor() { - $parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeEvent'); + $parent = NodeFactory::getInstance('NodeEvent'); $this->assertArrayHasKey( 'text', $parent->links diff --git a/test/classes/navigation/PMA_Node_Function_Container_test.php b/test/classes/navigation/PMA_Node_Function_Container_test.php index baf0a0e5b2..5d3e5e584d 100644 --- a/test/classes/navigation/PMA_Node_Function_Container_test.php +++ b/test/classes/navigation/PMA_Node_Function_Container_test.php @@ -39,7 +39,7 @@ class Node_Function_Container_Test extends PHPUnit_Framework_TestCase */ public function testConstructor() { - $parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeFunction_Container'); + $parent = NodeFactory::getInstance('NodeFunctionContainer'); $this->assertArrayHasKey( 'text', $parent->links diff --git a/test/classes/navigation/PMA_Node_Function_test.php b/test/classes/navigation/PMA_Node_Function_test.php index 3b60ddb4dd..c33c06627e 100644 --- a/test/classes/navigation/PMA_Node_Function_test.php +++ b/test/classes/navigation/PMA_Node_Function_test.php @@ -39,7 +39,7 @@ class Node_Function_Test extends PHPUnit_Framework_TestCase */ public function testConstructor() { - $parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeFunction'); + $parent = NodeFactory::getInstance('NodeFunction'); $this->assertArrayHasKey( 'text', $parent->links diff --git a/test/classes/navigation/PMA_Node_Index_Container_test.php b/test/classes/navigation/PMA_Node_Index_Container_test.php index e045fb9290..0556c3b3a0 100644 --- a/test/classes/navigation/PMA_Node_Index_Container_test.php +++ b/test/classes/navigation/PMA_Node_Index_Container_test.php @@ -39,7 +39,7 @@ class Node_Index_Container_Test extends PHPUnit_Framework_TestCase */ public function testConstructor() { - $parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeIndex_Container'); + $parent = NodeFactory::getInstance('NodeIndexContainer'); $this->assertArrayHasKey( 'text', $parent->links diff --git a/test/classes/navigation/PMA_Node_Index_test.php b/test/classes/navigation/PMA_Node_Index_test.php index 628ddb8251..1ff0c46a46 100644 --- a/test/classes/navigation/PMA_Node_Index_test.php +++ b/test/classes/navigation/PMA_Node_Index_test.php @@ -39,7 +39,7 @@ class Node_Index_Test extends PHPUnit_Framework_TestCase */ public function testConstructor() { - $parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeIndex'); + $parent = NodeFactory::getInstance('NodeIndex'); $this->assertArrayHasKey( 'text', $parent->links diff --git a/test/classes/navigation/PMA_Node_Procedure_Container_test.php b/test/classes/navigation/PMA_Node_Procedure_Container_test.php index db26db5b4f..1e2f320f28 100644 --- a/test/classes/navigation/PMA_Node_Procedure_Container_test.php +++ b/test/classes/navigation/PMA_Node_Procedure_Container_test.php @@ -39,7 +39,7 @@ class Node_Procedure_Container_Test extends PHPUnit_Framework_TestCase */ public function testConstructor() { - $parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeProcedure_Container'); + $parent = NodeFactory::getInstance('NodeProcedureContainer'); $this->assertArrayHasKey( 'text', $parent->links diff --git a/test/classes/navigation/PMA_Node_Procedure_test.php b/test/classes/navigation/PMA_Node_Procedure_test.php index 61d7f49c2c..c43e956598 100644 --- a/test/classes/navigation/PMA_Node_Procedure_test.php +++ b/test/classes/navigation/PMA_Node_Procedure_test.php @@ -39,7 +39,7 @@ class Node_Procedure_Test extends PHPUnit_Framework_TestCase */ public function testConstructor() { - $parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeProcedure'); + $parent = NodeFactory::getInstance('NodeProcedure'); $this->assertArrayHasKey( 'text', $parent->links diff --git a/test/classes/navigation/PMA_Node_Table_Container_test.php b/test/classes/navigation/PMA_Node_Table_Container_test.php index 1b2a9b0948..2f3ef52450 100644 --- a/test/classes/navigation/PMA_Node_Table_Container_test.php +++ b/test/classes/navigation/PMA_Node_Table_Container_test.php @@ -44,7 +44,7 @@ class Node_Table_Container_Test extends PHPUnit_Framework_TestCase */ public function testConstructor() { - $parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeTable_Container'); + $parent = NodeFactory::getInstance('NodeTableContainer'); $this->assertArrayHasKey( 'text', $parent->links diff --git a/test/classes/navigation/PMA_Node_Table_test.php b/test/classes/navigation/PMA_Node_Table_test.php index 886a99f48d..0a0e6dc326 100644 --- a/test/classes/navigation/PMA_Node_Table_test.php +++ b/test/classes/navigation/PMA_Node_Table_test.php @@ -48,7 +48,7 @@ class Node_Table_Test extends PHPUnit_Framework_TestCase */ public function testConstructor() { - $parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeTable'); + $parent = NodeFactory::getInstance('NodeTable'); $this->assertArrayHasKey( 'text', $parent->links @@ -72,7 +72,7 @@ class Node_Table_Test extends PHPUnit_Framework_TestCase public function testIcon($target, $imageName) { $GLOBALS['cfg']['NavigationTreeDefaultTabTable'] = $target; - $node = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeTable'); + $node = NodeFactory::getInstance('NodeTable'); $this->assertContains($imageName, $node->icon[0]); } diff --git a/test/classes/navigation/PMA_Node_Trigger_Container_test.php b/test/classes/navigation/PMA_Node_Trigger_Container_test.php index 734b9e8e67..8fd0da91ac 100644 --- a/test/classes/navigation/PMA_Node_Trigger_Container_test.php +++ b/test/classes/navigation/PMA_Node_Trigger_Container_test.php @@ -40,7 +40,7 @@ class Node_Trigger_Container_Test extends PHPUnit_Framework_TestCase */ public function testConstructor() { - $parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeTrigger_Container'); + $parent = NodeFactory::getInstance('NodeTriggerContainer'); $this->assertArrayHasKey( 'text', $parent->links diff --git a/test/classes/navigation/PMA_Node_Trigger_test.php b/test/classes/navigation/PMA_Node_Trigger_test.php index d34e0f6ad6..d43e4748ae 100644 --- a/test/classes/navigation/PMA_Node_Trigger_test.php +++ b/test/classes/navigation/PMA_Node_Trigger_test.php @@ -39,7 +39,7 @@ class Node_Trigger_Test extends PHPUnit_Framework_TestCase */ public function testConstructor() { - $parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeTrigger'); + $parent = NodeFactory::getInstance('NodeTrigger'); $this->assertArrayHasKey( 'text', $parent->links diff --git a/test/classes/navigation/PMA_Node_View_Container_test.php b/test/classes/navigation/PMA_Node_View_Container_test.php index 97a824375a..66796bb412 100644 --- a/test/classes/navigation/PMA_Node_View_Container_test.php +++ b/test/classes/navigation/PMA_Node_View_Container_test.php @@ -44,7 +44,7 @@ class Node_View_Container_Test extends PHPUnit_Framework_TestCase */ public function testConstructor() { - $parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeView_Container'); + $parent = NodeFactory::getInstance('NodeViewContainer'); $this->assertArrayHasKey( 'text', $parent->links diff --git a/test/classes/navigation/PMA_Node_View_test.php b/test/classes/navigation/PMA_Node_View_test.php index 980c6b7698..099b0b4f38 100644 --- a/test/classes/navigation/PMA_Node_View_test.php +++ b/test/classes/navigation/PMA_Node_View_test.php @@ -40,7 +40,7 @@ class Node_View_Test extends PHPUnit_Framework_TestCase */ public function testConstructor() { - $parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\NodeView'); + $parent = NodeFactory::getInstance('NodeView'); $this->assertArrayHasKey( 'text', $parent->links diff --git a/test/classes/navigation/PMA_Node_test.php b/test/classes/navigation/PMA_Node_test.php index be96c2ff4a..9a999762f6 100644 --- a/test/classes/navigation/PMA_Node_test.php +++ b/test/classes/navigation/PMA_Node_test.php @@ -41,8 +41,8 @@ class Node_Test extends PHPUnit_Framework_TestCase */ public function testAddNode() { - $parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\Node', 'parent'); - $child = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\Node', 'child'); + $parent = NodeFactory::getInstance('Node', 'parent'); + $child = NodeFactory::getInstance('Node', 'child'); $parent->addChild($child); $this->assertEquals( $parent->getChild($child->name), @@ -61,7 +61,7 @@ class Node_Test extends PHPUnit_Framework_TestCase */ public function testGetChildError() { - $parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\Node', 'parent'); + $parent = NodeFactory::getInstance('Node', 'parent'); $this->assertEquals( $parent->getChild("foo"), false @@ -79,8 +79,8 @@ class Node_Test extends PHPUnit_Framework_TestCase */ public function testRemoveNode() { - $parent = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\Node', 'parent'); - $child = NodeFactory::getInstance('\PMA\libraries\navigation\nodes\Node', 'child'); + $parent = NodeFactory::getInstance('Node', 'parent'); + $child = NodeFactory::getInstance('Node', 'child'); $parent->addChild($child); $this->assertEquals( $parent->getChild($child->name),