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/LexUpAccountProLimitControllerTest.cls | 134 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 133 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/classes/LexUpAccountProLimitControllerTest.cls b/force-app/main/default/classes/LexUpAccountProLimitControllerTest.cls
index 5ba11bd..144dcf7 100644
--- a/force-app/main/default/classes/LexUpAccountProLimitControllerTest.cls
+++ b/force-app/main/default/classes/LexUpAccountProLimitControllerTest.cls
@@ -1,4 +1,135 @@
@isTest
+<<<<<<< HEAD
+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 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 = '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 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 };
+ 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);
+ }
+}
+=======
private class LexUpAccountProLimitControllerTest
{
@isTest
@@ -66,4 +197,5 @@
LexUpAccountProLimit.upAccount(myAccount2.Id,productLimit1,'ET');
// System.assertEquals('Test01|2|4,Test02|3|5', accountre[0].Product_Limit_Date__c);
}
-}
\ No newline at end of file
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1