adamjakab / SuiteCRM

tests/tests/modules/EAPM/EAPMTest.php

Spacing +18 added lines, -18 removed lines

@@ -1,15 +1,15 @@ 
 <?PHP
 
-class EAPMTest extends PHPUnit_Framework_TestCase{
+class EAPMTest extends PHPUnit_Framework_TestCase {
 
 	
 	public function testEAPM() {
 	
 		//execute the contructor and check for the Object type and  attributes
 		$eapm = new EAPM();
-		$this->assertInstanceOf('EAPM',$eapm);
-		$this->assertInstanceOf('Basic',$eapm);
-		$this->assertInstanceOf('SugarBean',$eapm);
+		$this->assertInstanceOf('EAPM', $eapm);
+		$this->assertInstanceOf('Basic', $eapm);
+		$this->assertInstanceOf('SugarBean', $eapm);
 			
 		$this->assertAttributeEquals('EAPM', 'module_dir', $eapm);
 		$this->assertAttributeEquals('EAPM', 'object_name', $eapm);
@@ -38,12 +38,12 @@ 
 		
 		//test with default value/false
 		$result = $eapm->getLoginInfo('');
-		$this->assertEquals(null,$result);
+		$this->assertEquals(null, $result);
 		
 		
 		//test with true
-		$result = $eapm->getLoginInfo('',true);
-		$this->assertEquals(null,$result);
+		$result = $eapm->getLoginInfo('', true);
+		$this->assertEquals(null, $result);
 		
 	}
 
@@ -53,14 +53,14 @@ 
 		
 		//test with empty string params
 		$expected = " SELECT  eapm.*  , jt0.user_name modified_by_name , jt0.created_by modified_by_name_owner  , 'Users' modified_by_name_mod , jt1.user_name created_by_name , jt1.created_by created_by_name_owner  , 'Users' created_by_name_mod , jt2.user_name assigned_user_name , jt2.created_by assigned_user_name_owner  , 'Users' assigned_user_name_mod FROM eapm   LEFT JOIN  users jt0 ON eapm.modified_user_id=jt0.id AND jt0.deleted=0\n\n AND jt0.deleted=0  LEFT JOIN  users jt1 ON eapm.created_by=jt1.id AND jt1.deleted=0\n\n AND jt1.deleted=0  LEFT JOIN  users jt2 ON eapm.assigned_user_id=jt2.id AND jt2.deleted=0\n\n AND jt2.deleted=0 where ( eapm.assigned_user_id ='' ) AND eapm.deleted=0";
-		$actual = $eapm->create_new_list_query('','');
-		$this->assertSame($expected,$actual);
+		$actual = $eapm->create_new_list_query('', '');
+		$this->assertSame($expected, $actual);
 		
 		
 		//test with valid string params
 		$expected = " SELECT  eapm.*  , jt0.user_name modified_by_name , jt0.created_by modified_by_name_owner  , 'Users' modified_by_name_mod , jt1.user_name created_by_name , jt1.created_by created_by_name_owner  , 'Users' created_by_name_mod , jt2.user_name assigned_user_name , jt2.created_by assigned_user_name_owner  , 'Users' assigned_user_name_mod FROM eapm   LEFT JOIN  users jt0 ON eapm.modified_user_id=jt0.id AND jt0.deleted=0\n\n AND jt0.deleted=0  LEFT JOIN  users jt1 ON eapm.created_by=jt1.id AND jt1.deleted=0\n\n AND jt1.deleted=0  LEFT JOIN  users jt2 ON eapm.assigned_user_id=jt2.id AND jt2.deleted=0\n\n AND jt2.deleted=0 where (eapm.name=\"\" AND  eapm.assigned_user_id ='' ) AND eapm.deleted=0";
-		$actual = $eapm->create_new_list_query('eapm.id','eapm.name=""');
-		$this->assertSame($expected,$actual);
+		$actual = $eapm->create_new_list_query('eapm.id', 'eapm.name=""');
+		$this->assertSame($expected, $actual);
 		
 	}
 
@@ -69,7 +69,7 @@ 
 		$eapm = new EAPM();
 		
 		$eapm->name = "test";
-		$eapm->url ="test_url";
+		$eapm->url = "test_url";
 		$eapm->application = "webex";
 
 		//test validated method initially
@@ -96,7 +96,7 @@ 
 		//mark the record as deleted and verify that this record cannot be retrieved anymore.
 		$eapm->mark_deleted($eapm->id);
 		$result = $eapm->retrieve($eapm->id);
-		$this->assertEquals(null,$result);
+		$this->assertEquals(null, $result);
 		
 	}
 
@@ -138,14 +138,14 @@ 
 		//execute the method and verify attributes are set accordingly
 		$eapm->save_cleanup();
 		
-		$this->assertEquals("", $eapm->oauth_token );
-		$this->assertEquals("", $eapm->oauth_secret );
-		$this->assertEquals("", $eapm->api_data );
+		$this->assertEquals("", $eapm->oauth_token);
+		$this->assertEquals("", $eapm->oauth_secret);
+		$this->assertEquals("", $eapm->api_data);
 
 	}
 
 
-	public function testdelete_user_accounts(){
+	public function testdelete_user_accounts() {
 		
 		$eapm = new EAPM();
 		
@@ -164,7 +164,7 @@ 
 	public function testgetEAPMExternalApiDropDown() {
 	
 		$result = getEAPMExternalApiDropDown();
-		$this->assertEquals(array(""=>""),$result);
+		$this->assertEquals(array(""=>""), $result);
 		
 	}
 	

tests/tests/modules/Accounts/AccountTest.php

Spacing +13 added lines, -13 removed lines

@@ -8,9 +8,9 @@ 
 		
 		//execute the contructor and check for the Object type and type attribute
 		$Account = new Account();
-		$this->assertInstanceOf('Account',$Account);
-		$this->assertInstanceOf('Company',$Account);
-		$this->assertInstanceOf('SugarBean',$Account);
+		$this->assertInstanceOf('Account', $Account);
+		$this->assertInstanceOf('Company', $Account);
+		$this->assertInstanceOf('SugarBean', $Account);
 		$this->assertTrue(is_array($Account->field_name_map));
 		$this->assertTrue(is_array($Account->field_defs));
 		
@@ -24,12 +24,12 @@ 
 		//test without name setting attribute
 		$Account = new Account();
 		$name = $Account->get_summary_text();
-		$this->assertEquals(Null,$name);
+		$this->assertEquals(Null, $name);
 
 		//test with  name attribute set
 		$Account->name = "test account";
 		$name = $Account->get_summary_text();
-		$this->assertEquals('test account',$name);
+		$this->assertEquals('test account', $name);
 		
 	}
 
@@ -109,7 +109,7 @@ 
 	public function testget_list_view_data()
 	{
 		
-		$expected = array (
+		$expected = array(
 			'DELETED' => 0,
 			'EMAIL1' => '',
 			'EMAIL1_LINK' => '<a href=\'javascript:void(0);\' onclick=\'SUGAR.quickCompose.init({"fullComposeUrl":"contact_id=\\u0026parent_type=Accounts\\u0026parent_id=\\u0026parent_name=\\u0026to_addrs_ids=\\u0026to_addrs_names=\\u0026to_addrs_emails=\\u0026to_email_addrs=%26nbsp%3B%26lt%3B%26gt%3B\\u0026return_module=Accounts\\u0026return_action=ListView\\u0026return_id=","composePackage":{"contact_id":"","parent_type":"Accounts","parent_id":"","parent_name":"","to_addrs_ids":"","to_addrs_names":"","to_addrs_emails":"","to_email_addrs":" \\u003C\\u003E","return_module":"Accounts","return_action":"ListView","return_id":""}});\' class=\'\'>',
@@ -128,7 +128,7 @@ 
 	}
 
 	
-	public function testbuild_generic_where_clause () 
+	public function testbuild_generic_where_clause() 
 	{
 		$Account = new Account();
 		
@@ -158,7 +158,7 @@ 
     	
     	//execute the method with valid parameter values and verify that it retunrs expected results
     	$expected = "SELECT\n                                accounts.*,\n                                email_addresses.email_address email_address,\n                                '' email_addresses_non_primary, accounts.name as account_name,\n                                users.user_name as assigned_user_name  FROM accounts LEFT JOIN users\n	                                ON accounts.assigned_user_id=users.id  LEFT JOIN  email_addr_bean_rel on accounts.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='Accounts' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1  LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id where (name not null) AND ( accounts.deleted IS NULL OR accounts.deleted=0 ) ORDER BY accounts.name";
-    	$actual = $Account->create_export_query('name','name not null');
+    	$actual = $Account->create_export_query('name', 'name not null');
     	$this->assertSame($expected, $actual);
     	
     }
@@ -169,8 +169,8 @@ 
 		$Account = new Account();
 
 		//execute the method and test if populates provided sugar_smarty
-		$result = $Account->set_notification_body(new Sugar_Smarty(),new Account());
-		$this->assertInstanceOf('Sugar_Smarty',$result);
+		$result = $Account->set_notification_body(new Sugar_Smarty(), new Account());
+		$this->assertInstanceOf('Sugar_Smarty', $result);
 		$this->assertNotEquals(new Sugar_Smarty(), $result);	
 		
 	}
@@ -182,7 +182,7 @@ 
 		
 		$this->assertTrue($Account->bean_implements('ACL')); //test with valid value
 		$this->assertFalse($Account->bean_implements('')); //test with empty value
-		$this->assertFalse($Account->bean_implements('Basic'));//test with invalid value
+		$this->assertFalse($Account->bean_implements('Basic')); //test with invalid value
 	
 	}
 
@@ -200,11 +200,11 @@ 
 		
 		
 		//with type parameter set
-		$expected = array ('select' => 'SELECT emails.id ',
+		$expected = array('select' => 'SELECT emails.id ',
 						   'from' => 'FROM emails ',
 						   'where' => '',
 						   'join' => " JOIN (select DISTINCT email_id from emails_email_addr_rel eear\n\n	join email_addr_bean_rel eabr on eabr.bean_id ='' and eabr.bean_module = 'Accounts' and\n	eabr.email_address_id = eear.email_address_id and eabr.deleted=0\n	where eear.deleted=0 and eear.email_id not in\n	(select eb.email_id from emails_beans eb where eb.bean_module ='Accounts' and eb.bean_id = '')\n	) derivedemails on derivedemails.email_id = emails.id",
-						  'join_tables' => array (''),
+						  'join_tables' => array(''),
 					);
 		
 		$actual = $Account->get_unlinked_email_query(array('return_as_array'=>'true'));	

tests/tests/modules/AOS_Invoices/AOS_InvoicesTest.php

Spacing +6 added lines, -6 removed lines

@@ -3,13 +3,13 @@ 
 class AOS_InvoicesTest extends PHPUnit_Framework_TestCase {
 	
 	
-	public function testAOS_Invoices(){	
+	public function testAOS_Invoices() {	
 
 		//execute the contructor and check for the Object type and  attributes
 		$aosInvoices = new AOS_Invoices();
-		$this->assertInstanceOf('AOS_Invoices',$aosInvoices);
-		$this->assertInstanceOf('Basic',$aosInvoices);
-		$this->assertInstanceOf('SugarBean',$aosInvoices);
+		$this->assertInstanceOf('AOS_Invoices', $aosInvoices);
+		$this->assertInstanceOf('Basic', $aosInvoices);
+		$this->assertInstanceOf('SugarBean', $aosInvoices);
 			
 		$this->assertAttributeEquals('AOS_Invoices', 'module_dir', $aosInvoices);
 		$this->assertAttributeEquals('AOS_Invoices', 'object_name', $aosInvoices);
@@ -20,7 +20,7 @@ 
 				
 	}
 
-    public function testSaveAndMark_deleted(){
+    public function testSaveAndMark_deleted() {
 
     	error_reporting(E_ERROR | E_PARSE);
     	
@@ -38,7 +38,7 @@ 
     	//mark the record as deleted and verify that this record cannot be retrieved anymore.
     	$aosInvoices->mark_deleted($aosInvoices->id);
     	$result = $aosInvoices->retrieve($aosInvoices->id);
-    	$this->assertEquals(null,$result);
+    	$this->assertEquals(null, $result);
     	
     	
     }

tests/tests/modules/Users/UserTest.php

Spacing +55 added lines, -55 removed lines

@@ -9,9 +9,9 @@ 
 		//execute the contructor and check for the Object type and  attributes
 		$user = new User();
 		
-		$this->assertInstanceOf('User',$user);
-		$this->assertInstanceOf('Person',$user);
-		$this->assertInstanceOf('SugarBean',$user);
+		$this->assertInstanceOf('User', $user);
+		$this->assertInstanceOf('Person', $user);
+		$this->assertInstanceOf('SugarBean', $user);
 			
 		$this->assertAttributeEquals('Users', 'module_dir', $user);
 		$this->assertAttributeEquals('User', 'object_name', $user);
@@ -36,7 +36,7 @@ 
     	
     	$result = $user->getSystemUser();
     	
-    	$this->assertInstanceOf('User',$result);
+    	$this->assertInstanceOf('User', $result);
     	$this->assertEquals(1, $result->id);
     	
     }
@@ -66,7 +66,7 @@ 
 		$user->retrieve(1);
 		
 		$result = $user->getSignature(1);
-		$this->assertEquals(false,$result);
+		$this->assertEquals(false, $result);
 		
 	}
 
@@ -116,7 +116,7 @@ 
 		
 		//test with defaultDisplay true
 		$expected = "<input class='button' onclick='javascript:open_email_signature_form(\"\", \"1\");' value='' type='button'>&nbsp;<span name=\"edit_sig\" id=\"edit_sig\" style=\"visibility:inherit;\"><input class=\"button\" onclick=\"javascript:open_email_signature_form(document.getElementById('signature_id', '').value)\" value=\"\" type=\"button\" tabindex=\"392\">&nbsp;\n					</span>";
-		$actual = $user->getSignatureButtons('',true);
+		$actual = $user->getSignatureButtons('', true);
 		$this->assertSame($expected, $actual);
 
 	}
@@ -130,7 +130,7 @@ 
 		$user->retrieve(2);
 		
 		$result = $user->hasPersonalEmail(); 
-		$this->assertEquals(false,$result);
+		$this->assertEquals(false, $result);
 		
 	}
 
@@ -285,7 +285,7 @@ 
 	}
 
 
