-
Couldn't load subscription status.
- Fork 1.7k
fix(ai): Fix fraction seconds bug with ProtoDuration #15410
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
c5c9687
Fix fractional seconds bug
daymxn dd934c3
Add XCTAssertContains util
daymxn 04ea411
Add tests for ProtoDuration
daymxn bb069c4
Add changelog entry
daymxn f4e0970
Update PR number
daymxn 40408ae
Remove precondition
daymxn 5acb2e7
Add guards for previous preconditions
daymxn 87bc206
Parse to Double and multiply instead
daymxn 03e0207
Use accuracy for comparisons
daymxn e78bbca
format
daymxn File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| // Copyright 2025 Google LLC | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| import XCTest | ||
|
|
||
| /// Asserts that a string contains another string. | ||
| /// | ||
| /// ```swift | ||
| /// XCTAssertContains("my name is", "name") | ||
| /// ``` | ||
| /// | ||
| /// - Parameters: | ||
| /// - string: The source string that should contain the other. | ||
| /// - contains: The string that should be contained in the source string. | ||
| func XCTAssertContains(_ string: String, _ contains: String) { | ||
| if !string.contains(contains) { | ||
| XCTFail("(\"\(string)\") does not contain (\"\(contains)\")") | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| // Copyright 2025 Google LLC | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| import XCTest | ||
|
|
||
| @testable import FirebaseAI | ||
|
|
||
| final class ProtoDurationTests: XCTestCase { | ||
| let decoder = JSONDecoder() | ||
|
|
||
| private func decodeProtoDuration(_ jsonString: String) throws -> ProtoDuration { | ||
| let escapedString = "\"\(jsonString)\"" | ||
| let jsonData = try XCTUnwrap(escapedString.data(using: .utf8)) | ||
|
|
||
| return try decoder.decode(ProtoDuration.self, from: jsonData) | ||
| } | ||
|
|
||
| private func expectDecodeFailure(_ jsonString: String) throws -> DecodingError.Context? { | ||
| do { | ||
| let _ = try decodeProtoDuration(jsonString) | ||
| XCTFail("Expected decoding to fail") | ||
| return nil | ||
| } catch { | ||
| let decodingError = try XCTUnwrap(error as? DecodingError) | ||
| guard case let .dataCorrupted(dataCorrupted) = decodingError else { | ||
| XCTFail("Error was not a data corrupted error") | ||
| return nil | ||
| } | ||
|
|
||
| return dataCorrupted | ||
| } | ||
| } | ||
|
|
||
| func testDecodeProtoDuration_standardDuration() throws { | ||
| let duration = try decodeProtoDuration("120.000000123s") | ||
| XCTAssertEqual(duration.seconds, 120) | ||
| XCTAssertEqual(duration.nanos, 123) | ||
|
|
||
| XCTAssertEqual(duration.timeInterval, 120.000000123, accuracy: 1e-9) | ||
| } | ||
|
|
||
| func testDecodeProtoDuration_withoutNanoseconds() throws { | ||
| let duration = try decodeProtoDuration("120s") | ||
| XCTAssertEqual(duration.seconds, 120) | ||
| XCTAssertEqual(duration.nanos, 0) | ||
|
|
||
| XCTAssertEqual(duration.timeInterval, 120, accuracy: 1e-9) | ||
| } | ||
|
|
||
| func testDecodeProtoDuration_maxNanosecondDigits() throws { | ||
| let duration = try decodeProtoDuration("15.123456789s") | ||
| XCTAssertEqual(duration.seconds, 15) | ||
| XCTAssertEqual(duration.nanos, 123_456_789) | ||
|
|
||
| XCTAssertEqual(duration.timeInterval, 15.123456789, accuracy: 1e-9) | ||
| } | ||
|
|
||
| func testDecodeProtoDuration_withMilliseconds() throws { | ||
| let duration = try decodeProtoDuration("15.123s") | ||
| XCTAssertEqual(duration.seconds, 15) | ||
| XCTAssertEqual(duration.nanos, 123_000_000) | ||
|
|
||
| XCTAssertEqual(duration.timeInterval, 15.123, accuracy: 1e-9) | ||
| } | ||
|
|
||
| func testDecodeProtoDuration_invalidSeconds() throws { | ||
| guard let error = try expectDecodeFailure("invalid.123s") else { return } | ||
| XCTAssertContains(error.debugDescription, "Invalid proto duration seconds") | ||
| } | ||
|
|
||
| func testDecodeProtoDuration_invalidNanoseconds() throws { | ||
| guard let error = try expectDecodeFailure("123.invalid") else { return } | ||
| XCTAssertContains(error.debugDescription, "Invalid proto duration nanoseconds") | ||
| } | ||
|
|
||
| func testDecodeProtoDuration_tooManyDecimals() throws { | ||
| guard let error = try expectDecodeFailure("123.45.67") else { return } | ||
| XCTAssertContains(error.debugDescription, "Invalid proto duration string") | ||
| } | ||
|
|
||
| func testDecodeProtoDuration_withoutSuffix() throws { | ||
| let duration = try decodeProtoDuration("123.456") | ||
| XCTAssertEqual(duration.seconds, 123) | ||
| XCTAssertEqual(duration.nanos, 456_000_000) | ||
|
|
||
| XCTAssertEqual(duration.timeInterval, 123.456, accuracy: 1e-9) | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.