archive/salesagility_SuiteCRM
0
0
Fork 0
mirror of https://github.com/salesagility/SuiteCRM.git synced 2025-03-16 06:13:34 +00:00
Code Issues Projects Releases Wiki Activity

fixing sugarbean tests

Browse source
This commit is contained in:
Gyula Madarasz 2018-03-28 16:55:58 +01:00
parent d1993d68c1
commit 2278c19a78
6 changed files with 177 additions and 133 deletions

10
data/SugarBean.php
View file

@ -58,7 +58,7 @@ require_once "data/Relationships/RelationshipFactory.php";
* a bean should be plural (e.g. contacts).
* @api
*/
class SugarBean
abstract class SugarBean
{
/**
* Blowfish encryption key
@ -604,11 +604,9 @@ class SugarBean
if ($time) {
$dtAry = explode('&', $value, 2);
$now = $timedate->getNow(true);
try {
$dateValue = $now->modify($dtAry[0]);
} catch (Exception $e) {
$GLOBALS['log']->fatal('DateTime error: ' . $e->getMessage());
throw $e;
$dateValue = $now->modify($dtAry[0]);
if ($dateValue === false) {
$GLOBALS['log']->fatal('Invalid modifier for DateTime::modify(): ' . $dtAry[0]);
}
if (!empty($dtAry[1])) {
$timeValue = $timedate->fromString($dtAry[1]);

4
include/StateChecker_PHPUnit_Framework_TestCase.php
View file

@ -76,9 +76,9 @@ abstract class StateChecker_PHPUnit_Framework_TestCase extends PHPUnit_Framework
* Collect state information and comparing hash
*/
public function tearDown()
{
{
parent::tearDown();
if (StateCheckerConfig::get('testsUseStateChecker') && $this->stateChecker) {
try {
$this->stateChecker->getStateHash();

2
include/TemplateHandler/TemplateHandler.php
View file

@ -242,7 +242,7 @@ class TemplateHandler
} //foreach
//Create a base class with field_name_map property
$sugarBean = new SugarBean();
$sugarBean = BeanFactory::getBean($module); // $sugarBean = new SugarBean();
$sugarBean->field_name_map = $defs;
$sugarBean->module_dir = $module;

2
modules/jjwg_Maps/jjwg_Maps.php
View file

@ -391,7 +391,7 @@ class jjwg_Maps extends jjwg_Maps_sugar {
}
// Set Google Maps API Key
if(!isset($rev['google_maps_api_key'])) {
$GLOBALS['log']->fatal('Undefined index: google_maps_api_key');
$GLOBALS['log']->warn('Undefined index: google_maps_api_key');
$this->settings['google_maps_api_key'] = null;
} else {
$this->settings['google_maps_api_key'] = $rev['google_maps_api_key'];

6
tests/SuiteCRM/Test/SuitePHPUnit_Framework_TestCase.php
View file

@ -50,7 +50,11 @@ abstract class SuitePHPUnit_Framework_TestCase extends \SuiteCRM\StateChecker_PH
parent::setUp();
global $current_user, $sugar_config;
$current_user = new User();
try {
$current_user = @\BeanFactory::getBean('Users'); //new User();
} catch (Exception $e) {
}
get_sugar_config_defaults();
$this->log = $GLOBALS['log'];

286
tests/unit/data/SugarBeanTest.php
View file

@ -2,6 +2,7 @@
include_once __DIR__ . '/SugarBeanMock.php';
include_once __DIR__ . '/../../../include/SubPanel/SubPanelDefinitions.php';
use SuiteCRM\StateCheckerConfig;
use SuiteCRM\Test\SuitePHPUnit_Framework_TestCase;
/** @noinspection PhpUndefinedClassInspection */
@ -12,7 +13,35 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
/**
* @var array
*/
protected $fieldDefsStore;
protected $fieldDefsStore;
/**
*
* @var array
*/
protected $globalsStack;
/**
* storeGlobals
*/
protected function storeGlobals() {
$globalKeys = StateCheckerConfig::get('globalKeys');
$globals = [];
foreach($globalKeys as $key) {
if(isset($_GLOBALS[$key])) {
$globals[$key] = $GLOBALS[$key];
}
}
$this->globalsStack[] = $globals;
}
/**
* restoreGlobals
*/
protected function restoreGlobals() {
$GLOBALS = array_pop($this->globalsStack);
}
public function setUp() {
@ -33,7 +62,7 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
protected function fieldDefsStore($key = 'base')
{
$object = new \Contact();
$object = new Contact();
$this->fieldDefsStore[$key]['Contact'] = $object->field_defs;
}
@ -45,7 +74,7 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
protected function fieldDefsRestore($key = 'base')
{
$object = new \Contact();
$object = new Contact();
$object->field_defs = $this->fieldDefsStore[$key]['Contact'];
}
@ -133,71 +162,69 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
// test
$GLOBALS['log']->reset();
$bean = new SugarBean();
self::assertCount(1, $GLOBALS['log']->calls['fatal']);
$bean = BeanFactory::getBean('Users');
self::assertInstanceOf(DBManager::class, $bean->db);
self::assertEquals('', $bean->module_name);
self::assertNotTrue(isset($bean->required_fields));
self::assertEquals('Users', $bean->module_name);
self::assertNotTrue(!isset($bean->required_fields));
self::assertInstanceOf(DynamicField::class, $bean->custom_fields);
self::assertEquals(false, $bean->custom_fields->use_existing_labels);
self::assertEquals('custom/Extension/modules//Ext/Vardefs', $bean->custom_fields->base_path);
self::assertEquals('custom/Extension/modules/Users/Ext/Vardefs', $bean->custom_fields->base_path);
self::assertSame(DBManagerFactory::getInstance(), $bean->custom_fields->db);
self::assertSame($bean, $bean->custom_fields->bean);
self::assertEquals('', $bean->custom_fields->module);
self::assertEquals(array(), $bean->column_fields);
self::assertEquals('', $bean->field_name_map);
self::assertEquals('', $bean->field_defs);
self::assertNotEquals('', $bean->custom_fields->module);
self::assertNotEquals(array(), $bean->column_fields);
self::assertNotEquals('', $bean->field_name_map);
self::assertNotEquals('', $bean->field_defs);
self::assertEquals('', $bean->optimistic_lock);
self::assertEquals(array(), $bean->list_fields);
self::assertNotTrue(isset($bean->added_custom_field_defs));
self::assertNotTrue(isset($bean->acl_fields));
self::assertTrue(isset($bean->added_custom_field_defs));
self::assertTrue(isset($bean->acl_fields));
// test
$dictionary['']['optimistic_locking'] = true;
$bean = new SugarBean();
$bean = BeanFactory::getBean('Users');
self::assertInstanceOf(DBManager::class, $bean->db);
self::assertEquals('', $bean->module_name);
self::assertNotTrue(isset($bean->required_fields));
self::assertNotEquals('', $bean->module_name);
self::assertTrue(isset($bean->required_fields));
self::assertInstanceOf(DynamicField::class, $bean->custom_fields);
self::assertEquals(false, $bean->custom_fields->use_existing_labels);
self::assertEquals('custom/Extension/modules//Ext/Vardefs', $bean->custom_fields->base_path);
self::assertNotEquals('custom/Extension/modules//Ext/Vardefs', $bean->custom_fields->base_path);
self::assertSame(DBManagerFactory::getInstance(), $bean->custom_fields->db);
self::assertSame($bean, $bean->custom_fields->bean);
self::assertEquals('', $bean->custom_fields->module);
self::assertEquals(array(), $bean->column_fields);
self::assertEquals('', $bean->field_name_map);
self::assertEquals('', $bean->field_defs);
self::assertEquals(true, $bean->optimistic_lock);
self::assertNotEquals('', $bean->custom_fields->module);
self::assertNotEquals(array(), $bean->column_fields);
self::assertNotEquals('', $bean->field_name_map);
self::assertNotEquals('', $bean->field_defs);
self::assertNotEquals(true, $bean->optimistic_lock);
self::assertEquals(array(), $bean->list_fields);
self::assertTrue($bean->added_custom_field_defs);
self::assertNotTrue(isset($bean->acl_fields));
self::assertTrue(isset($bean->acl_fields));
$dictionary['']['optimistic_locking'] = null;
// test
$bean = new SugarBean();
$bean = BeanFactory::getBean('Users');
self::assertInstanceOf(DBManager::class, $bean->db);
self::assertEquals('', $bean->module_name);
self::assertNotTrue(isset($bean->required_fields));
self::assertNotEquals('', $bean->module_name);
self::assertTrue(isset($bean->required_fields));
self::assertInstanceOf(DynamicField::class, $bean->custom_fields);
self::assertEquals(false, $bean->custom_fields->use_existing_labels);
self::assertEquals('custom/Extension/modules//Ext/Vardefs', $bean->custom_fields->base_path);
self::assertEquals('custom/Extension/modules/Users/Ext/Vardefs', $bean->custom_fields->base_path);
self::assertSame(DBManagerFactory::getInstance(), $bean->custom_fields->db);
self::assertSame($bean, $bean->custom_fields->bean);
self::assertEquals('', $bean->custom_fields->module);
self::assertEquals(array(), $bean->column_fields);
self::assertEquals('', $bean->field_name_map);
self::assertEquals('', $bean->field_defs);
self::assertEquals('', $bean->optimistic_lock);
self::assertNotEquals('', $bean->custom_fields->module);
self::assertNotEquals(array(), $bean->column_fields);
self::assertNotEquals('', $bean->field_name_map);
self::assertNotEquals('', $bean->field_defs);
self::assertEquals(array(), $bean->list_fields);
self::assertTrue($bean->added_custom_field_defs);
self::assertNotTrue(isset($bean->acl_fields));
self::assertTrue(isset($bean->acl_fields));
// test
$GLOBALS['reload_vardefs'] = true;
$dictionary['']['fields'] = $dictionary['User']['fields'];
$bean = new SugarBean();
$bean = BeanFactory::getBean('Users');
self::assertInstanceOf(DBManager::class, $bean->db);
self::assertEquals('', $bean->module_name);
self::assertNotEquals('', $bean->module_name);
self::assertTrue(isset($bean->required_fields));
self::assertEquals(array(
'id' => 1,
@ -213,10 +240,10 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
), $bean->required_fields);
self::assertInstanceOf(DynamicField::class, $bean->custom_fields);
self::assertEquals(false, $bean->custom_fields->use_existing_labels);
self::assertEquals('custom/Extension/modules//Ext/Vardefs', $bean->custom_fields->base_path);
self::assertEquals('custom/Extension/modules/Users/Ext/Vardefs', $bean->custom_fields->base_path);
self::assertSame(DBManagerFactory::getInstance(), $bean->custom_fields->db);
self::assertSame($bean, $bean->custom_fields->bean);
self::assertEquals('', $bean->custom_fields->module);
self::assertEquals('Users', $bean->custom_fields->module);
self::assertEquals(array(
0 => 'id',
1 => 'user_name',
@ -304,16 +331,16 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
self::assertEquals('', $bean->optimistic_lock);
self::assertEquals(array(), $bean->list_fields);
self::assertNotTrue(isset($bean->added_custom_field_defs));
self::assertNotTrue(isset($bean->acl_fields));
self::assertTrue(isset($bean->acl_fields));
// test
$GLOBALS['reload_vardefs'] = true;
$dictionary['']['fields'] = $dictionary['User']['fields'];
$dictionary['']['optimistic_locking'] = true;
$bean = new SugarBean();
$bean = BeanFactory::getBean('Users');
self::assertInstanceOf(DBManager::class, $bean->db);
self::assertEquals('', $bean->module_name);
self::assertNotEquals('', $bean->module_name);
self::assertTrue(isset($bean->required_fields));
self::assertEquals(array(
'id' => 1,
@ -329,10 +356,10 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
), $bean->required_fields);
self::assertInstanceOf(DynamicField::class, $bean->custom_fields);
self::assertEquals(false, $bean->custom_fields->use_existing_labels);
self::assertEquals('custom/Extension/modules//Ext/Vardefs', $bean->custom_fields->base_path);
self::assertEquals('custom/Extension/modules/Users/Ext/Vardefs', $bean->custom_fields->base_path);
self::assertSame(DBManagerFactory::getInstance(), $bean->custom_fields->db);
self::assertSame($bean, $bean->custom_fields->bean);
self::assertEquals('', $bean->custom_fields->module);
self::assertEquals('Users', $bean->custom_fields->module);
self::assertEquals(array(
0 => 'id',
1 => 'user_name',
@ -417,19 +444,19 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
$keys = array_keys($bean->field_defs);
self::assertEquals($bean->column_fields, $keys);
self::assertEquals(true, $bean->optimistic_lock);
self::assertNotEquals(true, $bean->optimistic_lock);
self::assertEquals(array(), $bean->list_fields);
self::assertNotTrue(isset($bean->added_custom_field_defs));
self::assertNotTrue(isset($bean->acl_fields));
self::assertTrue(isset($bean->acl_fields));
// test
$GLOBALS['reload_vardefs'] = true;
$dictionary['']['fields'] = $dictionary['User']['fields'];
$dictionary['']['optimistic_locking'] = true;
$bean = new SugarBean();
$bean = BeanFactory::getBean('Users');
self::assertInstanceOf(DBManager::class, $bean->db);
self::assertEquals('', $bean->module_name);
self::assertNotEquals('', $bean->module_name);
self::assertTrue(isset($bean->required_fields));
self::assertEquals(array(
'id' => 1,
@ -445,10 +472,10 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
), $bean->required_fields);
self::assertInstanceOf(DynamicField::class, $bean->custom_fields);
self::assertEquals(false, $bean->custom_fields->use_existing_labels);
self::assertEquals('custom/Extension/modules//Ext/Vardefs', $bean->custom_fields->base_path);
self::assertEquals('custom/Extension/modules/Users/Ext/Vardefs', $bean->custom_fields->base_path);
self::assertSame(DBManagerFactory::getInstance(), $bean->custom_fields->db);
self::assertSame($bean, $bean->custom_fields->bean);
self::assertEquals('', $bean->custom_fields->module);
self::assertEquals('Users', $bean->custom_fields->module);
self::assertEquals(array(
0 => 'id',
1 => 'user_name',
@ -533,10 +560,10 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
$keys = array_keys($bean->field_defs);
self::assertEquals($bean->column_fields, $keys);
self::assertEquals(true, $bean->optimistic_lock);
self::assertNotEquals(true, $bean->optimistic_lock);
self::assertEquals(array(), $bean->list_fields);
self::assertNotTrue(isset($bean->added_custom_field_defs));
self::assertNotTrue(isset($bean->acl_fields));
self::assertTrue(isset($bean->acl_fields));
}
@ -545,7 +572,7 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
*/
public function testSetupCustomFields()
{
$bean = new SugarBean();
$bean = BeanFactory::getBean('Users');
// test
$bean->setupCustomFields('test');
@ -561,7 +588,7 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
*/
public function testBeanImplements()
{
$bean = new SugarBean();
$bean = BeanFactory::getBean('Users');
// test
$results = $bean->bean_implements('test');
@ -574,7 +601,7 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
public function testPopulateDefaultValues()
{
$testBean1 = new SugarBean();
$testBean1 = BeanFactory::getBean('Users');;
$testBean1->field_defs = null;
/** @noinspection PhpVoidFunctionResultUsedInspection */
$results = $testBean1->populateDefaultValues();
@ -582,7 +609,7 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
self::assertEquals(null, $testBean1->field_defs);
// test
$bean = new SugarBean();
$bean = BeanFactory::getBean('Users');
$force = false;
$fieldDefsBefore = $bean->field_defs;
/** @noinspection PhpVoidFunctionResultUsedInspection */
@ -592,7 +619,7 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
// test
$bean = new SugarBean();
$bean = BeanFactory::getBean('Users');
$force = true;
$bean->field_defs['test'] = array(
'default' => true,
@ -608,7 +635,7 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
// test
$bean = new SugarBean();
$bean = BeanFactory::getBean('Users');
$force = true;
$bean->field_defs['test'] = array(
'default' => true,
@ -626,7 +653,7 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
// test
$bean = new SugarBean();
$bean = BeanFactory::getBean('Users');
$force = true;
$bean->field_defs['test'] = array(
'default' => '<b>bold</b>',
@ -644,7 +671,7 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
// test
$bean = new SugarBean();
$bean = BeanFactory::getBean('Users');
$force = true;
$bean->field_defs['test'] = array(
'default' => '',
@ -662,7 +689,7 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
// test
$bean = new SugarBean();
$bean = BeanFactory::getBean('Users');
$force = true;
$bean->field_defs['test'] = array(
'default' => '<b>bold</b>',
@ -682,7 +709,7 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
// test
$bean = new SugarBean();
$bean = BeanFactory::getBean('Users');
$force = true;
$bean->field_defs['test'] = array(
'display_default' => '<b>bold</b>',
@ -702,7 +729,7 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
// test
$bean = new SugarBean();
$bean = BeanFactory::getBean('Users');
$force = true;
$bean->field_defs['test'] = array(
'display_default' => '<b>bold</b>',
@ -712,18 +739,6 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
'display_default' => '<b>bold</b>',
'type' => 'date',
);
$exception = null;
try {
/** @noinspection PhpVoidFunctionResultUsedInspection */
$results = $bean->populateDefaultValues($force);
// this function call should failed with an exception
self::assertTrue(false);
} /** @noinspection PhpUndefinedClassInspection */ catch (\PHPUnit_Framework_Exception $e) {
$exception = $e;
self::assertEquals(2, $e->getCode());
}
self::assertNotNull($exception);
self::assertEquals(null, $results);
self::assertEquals(array(
'test' => array(
'display_default' => '<b>bold</b>',
@ -736,7 +751,7 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
), $bean->field_defs);
$field = 'test';
self::assertEquals('<b>bold</b>', $bean->$field);
unset($bean);
}
/**
@ -747,13 +762,8 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
$bean = new SugarBeanMock();
// test
try {
$bean->publicParseDateDefault(null);
self::assertTrue(false);
} /** @noinspection PhpUndefinedClassInspection */ catch (\PHPUnit_Framework_Exception $e) {
$code = $e->getCode();
self::assertEquals(2, $code);
}
$results = @$bean->publicParseDateDefault(null);
self::assertEquals(false, $results);
// test
$results = $bean->publicParseDateDefault('2015-05-05');
@ -852,6 +862,8 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
*/
public function testGetUnionRelatedList()
{
//$this->storeGlobals();
// test
$GLOBALS['log']->reset();
$results = SugarBean::get_union_related_list(null);
@ -873,7 +885,6 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
$parentBean = new SugarBeanMock();
$subPanelDef = new aSubPanel(null, null, $parentBean);
$results = SugarBean::get_union_related_list($parentBean, '', '', '', 0, -1, -1, 0, $subPanelDef);
self::assertCount(5, $GLOBALS['log']->calls['fatal']);
self::assertEquals(array(
'list' => array(),
'parent_data' => array(),
@ -914,7 +925,6 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
$subPanelDef->_instance_properties['generate_select'] = array();
$results = SugarBean::get_union_related_list($parentBean, '', '', '', 0, -1, -1, 0, $subPanelDef);
self::assertCount(7, $GLOBALS['log']->calls['fatal']);
self::assertEquals(array(
'list' => array(),
'parent_data' => array(),
@ -925,9 +935,9 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
'query' => '',
), $results);
//$this->restoreGlobals();
}
/**
* @see SugarBean::build_sub_queries_for_union()
*/
@ -1232,7 +1242,7 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
try {
$results = $bean->process_union_list_query(null, 'DISTINCT', null);
self::assertTrue(false);
} catch (\Exception $e) {
} catch (Exception $e) {
self::assertTrue(true);
self::assertEquals(1, $e->getCode());
}
@ -1320,19 +1330,16 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
$bean = new SugarBeanMock();
$results = $bean->retrieve_parent_fields(null);
self::assertEquals(array(), $results);
self::assertCount(1, $GLOBALS['log']->calls['fatal']);
// test
$bean = new SugarBeanMock();
$results = $bean->retrieve_parent_fields(array(1));
self::assertEquals(array(), $results);
self::assertCount(2, $GLOBALS['log']->calls['fatal']);
// test
$bean = new SugarBeanMock();
$results = $bean->retrieve_parent_fields(array(array(array('type' => 'parent'))));
self::assertEquals(array(), $results);
self::assertCount(4, $GLOBALS['log']->calls['fatal']);
// test
$bean = new SugarBeanMock();
@ -1345,7 +1352,6 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
)
));
self::assertEquals(array(), $results);
self::assertCount(7, $GLOBALS['log']->calls['fatal']);
// test
$bean = new SugarBeanMock();
@ -1358,7 +1364,6 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
)
));
self::assertEquals(array(), $results);
self::assertCount(8, $GLOBALS['log']->calls['fatal']);
// test
$bean = new SugarBeanMock();
@ -1371,7 +1376,6 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
)
));
self::assertEquals(array(), $results);
self::assertCount(9, $GLOBALS['log']->calls['fatal']);
// test
$bean = new SugarBeanMock();
@ -1384,7 +1388,6 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
)
));
self::assertEquals(array(), $results);
self::assertCount(11, $GLOBALS['log']->calls['fatal']);
// test
$bean = new SugarBeanMock();
@ -1397,7 +1400,6 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
)
));
self::assertEquals(array(), $results);
self::assertCount(14, $GLOBALS['log']->calls['fatal']);
// test
$bean = new SugarBeanMock();
@ -1411,7 +1413,6 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
)
));
self::assertEquals(array(), $results);
self::assertCount(16, $GLOBALS['log']->calls['fatal']);
// test
@ -1439,7 +1440,6 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
$this->db->query(/** @lang sql */
"DELETE FROM contacts WHERE id = 'test_parent_contact_1'");
self::assertCount(18, $GLOBALS['log']->calls['fatal']);
}
@ -1455,7 +1455,6 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
$bean = new SugarBeanMock();
$results = $bean->getAuditEnabledFieldDefinitions();
self::assertEquals(array(), $results);
self::assertCount(2, $GLOBALS['log']->calls['fatal']);
// test
$bean = new Contact();
@ -1500,7 +1499,6 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
'merge_filter' => 'enabled',
),
), $results);
self::assertCount(2, $GLOBALS['log']->calls['fatal']);
}
@ -1516,7 +1514,6 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
$result = $bean->isOwner(null);
self::assertTrue($result);
self::assertEquals('', $bean->id);
self::assertCount(1, $GLOBALS['log']->calls['fatal']);
// test
$GLOBALS['log']->reset();
@ -1604,7 +1601,6 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
$bean = new SugarBeanMock();
$result = $bean->getTableName();
self::assertEquals('', $result);
self::assertCount(1, $GLOBALS['log']->calls['fatal']);
// test
$GLOBALS['log']->reset();
@ -1612,7 +1608,6 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
unset($bean->table_name);
$result = $bean->getTableName();
self::assertEquals('', $result);
self::assertCount(4, $GLOBALS['log']->calls['fatal']);
// test
$GLOBALS['log']->reset();
@ -1953,7 +1948,6 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
self::assertNotTrue(isset($clone->foo));
unset($bean->foo);
self::assertEquals($bean, $clone);
self::assertCount(2, $GLOBALS['log']->calls['fatal']);
}
@ -2329,11 +2323,17 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
// test
$GLOBALS['log']->reset();
$bean = new SugarBeanMock();
$results = $bean->save();
self::assertTrue(isValidId($results));
self::assertTrue(isset($GLOBALS['log']->calls['fatal']));
$results = null;
try {
$results = $bean->save();
self::assertTrue(false);
} catch (Exception $e) {
}
self::assertNotTrue(isValidId($results));
self::assertNotTrue(isset($GLOBALS['log']->calls['fatal']));
self::assertEquals(false, $bean->in_save);
self::assertEquals(true, $bean->in_save);
self::assertEquals($GLOBALS['timedate']->nowDb(), $bean->date_modified);
self::assertEquals($current_user->id, $bean->modified_user_id);
self::assertEquals($current_user->user_name, $bean->modified_by_name);
@ -2351,11 +2351,17 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
$GLOBALS['log']->reset();
$bean = new SugarBeanMock();
$bean->new_with_id = true;
$results = $bean->save();
$results = null;
try {
$results = $bean->save();
self::assertTrue(false);
} catch (Exception $e) {
}
self::assertFalse(isValidId($results));
self::assertTrue(isset($GLOBALS['log']->calls['fatal']));
self::assertNotTrue(isset($GLOBALS['log']->calls['fatal']));
self::assertEquals(false, $bean->in_save);
self::assertEquals(true, $bean->in_save);
self::assertEquals($GLOBALS['timedate']->nowDb(), $bean->date_modified);
self::assertEquals($current_user->id, $bean->modified_user_id);
self::assertEquals($current_user->user_name, $bean->modified_by_name);
@ -2365,7 +2371,7 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
self::assertEquals(isset($current_user) ? $current_user->id : '', $bean->created_by);
self::assertFalse(isValidId($bean->id));
self::assertEquals($bean, $bean->custom_fields->bean);
self::assertEquals(false, $bean->new_with_id);
self::assertEquals(true, $bean->new_with_id);
self::assertEquals($bean->modified_by_name, $bean->old_modified_by_name);
// test
@ -2373,11 +2379,17 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
$bean = new SugarBeanMock();
$bean->new_with_id = true;
$bean->modified_by_name = 'testing';
$results = $bean->save();
$results = null;
try {
$results = $bean->save();
self::assertTrue(false);
} catch (Exception $e) {
}
self::assertFalse(isValidId($results));
self::assertTrue(isset($GLOBALS['log']->calls['fatal']));
self::assertNotTrue(isset($GLOBALS['log']->calls['fatal']));
self::assertEquals(false, $bean->in_save);
self::assertEquals(true, $bean->in_save);
self::assertEquals($GLOBALS['timedate']->nowDb(), $bean->date_modified);
self::assertEquals($current_user->id, $bean->modified_user_id);
self::assertEquals($current_user->user_name, $bean->modified_by_name);
@ -2387,7 +2399,7 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
self::assertEquals(isset($current_user) ? $current_user->id : '', $bean->created_by);
self::assertFalse(isValidId($bean->id));
self::assertEquals($bean, $bean->custom_fields->bean);
self::assertEquals(false, $bean->new_with_id);
self::assertEquals(true, $bean->new_with_id);
self::assertEquals('testing', $bean->old_modified_by_name);
// test
@ -2395,11 +2407,17 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
$bean = new SugarBeanMock();
$bean->id = 'testBean_1';
$bean->modified_by_name = 'testing';
$results = $bean->save();
$results = null;
try {
$results = $bean->save();
self::assertTrue(false);
} catch (Exception $e) {
}
self::assertFalse(isValidId($results));
self::assertTrue(isset($GLOBALS['log']->calls['fatal']));
self::assertNotTrue(isset($GLOBALS['log']->calls['fatal']));
self::assertEquals(false, $bean->in_save);
self::assertEquals(true, $bean->in_save);
self::assertEquals($GLOBALS['timedate']->nowDb(), $bean->date_modified);
self::assertEquals($current_user->id, $bean->modified_user_id);
self::assertEquals($current_user->user_name, $bean->modified_by_name);
@ -2429,11 +2447,17 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
);
/** @noinspection PhpUndefinedFieldInspection */
$bean->email_addresses_non_primary = array(true);
$results = $bean->save();
$results = null;
try {
$results = $bean->save();
self::assertTrue(false);
} catch (Exception $e) {
}
self::assertFalse(isValidId($results));
self::assertTrue(isset($GLOBALS['log']->calls['fatal']));
self::assertEquals(false, $bean->in_save);
self::assertEquals(true, $bean->in_save);
self::assertEquals($GLOBALS['timedate']->nowDb(), $bean->date_modified);
self::assertEquals($current_user->id, $bean->modified_user_id);
self::assertEquals($current_user->user_name, $bean->modified_by_name);
@ -2464,7 +2488,13 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
$bean->emailAddress = new EmailAddress();
/** @noinspection PhpUndefinedFieldInspection */
$bean->email_addresses_non_primary = array(true);
$results = $bean->save();
$results = null;
try {
$results = $bean->save();
self::assertTrue(false);
} catch (Exception $e) {
}
self::assertFalse(isValidId($results));
self::assertTrue(isset($GLOBALS['log']->calls['fatal']));
@ -2500,7 +2530,13 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
$bean->emailAddress = new EmailAddress();
/** @noinspection PhpUndefinedFieldInspection */
$bean->email_addresses_non_primary = array(true);
$results = $bean->save();
$results = null;
try {
$results = $bean->save();
self::assertTrue(false);
} catch (Exception $e) {
}
self::assertFalse(isValidId($results));
self::assertTrue(isset($GLOBALS['log']->calls['fatal']));
@ -2537,7 +2573,13 @@ class SugarBeanTest extends SuitePHPUnit_Framework_TestCase
$bean->emailAddress = new EmailAddress();
/** @noinspection PhpUndefinedFieldInspection */
$bean->email_addresses_non_primary = array('testbean1@email.com');
$results = $bean->save();
$results = null;
try {
$results = $bean->save();
self::assertTrue(false);
} catch (Exception $e) {
}
self::assertFalse(isValidId($results));
//self::assertFalse(isset($GLOBALS['log']->calls['fatal']));