Merge pull request #4931 from davecivicrm/INFRA-132

[civicrm-core.git] / tests / phpunit / api / v3 / ACLCachingTest.php

diff --git a/tests/phpunit/api/v3/ACLCachingTest.php b/tests/phpunit/api/v3/ACLCachingTest.php
index cf59277061261261d9ca41cb7a33540e8e6fbea7..28695e107783344a8d08416e7e18e03461c3032f 100644 (file)
--- a/tests/phpunit/api/v3/ACLCachingTest.php
+++ b/tests/phpunit/api/v3/ACLCachingTest.php
@@ -1,8 +1,7 @@
 <?php
-
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -31,32 +30,32 @@ require_once 'CiviTest/CiviUnitTestCase.php';
 /**
  * This class is intended to test ACL permission using the multisite module
  *
- *  @package CiviCRM_APIv3
- *  @subpackage API_Contact
+ * @package CiviCRM_APIv3
+ * @subpackage API_Contact
  */
-
 class api_v3_ACLCachingTest extends CiviUnitTestCase {
   protected $_apiversion = 3;
   protected $_params;
 
   public $DBResetRequired = FALSE;
 
-  function setUp() {
+  public function setUp() {
     parent::setUp();
   }
-/**
- * (non-PHPdoc)
- * @see CiviUnitTestCase::tearDown()
- */
-  function tearDown() {
+
+  /**
+   * (non-PHPdoc)
+   * @see CiviUnitTestCase::tearDown()
+   */
+  public function tearDown() {
     $tablesToTruncate = array(
       'civicrm_activity',
     );
     $this->quickCleanup($tablesToTruncate, TRUE);
   }
 
-  function testActivityCreateCustomBefore() {
-    $values = $this->callAPISuccess('custom_field', 'getoptions', array('field' => 'custom_group_id',));
+  public function testActivityCreateCustomBefore() {
+    $values = $this->callAPISuccess('custom_field', 'getoptions', array('field' => 'custom_group_id'));
     $this->assertTrue($values['count'] == 0);
     $this->CustomGroupCreate(array('extends' => 'Activity'));
     $groupCount = $this->callAPISuccess('custom_group', 'getcount', array('extends' => 'activity'));
@@ -65,4 +64,3 @@ class api_v3_ACLCachingTest extends CiviUnitTestCase {
     $this->assertTrue($values['count'] == 1, 'check that cached value is not retained for custom_group_id');
   }
 }
-