From b95dcd4ae3baead51ddb77aad64b2a4388b6821f Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Fri, 4 Jan 2019 15:36:51 -0700
Subject: [PATCH] fix broken test
---
Signal/test/ViewControllers/ConversationViewItemTest.m | 3 ++-
SignalServiceKit/src/TestUtils/Factories.swift | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Signal/test/ViewControllers/ConversationViewItemTest.m b/Signal/test/ViewControllers/ConversationViewItemTest.m
index 4dd0ca755..249837d8f 100644
--- a/Signal/test/ViewControllers/ConversationViewItemTest.m
+++ b/Signal/test/ViewControllers/ConversationViewItemTest.m
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+// Copyright (c) 2019 Open Whisper Systems. All rights reserved.
//
#import "ConversationViewItem.h"
@@ -65,6 +65,7 @@
OWSAssertDebug([[NSFileManager defaultManager] fileExistsAtPath:filePath]);
DataSource *dataSource = [DataSourcePath dataSourceWithFilePath:filePath shouldDeleteOnDeallocation:NO];
+ dataSource.sourceFilename = filename;
TSAttachmentStream *attachment = [AttachmentStreamFactory createWithContentType:mimeType dataSource:dataSource];
TSOutgoingMessage *message =
diff --git a/SignalServiceKit/src/TestUtils/Factories.swift b/SignalServiceKit/src/TestUtils/Factories.swift
index 34bb2cd19..256ac209b 100644
--- a/SignalServiceKit/src/TestUtils/Factories.swift
+++ b/SignalServiceKit/src/TestUtils/Factories.swift
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+// Copyright (c) 2019 Open Whisper Systems. All rights reserved.
//
import Foundation
@@ -391,6 +391,7 @@ class AttachmentStreamFactory: NSObject, Factory {
let factory = AttachmentStreamFactory()
factory.contentTypeBuilder = { return contentType }
factory.byteCountBuilder = { return UInt32(dataSource.dataLength()) }
+ factory.sourceFilenameBuilder = { return dataSource.sourceFilename ?? "fake-filename.dat" }
let attachmentStream = factory.build(transaction: transaction)
dataSource.write(toPath: attachmentStream.originalFilePath!)