From a24a0be0722cd836fda2c1ae72f122ba3687257d Mon Sep 17 00:00:00 2001 From: Jon goldberg Date: Tue, 28 Apr 2015 10:29:58 -0600 Subject: [PATCH] CRM-13283 - update code to reflect change in schema to ignore_severity --- CRM/Core/BAO/StatusPreference.php | 18 +++++++++--------- api/v3/StatusPreference.php | 2 +- tests/phpunit/api/v3/StatusPreferenceTest.php | 16 ++++++++-------- tests/phpunit/api/v3/SystemCheckTest.php | 8 ++++---- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/CRM/Core/BAO/StatusPreference.php b/CRM/Core/BAO/StatusPreference.php index 12778dfed0..cecec3ec20 100644 --- a/CRM/Core/BAO/StatusPreference.php +++ b/CRM/Core/BAO/StatusPreference.php @@ -48,20 +48,20 @@ class CRM_Core_BAO_StatusPreference extends CRM_Core_DAO_StatusPreference { public static function create($params) { $statusPreference = new CRM_Core_DAO_StatusPreference(); - // Default severity level is 1 (INFO). - if (!$params['minimum_report_severity']) { - $params['minimum_report_severity'] = 1; + // Default severity level to ignore is 0 (DEBUG). + if (!$params['ignore_severity']) { + $params['ignore_severity'] = 0; } - // Severity can be either text ('critical') or an integer <= 8. + // Severity can be either text ('critical') or an integer <= 7. // It's a magic number, but based on PSR-3 standards. - if (!CRM_Utils_Rule::integer($params['minimum_report_severity'])) { - $params['minimum_report_severity'] = CRM_Utils_Check::severityMap($params['minimum_report_severity']); + if (!CRM_Utils_Rule::integer($params['ignore_severity'])) { + $params['ignore_severity'] = CRM_Utils_Check::severityMap($params['ignore_severity']); } - if ($params['minimum_report_severity'] > 8) { - CRM_Core_Error::fatal(ts('You can not pass a severity level higher than 8.')); + if ($params['ignore_severity'] > 7) { + CRM_Core_Error::fatal(ts('You can not pass a severity level higher than 7.')); } // If severity is now blank, you have an invalid severity string. - if (!$params['minimum_report_severity']) { + if (!$params['ignore_severity']) { CRM_Core_Error::fatal(ts('Invalid string passed as severity level.')); } diff --git a/api/v3/StatusPreference.php b/api/v3/StatusPreference.php index 00ef934f4c..0064ef5392 100644 --- a/api/v3/StatusPreference.php +++ b/api/v3/StatusPreference.php @@ -75,5 +75,5 @@ function civicrm_api3_status_preference_delete($params) { function _civicrm_api3_status_preference_create_spec(&$params) { $params['name']['api.required'] = 1; // Status Preference can be integer OR a string. - $params['minimum_report_severity']['type'] = 2; + $params['ignore_severity']['type'] = 2; } diff --git a/tests/phpunit/api/v3/StatusPreferenceTest.php b/tests/phpunit/api/v3/StatusPreferenceTest.php index 804cff324a..d5cec7e158 100644 --- a/tests/phpunit/api/v3/StatusPreferenceTest.php +++ b/tests/phpunit/api/v3/StatusPreferenceTest.php @@ -49,7 +49,7 @@ class api_v3_StatusPreferenceTest extends CiviUnitTestCase { 'name' => 'test_check', 'domain_id' => 1, 'hush_until' => '20151212', - 'minimum_report_severity' => 4, + 'ignore_severity' => 4, 'check_info' => NULL, ); } @@ -59,7 +59,7 @@ class api_v3_StatusPreferenceTest extends CiviUnitTestCase { $this->assertNotNull($result['id'], 'In line ' . __LINE__); $id = $result['id']; $this->assertEquals('test_check', $result['values'][$id]['name'], 'In line ' . __LINE__); - $this->assertEquals(4, $result['values'][$id]['minimum_report_severity'], 'In line ' . __LINE__); + $this->assertEquals(4, $result['values'][$id]['ignore_severity'], 'In line ' . __LINE__); $this->callAPISuccess('StatusPreference', 'delete', array('id' => $result['id'])); } @@ -97,14 +97,14 @@ class api_v3_StatusPreferenceTest extends CiviUnitTestCase { $this->assertEquals($statusPreference['values'][$id]['name'], $result['values'][$id]['name'], 'In line ' . __LINE__); $this->assertEquals($statusPreference['values'][$id]['domain_id'], $result['values'][$id]['domain_id'], 'In line ' . __LINE__); $this->assertEquals('2015-12-12', $result['values'][$id]['hush_until'], 'In line ' . __LINE__); - $this->assertEquals($statusPreference['values'][$id]['minimum_report_severity'], $result['values'][$id]['minimum_report_severity'], 'In line ' . __LINE__); + $this->assertEquals($statusPreference['values'][$id]['ignore_severity'], $result['values'][$id]['ignore_severity'], 'In line ' . __LINE__); } /** - * Ensure you can't create a StatusPref with minimum_report_severity > 8. + * Ensure you can't create a StatusPref with ignore_severity > 7. */ public function testCreateInvalidMinimumReportSeverity() { - $this->_params['minimum_report_severity'] = 45; + $this->_params['ignore_severity'] = 45; $result = $this->callAPIFailure('StatusPreference', 'create', $this->_params); } @@ -113,17 +113,17 @@ class api_v3_StatusPreferenceTest extends CiviUnitTestCase { */ public function testCreateSeverityByName() { // Any permutation of uppercase/lowercase should work. - $this->_params['minimum_report_severity'] = 'cRItical'; + $this->_params['ignore_severity'] = 'cRItical'; $result = $this->callAPIAndDocument('StatusPreference', 'create', $this->_params, __FUNCTION__, __FILE__); $id = $result['id']; - $this->assertEquals(5, $result['values'][$id]['minimum_report_severity'], 'In line ' . __LINE__); + $this->assertEquals(5, $result['values'][$id]['ignore_severity'], 'In line ' . __LINE__); } /** * Test creating an invalid severity by name. */ public function testCreateSeverityWithInvalidName() { - $this->_params['minimum_report_severity'] = 'wdsadasdarning'; + $this->_params['ignore_severity'] = 'wdsadasdarning'; $result = $this->callAPIFailure('StatusPreference', 'create', $this->_params); } diff --git a/tests/phpunit/api/v3/SystemCheckTest.php b/tests/phpunit/api/v3/SystemCheckTest.php index 143b2c471f..928d0504f3 100644 --- a/tests/phpunit/api/v3/SystemCheckTest.php +++ b/tests/phpunit/api/v3/SystemCheckTest.php @@ -72,7 +72,7 @@ class api_v3_SystemCheckTest extends CiviUnitTestCase { public function testSystemCheckHushForever() { $this->_params = array( 'name' => 'checkDefaultMailbox', - 'minimum_report_severity' => 4, + 'ignore_severity' => 4, ); $statusPreference = $this->callAPISuccess('StatusPreference', 'create', $this->_params); $result = $this->callAPISuccess('System', 'check', array()); @@ -92,7 +92,7 @@ class api_v3_SystemCheckTest extends CiviUnitTestCase { $tomorrow = new DateTime('tomorrow'); $this->_params = array( 'name' => 'checkDefaultMailbox', - 'minimum_report_severity' => 4, + 'ignore_severity' => 4, 'hush_until' => $tomorrow->format('Y-m-d'), ); $statusPreference = $this->callAPISuccess('StatusPreference', 'create', $this->_params); @@ -113,7 +113,7 @@ class api_v3_SystemCheckTest extends CiviUnitTestCase { $today = new DateTime('today'); $this->_params = array( 'name' => 'checkDefaultMailbox', - 'minimum_report_severity' => 4, + 'ignore_severity' => 4, 'hush_until' => $today->format('Y-m-d'), ); $statusPreference = $this->callAPISuccess('StatusPreference', 'create', $this->_params); @@ -134,7 +134,7 @@ class api_v3_SystemCheckTest extends CiviUnitTestCase { $yesterday = new DateTime('yesterday'); $this->_params = array( 'name' => 'checkDefaultMailbox', - 'minimum_report_severity' => 4, + 'ignore_severity' => 4, 'hush_until' => $yesterday->format('Y-m-d'), ); $statusPreference = $this->callAPISuccess('StatusPreference', 'create', $this->_params); -- 2.25.1