-    public function testGetETagSeedAndIncrementETag(){
+    public function testGetETagSeedAndIncrementETag() {
     	
     	//unset and reconnect Db to resolve mysqli fetch exeception
     	global $db;
@@ -298,7 +298,7 @@ 
     	
     	//execute getETagSeed method, get Etag value
     	$ETagInitial = $user->getETagSeed('test');
-    	$this->assertGreaterThanOrEqual(0,$ETagInitial);
+    	$this->assertGreaterThanOrEqual(0, $ETagInitial);
     	
     	
     	//execute incrementETag to increment
@@ -326,11 +326,11 @@ 
     	$user = new User();
     	
     	//test without setting name
-    	$this->assertEquals(Null,$user->get_summary_text());
+    	$this->assertEquals(Null, $user->get_summary_text());
     	
     	//test with name set
     	$user->name = "test";
-    	$this->assertEquals('test',$user->get_summary_text());
+    	$this->assertEquals('test', $user->get_summary_text());
     	
 	}
 
@@ -377,7 +377,7 @@ 
 		
 		$user->user_name  = "test";
 		
-		$user->first_name  = "firstn";
+		$user->first_name = "firstn";
 		$user->last_name  = "lastn";
 		
 		$user->email1 = "one@email.com";
@@ -427,7 +427,7 @@ 
 		
 		
 		//change username and delete the user to avoid picking it up by password in future  
-		$user->user_name  = "test_deleted";
+		$user->user_name = "test_deleted";
 		$user->save();
 		$user->mark_deleted($user->id);
 		
@@ -474,7 +474,7 @@ 
 		//set user password and then retrieve user by created password 
 		$user->setNewPassword("test");
 	
-		$result = User::findUserPassword("test",md5("test"));
+		$result = User::findUserPassword("test", md5("test"));
 		
 		$this->assertTrue(isset($result['id']));
 		$this->assertEquals($id, $result['id']);
@@ -490,11 +490,11 @@ 
 		
 		//test with invalid password
 		$result = $user->authenticate_user(md5("pass"));
-		$this->assertEquals(false ,$result);
+		$this->assertEquals(false, $result);
 		
 		//test with invalid password
 		$result = $user->authenticate_user(md5("test"));
-		$this->assertEquals(true ,$result);
+		$this->assertEquals(true, $result);
 		
 	}
 
@@ -523,7 +523,7 @@ 
 		
 		
 		//find the user by new password
-		$result = User::findUserPassword("test",md5("testpass"));
+		$result = User::findUserPassword("test", md5("testpass"));
 		
 		$this->assertTrue(isset($result['id']));
 		$this->assertEquals($id, $result['id']);
@@ -536,11 +536,11 @@ 
 		
 		$user->retrieve($id);
 		
-		$expected = array("name"=>"firstn lastn", "email"=>"one@email.com" );
+		$expected = array("name"=>"firstn lastn", "email"=>"one@email.com");
 		
 		$actual = $user->getPreferredEmail();
 		
-		$this->assertSame($actual,$expected);
+		$this->assertSame($actual, $expected);
 		
 	}
 	
@@ -550,11 +550,11 @@ 
 		
 		$user->retrieve($id);
 		
-		$expected = array("name"=>"firstn lastn", "email"=>"one@email.com" );
+		$expected = array("name"=>"firstn lastn", "email"=>"one@email.com");
 		
 		$actual = $user->getUsersNameAndEmail();
 		
-		$this->assertEquals($actual,$expected);
+		$this->assertEquals($actual, $expected);
 	}
 
 	
@@ -562,11 +562,11 @@ 
 	{
 		$user = new User();
 				
-		$expected = array("name"=>"firstn lastn", "email"=>"one@email.com" );
+		$expected = array("name"=>"firstn lastn", "email"=>"one@email.com");
 		
 		$actual = $user->getEmailInfo($id);
 		
-		$this->assertEquals($actual,$expected);
+		$this->assertEquals($actual, $expected);
 	}
 
 	
@@ -576,17 +576,17 @@ 
 		
 		$result = $user->encrypt_password("test");
 		$this->assertTrue(isset($result));
-		$this->assertGreaterThan(0,strlen($result));
+		$this->assertGreaterThan(0, strlen($result));
 		
 	}
 
 	public function testgetPasswordHash()
 	{
 
-		$result= User::getPasswordHash("test");
+		$result = User::getPasswordHash("test");
 		
 		$this->assertTrue(isset($result));
-		$this->assertGreaterThan(0,strlen($result));
+		$this->assertGreaterThan(0, strlen($result));
 		
 		$this->markTestIncomplete('Error: crypt(): No salt parameter was specified. You must use a randomly generated salt and a strong hash function to produce a secure hash.');
 		
@@ -598,22 +598,22 @@ 
 		
 		//test with empty password and empty hash
 		$result = User::checkPassword("", '');
-		$this->assertEquals(false,$result);
+		$this->assertEquals(false, $result);
 		
 		
 		//test with valid hash and empty password
 		$result = User::checkPassword("", '$1$Gt0.XI4.$tVVSXgE36sfsVMBNo/9la1');
-		$this->assertEquals(false,$result);
+		$this->assertEquals(false, $result);
 		
 		
 		//test with valid password and invalid hash
 		$result = User::checkPassword("test", '$1$Gt0.XI4.$tVVSXgE36sfsVMBNo/9la2');
-		$this->assertEquals(false,$result);
+		$this->assertEquals(false, $result);
 		
 		
 		//test with valid password and valid hash
 		$result = User::checkPassword("test", '$1$Gt0.XI4.$tVVSXgE36sfsVMBNo/9la1');
-		$this->assertEquals(true,$result);
+		$this->assertEquals(true, $result);
 		
 	}
 
