[NFC] [TEST] cleanup, more use of return in ActivityTest

civicrm · Jun 17, 2021 · a2b87ac · a2b87ac
1 parent 183ca91
commit a2b87ac
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 110 deletions.
diff --git a/Civi/Test/Api3TestTrait.php b/Civi/Test/Api3TestTrait.php
@@ -245,9 +245,7 @@ public function callAPISuccessGetSingle($entity, $params, $checkAgainst = NULL)
   }
 
   /**
-   * This function exists to wrap api getValue function & check the result
-   * so we can ensure they succeed & throw exceptions without litterering the test with checks
-   * There is a type check in this
+   * This function wraps the getValue api and checks the result.
    *
    * @param string $entity
    * @param array $params
@@ -261,15 +259,14 @@ public function callAPISuccessGetSingle($entity, $params, $checkAgainst = NULL)
    *   - object
    *
    * @return array|int
-   * @throws \CRM_Core_Exception
    */
   public function callAPISuccessGetValue($entity, $params, $type = NULL) {
     $params += [
       'version' => $this->_apiversion,
     ];
     $result = $this->civicrm_api($entity, 'getvalue', $params);
     if (is_array($result) && (!empty($result['is_error']) || isset($result['values']))) {
-      throw new \CRM_Core_Exception('Invalid getvalue result' . print_r($result, TRUE));
+      $this->fail('Invalid getvalue result' . print_r($result, TRUE));
     }
     if ($type) {
       if ($type === 'integer') {