From bcf12baf6307283e9895b8bf0567d5bc21a08c9f Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@gmail.com>
Date: Mon, 30 Mar 2015 22:26:28 +0000
Subject: fix broken tests

---
 ...sitsWithCustomVariablesSegmentMatchVisitorTypeTest.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php')

diff --git a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php
index a2c1d06672..05f6ef79d9 100755
--- a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php
+++ b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php
@@ -117,24 +117,23 @@ class TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest extends SystemTest
     public function test_checkArchiveRecords_shouldMergeSubtablesIntoOneRow()
     {
         $chunk = new Chunk();
-        $chunkBlobId = $chunk->getRecordNameForTableId(0);
 
         $tests = array(
             'archive_blob_2010_01' => array(
-                'CustomVariables_valueByName_' . $chunkBlobId => 6,
-                'Referrers_keywordBySearchEngine_' . $chunkBlobId => 1,
-                'Referrers_searchEngineByKeyword_' . $chunkBlobId => 1,
+                $chunk->getRecordNameForTableId('CustomVariables_valueByName', 0) => 6,
+                $chunk->getRecordNameForTableId('Referrers_keywordBySearchEngine', 0) => 1,
+                $chunk->getRecordNameForTableId('Referrers_searchEngineByKeyword', 0) => 1
             ),
             'archive_blob_2009_12' => array(
-                'CustomVariables_valueByName_' . $chunkBlobId => 6,
-                'Referrers_keywordBySearchEngine_' . $chunkBlobId => 1,
-                'Referrers_searchEngineByKeyword_' . $chunkBlobId => 1,
+                $chunk->getRecordNameForTableId('CustomVariables_valueByName', 0) => 6,
+                $chunk->getRecordNameForTableId('Referrers_keywordBySearchEngine', 0) => 1,
+                $chunk->getRecordNameForTableId('Referrers_searchEngineByKeyword', 0) => 1,
             )
         );
         $numTests = 0;
         foreach ($tests as $table => $expectedSubtables) {
             foreach ($expectedSubtables as $name => $expectedNumSubtables) {
-                $sql = "SELECT `value` FROM " . Common::prefixTable($table) . " WHERE `name` ='$name'";
+                $sql   = "SELECT `value` FROM " . Common::prefixTable($table) . " WHERE `name` ='$name'";
                 $blobs = Db::get()->fetchAll($sql);
 
                 foreach ($blobs as $blob) {
-- 
cgit v1.2.3