@@ -623,22 +623,22 @@ 
 
 		//test with empty password and empty hash
 		$result = User::checkPasswordMD5(md5(""), '');
-		$this->assertEquals(false,$result);
+		$this->assertEquals(false, $result);
 
 		
 		//test with valid hash and empty password
 		$result = User::checkPasswordMD5(md5(""), '$1$Gt0.XI4.$tVVSXgE36sfsVMBNo/9la1');
-		$this->assertEquals(false,$result);		
+		$this->assertEquals(false, $result);		
 		
 		
 		//test with valid password and invalid hash
 		$result = User::checkPasswordMD5(md5("test"), '$1$Gt0.XI4.$tVVSXgE36sfsVMBNo/9la2');
-		$this->assertEquals(false,$result);
+		$this->assertEquals(false, $result);
 		
 		
 		//test with valid password and valid hash
 		$result = User::checkPasswordMD5(md5("test"), '$1$Gt0.XI4.$tVVSXgE36sfsVMBNo/9la1');
-		$this->assertEquals(true,$result);
+		$this->assertEquals(true, $result);
 		
 	}
 
@@ -653,7 +653,7 @@ 
 		 
 		//test with name set
 		$user->authenticated = true;
-		$this->assertEquals(true,$user->is_authenticated());
+		$this->assertEquals(true, $user->is_authenticated());
 		
 	}
 
@@ -666,7 +666,7 @@ 
 		
 		$user->fill_in_additional_list_fields();
 		
-		$this->assertEquals("Administrator",$user->full_name);
+		$this->assertEquals("Administrator", $user->full_name);
 		
 	}
 
@@ -679,7 +679,7 @@ 
 		
 		$user->fill_in_additional_detail_fields();
 		
-		$this->assertEquals("Administrator",$user->full_name);
+		$this->assertEquals("Administrator", $user->full_name);
 			
 	}
 
@@ -758,14 +758,14 @@ 
 		
     	//test with empty string params
     	$expected = "SELECT id, user_name, first_name, last_name, description, date_entered, date_modified, modified_user_id, created_by, title, department, is_admin, phone_home, phone_mobile, phone_work, phone_other, phone_fax, address_street, address_city, address_state, address_postalcode, address_country, reports_to_id, portal_only, status, receive_notifications, employee_status, messenger_id, messenger_type, is_group FROM users  WHERE  users.deleted = 0 AND users.is_admin=0 ORDER BY users.user_name";
-    	$actual = $user->create_export_query('','');
-    	$this->assertSame($expected,$actual);
+    	$actual = $user->create_export_query('', '');
+    	$this->assertSame($expected, $actual);
     	
     		
     	//test with valid string params
     	$expected = "SELECT id, user_name, first_name, last_name, description, date_entered, date_modified, modified_user_id, created_by, title, department, is_admin, phone_home, phone_mobile, phone_work, phone_other, phone_fax, address_street, address_city, address_state, address_postalcode, address_country, reports_to_id, portal_only, status, receive_notifications, employee_status, messenger_id, messenger_type, is_group FROM users  WHERE user_name=\"\" AND  users.deleted = 0 AND users.is_admin=0 ORDER BY id";
-    	$actual = $user->create_export_query('id','user_name=""');
-    	$this->assertSame($expected,$actual);
+    	$actual = $user->create_export_query('id', 'user_name=""');
+    	$this->assertSame($expected, $actual);
 	
 	}
 
@@ -811,7 +811,7 @@ 
 		$renderedContent = ob_get_contents();
 		ob_end_clean();
 		
-		$this->assertSame($expected,$renderedContent);
+		$this->assertSame($expected, $renderedContent);
 		
 	}
 
@@ -821,9 +821,9 @@ 
 				
 		$user = new User();
 		
-		$expected = array( 'email' => 'do_not_reply@example.com', 'name' => 'SuiteCRM');
+		$expected = array('email' => 'do_not_reply@example.com', 'name' => 'SuiteCRM');
 		$actual = $user->getSystemDefaultNameAndEmail();		
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 		
 	} 
 
@@ -854,7 +854,7 @@ 
 		
 		$expected = "<a href='javascript:void(0);' onclick='SUGAR.quickCompose.init({\"fullComposeUrl\":\"contact_id=\u0026parent_type=Accounts\u0026parent_id=\u0026parent_name=test\u0026to_addrs_ids=\u0026to_addrs_names=\u0026to_addrs_emails=\u0026to_email_addrs=test%26nbsp%3B%26lt%3Babc%40email.com%26gt%3B\u0026return_module=Accounts\u0026return_action=DetailView\u0026return_id=\",\"composePackage\":{\"contact_id\":\"\",\"parent_type\":\"Accounts\",\"parent_id\":\"\",\"parent_name\":\"test\",\"to_addrs_ids\":\"\",\"to_addrs_names\":\"\",\"to_addrs_emails\":\"\",\"to_email_addrs\":\"test \u003Cabc@email.com\u003E\",\"return_module\":\"Accounts\",\"return_action\":\"DetailView\",\"return_id\":\"\"}});' class=''>";
 		$actual = $user->getEmailLink2("abc@email.com", $account);
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 		
 
 		//test with contacts module
@@ -863,7 +863,7 @@ 
 		
 		$expected = "<a href='javascript:void(0);' onclick='SUGAR.quickCompose.init({\"fullComposeUrl\":\"contact_id=\u0026parent_type=Contacts\u0026parent_id=\u0026parent_name=+\u0026to_addrs_ids=\u0026to_addrs_names=+\u0026to_addrs_emails=\u0026to_email_addrs=+%26nbsp%3B%26lt%3Babc%40email.com%26gt%3B\u0026return_module=Contacts\u0026return_action=DetailView\u0026return_id=\",\"composePackage\":{\"contact_id\":\"\",\"parent_type\":\"Contacts\",\"parent_id\":\"\",\"parent_name\":\" \",\"to_addrs_ids\":\"\",\"to_addrs_names\":\" \",\"to_addrs_emails\":\"\",\"to_email_addrs\":\"  \u003Cabc@email.com\u003E\",\"return_module\":\"Contacts\",\"return_action\":\"DetailView\",\"return_id\":\"\"}});' class=''>";
 		$actual = $user->getEmailLink2("abc@email.com", $contact);
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 		
 	}
 
@@ -882,7 +882,7 @@ 
 		
 		$expected = "<a href='javascript:void(0);' onclick='SUGAR.quickCompose.init({\"fullComposeUrl\":\"contact_id=\u0026parent_type=Accounts\u0026parent_id=\u0026parent_name=test\u0026to_addrs_ids=\u0026to_addrs_names=\u0026to_addrs_emails=\u0026to_email_addrs=test%26nbsp%3B%26lt%3Btest%26gt%3B\u0026return_module=Accounts\u0026return_action=DetailView\u0026return_id=\",\"composePackage\":{\"contact_id\":\"\",\"parent_type\":\"Accounts\",\"parent_id\":\"\",\"parent_name\":\"test\",\"to_addrs_ids\":\"\",\"to_addrs_names\":\"\",\"to_addrs_emails\":\"\",\"to_email_addrs\":\"test \u003Ctest\u003E\",\"return_module\":\"Accounts\",\"return_action\":\"DetailView\",\"return_id\":\"\"}});' class=''>";
 		$actual = $user->getEmailLink("name", $account);
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 		
 			
 		//test with contacts module
@@ -891,7 +891,7 @@ 
 		
 		$expected = "<a href='javascript:void(0);' onclick='SUGAR.quickCompose.init({\"fullComposeUrl\":\"contact_id=\u0026parent_type=Contacts\u0026parent_id=\u0026parent_name=+\u0026to_addrs_ids=\u0026to_addrs_names=+\u0026to_addrs_emails=\u0026to_email_addrs=+%26nbsp%3B%26lt%3Btest%26gt%3B\u0026return_module=Contacts\u0026return_action=DetailView\u0026return_id=\",\"composePackage\":{\"contact_id\":\"\",\"parent_type\":\"Contacts\",\"parent_id\":\"\",\"parent_name\":\" \",\"to_addrs_ids\":\"\",\"to_addrs_names\":\" \",\"to_addrs_emails\":\"\",\"to_email_addrs\":\"  \u003Ctest\u003E\",\"return_module\":\"Contacts\",\"return_action\":\"DetailView\",\"return_id\":\"\"}});' class=''>";
 		$actual = $user->getEmailLink("name", $contact);
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 			
 	}
 
@@ -901,7 +901,7 @@ 
 		
 		$result = $user->getLocaleFormatDesc();
 		$this->assertTrue(isset($result));
-		$this->assertGreaterThan(0,strlen($result));
+		$this->assertGreaterThan(0, strlen($result));
 		
 	}
 
@@ -1035,14 +1035,14 @@ 
 	   	
 	   	//test with empty string params
 	   	$expected = " SELECT  users.* , '                                                                                                                                                                                                                                                              ' c_accept_status_fields , '                                    '  call_id , '                                                                                                                                                                                                                                                              ' securitygroup_noninher_fields , '                                    '  securitygroup_id , LTRIM(RTRIM(CONCAT(IFNULL(users.first_name,''),' ',IFNULL(users.last_name,'')))) as full_name, LTRIM(RTRIM(CONCAT(IFNULL(users.first_name,''),' ',IFNULL(users.last_name,'')))) as name , jt2.last_name reports_to_name , jt2.created_by reports_to_name_owner  , 'Users' reports_to_name_mod, '                                                                                                                                                                                                                                                              ' m_accept_status_fields , '                                    '  meeting_id  FROM users   LEFT JOIN  users jt2 ON users.reports_to_id=jt2.id AND jt2.deleted=0\n\n AND jt2.deleted=0 where users.deleted=0";
