1 files changed, 17 insertions, 13 deletions

diff --git a/tests/PHPUnit/Core/DataTable/Filter/TruncateTest.php b/tests/PHPUnit/Core/DataTable/Filter/TruncateTest.php
index 1d46658e63..c499350066 100644
--- a/tests/PHPUnit/Core/DataTable/Filter/TruncateTest.php
+++ b/tests/PHPUnit/Core/DataTable/Filter/TruncateTest.php
@@ -5,6 +5,10 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+use Piwik\DataTable;
+use Piwik\DataTable\Filter\Truncate;
+use Piwik\DataTable\Row;
+
 class DataTable_Filter_TruncateTest extends PHPUnit_Framework_TestCase
 {
     /**
@@ -17,20 +21,20 @@ class DataTable_Filter_TruncateTest extends PHPUnit_Framework_TestCase
     {
         // remark: this unit test would become invalid and would need to be rewritten if
         // AddSummaryRow filter stops calling getRowsCount() on the DataTable being filtered.
-        $mockedDataTable = $this->getMock('Piwik_DataTable', array('getRowsCount'));
+        $mockedDataTable = $this->getMock('\Piwik\DataTable', array('getRowsCount'));
         $mockedDataTable->expects($this->never())->method('getRowsCount');
 
-        $dataTableBeingFiltered = new Piwik_DataTable();
-        $rowBeingFiltered = new Piwik_DataTable_Row();
+        $dataTableBeingFiltered = new DataTable();
+        $rowBeingFiltered = new Row();
         $dataTableBeingFiltered->addRow($rowBeingFiltered);
 
-        // we simulate the fact that the value of Piwik_DataTable_Row::DATATABLE_ASSOCIATED retrieved
-        // from the database is in conflict with one of the Piwik_DataTable_Manager managed table identifiers.
+        // we simulate the fact that the value of Row::DATATABLE_ASSOCIATED retrieved
+        // from the database is in conflict with one of the Manager managed table identifiers.
         // This is a rare but legitimate case as identifiers are not thoroughly synchronized
         // when the expanded parameter is false.
-        $rowBeingFiltered->c[Piwik_DataTable_Row::DATATABLE_ASSOCIATED] = $mockedDataTable->getId();
+        $rowBeingFiltered->c[Row::DATATABLE_ASSOCIATED] = $mockedDataTable->getId();
 
-        $filter = new Piwik_DataTable_Filter_Truncate($dataTableBeingFiltered, 1);
+        $filter = new Truncate($dataTableBeingFiltered, 1);
         $filter->filter($dataTableBeingFiltered);
     }
 
@@ -43,22 +47,22 @@ class DataTable_Filter_TruncateTest extends PHPUnit_Framework_TestCase
      */
     public function testForInfiniteRecursion()
     {
-        $dataTableBeingFiltered = new Piwik_DataTable();
+        $dataTableBeingFiltered = new DataTable();
 
         // remark: this unit test would become invalid and would need to be rewritten if
         // Truncate filter stops calling getIdSubDataTable() on rows associated with a SubDataTable
-        $rowBeingFiltered = $this->getMock('Piwik_DataTable_Row', array('getIdSubDataTable'));
+        $rowBeingFiltered = $this->getMock('Row', array('getIdSubDataTable'));
         $rowBeingFiltered->expects($this->never())->method('getIdSubDataTable');
 
         $dataTableBeingFiltered->addRow($rowBeingFiltered);
 
-        // we simulate a legitimate but rare circular reference between a Piwik_DataTable_Row and its
-        // enclosing Piwik_DataTable.
+        // we simulate a legitimate but rare circular reference between a Row and its
+        // enclosing DataTable.
         // This can happen because identifiers are not thoroughly synchronized when the expanded parameter
         // is false.
-        $rowBeingFiltered->c[Piwik_DataTable_Row::DATATABLE_ASSOCIATED] = $dataTableBeingFiltered->getId();
+        $rowBeingFiltered->c[Row::DATATABLE_ASSOCIATED] = $dataTableBeingFiltered->getId();
 
-        $filter = new Piwik_DataTable_Filter_Truncate($dataTableBeingFiltered, 1);
+        $filter = new Truncate($dataTableBeingFiltered, 1);
         $filter->filter($dataTableBeingFiltered);
     }
 }