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/LexProductLimitEditControllerTest.cls | 63 +++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/classes/LexProductLimitEditControllerTest.cls b/force-app/main/default/classes/LexProductLimitEditControllerTest.cls
index 6d0261e..546b545 100644
--- a/force-app/main/default/classes/LexProductLimitEditControllerTest.cls
+++ b/force-app/main/default/classes/LexProductLimitEditControllerTest.cls
@@ -1,4 +1,56 @@
@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
@@ -32,16 +84,25 @@
// 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
}
-}
\ No newline at end of file
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1