From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/classes/DealerInquiryModifyStateControllerTest.cls | 293 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 293 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/classes/DealerInquiryModifyStateControllerTest.cls b/force-app/main/default/classes/DealerInquiryModifyStateControllerTest.cls
index 0ad62f6..3b2d713 100644
--- a/force-app/main/default/classes/DealerInquiryModifyStateControllerTest.cls
+++ b/force-app/main/default/classes/DealerInquiryModifyStateControllerTest.cls
@@ -1,5 +1,6 @@
@isTest
private class DealerInquiryModifyStateControllerTest {
+<<<<<<< HEAD
@TestSetup
static void init() {
List<RecordType> rectCo = [
@@ -23,11 +24,24 @@
FROM RecordType
WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '瑷虹檪绉� 娑堝寲绉�'
];
+=======
+ @TestSetup static void init() {
+ List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鐥呴櫌'];
+ if (rectCo.size() == 0) {
+ return;
+ }
+ List<RecordType> rectSct = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鎴︾暐绉戝鍒嗛 鍛煎惛绉�'];
+ if (rectSct.size() == 0) {
+ return;
+ }
+ List<RecordType> rectDpt = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '瑷虹檪绉� 娑堝寲绉�'];
+>>>>>>> LEXCommunityLiJun
if (rectDpt.size() == 0) {
return;
}
// 銉嗐偣銉堛儑銉笺偪
+<<<<<<< HEAD
Account company = new Account();
company.RecordTypeId = rectCo[0].Id;
@@ -38,11 +52,24 @@
section.Name = '*';
section.Department_Class_Label__c = '娑堝寲绉�';
section.ParentId = company.Id;
+=======
+
+ Account company = new Account();
+ company.RecordTypeId = rectCo[0].Id;
+ company.Name = 'NFM007TestCompany';
+ insert company;
+ Account section = new Account();
+ section.RecordTypeId = rectSct[0].Id;
+ section.Name = '*';
+ section.Department_Class_Label__c = '娑堝寲绉�';
+ section.ParentId = company.Id;
+>>>>>>> LEXCommunityLiJun
section.Hospital_Department_Class__c = company.Id;
insert section;
// Test.startTest();
Account depart = new Account();
depart.RecordTypeId = rectDpt[0].Id;
+<<<<<<< HEAD
depart.Name = '*';
depart.Department_Name__c = 'NFM007TestDepart';
depart.ParentId = section.Id;
@@ -59,6 +86,24 @@
opp.Trade__c = '鍐呰部';
opp.StageName = '寮曞悎';
opp.CloseDate = Date.today();
+=======
+ depart.Name = '*';
+ depart.Department_Name__c = 'NFM007TestDepart';
+ depart.ParentId = section.Id;
+ depart.Department_Class__c = section.Id;
+ depart.Hospital__c = company.Id;
+ insert depart;
+
+ Opportunity opp = new Opportunity();
+ opp.AccountId = depart.Id;
+ opp.Department_Class__c = section.Id;
+ opp.Hospital__c = company.Id;
+ opp.SAP_Send_OK__c = false;
+ opp.Name = 'GZ-SP-NFM007_1';
+ opp.Trade__c = '鍐呰部';
+ opp.StageName = '寮曞悎';
+ opp.CloseDate = Date.today();
+>>>>>>> LEXCommunityLiJun
opp.Stock_apply_status__c = '鐢宠涓�';
insert opp;
Test.startTest();
@@ -73,6 +118,7 @@
contact1.LastName = 'test1鍖婚櫌';
contact1.Agency_User__c = true;
insert contact1;
+<<<<<<< HEAD
List<Contact> contactlist = [
SELECT Id, FirstName
FROM Contact
@@ -83,6 +129,19 @@
//
User user = new User();
Profile p = [SELECT Id FROM Profile WHERE Name = '901_缁忛攢鍟嗘椿鍔ㄧ郴缁�'];
+=======
+ List<Contact> contactlist = [select Id, FirstName
+ from Contact
+ ];
+
+ System.assertEquals('璨换鑰�', contactlist[0].FirstName);
+
+
+
+ //
+ User user = new User();
+ Profile p = [select Id from Profile where Name = '901_缁忛攢鍟嗘椿鍔ㄧ郴缁�'];
+>>>>>>> LEXCommunityLiJun
user.ProfileId = p.Id;
user.ContactId = contact1.Id;
user.FirstName = '銉︺兗銈躲兗';
@@ -96,6 +155,7 @@
user.Alias = '銉嗐儲';
user.CommunityNickname = '銉嗐偣銉堛儲銉笺偠銉�';
user.SalesManager__c = UserInfo.getUserId();
+<<<<<<< HEAD
System.runAs(new User(Id = UserInfo.getUserId())) {
insert user;
}
@@ -104,6 +164,12 @@
FROM User
WHERE LastName = '銉嗐偣銉�'
];
+=======
+ System.runAs(new User(Id = UserInfo.getUserId())){
+ insert user;
+ }
+ List<user> users = [select Id, Name, LastName, FirstName from User where LastName = '銉嗐偣銉�'];
+>>>>>>> LEXCommunityLiJun
//
Agency_Hospital_Link__c agency_hospital_link = new Agency_Hospital_Link__c();
@@ -116,6 +182,7 @@
//
//System.assertEquals('銉嗐偣銉�',users[0].LastName);
+<<<<<<< HEAD
System.assertEquals('銉︺兗銈躲兗', users[0].FirstName);
Id rtId = [
@@ -124,6 +191,11 @@
WHERE IsActive = TRUE AND SobjectType = 'Agency_Opportunity__c' AND DeveloperName = 'Opportunity'
]
.Id;
+=======
+ System.assertEquals('銉︺兗銈躲兗', users[0].FirstName );
+
+ Id rtId = [select Id, DeveloperName from RecordType where IsActive = true and SobjectType = 'Agency_Opportunity__c' and DeveloperName = 'Opportunity'].Id;
+>>>>>>> LEXCommunityLiJun
// Schema.SobjectType.Agency_Opportunity__c.getRecordTypeInfosByName().get('璇环').getRecordTypeId();
Agency_opportunity__c agency_opportunity = new Agency_opportunity__c();
agency_opportunity.RecordTypeId = rtId;
@@ -134,6 +206,7 @@
agency_opportunity.StageName__c = '杩樻病鐢宠棰勭畻';
agency_opportunity.OwnerId = user.Id;
agency_opportunity.Change_To_Opportunity_T__c = '::CF-HQ290I';
+<<<<<<< HEAD
agency_opportunity.Sales_Manager__c = UserInfo.getUserId();
insert agency_opportunity;
@@ -142,14 +215,34 @@
static testMethod void myUnitTest_SortKey() {
Test.startTest();
+=======
+ agency_opportunity.Sales_Manager__c =UserInfo.getUserId();
+
+ insert agency_opportunity;
+ Test.stopTest();
+
+ }
+
+ static testMethod void myUnitTest_SortKey() {
+ Test.startTest();
+>>>>>>> LEXCommunityLiJun
Test.setMock(WebServiceMock.class, new NFMTest_Mock());
Test.stopTest();
PageReference page = new PageReference('/apex/DealerInquiryModifyState');
System.Test.setCurrentPage(page);
+<<<<<<< HEAD
// 鍒濆鍖栨祴璇�
DealerInquiryModifyStateController controller = new DealerInquiryModifyStateController();
+=======
+
+
+ // 鍒濆鍖栨祴璇�
+ DealerInquiryModifyStateController controller = new DealerInquiryModifyStateController();
+
+
+>>>>>>> LEXCommunityLiJun
controller.init();
//System.assertEquals(1, controller.oppRecords.size());楠岃瘉棰勬湡鍊煎拰缁撴灉鍊兼纭��
// 鎺掑簭娴嬭瘯
@@ -164,7 +257,11 @@
// Test.stopTest();
}
static testMethod void myUnitTest_AccSearchAndAoosearch() {
+<<<<<<< HEAD
Test.startTest();
+=======
+ Test.startTest();
+>>>>>>> LEXCommunityLiJun
Test.setMock(WebServiceMock.class, new NFMTest_Mock());
Test.stopTest();
PageReference page = new PageReference('/apex/DealerInquiryModifyState');
@@ -172,7 +269,178 @@
DealerInquiryModifyStateController controller = new DealerInquiryModifyStateController();
// 鍒濆鍖栨祴璇�
// Test.startTest();
+<<<<<<< HEAD
+ controller.init();
+ //鏂囨湰杈撳叆妗嗘绱�
+ //1:缁忛攢鍟嗗尰闄�
+ controller.accSearch = '娲礊鍘夸腑鍖婚櫌';
+ controller.chick();
+ //2:鎷呭綋浜�
+ controller.aooSearch = '鐜嬪鐞�';
+ controller.chick();
+ // Test.stopTest();
+ }
+ static testMethod void myUnitTest_numtext_Equals() {
+ PageReference page = new PageReference('/apex/DealerInquiryModifyState');
+ System.Test.setCurrentPage(page);
+ DealerInquiryModifyStateController controller = new DealerInquiryModifyStateController();
+ // 鍒濆鍖栨祴璇�
+ Test.startTest();
+ controller.init();
+ // 妫�绱㈡暟鎹瓧娈垫祴璇�
+ //1:妫�绱㈢粡閿�鍟嗙紪鐮� = 151P-00001327
+ controller.numtext1 = 'Agency_Opportunity_No__c';
+ controller.numtext2 = '=';
+ controller.numtext = '151P-00001327';
+ controller.chick();
+ controller.numtext1 = 'Agency_Opportunity_No__c';
+ controller.numtext2 = '<>';
+ controller.numtext = '151P-00001327';
+ controller.chick();
+ Test.stopTest();
+ }
+ static testMethod void myUnitTest_numtext_Starts_with() {
+ PageReference page = new PageReference('/apex/DealerInquiryModifyState');
+ System.Test.setCurrentPage(page);
+ DealerInquiryModifyStateController controller = new DealerInquiryModifyStateController();
+ // 鍒濆鍖栨祴璇�
+ Test.startTest();
+ controller.init();
+ controller.numtext1 = 'Agency_Opportunity_No__c';
+ controller.numtext2 = '<';
+ controller.numtext = '151P-00001327';
+ controller.chick();
+ controller.numtext1 = 'Agency_Opportunity_No__c';
+ controller.numtext2 = 'starts with';
+ controller.numtext = '151P-00001327';
+ controller.chick();
+ Test.stopTest();
+ }
+ static testMethod void myUnitTest_contains() {
+ PageReference page = new PageReference('/apex/DealerInquiryModifyState');
+ System.Test.setCurrentPage(page);
+ DealerInquiryModifyStateController controller = new DealerInquiryModifyStateController();
+ // 鍒濆鍖栨祴璇�
+ Test.startTest();
+ controller.init();
+ //2:妫�绱㈢粡閿�鍟嗙紪鐮� 鍖呭惈 151P
+ controller.numtext1 = 'Agency_Opportunity_No__c';
+ controller.numtext2 = 'contains';
+ controller.numtext = '151P';
+ controller.chick();
+ controller.numtext1 = 'Agency_Opportunity_No__c';
+ controller.numtext2 = 'notcontains';
+ controller.numtext = '151P';
+ controller.chick();
+ Test.stopTest();
+ }
+ static testMethod void myUnitTest_null_contains() {
+ PageReference page = new PageReference('/apex/DealerInquiryModifyState');
+ System.Test.setCurrentPage(page);
+ DealerInquiryModifyStateController controller = new DealerInquiryModifyStateController();
+ // 鍒濆鍖栨祴璇�
+ Test.startTest();
+ controller.init();
+ //3:妫�绱㈡潯浠跺惈绌烘牸
+ controller.numtext1 = 'Agency_Opportunity_No__c';
+ controller.numtext2 = 'contains';
+ controller.numtext = '151P 150P';
+ controller.chick();
+ Test.stopTest();
+ }
+ static testMethod void myUnitTest_null_notcontains() {
+ PageReference page = new PageReference('/apex/DealerInquiryModifyState');
+ System.Test.setCurrentPage(page);
+ DealerInquiryModifyStateController controller = new DealerInquiryModifyStateController();
+ // 鍒濆鍖栨祴璇�
+ Test.startTest();
+ controller.init();
+ controller.numtext1 = 'Agency_Opportunity_No__c';
+ controller.numtext2 = 'notcontains';
+ controller.numtext = '151P 150P';
+ controller.chick();
+ Test.stopTest();
+ }
+ static testMethod void myUnitTest_AllNull_contains() {
+ PageReference page = new PageReference('/apex/DealerInquiryModifyState');
+ System.Test.setCurrentPage(page);
+ DealerInquiryModifyStateController controller = new DealerInquiryModifyStateController();
+ // 鍒濆鍖栨祴璇�
+ Test.startTest();
+ controller.init();
+ controller.numtext1 = 'Agency_Opportunity_No__c';
+ controller.numtext2 = 'contains';
+ controller.numtext = ' ';
+ controller.chick();
+ Test.stopTest();
+ }
+ static testMethod void myUnitTest_AllNull_notcontains() {
+ PageReference page = new PageReference('/apex/DealerInquiryModifyState');
+ System.Test.setCurrentPage(page);
+ DealerInquiryModifyStateController controller = new DealerInquiryModifyStateController();
+ // 鍒濆鍖栨祴璇�
+ Test.startTest();
+ controller.init();
+ controller.numtext1 = 'Agency_Opportunity_No__c';
+ controller.numtext2 = 'notcontains';
+ controller.numtext = ' ';
+ controller.chick();
+ controller.numtext1 = 'Agency_Opportunity_No__c';
+ controller.numtext2 = '=';
+ controller.numtext = ' ';
+ controller.chick();
+ Test.stopTest();
+ }
+ static testMethod void myUnitTest_tarts_with() {
+ PageReference page = new PageReference('/apex/DealerInquiryModifyState');
+ System.Test.setCurrentPage(page);
+ DealerInquiryModifyStateController controller = new DealerInquiryModifyStateController();
+ Test.startTest();
+ controller.init();
+ controller.numtext1 = 'Agency_Opportunity_No__c';
+ controller.numtext2 = '<>';
+ controller.numtext = ' ';
+ controller.chick();
+ controller.numtext1 = 'Agency_Opportunity_No__c';
+ controller.numtext2 = ' starts with ';
+ controller.numtext = ' ';
+ controller.chick();
+ Test.stopTest();
+ }
+ static testMethod void myUnitTest_Equals_D() {
+ PageReference page = new PageReference('/apex/DealerInquiryModifyState');
+ System.Test.setCurrentPage(page);
+ DealerInquiryModifyStateController controller = new DealerInquiryModifyStateController();
+ // 鍒濆鍖栨祴璇�
+ Test.startTest();
+ controller.init();
+ //4:妫�绱㈡潯浠跺惈閫楀彿
+ controller.numtext1 = 'Agency_Opportunity_No__c';
+ controller.numtext2 = '=';
+ controller.numtext = '151P-00001327,151P-00001343';
+ controller.chick();
+ controller.numtext1 = 'Agency_Opportunity_No__c';
+ controller.numtext2 = '<>';
+ controller.numtext = '151P-00001327,151P-00001343';
+ controller.chick();
+ Test.stopTest();
+ }
+ static testMethod void myUnitTestTime01() {
+ PageReference page = new PageReference('/apex/DealerInquiryModifyState');
+ System.Test.setCurrentPage(page);
+ DealerInquiryModifyStateController controller = new DealerInquiryModifyStateController();
+ // 鍒濆鍖栨祴璇�
+ Test.startTest();
+ controller.init();
+ //妫�绱㈡棩鏈熸祴璇�
+ controller.tmpAO = new Agency_Opportunity__c();
+ controller.tmpBO = new Agency_Opportunity__c();
+ controller.timetext1 = 'Created_Day__c';
+ controller.timetext2 = '=';
+ controller.tmpAO.MaxActivityDate__c = date.valueOf('2018-12-12');
+=======
+
controller.init();
//鏂囨湰杈撳叆妗嗘绱�
//1:缁忛攢鍟嗗尰闄�
@@ -352,6 +620,19 @@
controller.chick();
// Test.startTest();
controller.tmpAO.MaxActivityDate__c = date.valueOf('2018-12-02');
+>>>>>>> LEXCommunityLiJun
+ controller.tmpBO.MaxActivityDate__c = date.valueOf('2018-12-12');
+ controller.chick();
+
+ controller.tmpBO.MaxActivityDate__c = date.valueOf('2018-12-09');
+ controller.chick();
+ controller.tmpBO.MaxActivityDate__c = date.valueOf('2018-02-19');
+ controller.chick();
+ controller.tmpBO.MaxActivityDate__c = date.valueOf('2018-02-09');
+ controller.chick();
+<<<<<<< HEAD
+ // Test.startTest();
+ controller.tmpAO.MaxActivityDate__c = date.valueOf('2018-12-02');
controller.tmpBO.MaxActivityDate__c = date.valueOf('2018-12-12');
controller.chick();
@@ -362,6 +643,10 @@
controller.tmpBO.MaxActivityDate__c = date.valueOf('2018-02-09');
controller.chick();
Test.stopTest();
+=======
+ Test.stopTest();
+
+>>>>>>> LEXCommunityLiJun
}
static testMethod void myUnitTestTime02() {
PageReference page = new PageReference('/apex/DealerInquiryModifyState');
@@ -396,6 +681,10 @@
controller.tmpBO.MaxActivityDate__c = date.valueOf('2018-02-09');
controller.chick();
Test.stopTest();
+<<<<<<< HEAD
+=======
+
+>>>>>>> LEXCommunityLiJun
}
static testMethod void myUnitTestTimeSave() {
PageReference page = new PageReference('/apex/DealerInquiryModifyState');
@@ -434,4 +723,8 @@
controller.init();
Test.stopTest();
}
+<<<<<<< HEAD
}
+=======
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1