-	   	$actual = $user->create_new_list_query('','');
-	   	$this->assertSame($expected,$actual);
+	   	$actual = $user->create_new_list_query('', '');
+	   	$this->assertSame($expected, $actual);
 
 	   	
 	   	//test with valid string params
 	   	$expected = " SELECT  users.* , '                                                                                                                                                                                                                                                              ' c_accept_status_fields , '                                    '  call_id , '                                                                                                                                                                                                                                                              ' securitygroup_noninher_fields , '                                    '  securitygroup_id , LTRIM(RTRIM(CONCAT(IFNULL(users.first_name,''),' ',IFNULL(users.last_name,'')))) as full_name, LTRIM(RTRIM(CONCAT(IFNULL(users.first_name,''),' ',IFNULL(users.last_name,'')))) as name , jt2.last_name reports_to_name , jt2.created_by reports_to_name_owner  , 'Users' reports_to_name_mod, '                                                                                                                                                                                                                                                              ' m_accept_status_fields , '                                    '  meeting_id  FROM users   LEFT JOIN  users jt2 ON users.reports_to_id=jt2.id AND jt2.deleted=0\n\n AND jt2.deleted=0 where (user_name=\"\") AND users.deleted=0 ORDER BY users.id";
-	   	$actual = $user->create_new_list_query('id','user_name=""');
-	   	$this->assertSame($expected,$actual);
+	   	$actual = $user->create_new_list_query('id', 'user_name=""');
+	   	$this->assertSame($expected, $actual);
    	
    }
 
@@ -1062,10 +1062,10 @@ 
     	//generate apsswords and verify they are not same
     	
     	$password1 = User::generatePassword();
-    	$this->assertGreaterThan(0,strlen($password1));
+    	$this->assertGreaterThan(0, strlen($password1));
     	
     	$password2 = User::generatePassword();
-    	$this->assertGreaterThan(0,strlen($password2));
+    	$this->assertGreaterThan(0, strlen($password2));
     	
     	$this->assertNotEquals($password1, $password2);
     	

tests/tests/modules/Versions/VersionTest.php

Spacing +16 added lines, -16 removed lines

@@ -11,8 +11,8 @@ 
 		//execute the contructor and check for the Object type and  attributes
 		$version = new Version();
 			
-		$this->assertInstanceOf('Version',$version);
-		$this->assertInstanceOf('SugarBean',$version);
+		$this->assertInstanceOf('Version', $version);
+		$this->assertInstanceOf('SugarBean', $version);
 		
 		$this->assertAttributeEquals('versions', 'table_name', $version);
 		$this->assertAttributeEquals('Versions', 'module_dir', $version);
@@ -29,42 +29,42 @@ 
 		//test with empty string params
 		$expected = "name like '%'";
 		$actual = $version->build_generic_where_clause('');
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 		
 			
 		//test with valid string params
 		$expected = "name like 'test%'";
 		$actual = $version->build_generic_where_clause('test');
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 		
 		
 	}
 	
-	public function testis_expected_version(){
+	public function testis_expected_version() {
 	
 		$version = new Version();
 		
 		//test without setting attributes
-		$actual = $version->is_expected_version(array("file_version"=>"1","db_version"=>"2"));
-		$this->assertEquals(false,$actual);
+		$actual = $version->is_expected_version(array("file_version"=>"1", "db_version"=>"2"));
+		$this->assertEquals(false, $actual);
 		
 		
 		//test with attributes set to on matching values
 		$version->file_version = "2";
 		$version->db_version = "2";
-		$actual = $version->is_expected_version(array("file_version"=>"1","db_version"=>"2"));
-		$this->assertEquals(false,$actual);
+		$actual = $version->is_expected_version(array("file_version"=>"1", "db_version"=>"2"));
+		$this->assertEquals(false, $actual);
 		
 			
 		//test with valid param
 		$version->file_version = "1";
 		$version->db_version = "2";
-		$actual = $version->is_expected_version(array("file_version"=>"1","db_version"=>"2"));
-		$this->assertEquals(true,$actual);
+		$actual = $version->is_expected_version(array("file_version"=>"1", "db_version"=>"2"));
+		$this->assertEquals(true, $actual);
 	
 	}
 	
-	public function testmark_upgraded(){
+	public function testmark_upgraded() {
 	
 		$version = new Version();
 		
@@ -80,18 +80,18 @@ 
 		//mark the record as deleted and verify that this record cannot be retrieved anymore.
 		$version->mark_deleted($version->id);
 		$result = $version->retrieve($version->id);
-		$this->assertEquals(null,$result);
+		$this->assertEquals(null, $result);
 		
 	}
 	
-	public function testget_profile(){
+	public function testget_profile() {
 	
 		$version = new Version();
 
 		//test without setting attributes
 		$expected = array('name'=> null, 'file_version'=> null, 'db_version'=>null);
 		$actual = $version->get_profile();
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 		
 		
 		//test with attributes set
@@ -101,7 +101,7 @@ 
 		
 		$expected = array('name'=> 'test', 'file_version'=> 1, 'db_version'=>1);
 		$actual = $version->get_profile();
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 		
 	}
 

tests/tests/modules/Bugs/BugTest.php

Spacing +28 added lines, -28 removed lines

@@ -8,8 +8,8 @@ 
 	{
 		//execute the contructor and check for the Object type and  attributes
 		$bug = new Bug();
-		$this->assertInstanceOf('Bug',$bug);
-		$this->assertInstanceOf('SugarBean',$bug);
+		$this->assertInstanceOf('Bug', $bug);
+		$this->assertInstanceOf('SugarBean', $bug);
 			
 		$this->assertAttributeEquals('Bugs', 'module_dir', $bug);
 		$this->assertAttributeEquals('Bug', 'object_name', $bug);
@@ -29,11 +29,11 @@ 
 		$bug = new Bug();
 		
 		//test without setting name
-		$this->assertEquals(Null,$bug->get_summary_text());
+		$this->assertEquals(Null, $bug->get_summary_text());
 		
 		//test with name set//test with name set
 		$bug->name = "test";
-		$this->assertEquals('test',$bug->get_summary_text());
+		$this->assertEquals('test', $bug->get_summary_text());
 		
 	}
 
@@ -43,14 +43,14 @@ 
 		
 		//test with empty string params
 		$expected = "SELECT \n                               bugs.*\n\n                                ,users.user_name as assigned_user_name, releases.id release_id, releases.name release_name FROM bugs 				LEFT JOIN releases ON bugs.found_in_release=releases.id\n								LEFT JOIN users\n                                ON bugs.assigned_user_id=users.id  where  bugs.deleted=0  ORDER BY bugs.name";
-		$actual = $bug->create_list_query('','');
-		$this->assertSame($expected,$actual);
+		$actual = $bug->create_list_query('', '');
+		$this->assertSame($expected, $actual);
 	
 	
 		//test with valid string params
 		$expected = "SELECT \n                               bugs.*\n\n                                ,users.user_name as assigned_user_name, releases.id release_id, releases.name release_name FROM bugs 				LEFT JOIN releases ON bugs.found_in_release=releases.id\n								LEFT JOIN users\n                                ON bugs.assigned_user_id=users.id  where bugs.name=\"\" AND  bugs.deleted=0  ORDER BY releases.id";
-		$actual = $bug->create_list_query('releases.id','bugs.name=""');
-		$this->assertSame($expected,$actual);
+		$actual = $bug->create_list_query('releases.id', 'bugs.name=""');
+		$this->assertSame($expected, $actual);
 		
 	}
 
@@ -60,14 +60,14 @@ 
 		
 		//test with empty string params
 		$expected = "SELECT\n                                bugs.*,\n                                r1.name found_in_release_name,\n                                r2.name fixed_in_release_name,\n                                users.user_name assigned_user_name FROM bugs 				LEFT JOIN releases r1 ON bugs.found_in_release = r1.id\n								LEFT JOIN releases r2 ON bugs.fixed_in_release = r2.id\n								LEFT JOIN users\n                                ON bugs.assigned_user_id=users.id where   bugs.deleted=0\n                 ORDER BY bugs.bug_number";		
-		$actual = $bug->create_export_query('','');
-		$this->assertSame($expected,$actual);
+		$actual = $bug->create_export_query('', '');
+		$this->assertSame($expected, $actual);
 
 		
 		//test with valid string params
 		$expected = "SELECT\n                                bugs.*,\n                                r1.name found_in_release_name,\n                                r2.name fixed_in_release_name,\n                                users.user_name assigned_user_name FROM bugs 				LEFT JOIN releases r1 ON bugs.found_in_release = r1.id\n								LEFT JOIN releases r2 ON bugs.fixed_in_release = r2.id\n								LEFT JOIN users\n                                ON bugs.assigned_user_id=users.id where bugs.name=\"\" AND   bugs.deleted=0\n                 ORDER BY releases.id";
-		$actual = $bug->create_export_query('releases.id','bugs.name=""');
-		$this->assertSame($expected,$actual);
+		$actual = $bug->create_export_query('releases.id', 'bugs.name=""');
+		$this->assertSame($expected, $actual);
 		
 		
 		
@@ -115,7 +115,7 @@ 
 		
 		$bug->set_release();
 		
-		$this->assertEquals("",$bug->release_name);		
+		$this->assertEquals("", $bug->release_name);		
 		
 	}
 
@@ -128,7 +128,7 @@ 
 		
 		$bug->set_release();
 		
-		$this->assertEquals("",$bug->fixed_in_release_name);	
+		$this->assertEquals("", $bug->fixed_in_release_name);	
 	}
 	
 	
@@ -149,25 +149,25 @@ 
 		);
 		
 		$actual = $bug->get_list_view_data();
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 				
 	}
 
 
-	public function testbuild_generic_where_clause () 
+	public function testbuild_generic_where_clause() 
 	{
 		$bug = new Bug();
 		
 		//execute with blank parameters
 		$expected = "bugs.name like '%'";
-		$actual = $bug->build_generic_where_clause ("");
-		$this->assertSame($expected,$actual);
+		$actual = $bug->build_generic_where_clause("");
+		$this->assertSame($expected, $actual);
 		
 		
 		//execute with numeric parameter
 		$expected = "bugs.name like '1%' or bugs.bug_number like '1%'";
 		$actual = $bug->build_generic_where_clause(1);
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 				
 	}
 
