From ad60d64fb4d2967c3686bdcfd613f6c349f6663a Mon Sep 17 00:00:00 2001
From: sgiehl <stefangiehl@gmail.com>
Date: Fri, 17 Aug 2012 09:22:11 +0000
Subject: [PATCH] refs #2976 fixed privacymanager tests
git-svn-id: http://dev.piwik.org/svn/trunk@6802 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
plugins/PrivacyManager/tests/PrivacyManager.test.php | 4 ++--
tests/PHPUnit/Plugins/PrivacyManagerTest.php | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/plugins/PrivacyManager/tests/PrivacyManager.test.php b/plugins/PrivacyManager/tests/PrivacyManager.test.php
index bb2d298145..fb93f30876 100755
--- a/plugins/PrivacyManager/tests/PrivacyManager.test.php
+++ b/plugins/PrivacyManager/tests/PrivacyManager.test.php
@@ -447,7 +447,7 @@ class Test_Piwik_PrivacyManager extends Test_Integration
$this->unusedIdAction = Piwik_FetchOne(
"SELECT idaction FROM ".Piwik_Common::prefixTable('log_action')." WHERE name = ?",
- array('http://whatever.com/_40'));
+ array('whatever.com/_40'));
$this->assertTrue($this->unusedIdAction);
// purge data
@@ -769,7 +769,7 @@ class Test_Piwik_PrivacyManager extends Test_Integration
public function addReferenceToUnusedAction( $notification )
{
$unusedIdAction = $this->unusedIdAction;
- if (is_null($unusedIdAction)) // make sure we only do this for one test case
+ if (empty($unusedIdAction)) // make sure we only do this for one test case
{
return;
}
diff --git a/tests/PHPUnit/Plugins/PrivacyManagerTest.php b/tests/PHPUnit/Plugins/PrivacyManagerTest.php
index fa9eb43a82..0f032c7456 100755
--- a/tests/PHPUnit/Plugins/PrivacyManagerTest.php
+++ b/tests/PHPUnit/Plugins/PrivacyManagerTest.php
@@ -493,7 +493,7 @@ class PrivacyManagerTest extends DatabaseTestCase
$this->unusedIdAction = Piwik_FetchOne(
"SELECT idaction FROM ".Piwik_Common::prefixTable('log_action')." WHERE name = ?",
- array('http://whatever.com/_40'));
+ array('whatever.com/_40'));
$this->assertTrue($this->unusedIdAction > 0);
// purge data
@@ -801,7 +801,7 @@ class PrivacyManagerTest extends DatabaseTestCase
public function addReferenceToUnusedAction( $notification )
{
$unusedIdAction = $this->unusedIdAction;
- if (is_null($unusedIdAction)) // make sure we only do this for one test case
+ if (empty($unusedIdAction)) // make sure we only do this for one test case
{
return;
}
--
GitLab