fixconflict

buli

2023-07-14 36d15f189de2e83ce2576715dac30c3c260388dd

 force-app/main/default/classes/LexSaleAndDeliveryControllerTest.cls

@@ -1,6 +1,7 @@
@isTest
private class LexSaleAndDeliveryControllerTest {
    @isTest
<<<<<<< HEAD
    static void testInit() {
        User myUser_test;
        Account myAccount2;
@@ -53,16 +54,43 @@
                UserPro_Type__c = 'ENG',
                Work_Location__c = '北京'
            );
=======
    static void testInit(){
        User myUser_test;
        Account myAccount2;
        Product2__c pro2;
        User thisUser = [ SELECT Id FROM User WHERE Id = :UserInfo.getUserId()];
        System.runAs(thisUser){
            List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '販売店'];
            if (rectCo.size() == 0) {
                return;
            }
            Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET Email)'];
            Product2 prod02 = new Product2(Name='Test02181',ProductCode='Test0218',Asset_Model_No__c = 'Test0218',SFDA_Status__c = '有効',Dealer_special_Object__c = true,SFDA_Approbation_No__c = 'Test002',Packing_list_manual__c = 12,SFDA_Expiration_Date__c= Date.today(),Category5__c = 'tset8',Manual_Entry__c = false);
            pro2 = new Product2__c(Name='Pro002181',OT_CODE_Text__c='Test002181',Product2__c = prod02.Id);
            insert pro2;
            myAccount2 = new Account(name='Testaccount003',Dealer_discount__c =20,RecordTypeId = rectCo[0].Id,AgentCode_Ext__c = '2');
            insert myAccount2;
    
            Contact core = new Contact(email='wan@salesforce.com', firstname='wan',lastname='Plumbers',accountid=myAccount2.id);
            insert core;
            myUser_test = New User(ContactId = core.id, Alias = 'newUser', Email='newuser@testorg.com', EmailEncodingKey='UTF-8', LastName='TestUser', LanguageLocaleKey='zh_CN', LocaleSidKey='zh_CN', ProfileId = prof.Id, TimeZoneSidKey='Asia/Shanghai', UserName='testUser@testorg.com', UserPro_Type__c='ENG', Work_Location__c='北京');
>>>>>>> LEXCommunityLiJun
            insert myUser_test;
            myUser_test.UserPro_Type__c = '';
            update myUser_test;
        }
<<<<<<< HEAD
        System.runAs(MyUser_Test) {
=======
        System.runAs(MyUser_Test){
>>>>>>> LEXCommunityLiJun
            String accountId = myUser_test.accountid;
            String agencyProType = myUser_test.UserPro_Type__c;
            String userWorkLocation = myUser_test.Work_Location__c;
            System.Test.startTest();
            LexSaleAndDeliveryController.init();
<<<<<<< HEAD
            LexSaleAndDeliveryController.searchOrderInstatus(
                '2023/01/01',
                '2023/12/31',
@@ -95,3 +123,13 @@
        }
    }
}
=======
            LexSaleAndDeliveryController.searchOrderInstatus('2023/01/01','2023/12/31',accountId,agencyProType,userWorkLocation,'DB','大连');
            LexSaleAndDeliveryController.searchConsumableorderdetails('2023/01/01','2023/12/31',accountId,agencyProType,userWorkLocation,'DB','大连');
            LexSaleAndDeliveryController.searchConsumableorFinish('2023/01/01','2023/12/31',accountId,agencyProType,userWorkLocation,'DB','大连');
            LexSaleAndDeliveryController.cleanUp(accountId,agencyProType,userWorkLocation);
            System.Test.stopTest();
        }
    }
}
>>>>>>> LEXCommunityLiJun