Test cleanup in BAO_ParticipantTest

Fixes to use the trait. Also simplifies the fixEventLevel test
- the fixEventLevel function has a lot of set up with
some legacy function calls. However, the set up is not
relevent the the string-processing function being tested

diff --git a/tests/phpunit/CRM/Event/BAO/ParticipantTest.php b/tests/phpunit/CRM/Event/BAO/ParticipantTest.php
index 48321e83f08b9bf2df7cd9c51628f99a557d7ddb..b2d6a98ea63dbc32ab582d794469e281115fcbce 100644 (file)
--- a/tests/phpunit/CRM/Event/BAO/ParticipantTest.php
+++ b/tests/phpunit/CRM/Event/BAO/ParticipantTest.php
@@ -16,48 +16,42 @@
  */
 class CRM_Event_BAO_ParticipantTest extends CiviUnitTestCase {
 
-  /**
-   * @var int
-   */
-  private $_contactId;
-
-  /**
-   * @var int
-   */
-  private $_eventId;
-
   public function setUp(): void {
     parent::setUp();
-    $this->_contactId = $this->individualCreate();
-    $event = $this->eventCreate();
-    $this->_eventId = $event['id'];
+    $this->ids['Contact']['individual_0'] = $this->individualCreate();
+    $this->eventCreateUnpaid();
+  }
+
+  public function tearDown(): void {
+    $this->quickCleanUpFinancialEntities();
+    parent::tearDown();
   }
 
   /**
    * Add() method (add and edit modes of participant)
    */
-  public function testAdd() {
+  public function testAdd(): void {
     $params = [
       'send_receipt' => 1,
       'is_test' => 0,
       'is_pay_later' => 0,
-      'event_id' => $this->_eventId,
-      'register_date' => date('Y-m-d') . " 00:00:00",
+      'event_id' => $this->getEventID(),
+      'register_date' => date('Y-m-d') . ' 00:00:00',
       'role_id' => 1,
       'status_id' => 1,
-      'source' => 'Event_' . $this->_eventId,
-      'contact_id' => $this->_contactId,
+      'source' => 'Event_' . $this->getEventID(),
+      'contact_id' => $this->ids['Contact']['individual_0'],
     ];
 
     // New Participant Created
     $participant = CRM_Event_BAO_Participant::add($params);
 
-    $this->assertDBNotNull('CRM_Event_BAO_Participant', $this->_contactId, 'id',
+    $this->assertDBNotNull('CRM_Event_BAO_Participant', $this->ids['Contact']['individual_0'], 'id',
       'contact_id', 'Check DB for Participant of the contact'
     );
 
     $this->assertDBCompareValue('CRM_Event_BAO_Participant', $participant->id, 'contact_id',
-      'id', $this->_contactId, 'Check DB for contact of the participant'
+      'id', $this->ids['Contact']['individual_0'], 'Check DB for contact of the participant'
     );
 
     $params = array_merge($params, [
@@ -76,32 +70,32 @@ class CRM_Event_BAO_ParticipantTest extends CiviUnitTestCase {
       'id', 3, 'Check DB for updated status id  of the participant'
     );
 
-    $this->contactDelete($this->_contactId);
-    $this->eventDelete($this->_eventId);
+    $this->contactDelete($this->ids['Contact']['individual_0']);
+    $this->eventDelete($this->getEventID());
   }
 
   /**
    * GetValues() method (fetch value of participant)
    */
-  public function testgetValuesWithValidParams() {
-    $participantId = $this->participantCreate(['contact_id' => $this->_contactId, 'event_id' => $this->_eventId]);
-    $params = ['id' => $participantId];
-    $values = $ids = [];
+  public function testGetValuesWithValidParams(): void {
+    $participantID = $this->participantCreate(['contact_id' => $this->ids['Contact']['individual_0'], 'event_id' => $this->getEventID()]);
+    $params = ['id' => $participantID];
+    $values = [];
 
-    $fetchParticipant = CRM_Event_BAO_Participant::getValues($params, $values, $ids);
-    $compareValues = $fetchParticipant[$participantId];
+    $fetchParticipant = CRM_Event_BAO_Participant::getValues($params, $values);
+    $compareValues = $fetchParticipant[$participantID];
 
     $params = [
       'send_receipt' => 1,
       'is_test' => 0,
       'is_pay_later' => 0,
-      'event_id' => $this->_eventId,
+      'event_id' => $this->getEventID(),
       'register_date' => '2007-02-19 00:00:00',
       'role_id' => 1,
       'status_id' => 2,
       'source' => 'Wimbeldon',
-      'contact_id' => $this->_contactId,
-      'id' => $participantId,
+      'contact_id' => $this->ids['Contact']['individual_0'],
+      'id' => $participantID,
       'campaign_id' => NULL,
       'fee_level' => NULL,
       'fee_amount' => NULL,
@@ -112,175 +106,164 @@ class CRM_Event_BAO_ParticipantTest extends CiviUnitTestCase {
       'cart_id' => NULL,
       'must_wait' => NULL,
       'transferred_to_contact_id' => NULL,
-      'created_id' => $this->_contactId,
+      'created_id' => $this->ids['Contact']['individual_0'],
     ];
 
     foreach ($compareValues as $key => $value) {
-      if (substr($key, 0, 1) != '_' && $key != 'N') {
+      if ($key[0] !== '_' && $key !== 'N') {
         $this->assertEquals($compareValues->$key, $params[$key], 'Check for ' . $key . ' for given participant');
       }
     }
 
-    $this->participantDelete($participantId);
-    $this->contactDelete($this->_contactId);
-    $this->eventDelete($this->_eventId);
+    $this->participantDelete($participantID);
+    $this->contactDelete($this->ids['Contact']['individual_0']);
+    $this->eventDelete($this->getEventID());
   }
 
   /**
    * GetValues() method (checking for behavior when params are empty )
    */
-  public function testgetValuesWithoutValidParams() {
+  public function testGetValuesWithoutValidParams(): void {
     $params = $values = $ids = [];
-    $this->participantCreate(['contact_id' => $this->_contactId, 'event_id' => $this->_eventId]);
+    $this->participantCreate(['contact_id' => $this->ids['Contact']['individual_0'], 'event_id' => $this->getEventID()]);
     $fetchParticipant = CRM_Event_BAO_Participant::getValues($params, $values, $ids);
     $this->assertNull($fetchParticipant);
-
-    $this->contactDelete($this->_contactId);
-    $this->eventDelete($this->_eventId);
   }
 
   /**
-   * EventFull() method (checking the event for full )
+   * EventFull() method (checking the event for full).
    */
-  public function testEventFull() {
+  public function testEventFull(): void {
     $eventParams = [
       'max_participants' => 1,
-      'id' => $this->_eventId,
+      'id' => $this->getEventID(),
     ];
     CRM_Event_BAO_Event::add($eventParams);
 
-    $participantId = $this->participantCreate(['contact_id' => $this->_contactId, 'event_id' => $this->_eventId]);
-    $eventFull = CRM_Event_BAO_Participant::eventFull($this->_eventId);
+    $participantId = $this->participantCreate(['contact_id' => $this->ids['Contact']['individual_0'], 'event_id' => $this->getEventID()]);
+    $eventFull = CRM_Event_BAO_Participant::eventFull($this->getEventID());
 
-    $this->assertEquals($eventFull, 'Sorry! We are already full', 'Checking if Event is full.');
+    $this->assertEquals('Sorry! We are already full', $eventFull, 'Checking if Event is full.');
 
     $this->participantDelete($participantId);
-    $this->contactDelete($this->_contactId);
-    $this->eventDelete($this->_eventId);
+    $this->contactDelete($this->ids['Contact']['individual_0']);
+    $this->eventDelete($this->getEventID());
   }
 
   /**
    * ImportableFields() method ( Checking the Event's Importable Fields )
    */
-  public function testimportableFields() {
+  public function testImportableFields(): void {
     $importableFields = CRM_Event_BAO_Participant::importableFields();
-    $this->assertNotEquals(count($importableFields), 0, 'Checking array not to be empty.');
+    $this->assertNotCount(0, $importableFields, 'Checking array not to be empty.');
 
-    $this->contactDelete($this->_contactId);
-    $this->eventDelete($this->_eventId);
+    $this->contactDelete($this->ids['Contact']['individual_0']);
+    $this->eventDelete($this->getEventID());
   }
 
   /**
    * ParticipantDetails() method ( Checking the Participant Details )
    */
-  public function testparticipantDetails() {
-    $participant = $this->callAPISuccess('Participant', 'create', ['contact_id' => $this->_contactId, 'event_id' => $this->_eventId]);
+  public function testParticipantDetails(): void {
+    $participant = $this->callAPISuccess('Participant', 'create', ['contact_id' => $this->ids['Contact']['individual_0'], 'event_id' => $this->getEventID()]);
     $params = ['name' => 'Anderson, Anthony', 'title' => 'Annual CiviCRM meet'];
 
     $participantDetails = CRM_Event_BAO_Participant::participantDetails($participant['id']);
 
-    $this->assertEquals(count($participantDetails), 3, 'Equating the array contains.');
+    $this->assertCount(3, $participantDetails, 'Equating the array contains.');
     $this->assertEquals($participantDetails['name'], $params['name'], 'Checking Name of Participant.');
-    $this->assertEquals($participantDetails['title'], $params['title'], 'Checking Event Title in which participant is enroled.');
+    $this->assertEquals($participantDetails['title'], $params['title'], 'Checking Event Title in which participant is enrolled.');
 
     $this->participantDelete($participant['id']);
-    $this->contactDelete($this->_contactId);
-    $this->eventDelete($this->_eventId);
+    $this->contactDelete($this->ids['Contact']['individual_0']);
+    $this->eventDelete($this->getEventID());
   }
 
   /**
-   * DeleteParticipant() method ( Delete a Participant )
+   * DeleteParticipant() method.
    */
-  public function testdeleteParticipant() {
+  public function testDeleteParticipant(): void {
     $params = [
       'send_receipt' => 1,
       'is_test' => 0,
       'is_pay_later' => 0,
-      'event_id' => $this->_eventId,
-      'register_date' => date('Y-m-d') . " 00:00:00",
+      'event_id' => $this->getEventID(),
+      'register_date' => date('Y-m-d') . ' 00:00:00',
       'role_id' => 1,
       'status_id' => 1,
-      'source' => 'Event_' . $this->_eventId,
-      'contact_id' => $this->_contactId,
+      'source' => 'Event_' . $this->getEventID(),
+      'contact_id' => $this->ids['Contact']['individual_0'],
     ];
 
     // New Participant Created
     $participant = CRM_Event_BAO_Participant::add($params);
 
-    $this->assertDBNotNull('CRM_Event_BAO_Participant', $this->_contactId, 'id',
+    $this->assertDBNotNull('CRM_Event_BAO_Participant', $this->ids['Contact']['individual_0'], 'id',
       'contact_id', 'Check DB for Participant of the contact'
     );
 
     $this->assertDBCompareValue('CRM_Event_BAO_Participant', $participant->id, 'contact_id',
-      'id', $this->_contactId, 'Check DB for contact of the participant'
+      'id', $this->ids['Contact']['individual_0'], 'Check DB for contact of the participant'
     );
 
     CRM_Event_BAO_Participant::deleteParticipant($participant->id);
     $this->assertDBNull('CRM_Event_BAO_Participant', $participant->id, 'contact_id', 'id', 'Check DB for deleted Participant.');
 
-    $this->contactDelete($this->_contactId);
-    $this->eventDelete($this->_eventId);
+    $this->contactDelete($this->ids['Contact']['individual_0']);
+    $this->eventDelete($this->getEventID());
   }
 
   /**
    * CheckDuplicate() method ( Checking for Duplicate Participant returns array of participant id)
    */
-  public function testcheckDuplicate() {
+  public function testCheckDuplicate(): void {
     $duplicate = [];
 
     //Creating 3 new participants
     for ($i = 0; $i < 3; $i++) {
-      $partiId[] = $this->participantCreate(['contact_id' => $this->_contactId, 'event_id' => $this->_eventId]);
+      $partiId[] = $this->participantCreate(['contact_id' => $this->ids['Contact']['individual_0'], 'event_id' => $this->getEventID()]);
     }
 
-    $params = ['event_id' => $this->_eventId, 'contact_id' => $this->_contactId];
+    $params = ['event_id' => $this->getEventID(), 'contact_id' => $this->ids['Contact']['individual_0']];
     CRM_Event_BAO_Participant::checkDuplicate($params, $duplicate);
 
-    $this->assertEquals(count($duplicate), 3, 'Equating the array contains with duplicate array.');
+    $this->assertCount(3, $duplicate, 'Equating the array contains with duplicate array.');
 
     //Checking for the duplicate participant
     foreach ($duplicate as $key => $value) {
-      $this->assertEquals($partiId[$key], $duplicate[$key], 'Equating the contactid which is in the database.');
+      $this->assertEquals($partiId[$key], $value, 'Equating the contact ID which is in the database.');
     }
-
-    //Deleting all participant
-    for ($i = 0; $i < 3; $i++) {
-      $partidel[] = $this->participantDelete($partiId[$i]);
-    }
-
-    $this->contactDelete($this->_contactId);
-    $this->eventDelete($this->_eventId);
   }
 
   /**
-   * Create() method (create and updation of participant)
+   * Create() method (create and updating of participant)
    */
-  public function testCreate() {
+  public function testCreate(): void {
     $params = [
       'send_receipt' => 1,
       'is_test' => 0,
       'is_pay_later' => 0,
-      'event_id' => $this->_eventId,
-      'register_date' => date('Y-m-d') . " 00:00:00",
+      'event_id' => $this->getEventID(),
+      'register_date' => date('Y-m-d') . ' 00:00:00',
       'role_id' => 1,
       'status_id' => 1,
-      'source' => 'Event_' . $this->_eventId,
-      'contact_id' => $this->_contactId,
-      'note' => 'Note added for Event_' . $this->_eventId,
+      'source' => 'Event_' . $this->getEventID(),
+      'contact_id' => $this->ids['Contact']['individual_0'],
+      'note' => 'Note added for Event_' . $this->getEventID(),
     ];
 
     $participant = CRM_Event_BAO_Participant::create($params);
     //Checking for Contact id in the participant table.
-    $pid = $this->assertDBNotNull('CRM_Event_DAO_Participant', $this->_contactId, 'id',
+    $this->assertDBNotNull('CRM_Event_DAO_Participant', $this->ids['Contact']['individual_0'], 'id',
       'contact_id', 'Check DB for Participant of the contact'
     );
 
     //Checking for Activity added in the table for relative participant.
-    $this->assertDBCompareValue('CRM_Activity_DAO_Activity', $this->_contactId, 'source_record_id',
+    $this->assertDBCompareValue('CRM_Activity_DAO_Activity', $this->ids['Contact']['individual_0'], 'source_record_id',
       'source_contact_id', $participant->id, 'Check DB for activity added for the participant'
     );
     //Checking for participant contact_id added to activity target.
-    $params_activity = ['contact_id' => $this->_contactId, 'record_type_id' => 3];
+    $params_activity = ['contact_id' => $this->ids['Contact']['individual_0'], 'record_type_id' => 3];
     $this->assertDBCompareValues('CRM_Activity_DAO_ActivityContact', $params_activity, $params_activity);
 
     $params = array_merge($params, [
@@ -303,145 +286,57 @@ class CRM_Event_BAO_ParticipantTest extends CiviUnitTestCase {
     );
 
     //Checking for Activity added in the table for relative participant.
-    $this->assertDBCompareValue('CRM_Activity_DAO_Activity', $this->_contactId, 'source_record_id',
+    $this->assertDBCompareValue('CRM_Activity_DAO_Activity', $this->ids['Contact']['individual_0'], 'source_record_id',
       'source_contact_id', $participant->id, 'Check DB for activity added for the participant'
     );
     //Checking for participant contact_id added to activity target.
-    $params_activity = ['contact_id' => $this->_contactId, 'record_type_id' => 3];
+    $params_activity = ['contact_id' => $this->ids['Contact']['individual_0'], 'record_type_id' => 3];
     $this->assertDBCompareValues('CRM_Activity_DAO_ActivityContact', $params_activity, $params_activity);
 
-    //Checking for Note added in the table for relative participant.
-    $session = CRM_Core_Session::singleton();
-    $id = $session->get('userID');
-    if (!$id) {
-      $id = $this->_contactId;
-    }
-
     //Deleting the Participant created by create function in this function
     CRM_Event_BAO_Participant::deleteParticipant($participant->id);
-    $this->assertDBNull('CRM_Event_DAO_Participant', $this->_contactId, 'id',
+    $this->assertDBNull('CRM_Event_DAO_Participant', $this->ids['Contact']['individual_0'], 'id',
       'contact_id', 'Check DB for deleted participant. Should be NULL.'
     );
 
-    $this->contactDelete($this->_contactId);
-    $this->eventDelete($this->_eventId);
+    $this->contactDelete($this->ids['Contact']['individual_0']);
+    $this->eventDelete($this->getEventID());
   }
 
   /**
    * ExportableFields() method ( Exportable Fields for Participant)
    */
-  public function testexportableFields() {
+  public function testExportableFields(): void {
     $exportableFields = CRM_Event_BAO_Participant::exportableFields();
-    $this->assertNotEquals(count($exportableFields), 0, 'Checking array not to be empty.');
+    $this->assertNotCount(0, $exportableFields, 'Checking array not to be empty.');
 
-    $this->contactDelete($this->_contactId);
-    $this->eventDelete($this->_eventId);
+    $this->contactDelete($this->ids['Contact']['individual_0']);
+    $this->eventDelete($this->getEventID());
   }
 
   /**
-   * FixEventLevel() method (Setting ',' values), resolveDefaults(assinging value to array) method
+   * FixEventLevel().
    */
-  public function testfixEventLevel() {
-
-    $paramsSet['title'] = 'Price Set';
-    $paramsSet['name'] = CRM_Utils_String::titleToVar('Price Set');
-    $paramsSet['is_active'] = FALSE;
-    $paramsSet['extends'] = 1;
-
-    $priceset = CRM_Price_BAO_PriceSet::create($paramsSet);
-
-    //Checking for priceset added in the table.
-    $this->assertDBCompareValue('CRM_Price_BAO_PriceSet', $priceset->id, 'title',
-      'id', $paramsSet['title'], 'Check DB for created priceset'
-    );
-    $paramsField = [
-      'label' => 'Price Field',
-      'name' => CRM_Utils_String::titleToVar('Price Field'),
-      'html_type' => 'Text',
-      'price' => 10,
-      'option_label' => ['1' => 'Price Field'],
-      'option_value' => ['1' => 10],
-      'option_name' => ['1' => 10],
-      'option_weight' => ['1' => 1],
-      'is_display_amounts' => 1,
-      'weight' => 1,
-      'options_per_line' => 1,
-      'is_active' => ['1' => 1],
-      'price_set_id' => $priceset->id,
-      'is_enter_qty' => 1,
-    ];
-
-    $ids = [];
-    $pricefield = CRM_Price_BAO_PriceField::create($paramsField, $ids);
-
-    //Checking for priceset added in the table.
-    $this->assertDBCompareValue('CRM_Price_BAO_PriceField', $pricefield->id, 'label',
-      'id', $paramsField['label'], 'Check DB for created pricefield'
-    );
-
-    $eventId = $this->_eventId;
-    $participantParams = [
-      'send_receipt' => 1,
-      'is_test' => 0,
-      'is_pay_later' => 0,
-      'event_id' => $eventId,
-      'register_date' => date('Y-m-d') . " 00:00:00",
-      'role_id' => 1,
-      'status_id' => 1,
-      'source' => 'Event_' . $eventId,
-      'contact_id' => $this->_contactId,
-      'note' => 'Note added for Event_' . $eventId,
-      'fee_level' => '\ 1Price_Field - 55\ 1',
-    ];
-
-    $participant = CRM_Event_BAO_Participant::add($participantParams);
-
-    //Checking for participant added in the table.
-    $this->assertDBCompareValue('CRM_Event_BAO_Participant', $this->_contactId, 'id',
-      'contact_id', $participant->id, 'Check DB for created participant'
-    );
-
-    $values = [];
-    $ids = [];
-    $params = ['id' => $participant->id];
-
-    CRM_Event_BAO_Participant::getValues($params, $values, $ids);
-    $this->assertNotEquals(count($values), 0, 'Checking for empty array.');
-
-    CRM_Event_BAO_Participant::resolveDefaults($values[$participant->id]);
-
-    if ($values[$participant->id]['fee_level']) {
-      CRM_Event_BAO_Participant::fixEventLevel($values[$participant->id]['fee_level']);
-    }
-
-    CRM_Price_BAO_PriceField::deleteField($pricefield->id);
-    $this->assertDBNull('CRM_Price_BAO_PriceField', $pricefield->id, 'name',
-      'id', 'Check DB for non-existence of Price Field.'
-    );
-
-    CRM_Price_BAO_PriceSet::deleteSet($priceset->id);
-    $this->assertDBNull('CRM_Price_BAO_PriceSet', $priceset->id, 'title',
-      'id', 'Check DB for non-existence of Price Set.'
-    );
-
-    $this->participantDelete($participant->id);
-    $this->contactDelete($this->_contactId);
-    $this->eventDelete($eventId);
+  public function testFixEventLevel(): void {
+    $fee = CRM_Core_DAO::VALUE_SEPARATOR . 'Blah' . CRM_Core_DAO::VALUE_SEPARATOR . 'blah' . CRM_Core_DAO::VALUE_SEPARATOR;
+    CRM_Event_BAO_Participant::fixEventLevel($fee);
+    $this->assertEquals('Blah, blah', $fee);
   }
 
   /**
    * Test various self-service eligibility scenarios.
    *
    * @dataProvider selfServiceScenarios
-   * @param $selfSvcEnabled
-   * @param $selfSvcHours
-   * @param $hoursToEvent
-   * @param $participantStatusId
-   * @param $isBackOffice
-   * @param $successExpected  A boolean that indicates whether this test should pass or fail.
+   *
+   * @param int $selfSvcEnabled
+   * @param int $selfSvcHours
+   * @param int $hoursToEvent
+   * @param int $participantStatusID
+   * @param bool $isBackOffice
+   * @param bool $successExpected  A boolean that indicates whether this test should pass or fail.
    */
-  public function testGetSelfServiceEligibility($selfSvcEnabled, $selfSvcHours, $hoursToEvent, $participantStatusId, $isBackOffice, $successExpected) {
-    $participantId = $this->participantCreate(['contact_id' => $this->_contactId, 'event_id' => $this->_eventId, 'status_id' => $participantStatusId]);
+  public function testGetSelfServiceEligibility(int $selfSvcEnabled, int $selfSvcHours, $hoursToEvent, $participantStatusID, bool $isBackOffice, bool $successExpected): void {
+    $participantId = $this->participantCreate(['contact_id' => $this->ids['Contact']['individual_0'], 'event_id' => $this->getEventID(), 'status_id' => $participantStatusID]);
     $now = new Datetime();
     if ($hoursToEvent >= 0) {
       $startDate = $now->add(new DateInterval("PT{$hoursToEvent}H"))->format('Y-m-d H:i:s');
@@ -451,17 +346,17 @@ class CRM_Event_BAO_ParticipantTest extends CiviUnitTestCase {
       $startDate = $now->sub(new DateInterval("PT{$hoursAfterEvent}H"))->format('Y-m-d H:i:s');
     }
     $this->callAPISuccess('Event', 'create', [
-      'id' => $this->_eventId,
+      'id' => $this->getEventID(),
       'allow_selfcancelxfer' => $selfSvcEnabled,
       'selfcancelxfer_time' => $selfSvcHours,
       'start_date' => $startDate,
     ]);
-    $url = CRM_Utils_System::url('civicrm/event/info', "reset=1&id={$this->_eventId}");
+    $url = CRM_Utils_System::url('civicrm/event/info', "reset=1&id={$this->getEventID()}");
     $details = CRM_Event_BAO_Participant::getSelfServiceEligibility($participantId, $url, $isBackOffice);
     $this->assertEquals($details['eligible'], $successExpected);
   }
 
-  public function selfServiceScenarios() {
+  public function selfServiceScenarios(): array {
     // Standard pass scenario
     $scenarios[] = [
       'selfSvcEnabled' => 1,

diff --git a/tests/phpunit/CRM/Event/Form/ParticipantTest.php b/tests/phpunit/CRM/Event/Form/ParticipantTest.php
index 9b1c6d9ac0d16f085e577f76e6168db50f0c3f38..290c8ee589cb9d8eca524e907c9e61d912e131ce 100644 (file)
--- a/tests/phpunit/CRM/Event/Form/ParticipantTest.php
+++ b/tests/phpunit/CRM/Event/Form/ParticipantTest.php
@@ -369,7 +369,7 @@ London,',
       $submittedValues = array_merge($this->getRecordContributionParams('Partially paid', 'Pending'), $submittedValues);
     }
     else {
-      $event = $this->eventCreate($eventParams);
+      $event = $this->eventCreateUnpaid($eventParams);
     }
     $submittedValues['event_id'] = $event['id'];
     $_REQUEST['cid'] = $submittedValues['contact_id'];

diff --git a/tests/phpunit/CRM/Event/Form/Registration/RegisterTest.php b/tests/phpunit/CRM/Event/Form/Registration/RegisterTest.php
index 8a9763a2d8503d7215b372e0fe12682acf6e0ac7..17731eb5c24ef147cbbb26c0e05f8c80e340f036 100644 (file)
--- a/tests/phpunit/CRM/Event/Form/Registration/RegisterTest.php
+++ b/tests/phpunit/CRM/Event/Form/Registration/RegisterTest.php
@@ -22,25 +22,25 @@ class CRM_Event_Form_Registration_RegisterTest extends CiviUnitTestCase {
    */
   public function testMinValueForPriceSet(): void {
     $minAmt = 100;
-    $feeAmt = 1000;
-    $event = $this->eventCreate();
-    $form = $this->getEventForm($this->ids['Event'][0]);
-    $priceSetId = $this->eventPriceSetCreate($feeAmt, $minAmt);
-    $priceSet = current(CRM_Price_BAO_PriceSet::getSetDetail($priceSetId));
+    $priceSetID = $this->eventPriceSetCreate(1000, 100);
+    $event = $this->eventCreatePaid([], ['id' => $priceSetID, 'min_amount' => 100]);
+    $form = $this->getEventForm($this->getEventID());
+
+    $priceSet = current(CRM_Price_BAO_PriceSet::getSetDetail($priceSetID));
     $form->_values['fee'] = $form->_feeBlock = $priceSet['fields'];
     $form->_values['event'] = $event;
     $form->_skipDupeRegistrationCheck = 1;
 
-    $priceField = $this->callAPISuccess('PriceField', 'get', ['price_set_id' => $priceSetId]);
+    $priceField = $this->callAPISuccess('PriceField', 'get', ['price_set_id' => $priceSetID]);
     $params = [
       'email-Primary' => 'someone@example.com',
-      'priceSetId' => $priceSetId,
+      'priceSetId' => $priceSetID,
     ];
     // Check empty values for price fields.
     foreach (array_keys($priceField['values']) as $fieldId) {
       $params['price_' . $fieldId] = 0;
     }
-    $form->set('priceSetId', $priceSetId);
+    $form->set('priceSetId', $priceSetID);
     $form->set('priceSet', $priceSet);
     $form->set('name', 'CRM_Event_Form_Registration_Register');
     $files = [];
@@ -64,7 +64,7 @@ class CRM_Event_Form_Registration_RegisterTest extends CiviUnitTestCase {
     CRM_Core_DAO::executeQuery($sql);
 
     // Create an event, fill its participant slots.
-    $event = $this->eventCreate([
+    $event = $this->eventCreateUnpaid([
       'has_waitlist' => 1,
       'max_participants' => 1,
       'start_date' => 20351021,

diff --git a/tests/phpunit/CRM/Event/Form/SearchTest.php b/tests/phpunit/CRM/Event/Form/SearchTest.php
index c84aec970cc81a1dc0570aaa759fcdd72456307f..737f06acb6d51013f122e5447484c74e3fff53cc 100644 (file)
--- a/tests/phpunit/CRM/Event/Form/SearchTest.php
+++ b/tests/phpunit/CRM/Event/Form/SearchTest.php
@@ -18,7 +18,7 @@ class CRM_Event_Form_SearchTest extends CiviUnitTestCase {
   public function setUp(): void {
     parent::setUp();
     $this->individualID = $this->individualCreate();
-    $event = $this->eventCreate();
+    $event = $this->eventCreatePaid();
     $priceFieldValues = $this->createPriceSet('event', $event['id'], [
       'html_type'    => 'Radio',
       'option_label' => ['1' => 'Radio Label A (inc. GST)', '2' => 'Radio Label B (inc. GST)'],