Skip to content

Commit b54fcbc

Browse files
committed
fix: avoid zenzai in tests
1 parent 6909569 commit b54fcbc

2 files changed

Lines changed: 21 additions & 4 deletions

File tree

Core/Sources/Core/InputUtils/SegmentsManager.swift

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,30 @@ public final class SegmentsManager {
55
public init(
66
kanaKanjiConverter: KanaKanjiConverter,
77
applicationDirectoryURL: URL,
8-
containerURL: URL?
8+
containerURL: URL?,
9+
context: Context = Context()
910
) {
1011
self.kanaKanjiConverter = kanaKanjiConverter
1112
self.applicationDirectoryURL = applicationDirectoryURL
1213
self.containerURL = containerURL
14+
self.context = context
15+
}
16+
17+
/// テストなどの設定注入のための型。外部には設定を露出させない。
18+
public struct Context {
19+
public init() {}
20+
init(useZenzai: Bool) {
21+
self.useZenzai = useZenzai
22+
}
23+
24+
var useZenzai: Bool = true
1325
}
1426

1527
public weak var delegate: (any SegmentManagerDelegate)?
1628
private var kanaKanjiConverter: KanaKanjiConverter
1729
private let applicationDirectoryURL: URL
1830
private let containerURL: URL?
31+
private let context: Context
1932

2033
private var composingText: ComposingText = ComposingText()
2134

@@ -121,7 +134,10 @@ public final class SegmentsManager {
121134
}
122135

123136
private func zenzaiMode(leftSideContext: String?, requestRichCandidates: Bool) -> ConvertRequestOptions.ZenzaiMode {
124-
.on(
137+
if !self.context.useZenzai {
138+
return .off
139+
}
140+
return .on(
125141
weight: Bundle.main.bundleURL.appendingPathComponent("Contents/Resources/ggml-model-Q5_K_M.gguf", isDirectory: false),
126142
inferenceLimit: Config.ZenzaiInferenceLimit().value,
127143
requestRichCandidates: requestRichCandidates,

Core/Tests/CoreTests/InputUtilsTests/SegmentsManagerAdditionalCandidatesTests.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Core
1+
@testable import Core
22
import Foundation
33
import KanaKanjiConverterModuleWithDefaultDictionary
44
import Testing
@@ -7,7 +7,8 @@ private func makeSegmentsManager() -> SegmentsManager {
77
SegmentsManager(
88
kanaKanjiConverter: .withDefaultDictionary(),
99
applicationDirectoryURL: URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true),
10-
containerURL: nil
10+
containerURL: nil,
11+
context: .init(useZenzai: false)
1112
)
1213
}
1314

0 commit comments

Comments
 (0)