From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/classes/LexConsumableAccountControllerTest.cls | 200 +------------------------------------------------
1 files changed, 7 insertions(+), 193 deletions(-)
diff --git a/force-app/main/default/classes/LexConsumableAccountControllerTest.cls b/force-app/main/default/classes/LexConsumableAccountControllerTest.cls
index 766aacf..b204bad 100644
--- a/force-app/main/default/classes/LexConsumableAccountControllerTest.cls
+++ b/force-app/main/default/classes/LexConsumableAccountControllerTest.cls
@@ -3,7 +3,6 @@
public static Account account1 = new Account();
public static Account account2 = new Account();
public static Account account3 = new Account();
-<<<<<<< HEAD
public static Account consumable = new Account();
public static Contact contact1 = new Contact();
public static User user = new User();
@@ -12,21 +11,23 @@
static testMethod void testMethod1() {
User thisUser = [SELECT Id FROM User WHERE Id = :UserInfo.getUserId()];
System.runAs(thisUser) {
+ List<Account> accList = new List<Account>();
// 鍙栧紩鍏�
account1.Name = 'test1鍖婚櫌';
account1.RecordTypeId = '01210000000QemG';
// account1.Is_Active__c = '鑽夋涓�';
- insert account1;
+ accList.add(account1);
account2.Name = 'test2鍖婚櫌';
account2.RecordTypeId = '01210000000QemG';
// account2.Is_Active__c = '鏈夊姽';
- insert account2;
+ accList.add(account2);
account3.Name = 'test3鍖婚櫌';
account3.RecordTypeId = '01210000000QemG';
// account3.Is_Active__c = '鐢宠涓�';
- insert account3;
+ accList.add(account3);
+ insert accList;
consumable.Name = 'test1缁忛攢鍟�';
consumable.RecordTypeId = '01210000000Qem1';
@@ -38,11 +39,7 @@
insert contact1;
// 銉︺兗銈躲兗
- Profile p = [
- SELECT Id
- FROM Profile
- WHERE Name = '901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄�'
- ];
+ Profile p = [SELECT Id FROM Profile WHERE Name = '901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄�'];
user.ProfileId = p.Id;
user.ContactId = contact1.Id;
user.FirstName = '銉︺兗銈躲兗';
@@ -119,11 +116,7 @@
insert contact1;
// 銉︺兗銈躲兗
- Profile p = [
- SELECT Id
- FROM Profile
- WHERE Name = '901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄�'
- ];
+ Profile p = [SELECT Id FROM Profile WHERE Name = '901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄�'];
user.ProfileId = p.Id;
user.ContactId = contact1.Id;
user.FirstName = '銉︺兗銈躲兗';
@@ -187,183 +180,4 @@
);
}
}
-=======
- public static Account consumable = new Account();
- public static Contact contact1 = new Contact();
- public static User user = new User();
- public static Agency_Hospital_Link__c agency_hospital_link = new Agency_Hospital_Link__c();
-
- static testMethod void testMethod1(){
- User thisUser = [ select Id from User where Id = :UserInfo.getUserId()];
- System.runAs(thisUser){
- List<Account> accList = new List<Account>();
- // 鍙栧紩鍏�
- account1.Name = 'test1鍖婚櫌';
- account1.RecordTypeId = '01210000000QemG';
- // account1.Is_Active__c = '鑽夋涓�';
- accList.add(account1);
-
- account2.Name = 'test2鍖婚櫌';
- account2.RecordTypeId = '01210000000QemG';
- // account2.Is_Active__c = '鏈夊姽';
- accList.add(account2);
-
- account3.Name = 'test3鍖婚櫌';
- account3.RecordTypeId = '01210000000QemG';
- // account3.Is_Active__c = '鐢宠涓�';
- accList.add(account3);
- insert accList;
-
- consumable.Name = 'test1缁忛攢鍟�';
- consumable.RecordTypeId = '01210000000Qem1';
- insert consumable;
-
- contact1.AccountId = account1.Id;
- contact1.FirstName = '璨换鑰�';
- contact1.LastName = 'test1鍖婚櫌';
- insert contact1;
-
- // 銉︺兗銈躲兗
- Profile p = [select Id from Profile where Name = '901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄�'];
- user.ProfileId = p.Id;
- user.ContactId = contact1.Id;
- user.FirstName = '銉︺兗銈躲兗';
- user.LastName = '銉嗐偣銉�';
- user.Email = 'test_user@example.com';
- user.emailencodingkey='UTF-8';
- user.languagelocalekey='zh_CN';
- user.localesidkey='ja_JP';
- user.timezonesidkey='Asia/Shanghai';
- user.Username = 'test_user@example.com';
- user.Alias = '銉嗐儲';
- user.CommunityNickname = '銉嗐偣銉堛儲銉笺偠銉�';
- insert user;
-
- // 浠ｇ悊搴楀尰闄�
- agency_hospital_link.Name = 'test1浠ｇ悊搴楀尰闄�';
- agency_hospital_link.Hospital__c = account1.Id;
- agency_hospital_link.Agency__c = consumable.Id;
- agency_hospital_link.OwnerId = user.Id;
- insert agency_hospital_link;
-
-
-
- }
- System.runAs(user){
- //璁㈠崟
- Consumable_order__c Order1 = new Consumable_order__c();
- Order1.Name = 'OCM_01_001';
- Order1.Order_status__c = '鎵瑰噯';
- Order1.Order_type__c = '鍒拌揣';
- Order1.Dealer_Info__c = account1.Id;
- Order1.RecordTypeid = '01210000000c9dqAAA';
- Order1.Order_ProType__c = 'ET';
- Order1.Order_ForHospital__c = account1.Id;
- insert Order1;
-
-
-
- Consumable_Orderdetails__c con = new Consumable_Orderdetails__c();
- con.Consumable_order__c = Order1.Id;
- insert con;
-
-
- LexConsumableAccountController.init(2,1,'thisYear');
- LexConsumableAccountController.init(2,1,'lastYear');
- LexConsumableAccountController.init(2,1,'2023');
- LexConsumableAccountController.changeFiscalYearView('thisYear');
- LexConsumableAccountController.changeFiscalYearView('lastYear');
- // LexConsumableAccountController.changelistView('62. 鍖婚櫌_Hospital鐢宠涓殑鍖婚櫌',consumable.Id,'ET',1,0,'Is_Active__c','ASC');
- // LexConsumableAccountController.changelistView('63. 鍖婚櫌_Hospital涓婂懆鍒涘缓鐨勫尰闄�',consumable.Id,'ET',1,0,'Is_Active__c','ASC');
-
-
- }
-
-
-
}
-static testMethod void testMethod2(){
- User thisUser = [ select Id from User where Id = :UserInfo.getUserId()];
- System.runAs(thisUser){
- // 鍙栧紩鍏�
- account1.Name = 'test1鍖婚櫌';
- account1.RecordTypeId = '01210000000QemG';
- // account1.Is_Active__c = '鑽夋涓�';
- insert account1;
-
- account2.Name = 'test2鍖婚櫌';
- account2.RecordTypeId = '01210000000QemG';
- // account2.Is_Active__c = '鏈夊姽';
- insert account2;
-
- account3.Name = 'test3鍖婚櫌';
- account3.RecordTypeId = '01210000000QemG';
- // account3.Is_Active__c = '鐢宠涓�';
- insert account3;
-
- consumable.Name = 'test1缁忛攢鍟�';
- consumable.RecordTypeId = '01210000000Qem1';
- insert consumable;
-
- contact1.AccountId = account1.Id;
- contact1.FirstName = '璨换鑰�';
- contact1.LastName = 'test1鍖婚櫌';
- insert contact1;
-
- // 銉︺兗銈躲兗
- Profile p = [select Id from Profile where Name = '901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄�'];
- user.ProfileId = p.Id;
- user.ContactId = contact1.Id;
- user.FirstName = '銉︺兗銈躲兗';
- user.LastName = '銉嗐偣銉�';
- user.Email = 'test_user@example.com';
- user.emailencodingkey='UTF-8';
- user.languagelocalekey='zh_CN';
- user.localesidkey='ja_JP';
- user.timezonesidkey='Asia/Shanghai';
- user.Username = 'test_user@example.com';
- user.Alias = '銉嗐儲';
- user.CommunityNickname = '銉嗐偣銉堛儲銉笺偠銉�';
- insert user;
-
- // 浠ｇ悊搴楀尰闄�
- agency_hospital_link.Name = 'test1浠ｇ悊搴楀尰闄�';
- agency_hospital_link.Hospital__c = account1.Id;
- agency_hospital_link.Agency__c = consumable.Id;
- agency_hospital_link.OwnerId = user.Id;
- insert agency_hospital_link;
- }
- System.runAs(user){
- PageReference page = new PageReference('/apex/ConsumableAccount');
- System.Test.setCurrentPage(page);
- ConsumableAccountController ca = new ConsumableAccountController();
- //ConsumableAccountController.getlistViewOptions();
- ca.init();
-
- ca.filterName = '61. 鍖婚櫌_Hospital鑽夋涓殑鍖婚櫌';
- ca.changelistView();
-
- ca.filterName = '62. 鍖婚櫌_Hospital鐢宠涓殑鍖婚櫌';
- ca.changelistView();
-
- ca.filterName = '63. 鍖婚櫌_Hospital涓婂懆鍒涘缓鐨勫尰闄�';
- ca.changelistView();
-
- ca.refreshPageSize();
-
- ca.sortKey = '0';
- ca.accsort();
-
- ca.sortKey = '1';
- LexConsumableAccountController.changelistView('62. 鍖婚櫌_Hospital鐢宠涓殑鍖婚櫌',consumable.Id,'ET',1,0,'Is_Active__c','ASC');
- LexConsumableAccountController.changelistView('63. 鍖婚櫌_Hospital涓婂懆鍒涘缓鐨勫尰闄�',consumable.Id,'ET',1,0,'Is_Active__c','ASC');
-
-
- }
->>>>>>> LEXCommunityLiJun
-}
-
-
-
-
-}
\ No newline at end of file
--
Gitblit v1.9.1