Skip to content

Commit

Permalink
CRM-17867 - Api test fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
colemanw committed Feb 10, 2016
1 parent 9485b89 commit e4adbd4
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
18 changes: 9 additions & 9 deletions tests/phpunit/Civi/API/Subscriber/TransactionSubscriberTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions tests/phpunit/api/v3/SyntaxConformanceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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']);
}

/**
Expand Down Expand Up @@ -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']);
}

/**
Expand Down

0 comments on commit e4adbd4

Please sign in to comment.