Remove tesable imports of SKSupport

Author: benlangmuir

Sources/SKSupport/Logging.swift

@@ -62,8 +62,7 @@ public protocol LogHandler: AnyObject {
 public final class Logger {
 
   /// The shared logger instance.
-  public internal(set)
-  static var shared: Logger = .init()
+  public static var shared: Logger = .init()
 
   let logQueue: DispatchQueue = DispatchQueue(label: "log-queue", qos: .utility)
 
@@ -84,6 +83,11 @@ public final class Logger {
 
   var handlers: [LogHandler] = []
 
+  public init(disableOSLog: Bool = false, disableNSLog: Bool = false) {
+    self.disableOSLog = disableOSLog
+    self.disableNSLog = disableNSLog
+  }
+
   public func addLogHandler(_ handler: LogHandler) {
     logQueue.async {
       self.handlers.append(handler)
@@ -150,6 +154,9 @@ public final class Logger {
       handler.handle(message, level: level)
     }
   }
+
+  /// *For Testing*. Flush the logging queue before returning.
+  public func flush() { logQueue.sync {} }
 }
 
 public class AnyLogHandler: LogHandler {

Tests/SKSupportTests/SupportPerfTests.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-@testable import SKSupport
+import SKSupport
 import SKTestSupport
 import Basic
 import XCTest

Tests/SKSupportTests/SupportTests.swift

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import XCTest
-@testable import SKSupport
+import SKSupport
 import Basic
 
 final class SupportTests: XCTestCase {
@@ -107,18 +107,16 @@ final class SupportTests: XCTestCase {
     let orig = Logger.shared
     defer { Logger.shared = orig }
 
-    let testLogger = Logger()
+    let testLogger = Logger(disableOSLog: true, disableNSLog: true)
     Logger.shared = testLogger
-    testLogger.disableNSLog = true
-    testLogger.disableOSLog = true
 
     var messages: [(String, LogLevel)] = []
     let obj = testLogger.addLogHandler { message, level in
       messages.append((message, level))
     }
 
     func check(_ messages: inout [(String, LogLevel)], expected: [(String, LogLevel)], file: StaticString = #file, line: UInt = #line) {
-      testLogger.logQueue.sync {}
+      testLogger.flush()
       XCTAssert(messages == expected, "\(messages) does not match expected \(expected)", file: file, line: line)
       messages.removeAll()
     }