@@ -181,17 +181,17 @@ 
 		$bug->priority = "Urgent";
 		$bug->status = "New";
 		$bug->resolution = "Accepted";
-		$bug->bug_number ="1";
+		$bug->bug_number = "1";
 
 		//test with attributes preset and verify template variables are set accordingly
 		$result = $bug->set_notification_body(new Sugar_Smarty(), $bug);
 		
-		$this->assertEquals($bug->name ,$result->_tpl_vars['BUG_SUBJECT']);
-		$this->assertEquals($bug->type ,$result->_tpl_vars['BUG_TYPE']);
-		$this->assertEquals($bug->priority ,$result->_tpl_vars['BUG_PRIORITY']);
-		$this->assertEquals($bug->status ,$result->_tpl_vars['BUG_STATUS']);
-		$this->assertEquals($bug->resolution ,$result->_tpl_vars['BUG_RESOLUTION']);
-		$this->assertEquals($bug->bug_number ,$result->_tpl_vars['BUG_BUG_NUMBER']);
+		$this->assertEquals($bug->name, $result->_tpl_vars['BUG_SUBJECT']);
+		$this->assertEquals($bug->type, $result->_tpl_vars['BUG_TYPE']);
+		$this->assertEquals($bug->priority, $result->_tpl_vars['BUG_PRIORITY']);
+		$this->assertEquals($bug->status, $result->_tpl_vars['BUG_STATUS']);
+		$this->assertEquals($bug->resolution, $result->_tpl_vars['BUG_RESOLUTION']);
+		$this->assertEquals($bug->bug_number, $result->_tpl_vars['BUG_BUG_NUMBER']);
 		
 	}
 	
@@ -208,7 +208,7 @@ 
 		$bug = new Bug();
 		
 		$bug->name = "test";
-		$bug->bug_number ="1";
+		$bug->bug_number = "1";
 		$bug->type = "Defect";
 		$bug->priority = "Urgent";
 		$bug->status = "New";
@@ -225,7 +225,7 @@ 
 		//mark the record as deleted and verify that this record cannot be retrieved anymore.
 		$bug->mark_deleted($bug->id);
 		$result = $bug->retrieve($bug->id);
-		$this->assertEquals(null,$result);
+		$this->assertEquals(null, $result);
 		
 	}
 

tests/tests/modules/ProspectLists/ProspectListTest.php

Spacing +28 added lines, -28 removed lines

@@ -9,8 +9,8 @@ 
 		//execute the contructor and check for the Object type and  attributes
 		$prospectList = new ProspectList();
 		
-		$this->assertInstanceOf('ProspectList',$prospectList);
-		$this->assertInstanceOf('SugarBean',$prospectList);
+		$this->assertInstanceOf('ProspectList', $prospectList);
+		$this->assertInstanceOf('SugarBean', $prospectList);
 			
 		$this->assertAttributeEquals('prospect_lists', 'table_name', $prospectList);
 		$this->assertAttributeEquals('ProspectLists', 'module_dir', $prospectList);
@@ -27,11 +27,11 @@ 
 		$prospectList = new ProspectList();
 		
 		//test without setting name
-		$this->assertEquals(Null,$prospectList->get_summary_text());
+		$this->assertEquals(Null, $prospectList->get_summary_text());
 		
 		//test with name set
 		$prospectList->name = "test";
-		$this->assertEquals('test',$prospectList->get_summary_text());
+		$this->assertEquals('test', $prospectList->get_summary_text());
 	}
 
 	public function testcreate_list_query()
@@ -41,14 +41,14 @@ 
 		
 		//test with empty string params
 		$expected = "SELECT users.user_name as assigned_user_name, prospect_lists.* FROM prospect_lists LEFT JOIN users\n					ON prospect_lists.assigned_user_id=users.id where prospect_lists.deleted=0 ORDER BY prospect_lists.name";
-		$actual = $prospectList->create_list_query('','');
-		$this->assertSame($expected,$actual);
+		$actual = $prospectList->create_list_query('', '');
+		$this->assertSame($expected, $actual);
 		 
 		
 		//test with valid string params
 		$expected = "SELECT users.user_name as assigned_user_name, prospect_lists.* FROM prospect_lists LEFT JOIN users\n					ON prospect_lists.assigned_user_id=users.id where users.user_name = \"\" AND prospect_lists.deleted=0 ORDER BY prospect_lists.id";
-		$actual = $prospectList->create_list_query('prospect_lists.id','users.user_name = ""');
-		$this->assertSame($expected,$actual);
+		$actual = $prospectList->create_list_query('prospect_lists.id', 'users.user_name = ""');
+		$this->assertSame($expected, $actual);
 		
 	}
 
@@ -60,14 +60,14 @@ 
 		
 		//test with empty string params
 		$expected = "SELECT\n                                prospect_lists.*,\n                                users.user_name as assigned_user_name FROM prospect_lists LEFT JOIN users\n                                ON prospect_lists.assigned_user_id=users.id  WHERE  prospect_lists.deleted=0 ORDER BY prospect_lists.name";
-		$actual = $prospectList->create_export_query('','');
-		$this->assertSame($expected,$actual);
+		$actual = $prospectList->create_export_query('', '');
+		$this->assertSame($expected, $actual);
 			
 		
 		//test with valid string params
 		$expected = "SELECT\n                                prospect_lists.*,\n                                users.user_name as assigned_user_name FROM prospect_lists LEFT JOIN users\n                                ON prospect_lists.assigned_user_id=users.id  WHERE users.user_name = \"\" AND  prospect_lists.deleted=0 ORDER BY prospect_lists.id";
-		$actual = $prospectList->create_export_query('prospect_lists.id','users.user_name = ""');
-		$this->assertSame($expected,$actual);
+		$actual = $prospectList->create_export_query('prospect_lists.id', 'users.user_name = ""');
+		$this->assertSame($expected, $actual);
 		
     }
 
