Merge pull request #6812 from eileenmcnaughton/CRM-17075

[civicrm-core.git] / tests / phpunit / CRM / Extension / Manager / ModuleTest.php

diff --git a/tests/phpunit/CRM/Extension/Manager/ModuleTest.php b/tests/phpunit/CRM/Extension/Manager/ModuleTest.php
index 5da444ac6e942734cfac2b450c2a8a733762bebb..c8341b9be097866851ad58a259e6dab82458df7c 100644 (file)
--- a/tests/phpunit/CRM/Extension/Manager/ModuleTest.php
+++ b/tests/phpunit/CRM/Extension/Manager/ModuleTest.php
@@ -6,10 +6,6 @@ require_once 'CiviTest/CiviUnitTestCase.php';
  * Class CRM_Extension_Manager_ModuleTest
  */
 class CRM_Extension_Manager_ModuleTest extends CiviUnitTestCase {
-  //@todo make BAO enotice compliant  & remove the line below
-  // WARNING - NEVER COPY & PASTE $_eNoticeCompliant = FALSE
-  // new test classes should be compliant.
-  public $_eNoticeCompliant = FALSE;
 
   public function setUp() {
     parent::setUp();
@@ -31,7 +27,7 @@ class CRM_Extension_Manager_ModuleTest extends CiviUnitTestCase {
   }
 
   /**
-   * Install an extension with a valid type name
+   * Install an extension with a valid type name.
    */
   public function testInstallDisableUninstall() {
     $manager = $this->system->getManager();
@@ -72,7 +68,7 @@ class CRM_Extension_Manager_ModuleTest extends CiviUnitTestCase {
   }
 
   /**
-   * Install an extension with a valid type name
+   * Install an extension with a valid type name.
    */
   public function testInstallDisableEnable() {
     $manager = $this->system->getManager();
@@ -283,6 +279,9 @@ class CRM_Extension_Manager_ModuleTest extends CiviUnitTestCase {
    */
   public static function incHookCount($module, $name) {
     global $_test_extension_manager_moduletest_counts;
+    if (!isset($_test_extension_manager_moduletest_counts[$module][$name])) {
+      $_test_extension_manager_moduletest_counts[$module][$name] = 0;
+    }
     $_test_extension_manager_moduletest_counts[$module][$name] = 1 + (int) $_test_extension_manager_moduletest_counts[$module][$name];
   }