From 2ffda55d28743afc2d20f4b63e2c401263ce0f12 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Thu, 8 Jan 2015 18:31:57 -0800 Subject: [PATCH] INFRA-132 - tests/- Fix misc oddball syntax --- tests/mailing_test/controllerTest.js | 3 +-- tests/phpunit/CRM/Core/TransactionTest.php | 2 +- tests/phpunit/WebTest/Event/AddParticipationTest.php | 2 -- tests/phpunit/api/v3/ACLPermissionTest.php | 1 - tests/phpunit/api/v3/SyntaxConformanceTest.php | 1 - tests/qunit/crm-api3/test.js | 1 - 6 files changed, 2 insertions(+), 8 deletions(-) diff --git a/tests/mailing_test/controllerTest.js b/tests/mailing_test/controllerTest.js index c2341ef83c..ded9788d66 100644 --- a/tests/mailing_test/controllerTest.js +++ b/tests/mailing_test/controllerTest.js @@ -15,6 +15,5 @@ describe('Mailing Controllers', function() { expect(scope.cool_api.length).toBe(3); }); - }); + }); }); - diff --git a/tests/phpunit/CRM/Core/TransactionTest.php b/tests/phpunit/CRM/Core/TransactionTest.php index a6da28bad3..a0df74d55e 100644 --- a/tests/phpunit/CRM/Core/TransactionTest.php +++ b/tests/phpunit/CRM/Core/TransactionTest.php @@ -371,7 +371,7 @@ class CRM_Core_TransactionTest extends CiviUnitTestCase { * 'rollback'|'implicit-commit'|'explicit-commit' how to finish transaction. * @return int cid */ - public function runBatch($nesting, $callbacks, $existsByOffset, $outcome) { + public function runBatch($nesting, $callbacks, $existsByOffset, $outcome) { if ($nesting != 'reuse-tx' && $nesting != 'nest-tx') { throw new RuntimeException('Bad test data: nesting=' . $nesting); } diff --git a/tests/phpunit/WebTest/Event/AddParticipationTest.php b/tests/phpunit/WebTest/Event/AddParticipationTest.php index 4267e0e37d..f144ca6042 100644 --- a/tests/phpunit/WebTest/Event/AddParticipationTest.php +++ b/tests/phpunit/WebTest/Event/AddParticipationTest.php @@ -410,8 +410,6 @@ class WebTest_Event_AddParticipationTest extends CiviSeleniumTestCase { } /** - * @param string $firstName - * @param string $lastName * @param int $processorId */ public function _fillParticipantDetails($processorId) { diff --git a/tests/phpunit/api/v3/ACLPermissionTest.php b/tests/phpunit/api/v3/ACLPermissionTest.php index a9c5f57488..95febd633c 100644 --- a/tests/phpunit/api/v3/ACLPermissionTest.php +++ b/tests/phpunit/api/v3/ACLPermissionTest.php @@ -124,7 +124,6 @@ class api_v3_ACLPermissionTest extends CiviUnitTestCase { * Confirm that without check permissions we still get 2 contacts returned */ public function testContactGetHookLimitingHookDontCheck() { - // $result = $this->callAPISuccess('contact', 'get', array( 'check_permissions' => 0, 'return' => 'display_name', diff --git a/tests/phpunit/api/v3/SyntaxConformanceTest.php b/tests/phpunit/api/v3/SyntaxConformanceTest.php index 791b8d2940..d5c61f15a5 100644 --- a/tests/phpunit/api/v3/SyntaxConformanceTest.php +++ b/tests/phpunit/api/v3/SyntaxConformanceTest.php @@ -893,7 +893,6 @@ class api_v3_SyntaxConformanceTest extends CiviUnitTestCase { $this->markTestIncomplete("fixing this test to test the api functions fails on numberous tests which will either create a completely blank entity (batch, participant status) or have a damn good crack at it (e.g mailing job). Marking this as incomplete beats false success"); - // return; if (in_array($Entity, $this->toBeImplemented['create'])) { // $this->markTestIncomplete("civicrm_api3_{$Entity}_create to be implemented"); diff --git a/tests/qunit/crm-api3/test.js b/tests/qunit/crm-api3/test.js index 35cd165f34..fdf48cd8d2 100644 --- a/tests/qunit/crm-api3/test.js +++ b/tests/qunit/crm-api3/test.js @@ -1,4 +1,3 @@ - /* ------------ Test cases ------------ */ module('api single'); -- 2.25.1