From 12ef25420a9f43c7400c7c66841dd47455bf9821 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Tue, 17 Jul 2018 19:32:44 -0600
Subject: [PATCH] Fixup SSK tests

---
 Signal/test/util/SearcherTest.swift                     | 3 ++-
 SignalServiceKit/src/Storage/FullTextSearchFinder.swift | 6 +++++-
 SignalServiceKit/src/TextSecureKitEnv.m                 | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Signal/test/util/SearcherTest.swift b/Signal/test/util/SearcherTest.swift
index 56484d660..0152bfb69 100644
--- a/Signal/test/util/SearcherTest.swift
+++ b/Signal/test/util/SearcherTest.swift
@@ -112,13 +112,14 @@ class ConversationSearcherTest: XCTestCase {
     override func setUp() {
         super.setUp()
 
-        FullTextSearchFinder.syncRegisterDatabaseExtension(storage: OWSPrimaryStorage.shared())
+        FullTextSearchFinder.ensureDatabaseExtensionRegistered(storage: OWSPrimaryStorage.shared())
 
         TSContactThread.removeAllObjectsInCollection()
         TSGroupThread.removeAllObjectsInCollection()
         TSMessage.removeAllObjectsInCollection()
 
         originalEnvironment = TextSecureKitEnv.shared()
+        assert(originalEnvironment != nil)
 
         let testEnvironment: StubbableEnvironment = StubbableEnvironment(proxy: originalEnvironment!)
         testEnvironment.stubbedContactsManager = FakeContactsManager()
diff --git a/SignalServiceKit/src/Storage/FullTextSearchFinder.swift b/SignalServiceKit/src/Storage/FullTextSearchFinder.swift
index 39e935d30..b95fbfc6b 100644
--- a/SignalServiceKit/src/Storage/FullTextSearchFinder.swift
+++ b/SignalServiceKit/src/Storage/FullTextSearchFinder.swift
@@ -264,7 +264,11 @@ public class FullTextSearchFinder: NSObject {
     }
 
     // Only for testing.
-    public class func syncRegisterDatabaseExtension(storage: OWSStorage) {
+    public class func ensureDatabaseExtensionRegistered(storage: OWSStorage) {
+        guard storage.registeredExtension(dbExtensionName) == nil else {
+            return
+        }
+
         storage.register(dbExtensionConfig, withName: dbExtensionName)
     }
 
diff --git a/SignalServiceKit/src/TextSecureKitEnv.m b/SignalServiceKit/src/TextSecureKitEnv.m
index a85015892..856c8ae80 100644
--- a/SignalServiceKit/src/TextSecureKitEnv.m
+++ b/SignalServiceKit/src/TextSecureKitEnv.m
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
 #import "TextSecureKitEnv.h"
@@ -59,7 +59,7 @@ static TextSecureKitEnv *sharedTextSecureKitEnv;
 + (void)setSharedEnv:(TextSecureKitEnv *)env
 {
     OWSAssert(env);
-    OWSAssert(!sharedTextSecureKitEnv || !CurrentAppContext().isMainApp);
+    OWSAssert(!sharedTextSecureKitEnv || CurrentAppContext().isRunningTests);
 
     sharedTextSecureKitEnv = env;
 }