fixconflict

buli

2023-07-14 36d15f189de2e83ce2576715dac30c3c260388dd

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
@isTest
<<<<<<< HEAD
private class LexProductLimitEditControllerTest {
    @isTest
    static void unittest() {
        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)'
        ];
        Product2 prod01 = new Product2(
            Name = 'Test01',
            ProductCode = 'Test01',
            Asset_Model_No__c = 'Test01',
            SFDA_Status__c = '有効',
            Dealer_special_Object__c = true
        );
        Product2 prod02 = new Product2(
            Name = 'Test02',
            ProductCode = 'Test02',
            Asset_Model_No__c = 'Test02',
            SFDA_Status__c = '有効',
            Dealer_special_Object__c = true
        );
        insert new List<Product2>{ prod01, prod02 };
        Product2__c pro1 = new Product2__c(Name = 'Pro001', OT_CODE_Text__c = 'Test001', Product2__c = prod01.Id);
        Product2__c pro2 = new Product2__c(Name = 'Pro002', OT_CODE_Text__c = 'Test002', Product2__c = prod02.Id);
        insert new List<Product2__c>{ pro1, pro2 };
 
        Account myAccount2 = new Account(
            name = 'Testaccount005',
            Dealer_discount__c = 20,
            RecordTypeId = rectCo[0].Id,
            Product_Limit_Date__c = 'Test01|5|55,Test02|2|4'
        );
        insert myAccount2;
        String myAccount2Id = myAccount2.Id;
        LexProductLimitEditController.init(myAccount2Id, 'ENG');
        LexProductLimitEditController.init(myAccount2Id, '');
        LexProductLimitEditController.accountid = myAccount2Id;
        LexProductLimitEditController controllerLimit = new LexProductLimitEditController();
 
        // Given
        // PageReference page = new PageReference('/apex/ProductLimitEdit?accountid=' + myAccount2.id);
=======
private class LexProductLimitEditControllerTest
{
    @isTest
    static void unittest()
    {
 
        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)'];
        Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '有効',Dealer_special_Object__c = true);
        Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '有効',Dealer_special_Object__c = true);
        insert new Product2[]{prod01,prod02};
        Product2__c pro1 = new Product2__c(Name='Pro001',OT_CODE_Text__c='Test001',Product2__c = prod01.Id);
        Product2__c pro2 = new Product2__c(Name='Pro002',OT_CODE_Text__c='Test002',Product2__c = prod02.Id);
        insert new Product2__c[] {pro1, pro2};
      
 
        Account myAccount2 = new Account(name='Testaccount005',Dealer_discount__c =20,RecordTypeId = rectCo[0].Id,Product_Limit_Date__c = 'Test01|5|55,Test02|2|4');
           insert myAccount2;
        String myAccount2Id = myAccount2.Id;
        LexProductLimitEditController.init(myAccount2Id,'ENG');
        LexProductLimitEditController.init(myAccount2Id,'');
        LexProductLimitEditController.accountid = myAccount2Id;
        LexProductLimitEditController controllerLimit = new LexProductLimitEditController();
 
 
 
 
 
        // Given
        // PageReference page = new PageReference('/apex/ProductLimitEdit?accountid=' + myAccount2.id);
>>>>>>> LEXCommunityLiJun
        // page.setRedirect(true);
        // System.Test.setCurrentPage(page);
        // ProductLimitEditController conTest = new ProductLimitEditController();
        // conTest.init();
        // System.assertEquals('Test01|5|55,Test02|2|4', conTest.product_Limit);
 
<<<<<<< HEAD
        // When
 
        // Then
    }
}
=======
        // When
 
 
        // Then
 
    }
}
>>>>>>> LEXCommunityLiJun