feat: add platform shells, CLI, formatting, plugins, tests, and benchmarks
Phase 4 — Platform shells: - calcpad-macos/: SwiftUI two-column editor with Rust FFI bridge (16 files) - calcpad-windows/: iced GUI with Windows 11 Fluent theme (7 files, 13 tests) - calcpad-web/: React 18 + CodeMirror 6 + WASM Worker + PWA (20 files) - calcpad-cli/: clap-based CLI with expression eval, pipe/stdin, JSON/CSV output, and interactive REPL with rustyline history Phase 5 — Engine modules: - formatting/: answer formatting (decimal/scientific/SI notation, thousands separators, currency), line type classification, clipboard values (93 tests) - plugins/: CalcPadPlugin trait, PluginRegistry, Rhai scripting stub (43 tests) - benches/: criterion benchmarks (single-line, 100/500-line sheets, DAG, incremental) - tests/sheet_scenarios.rs: 20 real-world integration tests - tests/proptest_fuzz.rs: 12 property-based fuzz tests 771 tests passing across workspace, 0 failures.
This commit is contained in:
C. Cassel
227
calcpad-macos/Tests/CalcPadTests/FFIModelTests.swift
Normal file
227
calcpad-macos/Tests/CalcPadTests/FFIModelTests.swift
Normal file
@@ -0,0 +1,227 @@
|
||||
import Testing
|
||||
import Foundation
|
||||
@testable import CalcPad
|
||||
|
||||
@Suite("FFI JSON Model Decoding Tests")
|
||||
struct FFIModelTests {
|
||||
|
||||
// MARK: - Single Line Response
|
||||
|
||||
@Test("Decode number result")
|
||||
func decodeNumberResult() throws {
|
||||
let json = """
|
||||
{
|
||||
"schema_version": "1.0",
|
||||
"result": {
|
||||
"value": { "kind": "Number", "value": 42.0 },
|
||||
"metadata": {
|
||||
"span": { "start": 0, "end": 5 },
|
||||
"result_type": "Number",
|
||||
"display": "42",
|
||||
"raw_value": 42.0
|
||||
}
|
||||
}
|
||||
}
|
||||
"""
|
||||
let response = try JSONDecoder().decode(FFIResponse.self, from: Data(json.utf8))
|
||||
#expect(response.schemaVersion == "1.0")
|
||||
#expect(response.result.metadata.display == "42")
|
||||
#expect(response.result.metadata.resultType == "Number")
|
||||
#expect(response.result.metadata.rawValue == 42.0)
|
||||
if case .number(let value) = response.result.value {
|
||||
#expect(value == 42.0)
|
||||
} else {
|
||||
Issue.record("Expected .number variant")
|
||||
}
|
||||
}
|
||||
|
||||
@Test("Decode unit value result")
|
||||
func decodeUnitValueResult() throws {
|
||||
let json = """
|
||||
{
|
||||
"schema_version": "1.0",
|
||||
"result": {
|
||||
"value": { "kind": "UnitValue", "value": 5.0, "unit": "kg" },
|
||||
"metadata": {
|
||||
"span": { "start": 0, "end": 4 },
|
||||
"result_type": "UnitValue",
|
||||
"display": "5 kg",
|
||||
"raw_value": 5.0
|
||||
}
|
||||
}
|
||||
}
|
||||
"""
|
||||
let response = try JSONDecoder().decode(FFIResponse.self, from: Data(json.utf8))
|
||||
if case .unitValue(let value, let unit) = response.result.value {
|
||||
#expect(value == 5.0)
|
||||
#expect(unit == "kg")
|
||||
} else {
|
||||
Issue.record("Expected .unitValue variant")
|
||||
}
|
||||
}
|
||||
|
||||
@Test("Decode currency value result")
|
||||
func decodeCurrencyValueResult() throws {
|
||||
let json = """
|
||||
{
|
||||
"schema_version": "1.0",
|
||||
"result": {
|
||||
"value": { "kind": "CurrencyValue", "amount": 19.99, "currency": "USD" },
|
||||
"metadata": {
|
||||
"span": { "start": 0, "end": 6 },
|
||||
"result_type": "CurrencyValue",
|
||||
"display": "$19.99",
|
||||
"raw_value": 19.99
|
||||
}
|
||||
}
|
||||
}
|
||||
"""
|
||||
let response = try JSONDecoder().decode(FFIResponse.self, from: Data(json.utf8))
|
||||
if case .currencyValue(let amount, let currency) = response.result.value {
|
||||
#expect(amount == 19.99)
|
||||
#expect(currency == "USD")
|
||||
} else {
|
||||
Issue.record("Expected .currencyValue variant")
|
||||
}
|
||||
}
|
||||
|
||||
@Test("Decode datetime result")
|
||||
func decodeDateTimeResult() throws {
|
||||
let json = """
|
||||
{
|
||||
"schema_version": "1.0",
|
||||
"result": {
|
||||
"value": { "kind": "DateTime", "date": "2024-03-17" },
|
||||
"metadata": {
|
||||
"span": { "start": 0, "end": 10 },
|
||||
"result_type": "DateTime",
|
||||
"display": "2024-03-17",
|
||||
"raw_value": null
|
||||
}
|
||||
}
|
||||
}
|
||||
"""
|
||||
let response = try JSONDecoder().decode(FFIResponse.self, from: Data(json.utf8))
|
||||
if case .dateTime(let date) = response.result.value {
|
||||
#expect(date == "2024-03-17")
|
||||
} else {
|
||||
Issue.record("Expected .dateTime variant")
|
||||
}
|
||||
#expect(response.result.metadata.rawValue == nil)
|
||||
}
|
||||
|
||||
@Test("Decode time delta result")
|
||||
func decodeTimeDeltaResult() throws {
|
||||
let json = """
|
||||
{
|
||||
"schema_version": "1.0",
|
||||
"result": {
|
||||
"value": { "kind": "TimeDelta", "days": 30, "description": "30 days" },
|
||||
"metadata": {
|
||||
"span": { "start": 0, "end": 8 },
|
||||
"result_type": "TimeDelta",
|
||||
"display": "30 days",
|
||||
"raw_value": 30.0
|
||||
}
|
||||
}
|
||||
}
|
||||
"""
|
||||
let response = try JSONDecoder().decode(FFIResponse.self, from: Data(json.utf8))
|
||||
if case .timeDelta(let days, let desc) = response.result.value {
|
||||
#expect(days == 30)
|
||||
#expect(desc == "30 days")
|
||||
} else {
|
||||
Issue.record("Expected .timeDelta variant")
|
||||
}
|
||||
}
|
||||
|
||||
@Test("Decode boolean result")
|
||||
func decodeBooleanResult() throws {
|
||||
let json = """
|
||||
{
|
||||
"schema_version": "1.0",
|
||||
"result": {
|
||||
"value": { "kind": "Boolean", "value": true },
|
||||
"metadata": {
|
||||
"span": { "start": 0, "end": 5 },
|
||||
"result_type": "Boolean",
|
||||
"display": "true",
|
||||
"raw_value": null
|
||||
}
|
||||
}
|
||||
}
|
||||
"""
|
||||
let response = try JSONDecoder().decode(FFIResponse.self, from: Data(json.utf8))
|
||||
if case .boolean(let value) = response.result.value {
|
||||
#expect(value == true)
|
||||
} else {
|
||||
Issue.record("Expected .boolean variant")
|
||||
}
|
||||
}
|
||||
|
||||
@Test("Decode error result")
|
||||
func decodeErrorResult() throws {
|
||||
let json = """
|
||||
{
|
||||
"schema_version": "1.0",
|
||||
"result": {
|
||||
"value": { "kind": "Error", "message": "unexpected token", "span": { "start": 0, "end": 3 } },
|
||||
"metadata": {
|
||||
"span": { "start": 0, "end": 3 },
|
||||
"result_type": "Error",
|
||||
"display": "Error: unexpected token",
|
||||
"raw_value": null
|
||||
}
|
||||
}
|
||||
}
|
||||
"""
|
||||
let response = try JSONDecoder().decode(FFIResponse.self, from: Data(json.utf8))
|
||||
#expect(response.result.value.isError)
|
||||
if case .error(let message) = response.result.value {
|
||||
#expect(message == "unexpected token")
|
||||
} else {
|
||||
Issue.record("Expected .error variant")
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Sheet Response
|
||||
|
||||
@Test("Decode sheet response with multiple results")
|
||||
func decodeSheetResponse() throws {
|
||||
let json = """
|
||||
{
|
||||
"schema_version": "1.0",
|
||||
"results": [
|
||||
{
|
||||
"value": { "kind": "Number", "value": 4.0 },
|
||||
"metadata": { "span": { "start": 0, "end": 5 }, "result_type": "Number", "display": "4", "raw_value": 4.0 }
|
||||
},
|
||||
{
|
||||
"value": { "kind": "Error", "message": "empty expression", "span": { "start": 0, "end": 0 } },
|
||||
"metadata": { "span": { "start": 0, "end": 0 }, "result_type": "Error", "display": "Error: empty expression", "raw_value": null }
|
||||
},
|
||||
{
|
||||
"value": { "kind": "Number", "value": 30.0 },
|
||||
"metadata": { "span": { "start": 0, "end": 6 }, "result_type": "Number", "display": "30", "raw_value": 30.0 }
|
||||
}
|
||||
]
|
||||
}
|
||||
"""
|
||||
let response = try JSONDecoder().decode(FFISheetResponse.self, from: Data(json.utf8))
|
||||
#expect(response.results.count == 3)
|
||||
#expect(response.results[0].metadata.display == "4")
|
||||
#expect(response.results[1].value.isError)
|
||||
#expect(response.results[2].metadata.display == "30")
|
||||
}
|
||||
|
||||
// MARK: - FFICalcValue.isError
|
||||
|
||||
@Test("isError returns false for non-error values")
|
||||
func isErrorFalseForNonError() throws {
|
||||
let json = """
|
||||
{ "kind": "Number", "value": 42.0 }
|
||||
"""
|
||||
let value = try JSONDecoder().decode(FFICalcValue.self, from: Data(json.utf8))
|
||||
#expect(value.isError == false)
|
||||
}
|
||||
}
|
||||
64
calcpad-macos/Tests/CalcPadTests/PerformanceTests.swift
Normal file
64
calcpad-macos/Tests/CalcPadTests/PerformanceTests.swift
Normal file
@@ -0,0 +1,64 @@
|
||||
import Testing
|
||||
@testable import CalcPad
|
||||
|
||||
@Suite("Performance Tests")
|
||||
struct PerformanceTests {
|
||||
let engine = StubCalculationEngine()
|
||||
|
||||
@Test("Evaluate 1000+ line sheet completes in under 1 second")
|
||||
func largeSheetEvaluation() async throws {
|
||||
// Generate a 1500-line document mixing expressions, blanks, and comments
|
||||
var lines: [String] = []
|
||||
for i in 1...1500 {
|
||||
switch i % 5 {
|
||||
case 0: lines.append("") // blank
|
||||
case 1: lines.append("// Line \(i)") // comment
|
||||
case 2: lines.append("\(i) + \(i * 2)")
|
||||
case 3: lines.append("\(i) * 3")
|
||||
case 4: lines.append("\(i) / 7")
|
||||
default: lines.append("\(i)")
|
||||
}
|
||||
}
|
||||
let text = lines.joined(separator: "\n")
|
||||
|
||||
let start = ContinuousClock.now
|
||||
let results = engine.evaluateSheet(text)
|
||||
let elapsed = ContinuousClock.now - start
|
||||
|
||||
#expect(results.count == 1500)
|
||||
#expect(elapsed < .seconds(1), "Sheet evaluation took \(elapsed), expected < 1 second")
|
||||
}
|
||||
|
||||
@Test("Evaluate 5000 line sheet completes in under 3 seconds")
|
||||
func veryLargeSheetEvaluation() async throws {
|
||||
var lines: [String] = []
|
||||
for i in 1...5000 {
|
||||
lines.append("\(i) + \(i)")
|
||||
}
|
||||
let text = lines.joined(separator: "\n")
|
||||
|
||||
let start = ContinuousClock.now
|
||||
let results = engine.evaluateSheet(text)
|
||||
let elapsed = ContinuousClock.now - start
|
||||
|
||||
#expect(results.count == 5000)
|
||||
#expect(elapsed < .seconds(3), "Sheet evaluation took \(elapsed), expected < 3 seconds")
|
||||
}
|
||||
|
||||
@Test("LineResult array construction is efficient for large documents")
|
||||
func lineResultConstruction() {
|
||||
// Verify we get correct line numbering for large documents
|
||||
let lines = (1...1000).map { "\($0) + 1" }
|
||||
let text = lines.joined(separator: "\n")
|
||||
let results = engine.evaluateSheet(text)
|
||||
|
||||
#expect(results.count == 1000)
|
||||
#expect(results.first?.lineNumber == 1)
|
||||
#expect(results.last?.lineNumber == 1000)
|
||||
|
||||
// Spot-check results
|
||||
#expect(results[0].result == "2") // 1 + 1
|
||||
#expect(results[99].result == "101") // 100 + 1
|
||||
#expect(results[999].result == "1001") // 1000 + 1
|
||||
}
|
||||
}
|
||||
164
calcpad-macos/Tests/CalcPadTests/RustEngineTests.swift
Normal file
164
calcpad-macos/Tests/CalcPadTests/RustEngineTests.swift
Normal file
@@ -0,0 +1,164 @@
|
||||
import Testing
|
||||
import Foundation
|
||||
@testable import CalcPad
|
||||
|
||||
@Suite("RustCalculationEngine Tests")
|
||||
struct RustEngineTests {
|
||||
let engine = RustCalculationEngine()
|
||||
|
||||
// MARK: - AC: evaluateLine returns LineResult (not raw pointer)
|
||||
|
||||
@Test("evaluateLine 2+2 returns LineResult with result 4")
|
||||
func evalLineBasicArithmetic() {
|
||||
let result = engine.evaluateLine("2 + 2")
|
||||
#expect(result.result == "4")
|
||||
#expect(result.isError == false)
|
||||
#expect(result.lineNumber == 1)
|
||||
}
|
||||
|
||||
@Test("evaluateLine multiplication")
|
||||
func evalLineMultiplication() {
|
||||
let result = engine.evaluateLine("6 * 7")
|
||||
#expect(result.result == "42")
|
||||
#expect(result.isError == false)
|
||||
}
|
||||
|
||||
@Test("evaluateLine subtraction")
|
||||
func evalLineSubtraction() {
|
||||
let result = engine.evaluateLine("10 - 4")
|
||||
#expect(result.result == "6")
|
||||
#expect(result.isError == false)
|
||||
}
|
||||
|
||||
@Test("evaluateLine division")
|
||||
func evalLineDivision() {
|
||||
let result = engine.evaluateLine("15 / 3")
|
||||
#expect(result.result == "5")
|
||||
#expect(result.isError == false)
|
||||
}
|
||||
|
||||
@Test("evaluateLine decimal result")
|
||||
func evalLineDecimal() {
|
||||
let result = engine.evaluateLine("7 / 2")
|
||||
#expect(result.result == "3.5")
|
||||
#expect(result.isError == false)
|
||||
}
|
||||
|
||||
// MARK: - AC: evaluateSheet returns array of LineResult, one per line
|
||||
|
||||
@Test("evaluateSheet returns one result per line")
|
||||
func evalSheetMultiLine() {
|
||||
let text = "2 + 2\n\n10 * 3"
|
||||
let results = engine.evaluateSheet(text)
|
||||
#expect(results.count == 3)
|
||||
#expect(results[0].lineNumber == 1)
|
||||
#expect(results[0].result == "4")
|
||||
#expect(results[1].lineNumber == 2)
|
||||
#expect(results[1].result == nil) // blank line
|
||||
#expect(results[2].lineNumber == 3)
|
||||
#expect(results[2].result == "30")
|
||||
}
|
||||
|
||||
@Test("evaluateSheet with comments and blanks")
|
||||
func evalSheetMixed() {
|
||||
let text = "// Title\n5 + 5\n\n// Section\n3 * 3"
|
||||
let results = engine.evaluateSheet(text)
|
||||
#expect(results.count == 5)
|
||||
#expect(results[0].result == nil) // comment
|
||||
#expect(results[0].isError == false)
|
||||
#expect(results[1].result == "10")
|
||||
#expect(results[2].result == nil) // blank
|
||||
#expect(results[3].result == nil) // comment
|
||||
#expect(results[4].result == "9")
|
||||
}
|
||||
|
||||
// MARK: - AC: Error handling — errors become LineResult, no crash
|
||||
|
||||
@Test("Malformed expression returns error LineResult, not crash")
|
||||
func evalLineError() {
|
||||
let result = engine.evaluateLine("2 + + 3")
|
||||
#expect(result.isError == true)
|
||||
#expect(result.result != nil) // has error message
|
||||
#expect(result.result?.starts(with: "Error") == true)
|
||||
}
|
||||
|
||||
@Test("Completely invalid input returns error, not crash")
|
||||
func evalLineInvalidInput() {
|
||||
let result = engine.evaluateLine("@#$%^&")
|
||||
// Should not crash — either error or some result
|
||||
#expect(result.id == 1)
|
||||
}
|
||||
|
||||
// MARK: - AC: Blank and comment lines
|
||||
|
||||
@Test("Blank line returns nil result")
|
||||
func blankLine() {
|
||||
let result = engine.evaluateLine("")
|
||||
#expect(result.result == nil)
|
||||
#expect(result.isError == false)
|
||||
}
|
||||
|
||||
@Test("Comment with // returns nil result")
|
||||
func commentLine() {
|
||||
let result = engine.evaluateLine("// this is a comment")
|
||||
#expect(result.result == nil)
|
||||
#expect(result.isError == false)
|
||||
}
|
||||
|
||||
@Test("# is not a comment in Rust engine — treated as identifier lookup")
|
||||
func hashNotComment() {
|
||||
let result = engine.evaluateLine("# header")
|
||||
// The Rust engine does not treat # as a comment. The # is skipped and
|
||||
// "header" is parsed as an identifier, resulting in an undefined variable error.
|
||||
#expect(result.isError == true)
|
||||
}
|
||||
|
||||
// MARK: - AC: Memory safety — no leaks with repeated calls
|
||||
|
||||
@Test("Repeated evaluateLine calls don't leak (1000 iterations)")
|
||||
func memoryStressLine() {
|
||||
for i in 0..<1000 {
|
||||
let result = engine.evaluateLine("\(i) + 1")
|
||||
#expect(result.isError == false)
|
||||
}
|
||||
}
|
||||
|
||||
@Test("Repeated evaluateSheet calls don't leak (100 iterations)")
|
||||
func memoryStressSheet() {
|
||||
let text = (1...10).map { "\($0) * 2" }.joined(separator: "\n")
|
||||
for _ in 0..<100 {
|
||||
let results = engine.evaluateSheet(text)
|
||||
#expect(results.count == 10)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - AC: Thread safety — concurrent calls
|
||||
|
||||
@Test("Concurrent evaluateLine calls from multiple threads")
|
||||
func threadSafety() async {
|
||||
await withTaskGroup(of: LineResult.self) { group in
|
||||
for i in 0..<50 {
|
||||
group.addTask {
|
||||
engine.evaluateLine("\(i) + 1")
|
||||
}
|
||||
}
|
||||
var count = 0
|
||||
for await result in group {
|
||||
#expect(result.isError == false)
|
||||
count += 1
|
||||
}
|
||||
#expect(count == 50)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - AC: Variables shared across sheet lines
|
||||
|
||||
@Test("evaluateSheet shares variables across lines")
|
||||
func evalSheetVariables() {
|
||||
let text = "x = 10\nx * 2"
|
||||
let results = engine.evaluateSheet(text)
|
||||
#expect(results.count == 2)
|
||||
#expect(results[0].result == "10")
|
||||
#expect(results[1].result == "20")
|
||||
}
|
||||
}
|
||||
115
calcpad-macos/Tests/CalcPadTests/StubEngineTests.swift
Normal file
115
calcpad-macos/Tests/CalcPadTests/StubEngineTests.swift
Normal file
@@ -0,0 +1,115 @@
|
||||
import Testing
|
||||
@testable import CalcPad
|
||||
|
||||
@Suite("StubCalculationEngine Tests")
|
||||
struct StubEngineTests {
|
||||
let engine = StubCalculationEngine()
|
||||
|
||||
@Test("Blank lines produce nil result")
|
||||
func blankLine() {
|
||||
let result = engine.evaluateLine("")
|
||||
#expect(result.result == nil)
|
||||
#expect(result.isError == false)
|
||||
#expect(result.isEmpty == true)
|
||||
}
|
||||
|
||||
@Test("Whitespace-only lines produce nil result")
|
||||
func whitespaceOnly() {
|
||||
let result = engine.evaluateLine(" ")
|
||||
#expect(result.result == nil)
|
||||
#expect(result.isError == false)
|
||||
}
|
||||
|
||||
@Test("Comment lines starting with // produce nil result")
|
||||
func doubleSlashComment() {
|
||||
let result = engine.evaluateLine("// this is a comment")
|
||||
#expect(result.result == nil)
|
||||
#expect(result.isError == false)
|
||||
}
|
||||
|
||||
@Test("Comment lines starting with # produce nil result")
|
||||
func hashComment() {
|
||||
let result = engine.evaluateLine("# header")
|
||||
#expect(result.result == nil)
|
||||
#expect(result.isError == false)
|
||||
}
|
||||
|
||||
@Test("Simple addition")
|
||||
func addition() {
|
||||
let result = engine.evaluateLine("2 + 3")
|
||||
#expect(result.result == "5")
|
||||
#expect(result.isError == false)
|
||||
}
|
||||
|
||||
@Test("Simple subtraction")
|
||||
func subtraction() {
|
||||
let result = engine.evaluateLine("10 - 4")
|
||||
#expect(result.result == "6")
|
||||
#expect(result.isError == false)
|
||||
}
|
||||
|
||||
@Test("Simple multiplication")
|
||||
func multiplication() {
|
||||
let result = engine.evaluateLine("6 * 7")
|
||||
#expect(result.result == "42")
|
||||
#expect(result.isError == false)
|
||||
}
|
||||
|
||||
@Test("Simple division")
|
||||
func division() {
|
||||
let result = engine.evaluateLine("15 / 3")
|
||||
#expect(result.result == "5")
|
||||
#expect(result.isError == false)
|
||||
}
|
||||
|
||||
@Test("Decimal result")
|
||||
func decimalResult() {
|
||||
let result = engine.evaluateLine("7 / 2")
|
||||
#expect(result.result == "3.5")
|
||||
#expect(result.isError == false)
|
||||
}
|
||||
|
||||
@Test("evaluateSheet returns one result per line")
|
||||
func evaluateSheet() {
|
||||
let text = "2 + 2\n\n10 * 3"
|
||||
let results = engine.evaluateSheet(text)
|
||||
#expect(results.count == 3)
|
||||
#expect(results[0].lineNumber == 1)
|
||||
#expect(results[0].result == "4")
|
||||
#expect(results[1].lineNumber == 2)
|
||||
#expect(results[1].result == nil)
|
||||
#expect(results[2].lineNumber == 3)
|
||||
#expect(results[2].result == "30")
|
||||
}
|
||||
|
||||
@Test("evaluateSheet with comments and blanks")
|
||||
func evaluateSheetMixed() {
|
||||
let text = "// Title\n5 + 5\n\n# Section\n3 * 3"
|
||||
let results = engine.evaluateSheet(text)
|
||||
#expect(results.count == 5)
|
||||
#expect(results[0].result == nil) // comment
|
||||
#expect(results[1].result == "10")
|
||||
#expect(results[2].result == nil) // blank
|
||||
#expect(results[3].result == nil) // comment
|
||||
#expect(results[4].result == "9")
|
||||
}
|
||||
|
||||
@Test("LineResult id equals line number")
|
||||
func lineResultId() {
|
||||
let result = LineResult(id: 5, expression: "2+2", result: "4", isError: false)
|
||||
#expect(result.lineNumber == 5)
|
||||
#expect(result.id == 5)
|
||||
}
|
||||
|
||||
@Test("LineResult isEmpty for nil results")
|
||||
func lineResultIsEmpty() {
|
||||
let empty = LineResult(id: 1, expression: "", result: nil, isError: false)
|
||||
#expect(empty.isEmpty == true)
|
||||
|
||||
let error = LineResult(id: 1, expression: "bad", result: nil, isError: true)
|
||||
#expect(error.isEmpty == false)
|
||||
|
||||
let hasResult = LineResult(id: 1, expression: "2+2", result: "4", isError: false)
|
||||
#expect(hasResult.isEmpty == false)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user