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/LexUtilityTest.cls | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/classes/LexUtilityTest.cls b/force-app/main/default/classes/LexUtilityTest.cls
index 445376c..39e618b 100644
--- a/force-app/main/default/classes/LexUtilityTest.cls
+++ b/force-app/main/default/classes/LexUtilityTest.cls
@@ -1,17 +1,31 @@
@IsTest
private class LexUtilityTest {
@IsTest
+<<<<<<< HEAD
static void testMethod1() {
User currentUser = [SELECT Id FROM User WHERE Id = :UserInfo.getUserId()];
NoteStay__c n = new NoteStay__c(Name = 'NoteStay', IsStay__c = true);
+=======
+ static void testMethod1(){
+ User currentUser = [SELECT Id FROM User WHERE Id = :UserInfo.getUserId()];
+ NoteStay__c n = new NoteStay__c(Name = 'NoteStay',IsStay__c = true);
+>>>>>>> LEXCommunityLiJun
insert n;
LicenceReminderDate__c l = new LicenceReminderDate__c(Name = '180Days', ReminderDays__c = 180);
insert l;
Test.startTest();
+<<<<<<< HEAD
System.runAs(currentUser) {
+=======
+ System.runAs(currentUser){
+>>>>>>> LEXCommunityLiJun
LexUtility.getIsNoteStay();
LexUtility.getLicenceReminderDays();
}
Test.stopTest();
}
+<<<<<<< HEAD
}
+=======
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1