From 05035e40a6f382abc5fb6d90f282c7689e4f1b44 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael.code@endoftheworl.de>
Date: Fri, 19 Jan 2018 10:42:55 -0500
Subject: [PATCH] Fixup tests

// FREEBIE
---
 .../ConversationView/ConversationViewItem.m          |  8 ++++----
 .../test/ViewControllers/ConversationViewItemTest.m  | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
index ae6886cfa..2a50dc70a 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
 #import "ConversationViewItem.h"
@@ -427,11 +427,11 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
     }
 
     if (self.messageCellType == OWSMessageCellType_Unknown) {
-        DDLogVerbose(@"%@ message: %@", self.logTag, message.description);
-        OWSFail(@"%@ Unknown cell type", self.logTag);
         // Messages of unknown type (including messages with missing attachments)
         // are rendered like empty text messages, but without any interactivity.
-        self.messageCellType = OWSMessageCellType_Unknown;
+        DDLogWarn(@"%@ Treating unknown message as empty text message: %@", self.logTag, message.description);
+        self.messageCellType = OWSMessageCellType_TextMessage;
+        self.hasText = YES;
         self.displayableText = [[DisplayableText alloc] initWithFullText:@"" displayText:@"" isTextTruncated:NO];
     }
 }
diff --git a/Signal/test/ViewControllers/ConversationViewItemTest.m b/Signal/test/ViewControllers/ConversationViewItemTest.m
index df293aaec..802e10d10 100644
--- a/Signal/test/ViewControllers/ConversationViewItemTest.m
+++ b/Signal/test/ViewControllers/ConversationViewItemTest.m
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
 #import "ConversationViewItem.h"
@@ -275,7 +275,7 @@
     XCTAssertNil(UIPasteboard.generalPasteboard.string);
 
     ConversationViewItem *viewItem = self.textViewItem;
-    [viewItem copyAction];
+    [viewItem copyTextAction];
     XCTAssertEqualObjects(self.fakeTextMessageText, UIPasteboard.generalPasteboard.string);
 }
 
@@ -287,7 +287,7 @@
     XCTAssertNil([UIPasteboard.generalPasteboard dataForPasteboardType:(NSString *)kUTTypeJPEG]);
 
     ConversationViewItem *viewItem = self.stillImageViewItem;
-    [viewItem copyAction];
+    [viewItem copyMediaAction];
     NSData *_Nullable copiedData = [UIPasteboard.generalPasteboard dataForPasteboardType:(NSString *)kUTTypeJPEG];
     XCTAssertTrue(copiedData.length > 0);
 }
@@ -300,7 +300,7 @@
     XCTAssertNil([UIPasteboard.generalPasteboard dataForPasteboardType:(NSString *)kUTTypeGIF]);
 
     ConversationViewItem *viewItem = self.animatedImageViewItem;
-    [viewItem copyAction];
+    [viewItem copyMediaAction];
     NSData *_Nullable copiedData = [UIPasteboard.generalPasteboard dataForPasteboardType:(NSString *)kUTTypeGIF];
     XCTAssertTrue(copiedData.length > 0);
 }
@@ -312,7 +312,7 @@
     XCTAssertNil([UIPasteboard.generalPasteboard dataForPasteboardType:(NSString *)kUTTypeMPEG4]);
 
     ConversationViewItem *viewItem = self.videoViewItem;
-    [viewItem copyAction];
+    [viewItem copyMediaAction];
     NSData *_Nullable copiedData = [UIPasteboard.generalPasteboard dataForPasteboardType:(NSString *)kUTTypeMPEG4];
     XCTAssertTrue(copiedData.length > 0);
 }
@@ -324,7 +324,7 @@
     XCTAssertNil([UIPasteboard.generalPasteboard dataForPasteboardType:(NSString *)kUTTypeMP3]);
 
     ConversationViewItem *viewItem = self.audioViewItem;
-    [viewItem copyAction];
+    [viewItem copyMediaAction];
     NSData *_Nullable copiedData = [UIPasteboard.generalPasteboard dataForPasteboardType:(NSString *)kUTTypeMP3];
     XCTAssertTrue(copiedData.length > 0);
 }