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/LookupSearchResultTest.cls |   38 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 38 insertions(+), 0 deletions(-)

diff --git a/force-app/main/default/classes/LookupSearchResultTest.cls b/force-app/main/default/classes/LookupSearchResultTest.cls
index 7dad0a5..5769e86 100644
--- a/force-app/main/default/classes/LookupSearchResultTest.cls
+++ b/force-app/main/default/classes/LookupSearchResultTest.cls
@@ -1,5 +1,6 @@
 @isTest
 private class LookupSearchResultTest {
+<<<<<<< HEAD
     @testSetup
     static void testInfo() {
         List<RecordType> rectCo = [
@@ -44,3 +45,40 @@
         System.Test.stopTest();
     }
 }
+=======
+	@testSetup 
+    static void testInfo(){
+        List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '璨╁2搴�'];
+        if (rectCo.size() == 0) {
+            return;
+        }
+        Account myAccount2 = new Account(name='Account001',Dealer_discount__c =20,RecordTypeId = rectCo[0].Id,AgentCode_Ext__c = '2');
+        insert myAccount2;
+	}
+    
+    @isTest
+    static void testLookupSearchResult(){
+        String id = '';
+        String title = '';
+		List<Account> account = [SELECT Id,Name FROM Account WHERE Name = 'Account001' limit 1];
+        for(Account acc : account){
+            id = acc.Id;
+        }
+        object compareTo = account;
+        LookupSearchResult resultA = new LookupSearchResult(id, 'Account', 'standard:account', 'Account', 'Account');
+        LookupSearchResult resultB = new LookupSearchResult('', '', '', title, '');
+        LookupSearchResult resultC = new LookupSearchResult(id, 'Account', 'standard:account', title, 'Account');
+        System.Test.startTest();
+    	resultA.getId();
+    	resultA.getSObjectType();
+    	resultA.getIcon();
+    	resultA.getTitle();
+    	resultA.getSubtitle();
+        resultB.compareTo(resultB);
+        System.assertEquals(1, account.size(), 'expecting to find 1 Account');
+        List<LookupSearchResult> con = new List<LookupSearchResult>();
+        con.sort();
+        System.Test.stopTest();
+    }
+}
+>>>>>>> LEXCommunityLiJun

--
Gitblit v1.9.1