test fixup- changed fn signature doesn't expect 'NULL'

diff --git a/tests/phpunit/CiviTest/CiviUnitTestCase.php b/tests/phpunit/CiviTest/CiviUnitTestCase.php
index e2d4b8efbb5a8b2d7d5aee403da55b69e724cdd4..4728c92c077e016f767c80afb9c6a36f1187782b 100644 (file)
--- a/tests/phpunit/CiviTest/CiviUnitTestCase.php
+++ b/tests/phpunit/CiviTest/CiviUnitTestCase.php
@@ -1568,7 +1568,7 @@ class CiviUnitTestCase extends PHPUnit_Extensions_Database_TestCase {
   function activityCreate($params = NULL) {
 
     if ($params === NULL) {
-      $individualSourceID = $this->individualCreate(NULL);
+      $individualSourceID = $this->individualCreate();
 
       $contactParams = array(
         'first_name' => 'Julia',

diff --git a/tests/phpunit/api/v3/EntityTagTest.php b/tests/phpunit/api/v3/EntityTagTest.php
index a559cac704a5a02305cbcec048a934d1d31ba1ea..1e8d261057c2f39391a7b15f9afcf05388b9ceeb 100644 (file)
--- a/tests/phpunit/api/v3/EntityTagTest.php
+++ b/tests/phpunit/api/v3/EntityTagTest.php
@@ -49,7 +49,7 @@ class api_v3_EntityTagTest extends CiviUnitTestCase {
   function setUp() {
     parent::setUp();
 
-    $this->_individualID = $this->individualCreate(NULL);
+    $this->_individualID = $this->individualCreate();
     $this->_tag = $this->tagCreate();
     $this->_tagID = $this->_tag['id'];
     $this->_householdID = $this->houseHoldCreate(NULL);

diff --git a/tests/phpunit/api/v3/EventTest.php b/tests/phpunit/api/v3/EventTest.php
index 4e72d23243785e4402e177d08cd9c1819eae552b..1320ad7e815f278333bdebfbaeb880fa3d46fd56 100644 (file)
--- a/tests/phpunit/api/v3/EventTest.php
+++ b/tests/phpunit/api/v3/EventTest.php
@@ -384,7 +384,7 @@ class api_v3_EventTest extends CiviUnitTestCase {
      * Trying to delete an event with participants should return error
      */
   function testDeleteWithExistingParticipant() {
-    $contactID = $this->individualCreate(NULL);
+    $contactID = $this->individualCreate();
     $participantID = $this->participantCreate(
       array(
         'contactID' => $contactID,

diff --git a/tests/phpunit/api/v3/GroupContactTest.php b/tests/phpunit/api/v3/GroupContactTest.php
index 555c6278b3d73a55c6b44b3be14b3fd1a09fdaf0..2fad996fb1815eceb57a012a25d169d70eec8879 100644 (file)
--- a/tests/phpunit/api/v3/GroupContactTest.php
+++ b/tests/phpunit/api/v3/GroupContactTest.php
@@ -52,7 +52,7 @@ class api_v3_GroupContactTest extends CiviUnitTestCase {
   function setUp() {
     parent::setUp();
 
-    $this->_contactId = $this->individualCreate(NULL);
+    $this->_contactId = $this->individualCreate();
 
     $this->_groupId1 = $this->groupCreate(NULL);
     $params = array(

diff --git a/tests/phpunit/api/v3/MembershipPaymentTest.php b/tests/phpunit/api/v3/MembershipPaymentTest.php
index 9bde832badef67a46cabc3f1ca13c1268588bd56..b10b85caa5f6659acd75e4d6fce74af2a6c9fb7d 100644 (file)
--- a/tests/phpunit/api/v3/MembershipPaymentTest.php
+++ b/tests/phpunit/api/v3/MembershipPaymentTest.php
@@ -95,7 +95,7 @@ class api_v3_MembershipPaymentTest extends CiviUnitTestCase {
    * Test civicrm_membership_payment_create - success expected.
    */
   public function testCreate() {
-    $contactId = $this->individualCreate(NULL);
+    $contactId = $this->individualCreate();
 
     $params = array(
       'contact_id' => $contactId,
@@ -135,7 +135,7 @@ class api_v3_MembershipPaymentTest extends CiviUnitTestCase {
    * Test civicrm_membershipPayment_get - success expected.
    */
   public function testGet() {
-    $contactId = $this->individualCreate(NULL);
+    $contactId = $this->individualCreate();
     $params = array(
       'contact_id' => $contactId,
       'membership_type_id' => $this->_membershipTypeID,

diff --git a/tests/phpunit/api/v3/MembershipTest.php b/tests/phpunit/api/v3/MembershipTest.php
index 2445872b9eb96e75309a85889a4c53038d9fb982..8595db88b00705aff8bd3ede7077cd584a8e1c41 100644 (file)
--- a/tests/phpunit/api/v3/MembershipTest.php
+++ b/tests/phpunit/api/v3/MembershipTest.php
@@ -53,7 +53,6 @@ class api_v3_MembershipTest extends CiviUnitTestCase {
     $this->_membershipTypeID = $this->membershipTypeCreate(array('member_of_contact_id' => $this->_contactID));
     $this->_membershipStatusID = $this->membershipStatusCreate('test status');
 
-    require_once 'CRM/Member/PseudoConstant.php';
     CRM_Member_PseudoConstant::membershipType(NULL, TRUE);
     CRM_Member_PseudoConstant::membershipStatus(NULL, NULL, 'name', TRUE);
     CRM_Core_PseudoConstant::activityType(TRUE, TRUE, TRUE, 'name');
@@ -307,7 +306,7 @@ class api_v3_MembershipTest extends CiviUnitTestCase {
    */
   function testGetWithRelationship() {
     $membershipOrgId = $this->organizationCreate(NULL);
-    $memberContactId = $this->individualCreate(NULL);
+    $memberContactId = $this->individualCreate();
 
     $relTypeParams = array(
       'name_a_b' => 'Relation 1',

diff --git a/tests/phpunit/api/v3/ParticipantPaymentTest.php b/tests/phpunit/api/v3/ParticipantPaymentTest.php
index 8b853b29ab1d09cffe947b196738c9c02269967b..f0506cad2ca82ed139ce5a200d7dc0ef0f5c1114 100644 (file)
--- a/tests/phpunit/api/v3/ParticipantPaymentTest.php
+++ b/tests/phpunit/api/v3/ParticipantPaymentTest.php
@@ -63,16 +63,16 @@ class api_v3_ParticipantPaymentTest extends CiviUnitTestCase {
     $this->quickCleanup($tablesToTruncate);
     $event = $this->eventCreate(NULL);
     $this->_eventID = $event['id'];
-    $this->_contactID = $this->individualCreate(NULL);
+    $this->_contactID = $this->individualCreate();
     $this->_createdParticipants = array();
-    $this->_individualId = $this->individualCreate(NULL);
+    $this->_individualId = $this->individualCreate();
 
     $this->_participantID = $this->participantCreate(array('contactID' => $this->_contactID, 'eventID' => $this->_eventID));
-    $this->_contactID2 = $this->individualCreate(NULL);
+    $this->_contactID2 = $this->individualCreate();
     $this->_participantID2 = $this->participantCreate(array('contactID' => $this->_contactID2, 'eventID' => $this->_eventID));
     $this->_participantID3 = $this->participantCreate(array('contactID' => $this->_contactID2, 'eventID' => $this->_eventID));
 
-    $this->_contactID3 = $this->individualCreate(NULL);
+    $this->_contactID3 = $this->individualCreate();
     $this->_participantID4 = $this->participantCreate(array('contactID' => $this->_contactID3, 'eventID' => $this->_eventID));
   }
 

diff --git a/tests/phpunit/api/v3/ParticipantTest.php b/tests/phpunit/api/v3/ParticipantTest.php
index 007aff789febc32629338e1b0b16fb20f25c8897..c88ccb7b2c5a1067ea0af39c93d46f227704e417 100644 (file)
--- a/tests/phpunit/api/v3/ParticipantTest.php
+++ b/tests/phpunit/api/v3/ParticipantTest.php
@@ -62,13 +62,13 @@ class api_v3_ParticipantTest extends CiviUnitTestCase {
     $event          = $this->eventCreate(NULL);
     $this->_eventID = $event['id'];
 
-    $this->_contactID = $this->individualCreate(NULL);
+    $this->_contactID = $this->individualCreate();
 
     $this->_createdParticipants = array();
-    $this->_individualId = $this->individualCreate(NULL);
+    $this->_individualId = $this->individualCreate();
 
     $this->_participantID = $this->participantCreate(array('contact_id' => $this->_contactID, 'event_id' => $this->_eventID));
-    $this->_contactID2 = $this->individualCreate(NULL);
+    $this->_contactID2 = $this->individualCreate();
     $this->_participantID2 = $this->participantCreate(array('contact_id' => $this->_contactID2, 'event_id' => $this->_eventID));
     $this->_participantID3 = $this->participantCreate(array('contact_id' => $this->_contactID2, 'event_id' => $this->_eventID));
     $this->_params = array(

diff --git a/tests/phpunit/api/v3/PledgePaymentTest.php b/tests/phpunit/api/v3/PledgePaymentTest.php
index 80e2f5a6f800d372947e49b02285246968b974b9..88d7d07774730ebe79154aba76e1b9d5340d44ab 100644 (file)
--- a/tests/phpunit/api/v3/PledgePaymentTest.php
+++ b/tests/phpunit/api/v3/PledgePaymentTest.php
@@ -49,7 +49,7 @@ class api_v3_PledgePaymentTest extends CiviUnitTestCase {
 
   function setUp() {
     parent::setUp();
-    $this->_individualId = $this->individualCreate(NULL);
+    $this->_individualId = $this->individualCreate();
     $this->_pledgeID = $this->pledgeCreate($this->_individualId);
     $this->_contributionID = $this->contributionCreate($this->_individualId);
   }

diff --git a/tests/phpunit/api/v3/PledgeTest.php b/tests/phpunit/api/v3/PledgeTest.php
index b7c5fbead2ff2f2fc4b73ea8db936b7fd319cdf6..26c3a4ae46b76e8af714c74728ee58a2e9282bb8 100644 (file)
--- a/tests/phpunit/api/v3/PledgeTest.php
+++ b/tests/phpunit/api/v3/PledgeTest.php
@@ -54,7 +54,7 @@ class api_v3_PledgeTest extends CiviUnitTestCase {
     //due to timezone issues
     $this->scheduled_date = date('Ymd', mktime(0, 0, 0, date("m"), date("d") + 2, date("y")));
     $this->_entity = 'Pledge';
-    $this->_individualId = $this->individualCreate(NULL);
+    $this->_individualId = $this->individualCreate();
     $this->_params = array(
       'contact_id' => $this->_individualId,
       'pledge_create_date' => date('Ymd'),

diff --git a/tests/phpunit/api/v3/RelationshipTest.php b/tests/phpunit/api/v3/RelationshipTest.php
index c2c864b6ada7ca5adad10daa9eee0462a72cbbc0..08b98608dd177e5464c6b972cee3d885cd9619d0 100644 (file)
--- a/tests/phpunit/api/v3/RelationshipTest.php
+++ b/tests/phpunit/api/v3/RelationshipTest.php
@@ -53,7 +53,7 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
 
   function setUp() {
     parent::setUp();
-    $this->_cId_a      = $this->individualCreate(NULL);
+    $this->_cId_a      = $this->individualCreate();
     $this->_cId_b      = $this->organizationCreate();
     $this->_cId_b2      = $this->organizationCreate(array('organization_name' => ' Org 2'));
     $this->_entity     = 'relationship';

diff --git a/tests/phpunit/api/v3/RelationshipTypeTest.php b/tests/phpunit/api/v3/RelationshipTypeTest.php
index a0c315e0a6fe0818b7cb1e450e7605fec5e7ca0c..dd16c09b1947b7cfde1109a439e0ff83b283e7bc 100644 (file)
--- a/tests/phpunit/api/v3/RelationshipTypeTest.php
+++ b/tests/phpunit/api/v3/RelationshipTypeTest.php
@@ -75,8 +75,8 @@ class api_v3_RelationshipTypeTest extends CiviUnitTestCase {
   function setUp() {
 
     parent::setUp();
-    $this->_cId_a      = $this->individualCreate(NULL);
-    $this->_cId_b      = $this->organizationCreate(NULL);
+    $this->_cId_a      = $this->individualCreate();
+    $this->_cId_b      = $this->organizationCreate();
   }
 
   function tearDown() {