From f7969dcfb3ccc4dc97df26e5ffc0b2bb5a7432c9 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 6 Jul 2016 10:29:28 +1200
Subject: [PATCH] [NFC] CRM-19033 improve standardisation of tests

NB jenkins is doing wierd things here so trying a small subset to see what jenkins does

Change-Id: Ia4d74eeddff5ea159fbbb4eead9da6ec42028d00
---
 CRM/Member/BAO/Membership.php                 |  2 +-
 .../phpunit/CRM/Activity/BAO/ActivityTest.php | 24 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php
index fabd1cc207..8789a02ef7 100644
--- a/CRM/Member/BAO/Membership.php
+++ b/CRM/Member/BAO/Membership.php
@@ -1308,7 +1308,7 @@ FROM   civicrm_membership, civicrm_contact
 WHERE  civicrm_membership.contact_id = civicrm_contact.id
   AND  civicrm_membership.id = {$id}
 ";
-    return CRM_Core_DAO::singleValueQuery($query, CRM_Core_DAO::$_nullArray);
+    return CRM_Core_DAO::singleValueQuery($query);
   }
 
   /**
diff --git a/tests/phpunit/CRM/Activity/BAO/ActivityTest.php b/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
index 18d949b8a7..8643953b3f 100644
--- a/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
+++ b/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
@@ -21,7 +21,7 @@ class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
    * Test case for create() method.
    */
   public function testCreate() {
-    $contactId = Contact::createIndividual();
+    $contactId = $this->individualCreate();
 
     $params = array(
       'source_contact_id' => $contactId,
@@ -61,12 +61,12 @@ class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
    * getContactActivity() method get activities detail for given target contact id.
    */
   public function testGetContactActivity() {
-    $contactId = Contact::createIndividual();
+    $contactId = $this->individualCreate();
     $params = array(
       'first_name' => 'liz',
       'last_name' => 'hurleey',
     );
-    $targetContactId = Contact::createIndividual($params);
+    $targetContactId = $this->individualCreate($params);
 
     $params = array(
       'source_contact_id' => $contactId,
@@ -76,7 +76,7 @@ class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
       'activity_date_time' => date('Ymd'),
     );
 
-    CRM_Activity_BAO_Activity::create($params);
+    $this->callAPISuccess('Activity', 'create', $params);
 
     $activityId = $this->assertDBNotNull('CRM_Activity_DAO_Activity', 'Scheduling Meeting',
       'id',
@@ -98,12 +98,12 @@ class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
    *                              and set defaults.
    */
   public function testRetrieve() {
-    $contactId = Contact::createIndividual();
+    $contactId = $this->individualCreate();
     $params = array(
       'first_name' => 'liz',
       'last_name' => 'hurleey',
     );
-    $targetContactId = Contact::createIndividual($params);
+    $targetContactId = $this->individualCreate($params);
 
     $params = array(
       'source_contact_id' => $contactId,
@@ -146,12 +146,12 @@ class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
    * deleteActivity($params) method deletes activity for given params.
    */
   public function testDeleteActivity() {
-    $contactId = Contact::createIndividual();
+    $contactId = $this->individualCreate();
     $params = array(
       'first_name' => 'liz',
       'last_name' => 'hurleey',
     );
-    $targetContactId = Contact::createIndividual($params);
+    $targetContactId = $this->individualCreate($params);
 
     $params = array(
       'source_contact_id' => $contactId,
@@ -194,12 +194,12 @@ class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
    * deleteActivityTarget($activityId) method deletes activity target for given activity id.
    */
   public function testDeleteActivityTarget() {
-    $contactId = Contact::createIndividual();
+    $contactId = $this->individualCreate();
     $params = array(
       'first_name' => 'liz',
       'last_name' => 'hurleey',
     );
-    $targetContactId = Contact::createIndividual($params);
+    $targetContactId = $this->individualCreate($params);
 
     $params = array(
       'source_contact_id' => $contactId,
@@ -236,12 +236,12 @@ class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
    * deleteActivityAssignment($activityId) method deletes activity assignment for given activity id.
    */
   public function testDeleteActivityAssignment() {
-    $contactId = Contact::createIndividual();
+    $contactId = $this->individualCreate();
     $params = array(
       'first_name' => 'liz',
       'last_name' => 'hurleey',
     );
-    $assigneeContactId = Contact::createIndividual($params);
+    $assigneeContactId = $this->individualCreate($params);
 
     $params = array(
       'source_contact_id' => $contactId,
-- 
2.25.1