Fix merge conflict

diff --git a/tests/phpunit/CRM/Activity/BAO/ActivityTest.php b/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
index 11e3ead49210b62c167f7e68713ecb7b88301911..91b0af02b371f73f31f2fe8879963e0dafdae8d1 100644 (file)
--- a/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
+++ b/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
@@ -463,29 +463,6 @@ class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
 
   }
 
-  /**
-   * Test getActivities BAO method.
-   */
-  public function testGetActivitiesForAdminDashboardNoViewContacts() {
-    CRM_Core_Config::singleton()->userPermissionClass->permissions = array('access CiviCRM');
-    $this->setUpForActivityDashboardTests();
-    $activities = CRM_Activity_BAO_Activity::getActivities($this->_params);
-    $this->assertEquals(0, count($activities));
-  }
-
-  /**
-   * Test getActivities BAO method.
-   */
-  public function testGetActivitiesForAdminDashboardAclLimitedViewContacts() {
-    CRM_Core_Config::singleton()->userPermissionClass->permissions = array('access CiviCRM');
-    $this->allowedContacts = array(1, 3, 4, 5);
-    $this->hookClass->setHook('civicrm_aclWhereClause', array($this, 'aclWhereMultipleContacts'));
-    $this->setUpForActivityDashboardTests();
-    $activities = CRM_Activity_BAO_Activity::getActivities($this->_params);
-    $this->assertEquals(1, count($activities));
-
-  }
-
   /**
    * Test getActivities BAO method.
    */