1 files changed, 29 insertions, 24 deletions

diff --git a/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php b/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php
index 9af0b9b640..ddfb556209 100644
--- a/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php
+++ b/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php
@@ -5,12 +5,17 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+use Piwik\DataTable;
+use Piwik\DataTable\Manager;
+use Piwik\DataTable\Renderer\Console;
+use Piwik\DataTable\Row;
+
 class DataTable_Renderer_ConsoleTest extends PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
         parent::setUp();
-        Piwik_DataTable_Manager::getInstance()->deleteAll();
+        Manager::getInstance()->deleteAll();
     }
 
     /**
@@ -25,36 +30,36 @@ class DataTable_Renderer_ConsoleTest extends PHPUnit_Framework_TestCase
      */
     public function testConsole2SubLevelAnd2Different()
     {
-        $table = new Piwik_DataTable;
-        $table->addRowFromArray(array(Piwik_DataTable_Row::COLUMNS  => array('visits' => 245, 'visitors' => 245),
-                                      Piwik_DataTable_Row::METADATA => array('logo' => 'test.png'),)
+        $table = new DataTable;
+        $table->addRowFromArray(array(Row::COLUMNS  => array('visits' => 245, 'visitors' => 245),
+                                      Row::METADATA => array('logo' => 'test.png'),)
 
         );
 
-        $subsubtable = new Piwik_DataTable;
+        $subsubtable = new DataTable;
         $idsubsubtable = $subsubtable->getId();
-        $subsubtable->addRowFromArray(array(Piwik_DataTable_Row::COLUMNS => array('visits' => 2)));
+        $subsubtable->addRowFromArray(array(Row::COLUMNS => array('visits' => 2)));
 
-        $subtable = new Piwik_DataTable;
+        $subtable = new DataTable;
         $idsubtable1 = $subtable->getId();
-        $subtable->addRowFromArray(array(Piwik_DataTable_Row::COLUMNS              => array('visits' => 1),
-                                         Piwik_DataTable_Row::DATATABLE_ASSOCIATED => $subsubtable));
+        $subtable->addRowFromArray(array(Row::COLUMNS              => array('visits' => 1),
+                                         Row::DATATABLE_ASSOCIATED => $subsubtable));
 
-        $table->addRowFromArray(array(Piwik_DataTable_Row::COLUMNS              => array('visits' => 3),
-                                      Piwik_DataTable_Row::DATATABLE_ASSOCIATED => $subtable)
+        $table->addRowFromArray(array(Row::COLUMNS              => array('visits' => 3),
+                                      Row::DATATABLE_ASSOCIATED => $subtable)
         );
 
-        $subtable2 = new Piwik_DataTable;
+        $subtable2 = new DataTable;
         $idsubtable2 = $subtable2->getId();
-        $subtable2->addRowFromArray(array(Piwik_DataTable_Row::COLUMNS => array('visits' => 5),));
+        $subtable2->addRowFromArray(array(Row::COLUMNS => array('visits' => 5),));
 
-        $table->addRowFromArray(array(Piwik_DataTable_Row::COLUMNS              => array('visits' => 9),
-                                      Piwik_DataTable_Row::DATATABLE_ASSOCIATED => $subtable2)
+        $table->addRowFromArray(array(Row::COLUMNS              => array('visits' => 9),
+                                      Row::DATATABLE_ASSOCIATED => $subtable2)
         );
 
         $expected = "- 1 ['visits' => 245, 'visitors' => 245] ['logo' => 'test.png'] [idsubtable = ]<br />\n- 2 ['visits' => 3] [] [idsubtable = $idsubtable1]<br />\n*- 1 ['visits' => 1] [] [idsubtable = $idsubsubtable]<br />\n**- 1 ['visits' => 2] [] [idsubtable = ]<br />\n- 3 ['visits' => 9] [] [idsubtable = $idsubtable2]<br />\n*- 1 ['visits' => 5] [] [idsubtable = ]<br />\n";
 
-        $render = new Piwik_DataTable_Renderer_Console();
+        $render = new Console();
         $render->setTable($table);
         $render->setPrefixRow('*');
         $rendered = $render->render();
@@ -73,15 +78,15 @@ class DataTable_Renderer_ConsoleTest extends PHPUnit_Framework_TestCase
      */
     public function testConsoleSimple()
     {
-        $table = new Piwik_DataTable;
-        $table->addRowFromArray(array(Piwik_DataTable_Row::COLUMNS  => array('visits' => 245, 'visitors' => 245),
-                                      Piwik_DataTable_Row::METADATA => array('logo' => 'test.png'),)
+        $table = new DataTable;
+        $table->addRowFromArray(array(Row::COLUMNS  => array('visits' => 245, 'visitors' => 245),
+                                      Row::METADATA => array('logo' => 'test.png'),)
 
         );
 
         $expected = "- 1 ['visits' => 245, 'visitors' => 245] ['logo' => 'test.png'] [idsubtable = ]<br />\n";
 
-        $render = new Piwik_DataTable_Renderer_Console();
+        $render = new Console();
         $render->setTable($table);
         $rendered = $render->render();
 
@@ -98,7 +103,7 @@ class DataTable_Renderer_ConsoleTest extends PHPUnit_Framework_TestCase
     {
         $data = array();
 
-        $render = new Piwik_DataTable_Renderer_Console();
+        $render = new Console();
         $render->setTable($data);
         $expected = 'Empty table<br />
 ';
@@ -116,7 +121,7 @@ class DataTable_Renderer_ConsoleTest extends PHPUnit_Framework_TestCase
     {
         $data = array('a', 'b', 'c');
 
-        $render = new Piwik_DataTable_Renderer_Console();
+        $render = new Console();
         $render->setTable($data);
         $expected = "- 1 ['0' => 'a'] [] [idsubtable = ]<br />
 - 2 ['0' => 'b'] [] [idsubtable = ]<br />
@@ -136,7 +141,7 @@ class DataTable_Renderer_ConsoleTest extends PHPUnit_Framework_TestCase
     {
         $data = array('a' => 'b', 'c' => 'd', 'e' => 'f', 5 => 'g');
 
-        $render = new Piwik_DataTable_Renderer_Console();
+        $render = new Console();
         $render->setTable($data);
         $expected = "- 1 ['a' => 'b', 'c' => 'd', 'e' => 'f', '5' => 'g'] [] [idsubtable = ]<br />
 ";
@@ -154,7 +159,7 @@ class DataTable_Renderer_ConsoleTest extends PHPUnit_Framework_TestCase
     {
         $data = array('a' => 'b');
 
-        $render = new Piwik_DataTable_Renderer_Console();
+        $render = new Console();
         $render->setTable($data);
         $expected = "- 1 ['0' => 'b'] [] [idsubtable = ]<br />
 ";