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/LexUpAccountProLimitControllerTest.cls | 107 +++--------------------------------------------------
1 files changed, 6 insertions(+), 101 deletions(-)
diff --git a/force-app/main/default/classes/LexUpAccountProLimitControllerTest.cls b/force-app/main/default/classes/LexUpAccountProLimitControllerTest.cls
index 144dcf7..8766968 100644
--- a/force-app/main/default/classes/LexUpAccountProLimitControllerTest.cls
+++ b/force-app/main/default/classes/LexUpAccountProLimitControllerTest.cls
@@ -1,21 +1,12 @@
@isTest
-<<<<<<< HEAD
private class LexUpAccountProLimitControllerTest {
@isTest
static void proLimitTest() {
- 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',
@@ -44,11 +35,7 @@
insert myAccount2;
String productLimit = 'Test01|2|4,Test02|3|5';
String resultText = UpAccountProLimit.upAccount(myAccount2.Id, productLimit, 'ET');
- List<Account> accountre = [
- SELECT Id, Product_Limit_Date__c
- FROM Account
- WHERE Id = :myAccount2.Id
- ];
+ List<Account> accountre = [SELECT Id, Product_Limit_Date__c FROM Account WHERE Id = :myAccount2.Id];
LexUpAccountProLimit.upAccount(myAccount2.Id, productLimit, 'ENG');
LexUpAccountProLimit.upAccount(myAccount2.Id, productLimit, '');
LexUpAccountProLimit.upAccount('1000', productLimit, 'ENG');
@@ -56,19 +43,11 @@
}
@isTest
static void proLimitTest1() {
- 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',
@@ -119,83 +98,9 @@
String productLimit = 'Test01|2|4,Test02|3|5';
String productLimit1 = 'Test01|2|4';
String resultText = UpAccountProLimit.upAccount(myAccount2.Id, productLimit, 'ENG');
- List<Account> accountre = [
- SELECT Id, Product_Limit_Date__c
- FROM Account
- WHERE Id = :myAccount2.Id
- ];
+ List<Account> accountre = [SELECT Id, Product_Limit_Date__c FROM Account WHERE Id = :myAccount2.Id];
// LexUpAccountProLimit.upAccount(myAccount2.Id,productLimit,'');
LexUpAccountProLimit.upAccount(myAccount2.Id, productLimit1, 'ET');
// System.assertEquals('Test01|2|4,Test02|3|5', accountre[0].Product_Limit_Date__c);
}
}
-=======
-private class LexUpAccountProLimitControllerTest
-{
- @isTest
- static void proLimitTest()
- {
- 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='Testaccount002',Dealer_discount__c =20,RecordTypeId = rectCo[0].Id,Product_Limit_Date__c = 'Test01|2|4');
- insert myAccount2;
- String productLimit = 'Test01|2|4,Test02|3|5';
- String resultText = UpAccountProLimit.upAccount(myAccount2.Id,productLimit,'ET');
- List<Account> accountre = [select Id,Product_Limit_Date__c from Account where Id = :myAccount2.Id ];
- LexUpAccountProLimit.upAccount(myAccount2.Id,productLimit,'ENG');
- LexUpAccountProLimit.upAccount(myAccount2.Id,productLimit,'');
- LexUpAccountProLimit.upAccount('1000',productLimit,'ENG');
- // System.assertEquals('Test01|2|4,Test02|3|5', accountre[0].Product_Limit_Date__c);
- }
- @isTest
- static void proLimitTest1()
- {
- 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};
- System.debug('pro1===>'+pro1);
- System.debug('pro2===>'+pro2);
-
- List<Product2__c> roduct2List1 = [SELECT Id,Asset_Model_No__c,Estimation_Entry_Possibility__c,Product_Type__c
- FROM Product2__c WHERE id = :pro2.Id
- ];
- List<Product2__c> roduct2List2 = [SELECT Id,Asset_Model_No__c,Estimation_Entry_Possibility__c,Product_Type__c
- FROM Product2__c WHERE id = :pro1.Id
- ];
- System.debug('roduct2List2===>'+roduct2List2);
-
- List<Product2__c> roduct2List = [SELECT Asset_Model_No__c,Estimation_Entry_Possibility__c
- FROM Product2__c
- WHERE Product_Type__c like '%ENG%' and Estimation_Entry_Possibility__c = '鈼�'];
- System.debug('roduct2List'+roduct2List);
-
- Account myAccount2 = new Account(Name='Testaccount002',Dealer_discount__c =20,RecordTypeId = rectCo[0].Id,Product_Limit_Date__c = 'Test01|2|4');
- insert myAccount2;
- String productLimit = 'Test01|2|4,Test02|3|5';
- String productLimit1 = 'Test01|2|4';
- String resultText = UpAccountProLimit.upAccount(myAccount2.Id,productLimit,'ENG');
- List<Account> accountre = [select Id,Product_Limit_Date__c from Account where Id = :myAccount2.Id ];
- // LexUpAccountProLimit.upAccount(myAccount2.Id,productLimit,'');
- LexUpAccountProLimit.upAccount(myAccount2.Id,productLimit1,'ET');
- // System.assertEquals('Test01|2|4,Test02|3|5', accountre[0].Product_Limit_Date__c);
- }
-}
->>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1