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/LexProductLimitEditControllerTest.cls | 58 ++--------------------------------------------------------
1 files changed, 2 insertions(+), 56 deletions(-)
diff --git a/force-app/main/default/classes/LexProductLimitEditControllerTest.cls b/force-app/main/default/classes/LexProductLimitEditControllerTest.cls
index 546b545..97b4157 100644
--- a/force-app/main/default/classes/LexProductLimitEditControllerTest.cls
+++ b/force-app/main/default/classes/LexProductLimitEditControllerTest.cls
@@ -1,21 +1,12 @@
@isTest
-<<<<<<< HEAD
private class LexProductLimitEditControllerTest {
@isTest
static void unittest() {
- List<RecordType> rectCo = [
- SELECT Id
- FROM RecordType
- WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '璨╁２搴�'
- ];
+ 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)'
- ];
+ Profile prof = [SELECT Id FROM Profile WHERE Name = '901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(ET)'];
Product2 prod01 = new Product2(
Name = 'Test01',
ProductCode = 'Test01',
@@ -50,59 +41,14 @@
// 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
--
Gitblit v1.9.1