From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/classes/Batch_FixAttachmentToFilesTest.cls | 46 ----------------------------------------------
1 files changed, 0 insertions(+), 46 deletions(-)
diff --git a/force-app/main/default/classes/Batch_FixAttachmentToFilesTest.cls b/force-app/main/default/classes/Batch_FixAttachmentToFilesTest.cls
index 1516f53..938de55 100644
--- a/force-app/main/default/classes/Batch_FixAttachmentToFilesTest.cls
+++ b/force-app/main/default/classes/Batch_FixAttachmentToFilesTest.cls
@@ -1,6 +1,5 @@
@isTest(SeeAllData=true)
private class Batch_FixAttachmentToFilesTest {
-<<<<<<< HEAD
@isTest(SeeAllData=true)
static void testInit() {
String rectCo = Schema.SObjectType.Account.getRecordTypeInfosByDeveloperName().get('Agency').getRecordTypeId();
@@ -22,44 +21,15 @@
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() {
- 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');
->>>>>>> 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
@@ -68,14 +38,6 @@
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;
@@ -83,16 +45,8 @@
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();
- }
-}
->>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1