@@ -78,7 +78,7 @@ 
     	//test with random string params
     	$expected = "SELECT l.id AS id, 'Leads' AS related_type, '' AS \"name\", l.first_name AS first_name, l.last_name AS last_name, l.title AS title, l.salutation AS salutation, \n				l.primary_address_street AS primary_address_street,l.primary_address_city AS primary_address_city, l.primary_address_state AS primary_address_state, l.primary_address_postalcode AS primary_address_postalcode, l.primary_address_country AS primary_address_country,\n				l.account_name AS account_name,\n				ea.email_address AS primary_email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,\n				l.do_not_call AS do_not_call, l.phone_fax AS phone_fax, l.phone_other AS phone_other, l.phone_home AS phone_home, l.phone_mobile AS phone_mobile, l.phone_work AS phone_work\n				, leads_cstm.jjwg_maps_address_c AS jjwg_maps_address_c, leads_cstm.jjwg_maps_geocode_status_c AS jjwg_maps_geocode_status_c, leads_cstm.jjwg_maps_lat_c AS jjwg_maps_lat_c, leads_cstm.jjwg_maps_lng_c AS jjwg_maps_lng_c\n				FROM prospect_lists_prospects plp\n				INNER JOIN leads l ON plp.related_id=l.id\n				LEFT join leads_cstm ON l.id = leads_cstm.id_c\n				LEFT JOIN email_addr_bean_rel ear ON  ear.bean_id=l.id AND ear.deleted=0\n				LEFT JOIN email_addresses ea ON ear.email_address_id=ea.id\n				WHERE plp.prospect_list_id = 1 AND plp.deleted=0 \n				AND l.deleted=0\n				AND (ear.deleted=0 OR ear.deleted IS NULL) UNION ALL SELECT u.id AS id, 'Users' AS related_type, '' AS \"name\", u.first_name AS first_name, u.last_name AS last_name,u.title AS title, '' AS salutation, \n				u.address_street AS primary_address_street,u.address_city AS primary_address_city, u.address_state AS primary_address_state,  u.address_postalcode AS primary_address_postalcode, u.address_country AS primary_address_country,\n				'' AS account_name,\n				ea.email_address AS email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,\n				0 AS do_not_call, u.phone_fax AS phone_fax, u.phone_other AS phone_other, u.phone_home AS phone_home, u.phone_mobile AS phone_mobile, u.phone_work AS phone_work\n				, '' AS jjwg_maps_address_c, '' AS jjwg_maps_geocode_status_c, '' AS jjwg_maps_lat_c, '' AS jjwg_maps_lng_c\n				FROM prospect_lists_prospects plp\n				INNER JOIN users u ON plp.related_id=u.id\n				\n				LEFT JOIN email_addr_bean_rel ear ON  ear.bean_id=u.id AND ear.deleted=0\n				LEFT JOIN email_addresses ea ON ear.email_address_id=ea.id\n				WHERE plp.prospect_list_id = 1 AND plp.deleted=0 \n				AND u.deleted=0\n				AND (ear.deleted=0 OR ear.deleted IS NULL) UNION ALL SELECT c.id AS id, 'Contacts' AS related_type, '' AS \"name\", c.first_name AS first_name, c.last_name AS last_name,c.title AS title, c.salutation AS salutation, \n				c.primary_address_street AS primary_address_street,c.primary_address_city AS primary_address_city, c.primary_address_state AS primary_address_state,  c.primary_address_postalcode AS primary_address_postalcode, c.primary_address_country AS primary_address_country,\n				a.name AS account_name,\n				ea.email_address AS email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,\n				c.do_not_call AS do_not_call, c.phone_fax AS phone_fax, c.phone_other AS phone_other, c.phone_home AS phone_home, c.phone_mobile AS phone_mobile, c.phone_work AS phone_work\n				, contacts_cstm.jjwg_maps_address_c AS jjwg_maps_address_c, contacts_cstm.jjwg_maps_geocode_status_c AS jjwg_maps_geocode_status_c, contacts_cstm.jjwg_maps_lat_c AS jjwg_maps_lat_c, contacts_cstm.jjwg_maps_lng_c AS jjwg_maps_lng_c\nFROM prospect_lists_prospects plp\n				INNER JOIN contacts c ON plp.related_id=c.id LEFT JOIN accounts_contacts ac ON ac.contact_id=c.id LEFT JOIN accounts a ON ac.account_id=a.id\n				LEFT join contacts_cstm ON c.id = contacts_cstm.id_c\n				LEFT JOIN email_addr_bean_rel ear ON ear.bean_id=c.id AND ear.deleted=0\n				LEFT JOIN email_addresses ea ON ear.email_address_id=ea.id\n				WHERE plp.prospect_list_id = 1 AND plp.deleted=0 \n				AND c.deleted=0\n				AND ac.deleted=0\n                AND (ear.deleted=0 OR ear.deleted IS NULL) UNION ALL SELECT p.id AS id, 'Prospects' AS related_type, '' AS \"name\", p.first_name AS first_name, p.last_name AS last_name,p.title AS title, p.salutation AS salutation, \n				p.primary_address_street AS primary_address_street,p.primary_address_city AS primary_address_city, p.primary_address_state AS primary_address_state,  p.primary_address_postalcode AS primary_address_postalcode, p.primary_address_country AS primary_address_country,\n				p.account_name AS account_name,\n				ea.email_address AS email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,\n				p.do_not_call AS do_not_call, p.phone_fax AS phone_fax, p.phone_other AS phone_other, p.phone_home AS phone_home, p.phone_mobile AS phone_mobile, p.phone_work AS phone_work\n				, prospects_cstm.jjwg_maps_address_c AS jjwg_maps_address_c, prospects_cstm.jjwg_maps_geocode_status_c AS jjwg_maps_geocode_status_c, prospects_cstm.jjwg_maps_lat_c AS jjwg_maps_lat_c, prospects_cstm.jjwg_maps_lng_c AS jjwg_maps_lng_c\n				FROM prospect_lists_prospects plp\n				INNER JOIN prospects p ON plp.related_id=p.id\n				LEFT join prospects_cstm ON p.id = prospects_cstm.id_c\n				LEFT JOIN email_addr_bean_rel ear ON  ear.bean_id=p.id AND ear.deleted=0\n				LEFT JOIN email_addresses ea ON ear.email_address_id=ea.id\n				WHERE plp.prospect_list_id = 1  AND plp.deleted=0 \n				AND p.deleted=0\n				AND (ear.deleted=0 OR ear.deleted IS NULL) UNION ALL SELECT a.id AS id, 'Accounts' AS related_type, a.name AS \"name\", '' AS first_name, '' AS last_name,'' AS title, '' AS salutation, \n				a.billing_address_street AS primary_address_street,a.billing_address_city AS primary_address_city, a.billing_address_state AS primary_address_state, a.billing_address_postalcode AS primary_address_postalcode, a.billing_address_country AS primary_address_country,\n				'' AS account_name,\n				ea.email_address AS email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,\n				0 AS do_not_call, a.phone_fax as phone_fax, a.phone_alternate AS phone_other, '' AS phone_home, '' AS phone_mobile, a.phone_office AS phone_office\n				, accounts_cstm.jjwg_maps_address_c AS jjwg_maps_address_c, accounts_cstm.jjwg_maps_geocode_status_c AS jjwg_maps_geocode_status_c, accounts_cstm.jjwg_maps_lat_c AS jjwg_maps_lat_c, accounts_cstm.jjwg_maps_lng_c AS jjwg_maps_lng_c\n				FROM prospect_lists_prospects plp\n				INNER JOIN accounts a ON plp.related_id=a.id\n				LEFT join accounts_cstm ON a.id = accounts_cstm.id_c\n				LEFT JOIN email_addr_bean_rel ear ON  ear.bean_id=a.id AND ear.deleted=0\n				LEFT JOIN email_addresses ea ON ear.email_address_id=ea.id\n				WHERE plp.prospect_list_id = 1  AND plp.deleted=0 \n				AND a.deleted=0\n				AND (ear.deleted=0 OR ear.deleted IS NULL) ORDER BY related_type, id, primary_address DESC";
     	$actual = $prospectList->create_export_members_query('1');
-    	$this->assertSame($expected,$actual);
+    	$this->assertSame($expected, $actual);
 		
 	}
 	
@@ -87,7 +87,7 @@ 
 		$prospectList = new ProspectList();
 	
 		$prospectList->name = "test";
-		$prospectList->description ="test description";
+		$prospectList->description = "test description";
 	
 		$result = $prospectList->save();
 			
@@ -107,7 +107,7 @@ 
 		//mark the record as deleted and verify that this record cannot be retrieved anymore.
 		$prospectList->mark_deleted($prospectList->id);
 		$result = $prospectList->retrieve($prospectList->id);
-		$this->assertEquals(null,$result);
+		$this->assertEquals(null, $result);
 	
 	}	
 	
@@ -122,14 +122,14 @@ 
 		$prospectList = new ProspectList();
 
 		//preset the required attributes, retrive the bean by id and verify the count of records
-		$link_ids = array('1','2');
+		$link_ids = array('1', '2');
 	
 		$prospectList->retrieve($id);
-		$prospectList->set_prospect_relationship($id, $link_ids ,'related');
+		$prospectList->set_prospect_relationship($id, $link_ids, 'related');
 		
 		$expected_count = $prospectList->get_entry_count();
 		
-		$this->assertEquals(2,$expected_count);
+		$this->assertEquals(2, $expected_count);
 	
 		
 		//test clear_prospect_relationship method with expected counts
@@ -143,11 +143,11 @@ 
 		$prospectList = new ProspectList();
 		 
 		$prospectList->retrieve($id);
-		$prospectList->set_prospect_relationship_single($id, '3' ,'related');
+		$prospectList->set_prospect_relationship_single($id, '3', 'related');
 		
 		$expected_count = $prospectList->get_entry_count();
 		
-		$this->assertEquals(1,$expected_count);
+		$this->assertEquals(1, $expected_count);
 		
 		$this->clear_prospect_relationship($id, '3');
 		
@@ -167,7 +167,7 @@ 
 		$prospectList->clear_prospect_relationship($id, $related_id, 'related');		
 
 		$expected_count = (int)$prospectList->get_entry_count();
-		$this->assertEquals($initial_count - 1 , $expected_count);
+		$this->assertEquals($initial_count - 1, $expected_count);
 	}
 	
 
@@ -210,7 +210,7 @@ 
 		$prospectList = new ProspectList();
 		
 		$prospectList->fill_in_additional_detail_fields();
-		$this->assertEquals(0,$prospectList->entry_count);
+		$this->assertEquals(0, $prospectList->entry_count);
 		
 	}
 
@@ -222,7 +222,7 @@ 
 		
 		//execute the method and test if it works and does not throws an exception.
 		try {
-			$prospectList->update_currency_id('','');
+			$prospectList->update_currency_id('', '');
 			$this->assertTrue(true);
 		}
 		catch (Exception $e) {
@@ -244,11 +244,11 @@ 
 	}
 		
 		
