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/Batch_FixAttachmentToFilesTest.cls | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/classes/Batch_FixAttachmentToFilesTest.cls b/force-app/main/default/classes/Batch_FixAttachmentToFilesTest.cls
index ce9a300..1516f53 100644
--- a/force-app/main/default/classes/Batch_FixAttachmentToFilesTest.cls
+++ b/force-app/main/default/classes/Batch_FixAttachmentToFilesTest.cls
@@ -1,5 +1,28 @@
@isTest(SeeAllData=true)
private class Batch_FixAttachmentToFilesTest {
+<<<<<<< HEAD
+ @isTest(SeeAllData=true)
+ static void testInit() {
+ String rectCo = Schema.SObjectType.Account.getRecordTypeInfosByDeveloperName().get('Agency').getRecordTypeId();
+ Account accountItem1 = new Account(Name = 'Testaccount001', RecordTypeId = rectCo);
+ insert accountItem1;
+
+ Consumable_order__c consOrder = new Consumable_order__c();
+ consOrder.Name = 'test01';
+ consOrder.Order_status__c = '鎵瑰噯';
+ consOrder.Deliver_date__c = Date.today();
+ consOrder.RecordTypeid = System.Label.RT_ConOrder_Delivery;
+ consOrder.Order_type__c = '璁㈠崟';
+ consOrder.Order_ProType__c = 'ENG';
+ consOrder.Dealer_Info__c = accountItem1.Id;
+ consOrder.Delivery_detail_count__c = 5;
+ insert consOrder;
+
+ List<Attachment> attachList = new List<Attachment>();
+ Attachment attach = new Attachment();
+ attach.Name = 'A-65224941-20200923--1.docx';
+ Blob bodyBlob = Blob.valueOf('Unit Test Attachment Body');
+=======
@isTest(SeeAllData=true)
static void testInit() {
@@ -22,21 +45,37 @@
Attachment attach = new Attachment();
attach.Name='A-65224941-20200923--1.docx';
Blob bodyBlob= Blob.valueOf('Unit Test Attachment Body');
+>>>>>>> LEXCommunityLiJun
attach.body = bodyBlob;
attach.ParentId = consOrder.Id;
attachList.add(attach);
insert attachList;
+<<<<<<< HEAD
+
+=======
+>>>>>>> LEXCommunityLiJun
Set<String> Id = new Set<String>();
String objectType;
Datetime creStartDate;
Datetime creEndDate;
+<<<<<<< HEAD
+
+ List<Attachment> attachmentList = [
+ SELECT Id, Name, OwnerId, ParentId, Parent.Name, Parent.Type, Body, CreatedDate, CreatedById
+ FROM Attachment
+ WHERE Id = :attachList[0].Id
+ ORDER BY CreatedDate ASC
+ LIMIT 1
+ ];
+=======
List<Attachment> attachmentList = [Select Id, Name, OwnerId, ParentId, Parent.Name, Parent.Type, Body, CreatedDate, CreatedById
From Attachment
Where Id =:attachList[0].Id
Order by CreatedDate ASC
Limit 1];
+>>>>>>> LEXCommunityLiJun
for (Attachment att : attachmentList) {
Id.add(att.ParentId);
objectType = att.Parent.Name;
@@ -44,8 +83,16 @@
creEndDate = att.CreatedDate.addDays(1);
}
System.Test.startTest();
+<<<<<<< HEAD
+ Database.executeBatch(new Batch_FixAttachmentToFiles(objectType, creStartDate, creEndDate), 1);
+ Database.executeBatch(new Batch_FixAttachmentToFiles(Id), 1);
+ System.Test.stopTest();
+ }
+}
+=======
Database.executeBatch(new Batch_FixAttachmentToFiles(objectType,creStartDate,creEndDate),1);
Database.executeBatch(new Batch_FixAttachmentToFiles(Id),1);
System.Test.stopTest();
}
-}
\ No newline at end of file
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1