diff --git a/tests/features/stats/ObserverTab.test.tsx b/tests/features/stats/ObserverTab.test.tsx index 1e60110..a6006f8 100644 --- a/tests/features/stats/ObserverTab.test.tsx +++ b/tests/features/stats/ObserverTab.test.tsx @@ -63,8 +63,8 @@ const H = 3_600_000; const point = (t: number, p: Partial): TelemetryPoint => ({ t, batteryMv: null, - airtimeTxPct: null, - airtimeRxPct: null, + airtimeTxSecs: null, + airtimeRxSecs: null, noiseFloorDb: null, uptimeSeconds: null, queueLength: null, @@ -75,7 +75,7 @@ const point = (t: number, p: Partial): TelemetryPoint => ({ const telemetry: ObserverTelemetry = { range: "24h", interval: "1h", - points: [point(0, { airtimeRxPct: 100, airtimeTxPct: 10, batteryMv: 4100 }), point(H, { airtimeRxPct: 154, airtimeTxPct: 46, batteryMv: 4100 })], + points: [point(0, { airtimeRxSecs: 100, airtimeTxSecs: 10, batteryMv: 4100 }), point(H, { airtimeRxSecs: 154, airtimeTxSecs: 46, batteryMv: 4100 })], }; const activity: ObserverActivity = { @@ -135,7 +135,7 @@ describe("ObserverTab", () => { }); it("leaves the header airtime stat out when the observer reports no telemetry", () => { - const zero = point(0, { airtimeRxPct: 0, airtimeTxPct: 0 }); + const zero = point(0, { airtimeRxSecs: 0, airtimeTxSecs: 0 }); telemetryResult.data = { ...telemetry, points: [zero, { ...zero, t: H }] }; renderTab(); expect(screen.queryByText(/RX 0%/)).not.toBeInTheDocument(); diff --git a/tests/features/stats/chart-options.test.ts b/tests/features/stats/chart-options.test.ts index 3688c13..949f2d3 100644 --- a/tests/features/stats/chart-options.test.ts +++ b/tests/features/stats/chart-options.test.ts @@ -133,8 +133,8 @@ describe("leaderboardOption", () => { const point = (t: number, p: Partial): TelemetryPoint => ({ t, batteryMv: null, - airtimeTxPct: null, - airtimeRxPct: null, + airtimeTxSecs: null, + airtimeRxSecs: null, noiseFloorDb: null, uptimeSeconds: null, queueLength: null, @@ -146,9 +146,9 @@ const H = 3_600_000; describe("airtimeOption", () => { const points = [ - point(0, { airtimeRxPct: 10, airtimeTxPct: 4 }), - point(H, { airtimeRxPct: 46, airtimeTxPct: 4 }), // +36 s over 1 h → 1% - point(3 * H, { airtimeRxPct: 40, airtimeTxPct: 76 }), // RX dips → clamp at 0; TX +72 s over 2 h → 1% + point(0, { airtimeRxSecs: 10, airtimeTxSecs: 4 }), + point(H, { airtimeRxSecs: 46, airtimeTxSecs: 4 }), // +36 s over 1 h → 1% + point(3 * H, { airtimeRxSecs: 40, airtimeTxSecs: 76 }), // RX dips → clamp at 0; TX +72 s over 2 h → 1% ]; it("charts raw counters as percent of the wall-clock gap between reports", () => { @@ -159,7 +159,7 @@ describe("airtimeOption", () => { }); it("charts bucketed deltas as percent of the bucket width", () => { - const bucketed = [point(0, { airtimeRxPct: 216, airtimeTxPct: 0 }), point(6 * H, { airtimeRxPct: 0, airtimeTxPct: 1080 })]; + const bucketed = [point(0, { airtimeRxSecs: 216, airtimeTxSecs: 0 }), point(6 * H, { airtimeRxSecs: 0, airtimeTxSecs: 1080 })]; const opt = airtimeOption(bucketed, colors, 6 * H) as Record; expect(opt.series[0].data).toEqual([[0, 1], [6 * H, 0]]); expect(opt.series[1].data).toEqual([[0, 0], [6 * H, 5]]); diff --git a/tests/features/stats/has-telemetry.test.ts b/tests/features/stats/has-telemetry.test.ts index 419301c..7093b3f 100644 --- a/tests/features/stats/has-telemetry.test.ts +++ b/tests/features/stats/has-telemetry.test.ts @@ -2,7 +2,7 @@ import { describe, it, expect } from "vitest"; import { hasTelemetry } from "../../../src/features/stats/transforms"; import type { TelemetryPoint } from "../../../src/features/stats/types"; -const empty = (t: number): TelemetryPoint => ({ t, batteryMv: null, airtimeTxPct: null, airtimeRxPct: null, noiseFloorDb: null, uptimeSeconds: null, queueLength: null, receiveErrors: null }); +const empty = (t: number): TelemetryPoint => ({ t, batteryMv: null, airtimeTxSecs: null, airtimeRxSecs: null, noiseFloorDb: null, uptimeSeconds: null, queueLength: null, receiveErrors: null }); describe("hasTelemetry", () => { it("is false for no points", () => { @@ -18,7 +18,7 @@ describe("hasTelemetry", () => { }); it("is false when every metric is zero (bots / MQTT bridges report all-zero rows)", () => { - const allZero: TelemetryPoint = { t: 1, batteryMv: 0, airtimeTxPct: 0, airtimeRxPct: 0, noiseFloorDb: 0, uptimeSeconds: 0, queueLength: 0, receiveErrors: 0 }; + const allZero: TelemetryPoint = { t: 1, batteryMv: 0, airtimeTxSecs: 0, airtimeRxSecs: 0, noiseFloorDb: 0, uptimeSeconds: 0, queueLength: 0, receiveErrors: 0 }; expect(hasTelemetry([allZero, allZero])).toBe(false); }); }); diff --git a/tests/features/stats/transforms.test.ts b/tests/features/stats/transforms.test.ts index 1f35c56..cca413a 100644 --- a/tests/features/stats/transforms.test.ts +++ b/tests/features/stats/transforms.test.ts @@ -7,8 +7,8 @@ const H = 3_600_000; const point = (t: number, p: Partial): TelemetryPoint => ({ t, batteryMv: null, - airtimeTxPct: null, - airtimeRxPct: null, + airtimeTxSecs: null, + airtimeRxSecs: null, noiseFloorDb: null, uptimeSeconds: null, queueLength: null, @@ -46,46 +46,46 @@ describe("airtimePctSeries", () => { // raw points carry cumulative on-air seconds; the series is the increase as a percent of the // wall-clock gap between the two reports const raw = [ - point(0, { airtimeRxPct: 10, airtimeTxPct: 4 }), - point(H, { airtimeRxPct: 46, airtimeTxPct: 4 }), // +36 s over 1 h - point(3 * H, { airtimeRxPct: 40, airtimeTxPct: 76 }), // rx reset, tx +72 s over 2 h + point(0, { airtimeRxSecs: 10, airtimeTxSecs: 4 }), + point(H, { airtimeRxSecs: 46, airtimeTxSecs: 4 }), // +36 s over 1 h + point(3 * H, { airtimeRxSecs: 40, airtimeTxSecs: 76 }), // rx reset, tx +72 s over 2 h ]; it("divides each cumulative delta by the real gap to the previous report", () => { - expect(airtimePctSeries(raw, "airtimeRxPct", null)).toEqual([[H, 1], [3 * H, 0]]); - expect(airtimePctSeries(raw, "airtimeTxPct", null)).toEqual([[H, 0], [3 * H, 1]]); + expect(airtimePctSeries(raw, "airtimeRxSecs", null)).toEqual([[H, 1], [3 * H, 0]]); + expect(airtimePctSeries(raw, "airtimeTxSecs", null)).toEqual([[H, 0], [3 * H, 1]]); }); it("leaves a gap when either side of a delta is missing", () => { - const withHole = [point(0, { airtimeRxPct: 10 }), point(H, { airtimeRxPct: null }), point(2 * H, { airtimeRxPct: 82 })]; - expect(airtimePctSeries(withHole, "airtimeRxPct", null)).toEqual([[H, null], [2 * H, null]]); + const withHole = [point(0, { airtimeRxSecs: 10 }), point(H, { airtimeRxSecs: null }), point(2 * H, { airtimeRxSecs: 82 })]; + expect(airtimePctSeries(withHole, "airtimeRxSecs", null)).toEqual([[H, null], [2 * H, null]]); }); it("divides bucketed deltas by the bucket width", () => { - const bucketed = [point(0, { airtimeRxPct: 216 }), point(6 * H, { airtimeRxPct: 1080 })]; - expect(airtimePctSeries(bucketed, "airtimeRxPct", 6 * H)).toEqual([[0, 1], [6 * H, 5]]); + const bucketed = [point(0, { airtimeRxSecs: 216 }), point(6 * H, { airtimeRxSecs: 1080 })]; + expect(airtimePctSeries(bucketed, "airtimeRxSecs", 6 * H)).toEqual([[0, 1], [6 * H, 5]]); }); it("rounds to three decimals so tooltips stay readable", () => { - const pts = [point(0, { airtimeRxPct: 0 }), point(H, { airtimeRxPct: 1 })]; // 1 s / 3600 s - expect(airtimePctSeries(pts, "airtimeRxPct", null)).toEqual([[H, 0.028]]); + const pts = [point(0, { airtimeRxSecs: 0 }), point(H, { airtimeRxSecs: 1 })]; // 1 s / 3600 s + expect(airtimePctSeries(pts, "airtimeRxSecs", null)).toEqual([[H, 0.028]]); }); }); describe("latestAirtimePct", () => { it("reports the last delta for raw points", () => { - const raw = [point(0, { airtimeRxPct: 10, airtimeTxPct: 4 }), point(H, { airtimeRxPct: 46, airtimeTxPct: 76 })]; + const raw = [point(0, { airtimeRxSecs: 10, airtimeTxSecs: 4 }), point(H, { airtimeRxSecs: 46, airtimeTxSecs: 76 })]; expect(latestAirtimePct(raw, null)).toEqual({ rx: 1, tx: 2 }); }); it("reports the last bucket for bucketed points", () => { - const bucketed = [point(0, { airtimeRxPct: 1, airtimeTxPct: 1 }), point(6 * H, { airtimeRxPct: 216, airtimeTxPct: 0 })]; + const bucketed = [point(0, { airtimeRxSecs: 1, airtimeTxSecs: 1 }), point(6 * H, { airtimeRxSecs: 216, airtimeTxSecs: 0 })]; expect(latestAirtimePct(bucketed, 6 * H)).toEqual({ rx: 1, tx: 0 }); }); it("is null when there is nothing to difference", () => { expect(latestAirtimePct([], null)).toEqual({ rx: null, tx: null }); - expect(latestAirtimePct([point(0, { airtimeRxPct: 10 })], null)).toEqual({ rx: null, tx: null }); + expect(latestAirtimePct([point(0, { airtimeRxSecs: 10 })], null)).toEqual({ rx: null, tx: null }); }); });