-	public function testget_list_view_data(){
+	public function testget_list_view_data() {
 
 		$prospectList = new ProspectList();
 		
-		$expected = array( "DELETED"=> 0, "ENTRY_COUNT"=> '0' );
+		$expected = array("DELETED"=> 0, "ENTRY_COUNT"=> '0');
 		$actual = $prospectList->get_list_view_data();
 		$this->assertSame($expected, $actual);
 		
@@ -262,18 +262,18 @@ 
 		//test with empty string params
 		$expected = "prospect_lists.name like '%'";
 		$actual = $prospectList->build_generic_where_clause('');
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 			
 		
 		//test with valid string params
 		$expected = "prospect_lists.name like '%'";
 		$actual = $prospectList->build_generic_where_clause('1');
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 		
 	}
 
 	
-	public function testbean_implements(){
+	public function testbean_implements() {
 
 		$prospectList = new ProspectList();
 		

tests/tests/modules/Schedulers/SchedulerTest.php

Spacing +30 added lines, -30 removed lines

@@ -4,7 +4,7 @@ 
 require_once 'install/install_utils.php';
 
 
-class SchedulerTest extends PHPUnit_Framework_TestCase  {
+class SchedulerTest extends PHPUnit_Framework_TestCase {
 
 
 	public function test__construct()
@@ -13,8 +13,8 @@ 
 		//execute the contructor and check for the Object type and  attributes
 		$scheduler = new Scheduler();
 		
-		$this->assertInstanceOf('Scheduler',$scheduler);
-		$this->assertInstanceOf('SugarBean',$scheduler);
+		$this->assertInstanceOf('Scheduler', $scheduler);
+		$this->assertInstanceOf('SugarBean', $scheduler);
 			
 		$this->assertAttributeEquals('schedulers', 'table_name', $scheduler);
 		$this->assertAttributeEquals('Schedulers', 'module_dir', $scheduler);
@@ -31,7 +31,7 @@ 
 	public function testinitUser()
 	{
 		$user = Scheduler::initUser();
-		$this->assertInstanceOf('User',$user);
+		$this->assertInstanceOf('User', $user);
 	}
 
 
@@ -63,7 +63,7 @@ 
 		$scheduler = new Scheduler();
 		$result = $scheduler->createJob();
 		
-		$this->assertInstanceOf('SchedulersJob',$result);
+		$this->assertInstanceOf('SchedulersJob', $result);
 		
 	}
 
@@ -96,17 +96,17 @@ 
 		
 		$scheduler->job_interval = "0::3::3::*::*";
 		$result = $scheduler->deriveDBDateTimes();
-		$this->assertEquals(false,$result);
+		$this->assertEquals(false, $result);
 		
 		
 		$scheduler->job_interval = "*::*::*::*::*";
 		$result = $scheduler->deriveDBDateTimes();
-		$this->assertEquals(false,$result);		
+		$this->assertEquals(false, $result);		
 		
 		
 		$scheduler->job_interval = "0::*::3::*::*";
 		$result = $scheduler->deriveDBDateTimes();
-		$this->assertEquals(false,$result);
+		$this->assertEquals(false, $result);
 		
 	}
 
@@ -117,11 +117,11 @@ 
 		
 		//execute the method with different job intervals
 		
-		$this->assertEquals("", $scheduler->handleIntervalType('0','0','2','2'));
-		$this->assertEquals('00:02', $scheduler->handleIntervalType('1','0','2','2'));
-		$this->assertEquals('30th', $scheduler->handleIntervalType('2','0','2','2'));
-		$this->assertEquals('December', $scheduler->handleIntervalType('3','0','2','2'));
-		$this->assertEquals("", $scheduler->handleIntervalType('4','0','2','2'));
+		$this->assertEquals("", $scheduler->handleIntervalType('0', '0', '2', '2'));
+		$this->assertEquals('00:02', $scheduler->handleIntervalType('1', '0', '2', '2'));
+		$this->assertEquals('30th', $scheduler->handleIntervalType('2', '0', '2', '2'));
+		$this->assertEquals('December', $scheduler->handleIntervalType('3', '0', '2', '2'));
+		$this->assertEquals("", $scheduler->handleIntervalType('4', '0', '2', '2'));
 		
 	}
 
@@ -134,13 +134,13 @@ 
 		$scheduler->job_interval = "0::3::3::*::*";
 		$scheduler->parseInterval();
 		$scheduler->setIntervalHumanReadable();
-		$this->assertEquals('03:00; 3rd', $scheduler->intervalHumanReadable );
+		$this->assertEquals('03:00; 3rd', $scheduler->intervalHumanReadable);
 
 		
 		$scheduler->job_interval = "0::3::3::3::3";
 		$scheduler->parseInterval();
 		$scheduler->setIntervalHumanReadable();
-		$this->assertEquals('03:00; 3rd; March', $scheduler->intervalHumanReadable );
+		$this->assertEquals('03:00; 3rd; March', $scheduler->intervalHumanReadable);
 		
 	}
 	
@@ -155,11 +155,11 @@ 
 		
 		$scheduler->setStandardArraysAttributes();
 				
-		$this->assertEquals(array('*', 1, 2, 3, 4, 5, 6, 0), $scheduler->dayInt );
-		$this->assertEquals(array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12), $scheduler->monthsInt );
-		$this->assertEquals(array('', 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'), $scheduler->monthsLabel );
-		$this->assertEquals(array('*', '/', '-', ','), $scheduler->metricsVar );
-		$this->assertEquals(array(' every ', '', ' thru ', ' and '), $scheduler->metricsVal );
+		$this->assertEquals(array('*', 1, 2, 3, 4, 5, 6, 0), $scheduler->dayInt);
+		$this->assertEquals(array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12), $scheduler->monthsInt);
+		$this->assertEquals(array('', 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'), $scheduler->monthsLabel);
+		$this->assertEquals(array('*', '/', '-', ','), $scheduler->metricsVar);
+		$this->assertEquals(array(' every ', '', ' thru ', ' and '), $scheduler->metricsVal);
 	
 	}
 
@@ -170,8 +170,8 @@ 
 		
 		$scheduler->job_interval = "0::3::3::*::*";
 
-		$expected = array (
-					  'raw' => array ('0', '3', '3', '*', '*' ),
+		$expected = array(
+					  'raw' => array('0', '3', '3', '*', '*'),
 					  'hours' => '3:::0',
 					  'months' => '*:::3',
 					);
@@ -242,14 +242,14 @@ 
 		
 		//test with empty string params
 		$expected = " SELECT  schedulers.*  , jt0.user_name created_by_name , jt0.created_by created_by_name_owner  , 'Users' created_by_name_mod , jt1.user_name modified_by_name , jt1.created_by modified_by_name_owner  , 'Users' modified_by_name_mod FROM schedulers   LEFT JOIN  users jt0 ON jt0.id=schedulers.created_by AND jt0.deleted=0\n AND jt0.deleted=0  LEFT JOIN  users jt1 ON schedulers.modified_user_id=jt1.id AND jt1.deleted=0\n\n AND jt1.deleted=0 where schedulers.deleted=0";
-		$actual = $scheduler->create_export_query('','');
-		$this->assertSame($expected,$actual);
+		$actual = $scheduler->create_export_query('', '');
+		$this->assertSame($expected, $actual);
 			
 		
 		//test with valid string params
 		$expected = " SELECT  schedulers.*  , jt0.user_name created_by_name , jt0.created_by created_by_name_owner  , 'Users' created_by_name_mod , jt1.user_name modified_by_name , jt1.created_by modified_by_name_owner  , 'Users' modified_by_name_mod FROM schedulers   LEFT JOIN  users jt0 ON jt0.id=schedulers.created_by AND jt0.deleted=0\n AND jt0.deleted=0  LEFT JOIN  users jt1 ON schedulers.modified_user_id=jt1.id AND jt1.deleted=0\n\n AND jt1.deleted=0 where (schedulers.name = \"\") AND schedulers.deleted=0";
-		$actual = $scheduler->create_export_query('schedulers.id','schedulers.name = ""');
-		$this->assertSame($expected,$actual);
+		$actual = $scheduler->create_export_query('schedulers.id', 'schedulers.name = ""');
+		$this->assertSame($expected, $actual);
 		
 	}
 
@@ -298,7 +298,7 @@ 
 		$scheduler->created_by = 1;
 		$scheduler->modified_user_id = 1;
 		
-		$expected = array (
+		$expected = array(
 				'DELETED' => '0',
 				'CREATED_BY' => 1,
 				'MODIFIED_USER_ID' => 1,
@@ -311,7 +311,7 @@ 
 		);
 		
 		$actual = $scheduler->get_list_view_data();
-		$this->assertSame($expected ,$actual);
+		$this->assertSame($expected, $actual);
 		
 	}
 	
@@ -323,11 +323,11 @@ 
 		$scheduler = new Scheduler();
 		
 		//test without setting name
-		$this->assertEquals(Null,$scheduler->get_summary_text());
+		$this->assertEquals(Null, $scheduler->get_summary_text());
 		
 		//test with name set
 		$scheduler->name = "test";
-		$this->assertEquals('test',$scheduler->get_summary_text());
+		$this->assertEquals('test', $scheduler->get_summary_text());
 	
 	}
 

tests/tests/modules/Campaigns/CampaignTest.php

Spacing +37 added lines, -37 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 
 
-class CampaignTest extends PHPUnit_Framework_TestCase  {
+class CampaignTest extends PHPUnit_Framework_TestCase {
 
 
 	public function testCampaign() {
 	
 		//execute the contructor and check for the Object type and  attributes
 		$campaign = new Campaign();
-		$this->assertInstanceOf('Campaign',$campaign);
-		$this->assertInstanceOf('SugarBean',$campaign);
+		$this->assertInstanceOf('Campaign', $campaign);
+		$this->assertInstanceOf('SugarBean', $campaign);
 	
 		$this->assertAttributeEquals('Campaigns', 'module_dir', $campaign);
 		$this->assertAttributeEquals('Campaign', 'object_name', $campaign);
@@ -28,7 +28,7 @@ 
 		//test with attributes preset and verify template variables are set accordingly
 		$tpl = new Sugar_Smarty();
 		$campaign->list_view_parse_additional_sections($tpl);
-		$this->assertEquals("" ,$tpl->_tpl_vars['ASSIGNED_USER_NAME']);
+		$this->assertEquals("", $tpl->_tpl_vars['ASSIGNED_USER_NAME']);
 		
 	}
 
@@ -38,11 +38,11 @@ 
 		$campaign = new Campaign();
 		
 		//test without setting name
-		$this->assertEquals(Null,$campaign->get_summary_text());
+		$this->assertEquals(Null, $campaign->get_summary_text());
 		
 		//test with name set
 		$campaign->name = "test";
-		$this->assertEquals('test',$campaign->get_summary_text());
+		$this->assertEquals('test', $campaign->get_summary_text());
 
 		
 	}
@@ -54,14 +54,14 @@ 
 
 		//test with empty string params
 		$expected = "SELECT\n            campaigns.*,\n            users.user_name as assigned_user_name  FROM campaigns LEFT JOIN users\n                      ON campaigns.assigned_user_id=users.id where  campaigns.deleted=0 ORDER BY campaigns.name";
-		$actual = $campaign->create_export_query('','');		
-		$this->assertSame($expected,$actual);
+		$actual = $campaign->create_export_query('', '');		
+		$this->assertSame($expected, $actual);
 		
 		
 		//test with valid string params
 		$expected = "SELECT\n            campaigns.*,\n            users.user_name as assigned_user_name  FROM campaigns LEFT JOIN users\n                      ON campaigns.assigned_user_id=users.id where campaigns.name=\"\" AND  campaigns.deleted=0 ORDER BY campaigns.id";
-		$actual = $campaign->create_export_query('campaigns.id','campaigns.name=""');
-		$this->assertSame($expected,$actual);
+		$actual = $campaign->create_export_query('campaigns.id', 'campaigns.name=""');
+		$this->assertSame($expected, $actual);
 		
 	}
 
@@ -142,7 +142,7 @@ 
 		
 		//execute the method and test if it works and does not throws an exception.
 		try {
-			$campaign->update_currency_id('','');
+			$campaign->update_currency_id('', '');
 			$this->assertTrue(true);
 		}
 		catch (Exception $e) {
@@ -159,7 +159,7 @@ 
 		
 		//execute the method and verify that it retunrs expected results
 		
-		$expected = array (
+		$expected = array(
 				'DELETED' => 0,
 				'TRACKER_COUNT' => '0',
 				'REFER_URL' => 'http://',
@@ -174,10 +174,10 @@ 
 		);
 		
 		$actual = $campaign->get_list_view_data();
-        foreach($expected as $expectedKey => $expectedVal){
-            if($expectedKey == 'LAUNCH_WIZARD_IMAGE' || $expectedKey == 'TRACK_CAMPAIGN_IMAGE'){
-                $this->assertRegExp($expected[$expectedKey],$actual[$expectedKey]);
-            }else {
+        foreach ($expected as $expectedKey => $expectedVal) {
+            if ($expectedKey == 'LAUNCH_WIZARD_IMAGE' || $expectedKey == 'TRACK_CAMPAIGN_IMAGE') {
+                $this->assertRegExp($expected[$expectedKey], $actual[$expectedKey]);
+            } else {
                 $this->assertSame($expected[$expectedKey], $actual[$expectedKey]);
             }
         }
@@ -191,13 +191,13 @@ 
 		
 		//test with blank parameter
 		$expected = "campaigns.name like '%'";
-		$actual = $campaign->build_generic_where_clause ("");
-		$this->assertSame($expected,$actual);
+		$actual = $campaign->build_generic_where_clause("");
+		$this->assertSame($expected, $actual);
 		
 		//test with valid parameter
 		$expected = "campaigns.name like '1%'";
-		$actual = $campaign->build_generic_where_clause (1);
-		$this->assertSame($expected,$actual);
+		$actual = $campaign->build_generic_where_clause(1);
+		$this->assertSame($expected, $actual);
 		
 	}
 
@@ -219,7 +219,7 @@ 
 		//mark the record as deleted and verify that this record cannot be retrieved anymore.
 		$campaign->mark_deleted($campaign->id);
 		$result = $campaign->retrieve($campaign->id);
-		$this->assertEquals(null,$result);
+		$this->assertEquals(null, $result);
 
 	}
 
@@ -237,11 +237,11 @@ 
 				
 		$result = $campaign->set_notification_body(new Sugar_Smarty(), $campaign);
 		
-		$this->assertEquals($campaign->name ,$result->_tpl_vars['CAMPAIGN_NAME']);
-		$this->assertEquals($campaign->budget ,$result->_tpl_vars['CAMPAIGN_AMOUNT']);
-		$this->assertEquals($campaign->end_date ,$result->_tpl_vars['CAMPAIGN_CLOSEDATE']);
-		$this->assertEquals($campaign->status ,$result->_tpl_vars['CAMPAIGN_STATUS']);
-		$this->assertEquals($campaign->content ,$result->_tpl_vars['CAMPAIGN_DESCRIPTION']);
+		$this->assertEquals($campaign->name, $result->_tpl_vars['CAMPAIGN_NAME']);
+		$this->assertEquals($campaign->budget, $result->_tpl_vars['CAMPAIGN_AMOUNT']);
+		$this->assertEquals($campaign->end_date, $result->_tpl_vars['CAMPAIGN_CLOSEDATE']);
+		$this->assertEquals($campaign->status, $result->_tpl_vars['CAMPAIGN_STATUS']);
+		$this->assertEquals($campaign->content, $result->_tpl_vars['CAMPAIGN_DESCRIPTION']);
 				
 	}
 
@@ -251,7 +251,7 @@ 
     	
     	$expected = "SELECT campaign_log.*  FROM campaign_log WHERE campaign_log.campaign_id = '' AND campaign_log.deleted=0 AND activity_type = 'lead' AND archived = 0 AND target_id IS NOT NULL ";
     	$actual = $campaign->track_log_leads();
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 		
     }
 
@@ -262,12 +262,12 @@ 
 		//test without parameters
 		$expected = "SELECT campaign_log.*  FROM campaign_log WHERE campaign_log.campaign_id = '' AND campaign_log.deleted=0 AND activity_type='targeted' AND archived=0 ";
 		$actual = $campaign->track_log_entries();
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 
 		//test with parameters
 		$expected = "SELECT campaign_log.*  FROM campaign_log WHERE campaign_log.campaign_id = '' AND campaign_log.deleted=0 AND activity_type='test1' AND archived=0 ";
-		$actual = $campaign->track_log_entries(array('test1','test2'));
-		$this->assertSame($expected,$actual);
+		$actual = $campaign->track_log_entries(array('test1', 'test2'));
+		$this->assertSame($expected, $actual);
 		
 	}
 
