projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
INFRA 32 - Batch #17
[civicrm-core.git]
/
tests
/
phpunit
/
CRM
/
Activity
/
BAO
/
ActivityTest.php
diff --git
a/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
b/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
index 74a91049cae25f89eaa336d0588a9a5af37e79bc..f0ecc8f956b7adb62b988382db373cffe67f8491 100644
(file)
--- a/
tests/phpunit/CRM/Activity/BAO/ActivityTest.php
+++ b/
tests/phpunit/CRM/Activity/BAO/ActivityTest.php
@@
-6,32
+6,21
@@
require_once 'CiviTest/Contact.php';
* Class CRM_Activity_BAO_ActivityTest
*/
class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
* Class CRM_Activity_BAO_ActivityTest
*/
class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
- /**
- * @return array
- */
- function get_info() {
- return array(
- 'name' => 'Activity BAOs',
- 'description' => 'Test all Activity_BAO_Activity methods.',
- 'group' => 'CiviCRM BAO Tests',
- );
- }
-
- function setUp() {
+ public function setUp() {
parent::setUp();
}
parent::setUp();
}
- function tearDown() {
+
public
function tearDown() {
// truncate a few tables
$tablesToTruncate = array('civicrm_contact', 'civicrm_activity', 'civicrm_activity_contact');
$this->quickCleanup($tablesToTruncate);
}
/**
// truncate a few tables
$tablesToTruncate = array('civicrm_contact', 'civicrm_activity', 'civicrm_activity_contact');
$this->quickCleanup($tablesToTruncate);
}
/**
- *
t
estcases for create() method
+ *
T
estcases for create() method
* create() method Add/Edit activity.
*/
* create() method Add/Edit activity.
*/
- function testCreate() {
+
public
function testCreate() {
$contactId = Contact::createIndividual();
$params = array(
$contactId = Contact::createIndividual();
$params = array(
@@
-68,10
+57,10
@@
class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
}
/**
}
/**
- *
t
estcase for getContactActivity() method.
+ *
T
estcase for getContactActivity() method.
* getContactActivity() method get activities detail for given target contact id
*/
* getContactActivity() method get activities detail for given target contact id
*/
- function testGetContactActivity() {
+
public
function testGetContactActivity() {
$contactId = Contact::createIndividual();
$params = array(
'first_name' => 'liz',
$contactId = Contact::createIndividual();
$params = array(
'first_name' => 'liz',
@@
-103,11
+92,11
@@
class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
}
/**
}
/**
- *
t
estcase for retrieve() method.
+ *
T
estcase for retrieve() method.
* retrieve($params, $defaults) method return activity detail for given params
* and set defaults.
*/
* retrieve($params, $defaults) method return activity detail for given params
* and set defaults.
*/
- function testRetrieve() {
+
public
function testRetrieve() {
$contactId = Contact::createIndividual();
$params = array(
'first_name' => 'liz',
$contactId = Contact::createIndividual();
$params = array(
'first_name' => 'liz',
@@
-151,10
+140,10
@@
class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
}
/**
}
/**
- *
t
estcase for deleteActivity() method.
+ *
T
estcase for deleteActivity() method.
* deleteActivity($params) method deletes activity for given params.
*/
* deleteActivity($params) method deletes activity for given params.
*/
- function testDeleteActivity() {
+
public
function testDeleteActivity() {
$contactId = Contact::createIndividual();
$params = array(
'first_name' => 'liz',
$contactId = Contact::createIndividual();
$params = array(
'first_name' => 'liz',
@@
-198,10
+187,10
@@
class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
}
/**
}
/**
- *
t
estcase for deleteActivityTarget() method.
+ *
T
estcase for deleteActivityTarget() method.
* deleteActivityTarget($activityId) method deletes activity target for given activity id.
*/
* deleteActivityTarget($activityId) method deletes activity target for given activity id.
*/
- function testDeleteActivityTarget() {
+
public
function testDeleteActivityTarget() {
$contactId = Contact::createIndividual();
$params = array(
'first_name' => 'liz',
$contactId = Contact::createIndividual();
$params = array(
'first_name' => 'liz',
@@
-239,10
+228,10
@@
class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
}
/**
}
/**
- *
t
estcase for deleteActivityAssignment() method.
+ *
T
estcase for deleteActivityAssignment() method.
* deleteActivityAssignment($activityId) method deletes activity assignment for given activity id.
*/
* deleteActivityAssignment($activityId) method deletes activity assignment for given activity id.
*/
- function testDeleteActivityAssignment() {
+
public
function testDeleteActivityAssignment() {
$contactId = Contact::createIndividual();
$params = array(
'first_name' => 'liz',
$contactId = Contact::createIndividual();
$params = array(
'first_name' => 'liz',
@@
-280,9
+269,9
@@
class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
}
/**
}
/**
- *
t
est getActivitiesCount BAO method
+ *
T
est getActivitiesCount BAO method
*/
*/
- function testGetActivitiesCountforAdminDashboard() {
+
public
function testGetActivitiesCountforAdminDashboard() {
$op = new PHPUnit_Extensions_Database_Operation_Insert();
$op->execute($this->_dbconn,
$this->createFlatXMLDataSet(
$op = new PHPUnit_Extensions_Database_Operation_Insert();
$op->execute($this->_dbconn,
$this->createFlatXMLDataSet(
@@
-309,9
+298,9
@@
class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
}
/**
}
/**
- *
t
est getActivitiesCount BAO method
+ *
T
est getActivitiesCount BAO method
*/
*/
- function testGetActivitiesCountforNonAdminDashboard() {
+
public
function testGetActivitiesCountforNonAdminDashboard() {
$op = new PHPUnit_Extensions_Database_Operation_Insert();
$op->execute($this->_dbconn,
$this->createFlatXMLDataSet(
$op = new PHPUnit_Extensions_Database_Operation_Insert();
$op->execute($this->_dbconn,
$this->createFlatXMLDataSet(
@@
-339,9
+328,9
@@
class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
}
/**
}
/**
- *
t
est getActivitiesCount BAO method
+ *
T
est getActivitiesCount BAO method
*/
*/
- function testGetActivitiesCountforContactSummary() {
+
public
function testGetActivitiesCountforContactSummary() {
$op = new PHPUnit_Extensions_Database_Operation_Insert();
$op->execute($this->_dbconn,
$this->createFlatXMLDataSet(
$op = new PHPUnit_Extensions_Database_Operation_Insert();
$op->execute($this->_dbconn,
$this->createFlatXMLDataSet(
@@
-368,9
+357,9
@@
class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
}
/**
}
/**
- *
Function to t
est getActivitiesCount BAO method
+ *
T
est getActivitiesCount BAO method
*/
*/
- function testGetActivitiesCountforContactSummaryWithNoActivities() {
+
public
function testGetActivitiesCountforContactSummaryWithNoActivities() {
$op = new PHPUnit_Extensions_Database_Operation_Insert();
$op->execute($this->_dbconn,
$this->createFlatXMLDataSet(
$op = new PHPUnit_Extensions_Database_Operation_Insert();
$op->execute($this->_dbconn,
$this->createFlatXMLDataSet(
@@
-396,9
+385,9
@@
class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
}
/**
}
/**
- *
Function to t
est getActivities BAO method
+ *
T
est getActivities BAO method
*/
*/
- function testGetActivitiesforAdminDashboard() {
+
public
function testGetActivitiesforAdminDashboard() {
$op = new PHPUnit_Extensions_Database_Operation_Insert();
$op->execute($this->_dbconn,
$this->createFlatXMLDataSet(
$op = new PHPUnit_Extensions_Database_Operation_Insert();
$op->execute($this->_dbconn,
$this->createFlatXMLDataSet(
@@
-421,7
+410,7
@@
class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
//since we are loading activities from dataset, we know total number of activities
// 8 schedule activities that should be shown on dashboard
$count = 8;
//since we are loading activities from dataset, we know total number of activities
// 8 schedule activities that should be shown on dashboard
$count = 8;
- $this->assertEquals($count,
sizeof
($activities), 'In line ' . __LINE__);
+ $this->assertEquals($count,
count
($activities), 'In line ' . __LINE__);
foreach ($activities as $key => $value) {
$this->assertEquals($value['subject'], "subject {$key}", 'Verify activity subject is correct.');
foreach ($activities as $key => $value) {
$this->assertEquals($value['subject'], "subject {$key}", 'Verify activity subject is correct.');
@@
-431,9
+420,9
@@
class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
}
/**
}
/**
- *
Function to t
est getActivities BAO method
+ *
T
est getActivities BAO method
*/
*/
- function testGetActivitiesforNonAdminDashboard() {
+
public
function testGetActivitiesforNonAdminDashboard() {
$op = new PHPUnit_Extensions_Database_Operation_Insert();
$op->execute($this->_dbconn,
$this->createFlatXMLDataSet(
$op = new PHPUnit_Extensions_Database_Operation_Insert();
$op->execute($this->_dbconn,
$this->createFlatXMLDataSet(
@@
-457,7
+446,7
@@
class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
//since we are loading activities from dataset, we know total number of activities for this contact
// 5 activities ( 2 scheduled, 3 Completed ), note that dashboard shows only scheduled activities
$count = 2;
//since we are loading activities from dataset, we know total number of activities for this contact
// 5 activities ( 2 scheduled, 3 Completed ), note that dashboard shows only scheduled activities
$count = 2;
- $this->assertEquals($count,
sizeof
($activities), 'In line ' . __LINE__);
+ $this->assertEquals($count,
count
($activities), 'In line ' . __LINE__);
foreach ($activities as $key => $value) {
$this->assertEquals($value['subject'], "subject {$key}", 'Verify activity subject is correct.');
foreach ($activities as $key => $value) {
$this->assertEquals($value['subject'], "subject {$key}", 'Verify activity subject is correct.');
@@
-474,9
+463,9
@@
class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
}
/**
}
/**
- *
Function to t
est getActivities BAO method
+ *
T
est getActivities BAO method
*/
*/
- function testGetActivitiesforContactSummary() {
+
public
function testGetActivitiesforContactSummary() {
$op = new PHPUnit_Extensions_Database_Operation_Insert();
$op->execute($this->_dbconn,
$this->createFlatXMLDataSet(
$op = new PHPUnit_Extensions_Database_Operation_Insert();
$op->execute($this->_dbconn,
$this->createFlatXMLDataSet(
@@
-500,7
+489,7
@@
class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
//since we are loading activities from dataset, we know total number of activities for this contact
// 5 activities, Contact Summary should show all activities
$count = 5;
//since we are loading activities from dataset, we know total number of activities for this contact
// 5 activities, Contact Summary should show all activities
$count = 5;
- $this->assertEquals($count,
sizeof
($activities), 'In line ' . __LINE__);
+ $this->assertEquals($count,
count
($activities), 'In line ' . __LINE__);
foreach ($activities as $key => $value) {
$this->assertEquals($value['subject'], "subject {$key}", 'Verify activity subject is correct.');
foreach ($activities as $key => $value) {
$this->assertEquals($value['subject'], "subject {$key}", 'Verify activity subject is correct.');
@@
-529,9
+518,9
@@
class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
}
/**
}
/**
- *
Function to t
est getActivities BAO method
+ *
T
est getActivities BAO method
*/
*/
- function testGetActivitiesforContactSummaryWithNoActivities() {
+
public
function testGetActivitiesforContactSummaryWithNoActivities() {
$op = new PHPUnit_Extensions_Database_Operation_Insert();
$op->execute($this->_dbconn,
$this->createFlatXMLDataSet(
$op = new PHPUnit_Extensions_Database_Operation_Insert();
$op->execute($this->_dbconn,
$this->createFlatXMLDataSet(
@@
-553,7
+542,6
@@
class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
//since we are loading activities from dataset, we know total number of activities for this contact
// This contact does not have any activities
//since we are loading activities from dataset, we know total number of activities for this contact
// This contact does not have any activities
- $this->assertEquals(0,
sizeof
($activities), 'In line ' . __LINE__);
+ $this->assertEquals(0,
count
($activities), 'In line ' . __LINE__);
}
}
}
}
-