Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaurício Meneghini Fauth <mauricio@fauth.dev>2021-05-12 05:29:54 +0300
committerMaurício Meneghini Fauth <mauricio@fauth.dev>2021-05-12 05:50:17 +0300
commit61eae4dba9edce44e6933586d10a2327cacec5a3 (patch)
tree1209da3de47299aaefe51b2895f6d0d07001926c /test/classes
parent878ab12decf4899e7ac5c8025d2945589748ca0c (diff)
Remove navigation link generation from the Nodes
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Diffstat (limited to 'test/classes')
-rw-r--r--test/classes/Navigation/Nodes/NodeColumnContainerTest.php12
-rw-r--r--test/classes/Navigation/Nodes/NodeColumnTest.php25
-rw-r--r--test/classes/Navigation/Nodes/NodeDatabaseTest.php16
-rw-r--r--test/classes/Navigation/Nodes/NodeEventContainerTest.php13
-rw-r--r--test/classes/Navigation/Nodes/NodeEventTest.php18
-rw-r--r--test/classes/Navigation/Nodes/NodeFunctionContainerTest.php12
-rw-r--r--test/classes/Navigation/Nodes/NodeFunctionTest.php18
-rw-r--r--test/classes/Navigation/Nodes/NodeIndexContainerTest.php12
-rw-r--r--test/classes/Navigation/Nodes/NodeIndexTest.php12
-rw-r--r--test/classes/Navigation/Nodes/NodeProcedureContainerTest.php12
-rw-r--r--test/classes/Navigation/Nodes/NodeProcedureTest.php18
-rw-r--r--test/classes/Navigation/Nodes/NodeTableContainerTest.php12
-rw-r--r--test/classes/Navigation/Nodes/NodeTableTest.php18
-rw-r--r--test/classes/Navigation/Nodes/NodeTriggerContainerTest.php12
-rw-r--r--test/classes/Navigation/Nodes/NodeTriggerTest.php18
-rw-r--r--test/classes/Navigation/Nodes/NodeViewContainerTest.php12
-rw-r--r--test/classes/Navigation/Nodes/NodeViewTest.php12
17 files changed, 141 insertions, 111 deletions
diff --git a/test/classes/Navigation/Nodes/NodeColumnContainerTest.php b/test/classes/Navigation/Nodes/NodeColumnContainerTest.php
index fe34dba662..e4856eb10e 100644
--- a/test/classes/Navigation/Nodes/NodeColumnContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeColumnContainerTest.php
@@ -22,14 +22,14 @@ class NodeColumnContainerTest extends AbstractTestCase
public function testConstructor(): void
{
$parent = NodeFactory::getInstance('NodeColumnContainer');
- $this->assertArrayHasKey(
- 'text',
+ $this->assertIsArray($parent->links);
+ $this->assertEquals(
+ [
+ 'text' => ['route' => '/table/structure', 'params' => ['db' => null, 'table' => null]],
+ 'icon' => ['route' => '/table/structure', 'params' => ['db' => null, 'table' => null]],
+ ],
$parent->links
);
- $this->assertStringContainsString(
- 'index.php?route=/table/structure',
- $parent->links['text']
- );
$this->assertEquals('columns', $parent->realName);
}
}
diff --git a/test/classes/Navigation/Nodes/NodeColumnTest.php b/test/classes/Navigation/Nodes/NodeColumnTest.php
index 71d8c77020..3abc32e540 100644
--- a/test/classes/Navigation/Nodes/NodeColumnTest.php
+++ b/test/classes/Navigation/Nodes/NodeColumnTest.php
@@ -21,20 +21,21 @@ class NodeColumnTest extends AbstractTestCase
public function testConstructor(): void
{
- $parent = NodeFactory::getInstance(
- 'NodeColumn',
+ $parent = NodeFactory::getInstance('NodeColumn', ['name' => 'name', 'key' => 'key']);
+ $this->assertIsArray($parent->links);
+ $this->assertEquals(
[
- 'name' => 'name',
- 'key' => 'key',
- ]
- );
- $this->assertArrayHasKey(
- 'text',
+ 'text' => [
+ 'route' => '/table/structure/change',
+ 'params' => ['change_column' => 1, 'db' => null, 'table' => null, 'field' => null],
+ ],
+ 'icon' => [
+ 'route' => '/table/structure/change',
+ 'params' => ['change_column' => 1, 'db' => null, 'table' => null, 'field' => null],
+ ],
+ 'title' => 'Structure',
+ ],
$parent->links
);
- $this->assertStringContainsString(
- 'index.php?route=/table/structure',
- $parent->links['text']
- );
}
}
diff --git a/test/classes/Navigation/Nodes/NodeDatabaseTest.php b/test/classes/Navigation/Nodes/NodeDatabaseTest.php
index a5d7014509..3f1132c1d4 100644
--- a/test/classes/Navigation/Nodes/NodeDatabaseTest.php
+++ b/test/classes/Navigation/Nodes/NodeDatabaseTest.php
@@ -30,14 +30,18 @@ class NodeDatabaseTest extends AbstractTestCase
public function testConstructor(): void
{
$parent = NodeFactory::getInstance('NodeDatabase');
- $this->assertArrayHasKey(
- 'text',
+ $this->assertIsArray($parent->links);
+ $this->assertEquals(
+ [
+ 'text' => [
+ 'route' => '/database/structure',
+ 'params' => ['db' => null],
+ ],
+ 'icon' => ['route' => '/database/operations', 'params' => ['db' => null]],
+ 'title' => 'Structure',
+ ],
$parent->links
);
- $this->assertStringContainsString(
- 'index.php?route=/database/structure',
- $parent->links['text']
- );
$this->assertStringContainsString('database', $parent->classes);
}
diff --git a/test/classes/Navigation/Nodes/NodeEventContainerTest.php b/test/classes/Navigation/Nodes/NodeEventContainerTest.php
index 2a3a4b4bd8..8880a8605d 100644
--- a/test/classes/Navigation/Nodes/NodeEventContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeEventContainerTest.php
@@ -6,7 +6,6 @@ namespace PhpMyAdmin\Tests\Navigation\Nodes;
use PhpMyAdmin\Navigation\NodeFactory;
use PhpMyAdmin\Tests\AbstractTestCase;
-use PhpMyAdmin\Url;
class NodeEventContainerTest extends AbstractTestCase
{
@@ -26,14 +25,14 @@ class NodeEventContainerTest extends AbstractTestCase
public function testConstructor(): void
{
$parent = NodeFactory::getInstance('NodeEventContainer');
- $this->assertArrayHasKey(
- 'text',
+ $this->assertIsArray($parent->links);
+ $this->assertEquals(
+ [
+ 'text' => ['route' => '/database/events', 'params' => ['db' => null]],
+ 'icon' => ['route' => '/database/events', 'params' => ['db' => null]],
+ ],
$parent->links
);
- $this->assertStringContainsString(
- Url::getFromRoute('/database/events'),
- $parent->links['text']
- );
$this->assertEquals('events', $parent->realName);
}
}
diff --git a/test/classes/Navigation/Nodes/NodeEventTest.php b/test/classes/Navigation/Nodes/NodeEventTest.php
index 0cecd3881b..1b7f8511ad 100644
--- a/test/classes/Navigation/Nodes/NodeEventTest.php
+++ b/test/classes/Navigation/Nodes/NodeEventTest.php
@@ -25,13 +25,19 @@ class NodeEventTest extends AbstractTestCase
public function testConstructor(): void
{
$parent = NodeFactory::getInstance('NodeEvent');
- $this->assertArrayHasKey(
- 'text',
+ $this->assertIsArray($parent->links);
+ $this->assertEquals(
+ [
+ 'text' => [
+ 'route' => '/database/events',
+ 'params' => ['edit_item' => 1, 'db' => null, 'item_name' => null],
+ ],
+ 'icon' => [
+ 'route' => '/database/events',
+ 'params' => ['export_item' => 1, 'db' => null, 'item_name' => null],
+ ],
+ ],
$parent->links
);
- $this->assertStringContainsString(
- 'index.php?route=/database/events',
- $parent->links['text']
- );
}
}
diff --git a/test/classes/Navigation/Nodes/NodeFunctionContainerTest.php b/test/classes/Navigation/Nodes/NodeFunctionContainerTest.php
index 6054d2aea1..4a1adb3c76 100644
--- a/test/classes/Navigation/Nodes/NodeFunctionContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeFunctionContainerTest.php
@@ -25,14 +25,14 @@ class NodeFunctionContainerTest extends AbstractTestCase
public function testConstructor(): void
{
$parent = NodeFactory::getInstance('NodeFunctionContainer');
- $this->assertArrayHasKey(
- 'text',
+ $this->assertIsArray($parent->links);
+ $this->assertEquals(
+ [
+ 'text' => ['route' => '/database/routines', 'params' => ['type' => 'FUNCTION', 'db' => null]],
+ 'icon' => ['route' => '/database/routines', 'params' => ['type' => 'FUNCTION', 'db' => null]],
+ ],
$parent->links
);
- $this->assertStringContainsString(
- 'index.php?route=/database/routines',
- $parent->links['text']
- );
$this->assertEquals('functions', $parent->realName);
}
}
diff --git a/test/classes/Navigation/Nodes/NodeFunctionTest.php b/test/classes/Navigation/Nodes/NodeFunctionTest.php
index c004c2695d..708818ab01 100644
--- a/test/classes/Navigation/Nodes/NodeFunctionTest.php
+++ b/test/classes/Navigation/Nodes/NodeFunctionTest.php
@@ -25,13 +25,19 @@ class NodeFunctionTest extends AbstractTestCase
public function testConstructor(): void
{
$parent = NodeFactory::getInstance('NodeFunction');
- $this->assertArrayHasKey(
- 'text',
+ $this->assertIsArray($parent->links);
+ $this->assertEquals(
+ [
+ 'text' => [
+ 'route' => '/database/routines',
+ 'params' => ['item_type' => 'FUNCTION', 'edit_item' => 1, 'db' => null, 'item_name' => null],
+ ],
+ 'icon' => [
+ 'route' => '/database/routines',
+ 'params' => ['item_type' => 'FUNCTION', 'execute_dialog' => 1, 'db' => null, 'item_name' => null],
+ ],
+ ],
$parent->links
);
- $this->assertStringContainsString(
- 'index.php?route=/database/routines',
- $parent->links['text']
- );
}
}
diff --git a/test/classes/Navigation/Nodes/NodeIndexContainerTest.php b/test/classes/Navigation/Nodes/NodeIndexContainerTest.php
index 04fd108133..bb96077786 100644
--- a/test/classes/Navigation/Nodes/NodeIndexContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeIndexContainerTest.php
@@ -25,14 +25,14 @@ class NodeIndexContainerTest extends AbstractTestCase
public function testConstructor(): void
{
$parent = NodeFactory::getInstance('NodeIndexContainer');
- $this->assertArrayHasKey(
- 'text',
+ $this->assertIsArray($parent->links);
+ $this->assertEquals(
+ [
+ 'text' => ['route' => '/table/structure', 'params' => ['db' => null, 'table' => null]],
+ 'icon' => ['route' => '/table/structure', 'params' => ['db' => null, 'table' => null]],
+ ],
$parent->links
);
- $this->assertStringContainsString(
- 'index.php?route=/table/structure',
- $parent->links['text']
- );
$this->assertEquals('indexes', $parent->realName);
}
}
diff --git a/test/classes/Navigation/Nodes/NodeIndexTest.php b/test/classes/Navigation/Nodes/NodeIndexTest.php
index 961711a60f..4c450b960f 100644
--- a/test/classes/Navigation/Nodes/NodeIndexTest.php
+++ b/test/classes/Navigation/Nodes/NodeIndexTest.php
@@ -25,13 +25,13 @@ class NodeIndexTest extends AbstractTestCase
public function testConstructor(): void
{
$parent = NodeFactory::getInstance('NodeIndex');
- $this->assertArrayHasKey(
- 'text',
+ $this->assertIsArray($parent->links);
+ $this->assertEquals(
+ [
+ 'text' => ['route' => '/table/indexes', 'params' => ['db' => null, 'table' => null, 'index' => null]],
+ 'icon' => ['route' => '/table/indexes', 'params' => ['db' => null, 'table' => null, 'index' => null]],
+ ],
$parent->links
);
- $this->assertStringContainsString(
- 'index.php?route=/table/indexes',
- $parent->links['text']
- );
}
}
diff --git a/test/classes/Navigation/Nodes/NodeProcedureContainerTest.php b/test/classes/Navigation/Nodes/NodeProcedureContainerTest.php
index c9a07daedc..a592fa063f 100644
--- a/test/classes/Navigation/Nodes/NodeProcedureContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeProcedureContainerTest.php
@@ -25,14 +25,14 @@ class NodeProcedureContainerTest extends AbstractTestCase
public function testConstructor(): void
{
$parent = NodeFactory::getInstance('NodeProcedureContainer');
- $this->assertArrayHasKey(
- 'text',
+ $this->assertIsArray($parent->links);
+ $this->assertEquals(
+ [
+ 'text' => ['route' => '/database/routines', 'params' => ['type' => 'PROCEDURE', 'db' => null]],
+ 'icon' => ['route' => '/database/routines', 'params' => ['type' => 'PROCEDURE', 'db' => null]],
+ ],
$parent->links
);
- $this->assertStringContainsString(
- 'index.php?route=/database/routines',
- $parent->links['text']
- );
$this->assertEquals('procedures', $parent->realName);
}
}
diff --git a/test/classes/Navigation/Nodes/NodeProcedureTest.php b/test/classes/Navigation/Nodes/NodeProcedureTest.php
index af42cb85ab..a6c8459480 100644
--- a/test/classes/Navigation/Nodes/NodeProcedureTest.php
+++ b/test/classes/Navigation/Nodes/NodeProcedureTest.php
@@ -25,13 +25,19 @@ class NodeProcedureTest extends AbstractTestCase
public function testConstructor(): void
{
$parent = NodeFactory::getInstance('NodeProcedure');
- $this->assertArrayHasKey(
- 'text',
+ $this->assertIsArray($parent->links);
+ $this->assertEquals(
+ [
+ 'text' => [
+ 'route' => '/database/routines',
+ 'params' => ['item_type' => 'PROCEDURE', 'edit_item' => 1, 'db' => null, 'item_name' => null],
+ ],
+ 'icon' => [
+ 'route' => '/database/routines',
+ 'params' => ['item_type' => 'PROCEDURE', 'execute_dialog' => 1, 'db' => null, 'item_name' => null],
+ ],
+ ],
$parent->links
);
- $this->assertStringContainsString(
- 'index.php?route=/database/routines',
- $parent->links['text']
- );
}
}
diff --git a/test/classes/Navigation/Nodes/NodeTableContainerTest.php b/test/classes/Navigation/Nodes/NodeTableContainerTest.php
index 6af4a76f27..1ca8d0bcb7 100644
--- a/test/classes/Navigation/Nodes/NodeTableContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeTableContainerTest.php
@@ -29,14 +29,14 @@ class NodeTableContainerTest extends AbstractTestCase
public function testConstructor(): void
{
$parent = NodeFactory::getInstance('NodeTableContainer');
- $this->assertArrayHasKey(
- 'text',
+ $this->assertIsArray($parent->links);
+ $this->assertEquals(
+ [
+ 'text' => ['route' => '/database/structure', 'params' => ['tbl_type' => 'table', 'db' => null]],
+ 'icon' => ['route' => '/database/structure', 'params' => ['tbl_type' => 'table', 'db' => null]],
+ ],
$parent->links
);
- $this->assertStringContainsString(
- 'index.php?route=/database/structure',
- $parent->links['text']
- );
$this->assertEquals('tables', $parent->realName);
$this->assertStringContainsString('tableContainer', $parent->classes);
}
diff --git a/test/classes/Navigation/Nodes/NodeTableTest.php b/test/classes/Navigation/Nodes/NodeTableTest.php
index 1cffc1bd8c..75bde6f729 100644
--- a/test/classes/Navigation/Nodes/NodeTableTest.php
+++ b/test/classes/Navigation/Nodes/NodeTableTest.php
@@ -18,8 +18,8 @@ class NodeTableTest extends AbstractTestCase
parent::loadDefaultConfig();
$GLOBALS['server'] = 0;
- $GLOBALS['cfg']['NavigationTreeDefaultTabTable'] = 'b_browse';
- $GLOBALS['cfg']['NavigationTreeDefaultTabTable2'] = '';
+ $GLOBALS['cfg']['NavigationTreeDefaultTabTable'] = 'search';
+ $GLOBALS['cfg']['NavigationTreeDefaultTabTable2'] = 'insert';
$GLOBALS['cfg']['DefaultTabTable'] = 'browse';
$GLOBALS['cfg']['MaxNavigationItems'] = 250;
$GLOBALS['cfg']['NavigationTreeEnableGrouping'] = true;
@@ -34,14 +34,16 @@ class NodeTableTest extends AbstractTestCase
public function testConstructor(): void
{
$parent = NodeFactory::getInstance('NodeTable');
- $this->assertArrayHasKey(
- 'text',
+ $this->assertIsArray($parent->links);
+ $this->assertEquals(
+ [
+ 'text' => ['route' => '/sql', 'params' => ['pos' => 0, 'db' => null, 'table' => null]],
+ 'icon' => ['route' => '/table/search', 'params' => ['db' => null, 'table' => null]],
+ 'second_icon' => ['route' => '/table/change', 'params' => ['db' => null, 'table' => null]],
+ 'title' => 'Browse',
+ ],
$parent->links
);
- $this->assertStringContainsString(
- 'index.php?route=/sql',
- $parent->links['text']
- );
$this->assertStringContainsString('table', $parent->classes);
}
diff --git a/test/classes/Navigation/Nodes/NodeTriggerContainerTest.php b/test/classes/Navigation/Nodes/NodeTriggerContainerTest.php
index cc49eda9f8..ef9f6bea30 100644
--- a/test/classes/Navigation/Nodes/NodeTriggerContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeTriggerContainerTest.php
@@ -25,14 +25,14 @@ class NodeTriggerContainerTest extends AbstractTestCase
public function testConstructor(): void
{
$parent = NodeFactory::getInstance('NodeTriggerContainer');
- $this->assertArrayHasKey(
- 'text',
+ $this->assertIsArray($parent->links);
+ $this->assertEquals(
+ [
+ 'text' => ['route' => '/database/triggers', 'params' => ['db' => null, 'table' => null]],
+ 'icon' => ['route' => '/database/triggers', 'params' => ['db' => null, 'table' => null]],
+ ],
$parent->links
);
- $this->assertStringContainsString(
- 'index.php?route=/database/triggers',
- $parent->links['text']
- );
$this->assertEquals('triggers', $parent->realName);
}
}
diff --git a/test/classes/Navigation/Nodes/NodeTriggerTest.php b/test/classes/Navigation/Nodes/NodeTriggerTest.php
index 5c5f5cdf44..439e9540fa 100644
--- a/test/classes/Navigation/Nodes/NodeTriggerTest.php
+++ b/test/classes/Navigation/Nodes/NodeTriggerTest.php
@@ -25,13 +25,19 @@ class NodeTriggerTest extends AbstractTestCase
public function testConstructor(): void
{
$parent = NodeFactory::getInstance('NodeTrigger');
- $this->assertArrayHasKey(
- 'text',
+ $this->assertIsArray($parent->links);
+ $this->assertEquals(
+ [
+ 'text' => [
+ 'route' => '/database/triggers',
+ 'params' => ['edit_item' => 1, 'db' => null, 'item_name' => null],
+ ],
+ 'icon' => [
+ 'route' => '/database/triggers',
+ 'params' => ['export_item' => 1, 'db' => null, 'item_name' => null],
+ ],
+ ],
$parent->links
);
- $this->assertStringContainsString(
- 'index.php?route=/database/triggers',
- $parent->links['text']
- );
}
}
diff --git a/test/classes/Navigation/Nodes/NodeViewContainerTest.php b/test/classes/Navigation/Nodes/NodeViewContainerTest.php
index 823d1e01b5..68ea6bb611 100644
--- a/test/classes/Navigation/Nodes/NodeViewContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeViewContainerTest.php
@@ -29,14 +29,14 @@ class NodeViewContainerTest extends AbstractTestCase
public function testConstructor(): void
{
$parent = NodeFactory::getInstance('NodeViewContainer');
- $this->assertArrayHasKey(
- 'text',
+ $this->assertIsArray($parent->links);
+ $this->assertEquals(
+ [
+ 'text' => ['route' => '/database/structure', 'params' => ['tbl_type' => 'view', 'db' => null]],
+ 'icon' => ['route' => '/database/structure', 'params' => ['tbl_type' => 'view', 'db' => null]],
+ ],
$parent->links
);
- $this->assertStringContainsString(
- 'index.php?route=/database/structure',
- $parent->links['text']
- );
$this->assertEquals('views', $parent->realName);
$this->assertStringContainsString('viewContainer', $parent->classes);
}
diff --git a/test/classes/Navigation/Nodes/NodeViewTest.php b/test/classes/Navigation/Nodes/NodeViewTest.php
index cbbecf872a..a9d0f5d51c 100644
--- a/test/classes/Navigation/Nodes/NodeViewTest.php
+++ b/test/classes/Navigation/Nodes/NodeViewTest.php
@@ -25,14 +25,14 @@ class NodeViewTest extends AbstractTestCase
public function testConstructor(): void
{
$parent = NodeFactory::getInstance('NodeView');
- $this->assertArrayHasKey(
- 'text',
+ $this->assertIsArray($parent->links);
+ $this->assertEquals(
+ [
+ 'text' => ['route' => '/sql', 'params' => ['pos' => 0, 'db' => null, 'table' => null]],
+ 'icon' => ['route' => '/table/structure', 'params' => ['db' => null, 'table' => null]],
+ ],
$parent->links
);
- $this->assertStringContainsString(
- 'index.php?route=/sql',
- $parent->links['text']
- );
$this->assertEquals('b_props', $parent->icon['image']);
$this->assertEquals('View', $parent->icon['title']);
$this->assertStringContainsString('view', $parent->classes);