@@ -279,12 +279,12 @@ 
 		//without parameters
 		$expected = "SELECT emailman.* ,\n					campaigns.name as campaign_name,\n					email_marketing.name as message_name,\n					(CASE related_type\n						WHEN 'Contacts' THEN LTRIM(RTRIM(CONCAT(IFNULL(contacts.first_name,''),'&nbsp;',IFNULL(contacts.last_name,''))))\n						WHEN 'Leads' THEN LTRIM(RTRIM(CONCAT(IFNULL(leads.first_name,''),'&nbsp;',IFNULL(leads.last_name,''))))\n						WHEN 'Accounts' THEN accounts.name\n						WHEN 'Users' THEN LTRIM(RTRIM(CONCAT(IFNULL(users.first_name,''),'&nbsp;',IFNULL(users.last_name,''))))\n						WHEN 'Prospects' THEN LTRIM(RTRIM(CONCAT(IFNULL(prospects.first_name,''),'&nbsp;',IFNULL(prospects.last_name,''))))\n					END) recipient_name FROM emailman\n		            LEFT JOIN users ON users.id = emailman.related_id and emailman.related_type ='Users'\n					LEFT JOIN contacts ON contacts.id = emailman.related_id and emailman.related_type ='Contacts'\n					LEFT JOIN leads ON leads.id = emailman.related_id and emailman.related_type ='Leads'\n					LEFT JOIN accounts ON accounts.id = emailman.related_id and emailman.related_type ='Accounts'\n					LEFT JOIN prospects ON prospects.id = emailman.related_id and emailman.related_type ='Prospects'\n					LEFT JOIN prospect_lists ON prospect_lists.id = emailman.list_id\n                    LEFT JOIN email_addr_bean_rel ON email_addr_bean_rel.bean_id = emailman.related_id and emailman.related_type = email_addr_bean_rel.bean_module and email_addr_bean_rel.primary_address = 1 and email_addr_bean_rel.deleted=0\n					LEFT JOIN campaigns ON campaigns.id = emailman.campaign_id\n					LEFT JOIN email_marketing ON email_marketing.id = emailman.marketing_id WHERE  emailman.campaign_id = '' AND emailman.deleted=0 AND  emailman.deleted=0";
 		$actual = $campaign->get_queue_items();
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 		
 		//with parameters		
 		$expected = "SELECT emailman.* ,\n					campaigns.name as campaign_name,\n					email_marketing.name as message_name,\n					(CASE related_type\n						WHEN 'Contacts' THEN LTRIM(RTRIM(CONCAT(IFNULL(contacts.first_name,''),'&nbsp;',IFNULL(contacts.last_name,''))))\n						WHEN 'Leads' THEN LTRIM(RTRIM(CONCAT(IFNULL(leads.first_name,''),'&nbsp;',IFNULL(leads.last_name,''))))\n						WHEN 'Accounts' THEN accounts.name\n						WHEN 'Users' THEN LTRIM(RTRIM(CONCAT(IFNULL(users.first_name,''),'&nbsp;',IFNULL(users.last_name,''))))\n						WHEN 'Prospects' THEN LTRIM(RTRIM(CONCAT(IFNULL(prospects.first_name,''),'&nbsp;',IFNULL(prospects.last_name,''))))\n					END) recipient_name FROM emailman\n		            LEFT JOIN users ON users.id = emailman.related_id and emailman.related_type ='Users'\n					LEFT JOIN contacts ON contacts.id = emailman.related_id and emailman.related_type ='Contacts'\n					LEFT JOIN leads ON leads.id = emailman.related_id and emailman.related_type ='Leads'\n					LEFT JOIN accounts ON accounts.id = emailman.related_id and emailman.related_type ='Accounts'\n					LEFT JOIN prospects ON prospects.id = emailman.related_id and emailman.related_type ='Prospects'\n					LEFT JOIN prospect_lists ON prospect_lists.id = emailman.list_id\n                    LEFT JOIN email_addr_bean_rel ON email_addr_bean_rel.bean_id = emailman.related_id and emailman.related_type = email_addr_bean_rel.bean_module and email_addr_bean_rel.primary_address = 1 and email_addr_bean_rel.deleted=0\n					LEFT JOIN campaigns ON campaigns.id = emailman.campaign_id\n					LEFT JOIN email_marketing ON email_marketing.id = emailman.marketing_id INNER JOIN (select min(id) as id from emailman  em GROUP BY users.id  ) secondary\n			           on emailman.id = secondary.id	WHERE  emailman.campaign_id = '' AND emailman.deleted=0 AND marketing_id ='1'  AND  emailman.deleted=0";
-		$actual = $campaign->get_queue_items(array("EMAIL_MARKETING_ID_VALUE"=>1,"group_by"=>"users.id"));
-		$this->assertSame($expected,$actual);
+		$actual = $campaign->get_queue_items(array("EMAIL_MARKETING_ID_VALUE"=>1, "group_by"=>"users.id"));
+		$this->assertSame($expected, $actual);
 		
 	}
 
@@ -308,17 +308,17 @@ 
     	//test without parameters
     	$expected = "";
     	$actual = $campaign->create_list_count_query('');
-    	$this->assertSame($expected,$actual);
+    	$this->assertSame($expected, $actual);
 
     	//test with query parameters
     	$expected = "SELECT count(*) c FROM campaigns";
     	$actual = $campaign->create_list_count_query('select * from campaigns');
-    	$this->assertSame($expected,$actual);
+    	$this->assertSame($expected, $actual);
 
     	//test with distinct
     	$expected = "SELECT count(DISTINCT campaigns.id) c FROM campaigns";
     	$actual = $campaign->create_list_count_query('SELECT distinct marketing_id FROM campaigns');
-    	$this->assertSame($expected,$actual);
+    	$this->assertSame($expected, $actual);
     	    	
     }
 
@@ -327,7 +327,7 @@ 
     {
     	$campaign = new Campaign();
     	$result = $campaign->getDeletedCampaignLogLeadsCount();
-    	$this->assertEquals(0,$result);
+    	$this->assertEquals(0, $result);
     	
     }