From 6150b2a0c8fc538fc5db460d4e49e00345f3cf51 Mon Sep 17 00:00:00 2001
From: Monish Deb <monish.deb@jmaconsulting.biz>
Date: Tue, 13 Dec 2016 17:56:22 +0530
Subject: [PATCH] unit test fix

---
 CRM/Activity/BAO/Activity.php       | 12 +++++++-----
 CRM/Contribute/BAO/Contribution.php |  1 +
 tests/phpunit/api/v3/JobTest.php    |  8 ++++----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php
index d12afdc0b0..c436d774bc 100644
--- a/CRM/Activity/BAO/Activity.php
+++ b/CRM/Activity/BAO/Activity.php
@@ -2075,6 +2075,10 @@ WHERE      activity.id IN ($activityIds)";
           'activity_type_id' => $activityType,
         )));
       }
+      if (!empty($params['id'])) {
+        // CRM-13237 : if activity record found, update it with campaign id of contribution
+        $params['campaign_id'] = $activity->campaign_id;
+      }
 
       $date = CRM_Utils_Date::isoToMysql($activity->receive_date);
       $activityType = $component = 'Contribution';
@@ -2101,11 +2105,9 @@ WHERE      activity.id IN ($activityIds)";
       $activityParams['id'] = $activity->activity_id;
     }
     // create activity with target contacts
-    if (!empty($activityParams['source_contact_id'])) {
-      $id = CRM_Core_Session::getLoggedInContactID();
-      if ($id) {
-        $activityParams['source_contact_id'] = $id;
-      }
+    $id = CRM_Core_Session::getLoggedInContactID();
+    if ($id) {
+      $activityParams['source_contact_id'] = $id;
     }
 
     // CRM-14945
diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index fb5a7c9553..e8cc41e1d7 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -576,6 +576,7 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution {
       CRM_Core_DAO::setFieldValue('CRM_Activity_BAO_Activity', $activity['id'], 'campaign_id', $contribution->campaign_id);
       $contribution->activity_id = $activity['id'];
     }
+
     if (empty($contribution->contact_id)) {
       $contribution->find(TRUE);
     }
diff --git a/tests/phpunit/api/v3/JobTest.php b/tests/phpunit/api/v3/JobTest.php
index 83d24adb61..400ef2d0d1 100644
--- a/tests/phpunit/api/v3/JobTest.php
+++ b/tests/phpunit/api/v3/JobTest.php
@@ -369,10 +369,10 @@ class api_v3_JobTest extends CiviUnitTestCase {
     $this->callAPISuccessGetCount('Membership', array('contact_id' => $contact2ID), 0);
     $this->callAPISuccessGetCount('EntityTag', array('contact_id' => $contactID), 2);
     $this->callAPISuccessGetCount('EntityTag', array('contact_id' => $contact2ID), 0);
-    // 12 activities is one for each contribution (2), one for each membership (+2 = 4)
-    // 3 for each of the added activities as there are 3 roles (+6 = 10
-    // 2 for the (source & target) contact merged activity (+2 = 12)
-    $this->callAPISuccessGetCount('ActivityContact', array('contact_id' => $contactID), 12);
+    // 14 activities is one for each contribution (2), two (source + target) for each membership (+(2x2) = 6)
+    // 3 for each of the added activities as there are 3 roles (+6 = 12
+    // 2 for the (source & target) contact merged activity (+2 = 14)
+    $this->callAPISuccessGetCount('ActivityContact', array('contact_id' => $contactID), 14);
     // 2 for the connection to the deleted by merge activity (source & target)
     $this->callAPISuccessGetCount('ActivityContact', array('contact_id' => $contact2ID), 2);
   }
-- 
2.25.1