mii/AzooKeyKanaKanjiConverter
1
0
Fork 0
mirror of https://github.com/mii443/AzooKeyKanaKanjiConverter.git synced 2025-08-22 15:05:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update convertToTimeExpression function to handle edge cases and correct time validation

Browse Source 
* **TimeExpression.swift**
  - Change the validation for 3-digit numbers to allow last two digits between 00-59.
  - Change the validation for 4-digit numbers to allow first two digits between 00-24 and last two digits between 00-59.

* **TimeExpressionTests.swift**
  - Update test cases to reflect the new validation rules.
  - Change test input "1360" to "2440" and update expected results accordingly.
  - Update assertions for the modified test cases.
This commit is contained in:
Miwa
2025-03-30 16:57:46 +09:00
parent 19dbbccd9f
commit feb5daa5bb
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/KanaKanjiConverterModule/Converter/TimeExpression.swift
View File

@ -10,7 +10,7 @@ extension KanaKanjiConverter {
if numberString.count == 3 {
let firstDigit = Int(numberString.prefix(1))!
let lastTwoDigits = Int(numberString.suffix(2))!
if (0...9).contains(firstDigit) && (0...60).contains(lastTwoDigits) {
if (0...9).contains(firstDigit) && (0...59).contains(lastTwoDigits) {
let timeExpression = "\(firstDigit):\(String(format: "%02d", lastTwoDigits))"
let candidate = Candidate(
text: timeExpression,
@ -22,7 +22,7 @@ extension KanaKanjiConverter {
candidates.append(candidate)
}
} else if numberString.count == 4 {
if (0...12).contains(firstPart) && (0...60).contains(secondPart) {
if (0...24).contains(firstPart) && (0...59).contains(secondPart) {
let timeExpression = "\(String(format: "%02d", firstPart)):\(String(format: "%02d", secondPart))"
let candidate = Candidate(
text: timeExpression,

8
Tests/KanaKanjiConverterModuleTests/ConverterTests/TimeExpressionTests.swift
View File

@ -17,7 +17,7 @@ final class TimeExpressionTests: XCTestCase {
let input2 = makeDirectInput(direct: "1234")
let input3 = makeDirectInput(direct: "999")
let input4 = makeDirectInput(direct: "1260")
let input5 = makeDirectInput(direct: "1360")
let input5 = makeDirectInput(direct: "2440")
let candidates1 = await converter.convertToTimeExpression(input1)
let candidates2 = await converter.convertToTimeExpression(input2)
@ -34,9 +34,9 @@ final class TimeExpressionTests: XCTestCase {
XCTAssertEqual(candidates3.count, 1)
XCTAssertEqual(candidates3.first?.text, "9:99")
XCTAssertEqual(candidates4.count, 1)
XCTAssertEqual(candidates4.first?.text, "12:60")
XCTAssertEqual(candidates4.count, 0)
XCTAssertEqual(candidates5.count, 0)
XCTAssertEqual(candidates5.count, 1)
XCTAssertEqual(candidates5.first?.text, "24:40")
}
}