Update test runners

skiptools · Jan 7, 2024 · 9aac5c9 · 9aac5c9
1 parent 1feff5a
commit 9aac5c9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/Sources/FireSide/ContentView.swift b/Sources/FireSide/ContentView.swift
@@ -5,12 +5,13 @@ let fireSide = try! FireSideStore()
 
 public struct ContentView: View {
     @AppStorage("setting") var setting = true
+    @AppStorage("selectedTab") var selectedTab = 0
 
     public init() {
     }
 
     public var body: some View {
-        TabView() {
+        TabView(selection: $selectedTab) {
             JoinChatView()
                 .tag(0)
                 .tabItem { Label("Welcome", systemImage: "star") }
@@ -43,12 +44,14 @@ public struct ContentView: View {
                     .font(.largeTitle)
                 Toggle("Option", isOn: $setting)
             }
-            .tag(1)
+            .tag(2)
             .tabItem { Label("Settings", systemImage: "gearshape.fill") }
         }
     }
 }
 
+let chatKeyCount = 8
+
 struct JoinChatView : View {
     @AppStorage("chatKey") var chatKey: String = ""
     @State var lastError: String? = nil
@@ -77,7 +80,7 @@ struct JoinChatView : View {
                     .frame(width: 250.0, height: 180.0)
                 }
                 .buttonStyle(.borderedProminent)
-                .disabled(chatKey.isEmpty == false && chatKey.count != 8)
+                .disabled(chatKey.isEmpty == false && chatKey.count != chatKeyCount)
 
 
                 Text(lastError ?? "")
@@ -103,12 +106,15 @@ struct JoinChatView : View {
     private func joinChat() async {
         do {
             self.lastError = nil // clear the most recent error
-            if chatKey.count == 8 {
+            if chatKey.count == chatKeyCount {
+                logger.log("joinChat: \(chatKey)")
                 try await fireSide.joinChat(chatKey: chatKey)
             } else {
+                logger.log("startNewChat")
                 chatKey = try await fireSide.startNewChat()
             }
         } catch {
+            logger.log("joinChat error: \(error)")
             self.lastError = error.localizedDescription
         }
     }

diff --git a/Tests/FireSideModelTests/FireSideModelTests.swift b/Tests/FireSideModelTests/FireSideModelTests.swift
@@ -5,6 +5,7 @@ import Foundation
 
 let logger: Logger = Logger(subsystem: "FireSideModel", category: "Tests")
 
+// SKIP INSERT: @org.junit.runner.RunWith(androidx.test.ext.junit.runners.AndroidJUnit4::class)
 @available(macOS 13, *)
 final class FireSideModelTests: XCTestCase {
     // values from Darwin/GoogleService-Info.plist

diff --git a/Tests/FireSideTests/FireSideTests.swift b/Tests/FireSideTests/FireSideTests.swift
@@ -5,6 +5,7 @@ import Foundation
 
 let logger: Logger = Logger(subsystem: "FireSide", category: "Tests")
 
+// SKIP INSERT: @org.junit.runner.RunWith(androidx.test.ext.junit.runners.AndroidJUnit4::class)
 @available(macOS 13, *)
 final class FireSideTests: XCTestCase {
     func testFireSide() throws {
@@ -20,4 +21,4 @@ final class FireSideTests: XCTestCase {
 
 struct TestData : Codable, Hashable {
     var testModuleName: String
-}
+}