[NFC] Minor test cleanup

diff --git a/tests/phpunit/CRM/Activity/Form/ActivityViewTest.php b/tests/phpunit/CRM/Activity/Form/ActivityViewTest.php
index 757e1851ba36b230179367778b099a64cb5195ed..4982cd59cd95a3ca96b15287ac016e102f85c02b 100644 (file)
--- a/tests/phpunit/CRM/Activity/Form/ActivityViewTest.php
+++ b/tests/phpunit/CRM/Activity/Form/ActivityViewTest.php
@@ -5,11 +5,12 @@
  */
 class CRM_Activity_Form_ActivityViewTest extends CiviUnitTestCase {
 
-  public function setUp() {
-    parent::setUp();
-  }
-
-  public function tearDown() {
+  /**
+   * Cleanup after class.
+   *
+   * @throws \CRM_Core_Exception
+   */
+  public function tearDown(): void {
     $tablesToTruncate = [
       'civicrm_activity',
       'civicrm_activity_contact',
@@ -20,8 +21,11 @@ class CRM_Activity_Form_ActivityViewTest extends CiviUnitTestCase {
   /**
    * Test that the smarty template for ActivityView contains what we expect
    * after preProcess().
+   *
+   * @throws \CRM_Core_Exception
+   * @throws \CiviCRM_API3_Exception
    */
-  public function testActivityViewPreProcess() {
+  public function testActivityViewPreProcess(): void {
     // create activity
     $activity = $this->activityCreate();
 
@@ -38,7 +42,7 @@ class CRM_Activity_Form_ActivityViewTest extends CiviUnitTestCase {
 
     // check one of the smarty template vars
     // not checking EVERYTHING
-    $templateVar = $activityViewForm->getTemplate()->get_template_vars('values');
+    $templateVar = CRM_Activity_Form_ActivityView::getTemplate()->get_template_vars('values');
     $expected = [
       'assignee_contact' => [0 => $activity['target_contact_id']],
       // it's always Julia

diff --git a/tests/phpunit/CRM/Activity/Form/Task/PDFLetterCommonTest.php b/tests/phpunit/CRM/Activity/Form/Task/PDFLetterCommonTest.php
index 361fc0585bce53abd5491960e077380265b15f0a..c52fc647405b5ca7f6e597d5193403a95d96034a 100644 (file)
--- a/tests/phpunit/CRM/Activity/Form/Task/PDFLetterCommonTest.php
+++ b/tests/phpunit/CRM/Activity/Form/Task/PDFLetterCommonTest.php
@@ -6,26 +6,25 @@
  */
 class CRM_Activity_Form_Task_PDFLetterCommonTest extends CiviUnitTestCase {
 
-  public function setUp() {
-    $this->useTransaction(TRUE);
+  /**
+   * Set up for tests.
+   */
+  public function setUp(): void {
+    $this->useTransaction();
     parent::setUp();
   }
 
-  public function tearDown() {
-    parent::tearDown();
-  }
-
   /**
    * Test create a document with basic tokens.
    *
    * @throws \CRM_Core_Exception
    * @throws \CiviCRM_API3_Exception
    */
-  public function testCreateDocumentBasicTokens() {
+  public function testCreateDocumentBasicTokens(): void {
     $activity = $this->activityCreate();
     $data = [
       ['Subject: {activity.subject}', 'Subject: Discussion on warm beer'],
-      ['Date: {activity.activity_date_time}', 'Date: ' . \CRM_Utils_Date::customFormat(date('Ymd')) . ' 12:00 AM'],
+      ['Date: {activity.activity_date_time}', 'Date: ' . CRM_Utils_Date::customFormat(date('Ymd')) . ' 12:00 AM'],
       ['Duration: {activity.duration}', 'Duration: 90'],
       ['Location: {activity.location}', 'Location: Baker Street'],
       ['Details: {activity.details}', 'Details: Lets schedule a meeting'],
@@ -61,29 +60,33 @@ class CRM_Activity_Form_Task_PDFLetterCommonTest extends CiviUnitTestCase {
     $activityIds = CRM_Utils_Array::collect('id', $activities);
     $output = CRM_Activity_Form_Task_PDFLetterCommon::createDocument($activityIds, $html_message, ['is_unit_test' => TRUE]);
     // Should have one row of output per activity
-    $this->assertEquals(count($activities), count($output));
+    $this->assertCount(count($activities), $output);
 
     // Check each line has the correct substitution
     foreach ($output as $key => $line) {
-      $this->assertEquals($line, "Custom: " . $cg['custom_field_group_options'][$activities[$key]['option']]);
+      $this->assertEquals($line, 'Custom: ' . $cg['custom_field_group_options'][$activities[$key]['option']]);
     }
   }
 
-  public function testCreateDocumentSpecialTokens() {
+  /**
+   * @throws \CRM_Core_Exception
+   * @throws \CiviCRM_API3_Exception
+   */
+  public function testCreateDocumentSpecialTokens(): void {
     $this->markTestIncomplete('special tokens not yet merged - see https://github.com/civicrm/civicrm-core/pull/12012');
     $activity = $this->activityCreate();
     $data = [
-      ["Source First Name: {activity.source_first_name}", "Source First Name: Anthony"],
-      ["Target N First Name: {activity.target_N_first_name}", "Target N First Name: Julia"],
-      ["Target 0 First Name: {activity.target_0_first_name}", "Target 0 First Name: Julia"],
-      ["Target 1 First Name: {activity.target_1_first_name}", "Target 1 First Name: Julia"],
-      ["Target 2 First Name: {activity.target_2_first_name}", "Target 2 First Name: "],
-      ["Assignee N First Name: {activity.target_N_first_name}", "Assignee N First Name: Julia"],
-      ["Assignee 0 First Name: {activity.target_0_first_name}", "Assignee 0 First Name: Julia"],
-      ["Assignee 1 First Name: {activity.target_1_first_name}", "Assignee 1 First Name: Julia"],
-      ["Assignee 2 First Name: {activity.target_2_first_name}", "Assignee 2 First Name: "],
-      ["Assignee Count: {activity.assignees_count}", "Assignee Count: 1"],
-      ["Target Count: {activity.targets_count}", "Target Count: 1"],
+      ['Source First Name: {activity.source_first_name}', "Source First Name: Anthony"],
+      ['Target N First Name: {activity.target_N_first_name}', "Target N First Name: Julia"],
+      ['Target 0 First Name: {activity.target_0_first_name}', "Target 0 First Name: Julia"],
+      ['Target 1 First Name: {activity.target_1_first_name}', "Target 1 First Name: Julia"],
+      ['Target 2 First Name: {activity.target_2_first_name}', "Target 2 First Name: "],
+      ['Assignee N First Name: {activity.target_N_first_name}', "Assignee N First Name: Julia"],
+      ['Assignee 0 First Name: {activity.target_0_first_name}', "Assignee 0 First Name: Julia"],
+      ['Assignee 1 First Name: {activity.target_1_first_name}', "Assignee 1 First Name: Julia"],
+      ['Assignee 2 First Name: {activity.target_2_first_name}', "Assignee 2 First Name: "],
+      ['Assignee Count: {activity.assignees_count}', "Assignee Count: 1"],
+      ['Target Count: {activity.targets_count}', "Target Count: 1"],
     ];
     $html_message = "\n" . implode("\n", CRM_Utils_Array::collect('0', $data)) . "\n";
     $output = CRM_Activity_Form_Task_PDFLetterCommon::createDocument([$activity['id']], $html_message, ['is_unit_test' => TRUE]);
@@ -93,12 +96,16 @@ class CRM_Activity_Form_Task_PDFLetterCommonTest extends CiviUnitTestCase {
     }
   }
 
-  public function testCreateDocumentUnknownTokens() {
+  /**
+   * @throws \CRM_Core_Exception
+   * @throws \CiviCRM_API3_Exception
+   */
+  public function testCreateDocumentUnknownTokens(): void {
     $activity = $this->activityCreate();
-    $html_message = "Unknown token: {activity.something_unknown}";
+    $html_message = 'Unknown token: {activity.something_unknown}';
     $output = CRM_Activity_Form_Task_PDFLetterCommon::createDocument([$activity['id']], $html_message, ['is_unit_test' => TRUE]);
     // Unknown tokens should be left alone
-    $this->assertEquals($output[0], $html_message);
+    $this->assertEquals($html_message, $output[0]);
   }
 
 }

diff --git a/tests/phpunit/CRM/Core/ResourcesTest.php b/tests/phpunit/CRM/Core/ResourcesTest.php
index 4adb1aa1ab411c559e9f7a919691761593262ffc..f6d00a1c92ca0d689467871475bbb37fb76d4cee 100644 (file)
--- a/tests/phpunit/CRM/Core/ResourcesTest.php
+++ b/tests/phpunit/CRM/Core/ResourcesTest.php
@@ -35,7 +35,7 @@ class CRM_Core_ResourcesTest extends CiviUnitTestCase {
   protected $originalRequest;
   protected $originalGet;
 
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
 
     list ($this->basedir, $this->container, $this->mapper) = $this->_createMapper();
@@ -55,9 +55,10 @@ class CRM_Core_ResourcesTest extends CiviUnitTestCase {
   /**
    * Restore globals so this test doesn't interfere with others.
    */
-  public function tearDown() {
+  public function tearDown(): void {
     $_REQUEST = $this->originalRequest;
     $_GET = $this->originalGet;
+    parent::tearDown();
   }
 
   public function testCreateBasicBundle() {

diff --git a/tests/phpunit/HelloTest.php b/tests/phpunit/HelloTest.php
index 3c6f4ab655f724e3e577e58e4740c151d63310c5..172d62f358375b650f5c2cb01f16f7e6afbf99f2 100644 (file)
--- a/tests/phpunit/HelloTest.php
+++ b/tests/phpunit/HelloTest.php
@@ -33,13 +33,6 @@ class HelloTest extends PHPUnit\Framework\TestCase {
    */
   public $abc;
 
-  /**
-   * @param string|null $name
-   */
-  public function __construct($name = NULL) {
-    parent::__construct($name);
-  }
-
   /**
    * Called before the test functions will be executed.
    * this function is defined in PHPUnit_TestCase and overwritten
@@ -48,7 +41,7 @@ class HelloTest extends PHPUnit\Framework\TestCase {
   public function setUp() {
     // create a new instance of String with the
     // string 'abc'
-    $this->abc = "hello";
+    $this->abc = 'hello';
   }
 
   /**
@@ -56,7 +49,7 @@ class HelloTest extends PHPUnit\Framework\TestCase {
    * this function is defined in PHPUnit_TestCase and overwritten
    * here.
    */
-  public function tearDown() {
+  public function tearDown(): void {
     // delete your instance
     unset($this->abc);
   }
@@ -64,10 +57,9 @@ class HelloTest extends PHPUnit\Framework\TestCase {
   /**
    * test the toString function.
    */
-  public function testHello() {
+  public function testHello(): void {
     $result = $this->abc;
-    $expected = 'hello';
-    $this->assertEquals($result, $expected);
+    $this->assertEquals('hello', $result);
   }
 
 }