Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-02-09-11-44-07

[civicrm-core.git] / tests / phpunit / CRM / Member / BAO / MembershipTypeTest.php

diff --git a/tests/phpunit/CRM/Member/BAO/MembershipTypeTest.php b/tests/phpunit/CRM/Member/BAO/MembershipTypeTest.php
index dd5997ca0886d2e65299000cf241faf7c801605c..250698bc8a7faa5f054c528a8f8a6ba84c83658e 100644 (file)
--- a/tests/phpunit/CRM/Member/BAO/MembershipTypeTest.php
+++ b/tests/phpunit/CRM/Member/BAO/MembershipTypeTest.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 
 require_once 'CiviTest/CiviUnitTestCase.php';
@@ -33,7 +33,7 @@ require_once 'CiviTest/CiviUnitTestCase.php';
  */
 class CRM_Member_BAO_MembershipTypeTest extends CiviUnitTestCase {
 
-  function setUp() {
+  public function setUp() {
     parent::setUp();
 
     //create relationship
@@ -55,19 +55,19 @@ class CRM_Member_BAO_MembershipTypeTest extends CiviUnitTestCase {
   /**
    * Tears down the fixture, for example, closes a network connection.
    * This method is called after a test is executed.
-   *
    */
-  function tearDown() {
+  public function tearDown() {
     $this->relationshipTypeDelete($this->_relationshipTypeId);
     $this->membershipStatusDelete($this->_membershipStatusID);
     $this->contactDelete($this->_orgContactID);
     $this->contactDelete($this->_indiviContactID);
   }
 
-  /* check function add()
-     *
-     */
-  function testAdd() {
+  /**
+   * check function add()
+   *
+   */
+  public function testAdd() {
     $ids = array();
     $params = array(
       'name' => 'test type',
@@ -94,10 +94,11 @@ class CRM_Member_BAO_MembershipTypeTest extends CiviUnitTestCase {
     $this->membershipTypeDelete(array('id' => $membershipType->id));
   }
 
-  /* check function retrive()
-     *
-     */
-  function testRetrieve() {
+  /**
+   * check function retrive()
+   *
+   */
+  public function testRetrieve() {
     $ids = array();
     $params = array(
       'name' => 'General',
@@ -114,17 +115,18 @@ class CRM_Member_BAO_MembershipTypeTest extends CiviUnitTestCase {
     );
     $membershipType = CRM_Member_BAO_MembershipType::add($params, $ids);
 
-    $params  = array('name' => 'General');
+    $params = array('name' => 'General');
     $default = array();
-    $result  = CRM_Member_BAO_MembershipType::retrieve($params, $default);
+    $result = CRM_Member_BAO_MembershipType::retrieve($params, $default);
     $this->assertEquals($result->name, 'General', 'Verify membership type name.');
     $this->membershipTypeDelete(array('id' => $membershipType->id));
   }
 
-  /* check function isActive()
-     *
-     */
-  function testSetIsActive() {
+  /**
+   * check function isActive()
+   *
+   */
+  public function testSetIsActive() {
     $ids = array();
     $params = array(
       'name' => 'General',
@@ -153,10 +155,11 @@ class CRM_Member_BAO_MembershipTypeTest extends CiviUnitTestCase {
     $this->membershipTypeDelete(array('id' => $membership->id));
   }
 
-  /* check function del()
-     *
-     */
-  function testdel() {
+  /**
+   * check function del()
+   *
+   */
+  public function testdel() {
     $ids = array();
     $params = array(
       'name' => 'General',
@@ -179,10 +182,11 @@ class CRM_Member_BAO_MembershipTypeTest extends CiviUnitTestCase {
     $this->assertEquals($result, TRUE, 'Verify membership deleted.');
   }
 
-  /* check function convertDayFormat( )
-     *
-     */
-  function testConvertDayFormat() {
+  /**
+   * check function convertDayFormat( )
+   *
+   */
+  public function testConvertDayFormat() {
     $ids = array();
     $params = array(
       'name' => 'General',
@@ -209,10 +213,11 @@ class CRM_Member_BAO_MembershipTypeTest extends CiviUnitTestCase {
     $this->membershipTypeDelete(array('id' => $membership->id));
   }
 
-  /* check function getMembershipTypes( )
-     *
-     */
-  function testGetMembershipTypes() {
+  /**
+   * check function getMembershipTypes( )
+   *
+   */
+  public function testGetMembershipTypes() {
     $ids = array();
     $params = array(
       'name' => 'General',
@@ -234,10 +239,11 @@ class CRM_Member_BAO_MembershipTypeTest extends CiviUnitTestCase {
     $this->membershipTypeDelete(array('id' => $membership->id));
   }
 
-  /* check function getMembershipTypeDetails( )
-     *
-     */
-  function testGetMembershipTypeDetails() {
+  /**
+   * check function getMembershipTypeDetails( )
+   *
+   */
+  public function testGetMembershipTypeDetails() {
     $ids = array();
     $params = array(
       'name' => 'General',
@@ -261,10 +267,11 @@ class CRM_Member_BAO_MembershipTypeTest extends CiviUnitTestCase {
     $this->membershipTypeDelete(array('id' => $membership->id));
   }
 
-  /* check function getDatesForMembershipType( )
-     *
-     */
-  function testGetDatesForMembershipType() {
+  /**
+   * check function getDatesForMembershipType( )
+   *
+   */
+  public function testGetDatesForMembershipType() {
     $ids = array();
     $params = array(
       'name' => 'General',
@@ -287,10 +294,11 @@ class CRM_Member_BAO_MembershipTypeTest extends CiviUnitTestCase {
     $this->membershipTypeDelete(array('id' => $membership->id));
   }
 
-  /* check function getRenewalDatesForMembershipType( )
-     *
-     */
-  function testGetRenewalDatesForMembershipType() {
+  /**
+   * check function getRenewalDatesForMembershipType( )
+   *
+   */
+  public function testGetRenewalDatesForMembershipType() {
     $ids = array();
     $params = array(
       'name' => 'General',
@@ -330,10 +338,11 @@ class CRM_Member_BAO_MembershipTypeTest extends CiviUnitTestCase {
     $this->membershipTypeDelete(array('id' => $membershipType->id));
   }
 
-  /* check function getMembershipTypesByOrg( )
-     *
-     */
-  function testGetMembershipTypesByOrg() {
+  /**
+   * check function getMembershipTypesByOrg( )
+   *
+   */
+  public function testGetMembershipTypesByOrg() {
     $ids = array();
     $params = array(
       'name' => 'General',
@@ -359,5 +368,5 @@ class CRM_Member_BAO_MembershipTypeTest extends CiviUnitTestCase {
 
     $this->membershipTypeDelete(array('id' => $membershipType->id));
   }
-}
 
+}