From bd920e47cc9ad5093a4fcaae165e54660fef2dea Mon Sep 17 00:00:00 2001
From: benakamoorthi <benaka.moorthi@gmail.com>
Date: Thu, 4 Oct 2012 09:58:32 +0000
Subject: [PATCH] Refs #3311, clarify test case.
git-svn-id: http://dev.piwik.org/svn/trunk@7099 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php b/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php
index 40e3402f1c..c2035f9829 100755
--- a/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php
+++ b/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php
@@ -160,18 +160,15 @@ class Test_Piwik_Integration_OneVisitorTwoVisits extends IntegrationTestCase
$this->assertTrue(count($cache) > 0, "empty blob cache");
foreach ($cache as $name => $value)
{
- $this->assertTrue(
- preg_match("/^Actions_actions(?:_[0-9]+)?$/", $name) === 1,
- "Got blob name '$name' when pre-fetching Actions_actions."
- );
+ $this->assertTrue(strpos($name, "Actions_actions_url") === false, "found blob w/ name '$name'");
- if (preg_match("/^Actions_actions_[0-9]+$/", $name) === 1)
+ if (strpos($name, "Actions_actions_") !== false)
{
$foundSubtable = true;
}
}
- $this->assertTrue($foundSubtable);
+ $this->assertTrue($foundSubtable, "Actions_actions subtable was not loaded");
}
protected static function setUpWebsitesAndGoals()
--
GitLab