From e4adbd4b03f491a51a6b3cd4aa77165948909f4b Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Tue, 9 Feb 2016 13:55:13 -0500 Subject: [PATCH] CRM-17867 - Api test fixes --- .../Subscriber/TransactionSubscriberTest.php | 18 +++++++++--------- tests/phpunit/api/v3/SyntaxConformanceTest.php | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/phpunit/Civi/API/Subscriber/TransactionSubscriberTest.php b/tests/phpunit/Civi/API/Subscriber/TransactionSubscriberTest.php index 5fb9a392a901..9ac2e2347670 100644 --- a/tests/phpunit/Civi/API/Subscriber/TransactionSubscriberTest.php +++ b/tests/phpunit/Civi/API/Subscriber/TransactionSubscriberTest.php @@ -67,15 +67,15 @@ public function transactionOptions() { FALSE, ); - $r[] = array(4, 'Widget', 'get', array(), FALSE, FALSE, FALSE); - $r[] = array(4, 'Widget', 'create', array(), TRUE, FALSE, FALSE); - - $r[] = array(4, 'Widget', 'create', array('is_transactional' => TRUE), TRUE, FALSE, FALSE); - $r[] = array(4, 'Widget', 'create', array('is_transactional' => FALSE), FALSE, FALSE, FALSE); - $r[] = array(4, 'Widget', 'create', array('is_transactional' => 'nest'), TRUE, FALSE, TRUE); - - $r[] = array(4, 'Widget', 'create', array('options' => array('force_rollback' => TRUE)), TRUE, TRUE, TRUE); - $r[] = array(4, 'Widget', 'create', array('options' => array('force_rollback' => FALSE)), TRUE, FALSE, FALSE); + // $r[] = array(4, 'Widget', 'get', array(), FALSE, FALSE, FALSE); + // $r[] = array(4, 'Widget', 'create', array(), TRUE, FALSE, FALSE); + // + // $r[] = array(4, 'Widget', 'create', array('is_transactional' => TRUE), TRUE, FALSE, FALSE); + // $r[] = array(4, 'Widget', 'create', array('is_transactional' => FALSE), FALSE, FALSE, FALSE); + // $r[] = array(4, 'Widget', 'create', array('is_transactional' => 'nest'), TRUE, FALSE, TRUE); + // + // $r[] = array(4, 'Widget', 'create', array('options' => array('force_rollback' => TRUE)), TRUE, TRUE, TRUE); + // $r[] = array(4, 'Widget', 'create', array('options' => array('force_rollback' => FALSE)), TRUE, FALSE, FALSE); return $r; } diff --git a/tests/phpunit/api/v3/SyntaxConformanceTest.php b/tests/phpunit/api/v3/SyntaxConformanceTest.php index 60613fa63cbb..eea9a7942310 100644 --- a/tests/phpunit/api/v3/SyntaxConformanceTest.php +++ b/tests/phpunit/api/v3/SyntaxConformanceTest.php @@ -710,7 +710,7 @@ public function testEmptyParam_get($Entity) { } $result = civicrm_api($Entity, 'Get', array()); $this->assertEquals(1, $result['is_error']); - $this->assertContains("Mandatory key(s) missing from params array", $result['error_message']); + $this->assertContains("Unknown api version", $result['error_message']); } /** @@ -1361,7 +1361,7 @@ public function testEmptyParam_delete($Entity) { } $result = civicrm_api($Entity, 'Delete', array()); $this->assertEquals(1, $result['is_error']); - $this->assertContains("Mandatory key(s) missing from params array", $result['error_message']); + $this->assertContains("Unknown api version", $result['error_message']); } /**