From c4edb0b5340638459d778ab9383a34af8867e028 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael.code@endoftheworl.de>
Date: Tue, 30 Jan 2018 08:48:16 -0800
Subject: [PATCH] Fixup some tests

// FREEBIE
---
 Signal/test/util/DisplayableTextFilterTest.swift | 13 +++++++------
 Signal/test/util/OWSDatabaseConverterTest.m      |  1 +
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Signal/test/util/DisplayableTextFilterTest.swift b/Signal/test/util/DisplayableTextFilterTest.swift
index 3ec2cc1ac..6e2a82a9a 100644
--- a/Signal/test/util/DisplayableTextFilterTest.swift
+++ b/Signal/test/util/DisplayableTextFilterTest.swift
@@ -1,9 +1,10 @@
 //
-//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
 import XCTest
 @testable import Signal
+@testable import SignalMessaging
 
 class DisplayableTextTest: XCTestCase {
 
@@ -20,20 +21,20 @@ class DisplayableTextTest: XCTestCase {
     func testDisplayableText() {
         // show plain text
         let boringText = "boring text"
-        XCTAssertEqual(boringText, DisplayableText.displayableText(boringText))
+        XCTAssertEqual(boringText, DisplayableText.displayableText(boringText).displayText)
 
         // show high byte emojis
         let emojiText = "🇹🇹🌼🇹🇹🌼🇹🇹"
-        XCTAssertEqual(emojiText, DisplayableText.displayableText(emojiText))
+        XCTAssertEqual(emojiText, DisplayableText.displayableText(emojiText).displayText)
 
         // show normal diacritic usage
         let diacriticalText = "Příliš žluťoučký kůň úpěl ďábelské ódy."
-        XCTAssertEqual(diacriticalText, DisplayableText.displayableText(diacriticalText))
+        XCTAssertEqual(diacriticalText, DisplayableText.displayableText(diacriticalText).displayText)
 
         // filter excessive diacritics
-        XCTAssertEqual("HAVING TROUBLE READING TEXT?", DisplayableText.displayableText("H҉̸̧͘͠A͢͞V̛̛I̴̸N͏̕͏G҉̵͜͏͢ ̧̧́T̶̛͘͡R̸̵̨̢̀O̷̡U͡҉B̶̛͢͞L̸̸͘͢͟É̸ ̸̛͘͏R͟È͠͞A̸͝Ḑ̕͘͜I̵͘҉͜͞N̷̡̢͠G̴͘͠ ͟͞T͏̢́͡È̀X̕҉̢̀T̢͠?̕͏̢͘͢") )
+        XCTAssertEqual("HAVING TROUBLE READING TEXT?", DisplayableText.displayableText("H҉̸̧͘͠A͢͞V̛̛I̴̸N͏̕͏G҉̵͜͏͢ ̧̧́T̶̛͘͡R̸̵̨̢̀O̷̡U͡҉B̶̛͢͞L̸̸͘͢͟É̸ ̸̛͘͏R͟È͠͞A̸͝Ḑ̕͘͜I̵͘҉͜͞N̷̡̢͠G̴͘͠ ͟͞T͏̢́͡È̀X̕҉̢̀T̢͠?̕͏̢͘͢").displayText )
 
-        XCTAssertEqual("LGO!", DisplayableText.displayableText("L̷̳͔̲͝Ģ̵̮̯̤̩̙͍̬̟͉̹̘̹͍͈̮̦̰̣͟͝O̶̴̮̻̮̗͘͡!̴̷̟͓͓"))
+        XCTAssertEqual("LGO!", DisplayableText.displayableText("L̷̳͔̲͝Ģ̵̮̯̤̩̙͍̬̟͉̹̘̹͍͈̮̦̰̣͟͝O̶̴̮̻̮̗͘͡!̴̷̟͓͓").displayText)
     }
 
     func testGlyphCount() {
diff --git a/Signal/test/util/OWSDatabaseConverterTest.m b/Signal/test/util/OWSDatabaseConverterTest.m
index 75745c499..45e4fd27e 100644
--- a/Signal/test/util/OWSDatabaseConverterTest.m
+++ b/Signal/test/util/OWSDatabaseConverterTest.m
@@ -5,6 +5,7 @@
 #import "OWSDatabaseConverterTest.h"
 #import <Curve25519Kit/Randomness.h>
 #import <SignalServiceKit/NSData+hexString.h>
+#import <SignalServiceKit/OWSFileSystem.h>
 #import <SignalServiceKit/OWSStorage.h>
 #import <SignalServiceKit/YapDatabaseConnection+OWS.h>
 #import <YapDatabase/YapDatabase.h>