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

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattab <matthieu.aubry@gmail.com>2015-03-31 05:15:36 +0300
committerThomas Steur <thomas.steur@gmail.com>2015-03-31 05:27:08 +0300
commite2e76165cb45b03bca7e8bffc56d5963f434c7c4 (patch)
treebf292d1137769ae137053e1391e1059f826cd863
parentbcf12baf6307283e9895b8bf0567d5bc21a08c9f (diff)
Update comments and function name (minor)
-rwxr-xr-xtests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php3
-rwxr-xr-xtests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php4
-rw-r--r--tests/PHPUnit/Unit/DataTable/RowTest.php2
3 files changed, 4 insertions, 5 deletions
diff --git a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php
index 83110d149a..373cfdf170 100755
--- a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php
+++ b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php
@@ -105,11 +105,10 @@ class OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest extends SystemTestCa
// so we only archived the parent table
$expectedActionsBlobs = 5;
- // When flat=1, Actions plugin will process 5 + 3 extra blobs (URL = 'http://example.org/sub1/sub2/sub3/news')
+ // When flat=1, Actions plugin will process 5 + 1 extra chunk blobs (URL = 'http://example.org/sub1/sub2/sub3/news')
$expectedActionsBlobsWhenFlattened = $expectedActionsBlobs + 1;
$tests = array(
- // TODO Implement fix, then remove the +3 below
'archive_blob_2010_12' => ( ($expectedActionsBlobs+1) /*Actions*/
+ 2 /* Resolution */
+ 2 /* VisitTime */) * 3,
diff --git a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php
index 05f6ef79d9..3a11d10668 100755
--- a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php
+++ b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php
@@ -76,7 +76,7 @@ class TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest extends SystemTest
// 1) CHECK 'day' archive stored in January
// We expect 2 segments
// * (1 custom variable name + 2 ref metrics
- // + 1 subtable for the custom var values + 5 Referrers blob (2 of them subtables)
+ // + 1 subtable chunk for the custom var values + 5 Referrers blob (2 of them subtables)
// )
'archive_blob_2010_01' => 18,
// This contains all 'last N' weeks & days,
@@ -88,7 +88,7 @@ class TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest extends SystemTest
'archive_numeric_2010_01' => 138,
// 2) CHECK 'week' archive stored in December (week starts the month before)
- // We expect 2 segments * (1 custom variable name + 2 ref metrics + 1 subtable for the values of the name + 5 referrers blob (2 of them subtables))
+ // We expect 2 segments * (1 custom variable name + 2 ref metrics + 1 subtable chunk for the values of the name + 5 referrers blob (2 of them subtables))
'archive_blob_2009_12' => 18,
// 7 metrics,
// 2 Referrer metrics (Referrers_distinctSearchEngines/Referrers_distinctKeywords),
diff --git a/tests/PHPUnit/Unit/DataTable/RowTest.php b/tests/PHPUnit/Unit/DataTable/RowTest.php
index be15be9d65..e18806d2d5 100644
--- a/tests/PHPUnit/Unit/DataTable/RowTest.php
+++ b/tests/PHPUnit/Unit/DataTable/RowTest.php
@@ -61,7 +61,7 @@ class RowTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(null, $testRow->getIdSubDataTable());
}
- public function test_desctruct_ShouldRemoveASetSubtable()
+ public function test_destruct_ShouldRemoveASetSubtable()
{
$testRow = $this->getTestRowWithSubDataTableLoaded();
$this->assertTrue($testRow->isSubtableLoaded());