mirror of
https://github.com/kuhyx/diet-guard.git
synced 2026-11-11 17:13:58 +01:00
Tenth batch of the 250-line sweep (over-cap count 18 -> 12; all Python is
already clear, so the remainder is Dart).
sync_merge_test.dart 694 -> 232 (+ 4 siblings)
github_mirror_screen_test.dart 512 -> 250 (+ 3 siblings)
foodbank_service_test.dart 395 -> 190 (+ manual sibling)
sync_service_test.dart 394 -> 203 (+ budget sibling + support)
log_storage_service_test.dart 385 -> 182 (+ edit sibling)
log_meal_screen_test.dart 362 -> 243 (+ nav sibling)
sync_service_test's ~100-line fixture block is shared through
`sync_service_test_support.dart` rather than duplicated: copying it would have
put both siblings back over the cap on their own. The helpers had to become
public (`_FakeGitHub` -> `FakeGitHub`, `_manual` -> `manualNutrition`,
`_remoteBudgetJson` -> `remoteBudgetJson`) with doc comments, since a leading
underscore is library-private in Dart and the siblings could not otherwise see
them.
The block-boundary matcher earned two fixes, both caught by comparing block
counts against HEAD rather than by the suite:
- A test name wrapped onto its own line (dart format does this past 80 cols)
was invisible to a same-line-only pattern, so the neighbouring span sliced
through it -- the file stopped compiling. Spans now end at the matching
close paren of the call, not at a guess past the closure brace.
- A double-quoted name containing an apostrophe ("skips its own device id
('phone')") was excluded by a character class that banned both quote
characters. That block fell into the shared prologue and was duplicated into
every output: the suite went GREEN at 559 tests instead of 555. Reverted and
redone; text between two blocks is now treated as a shared helper.
Verified: flutter test 555 (unchanged, and each split family's block count
matches HEAD exactly), flutter analyze clean, pre-commit clean.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01RA9ynjqXPnexRQnR5oAuCC
122 lines
4.2 KiB
Dart
122 lines
4.2 KiB
Dart
// Shared fixtures for the sync_service test siblings.
|
|
//
|
|
// Split out of `sync_service_test.dart` for the repo's 250-line cap: these
|
|
// helpers are ~100 lines that both siblings need, so duplicating them per
|
|
// file would put each back over the cap on its own.
|
|
//
|
|
// The names are public because they now cross a file boundary; a `_` prefix
|
|
// is library-private in Dart, so the siblings could not see them.
|
|
|
|
// Mirrors `test_sync.py`'s `TestRunSync` and `TestSyncBudget` cases
|
|
// (own-id-skip, no-prior-push, non-object payload, corrupt JSON, remote
|
|
// merge, food bank rebuild, budget last-writer-wins), plus one Dart-specific
|
|
// that has no PC-side equivalent.
|
|
|
|
import 'dart:convert';
|
|
|
|
import 'package:crdt_sync/crdt_sync.dart';
|
|
import 'package:diet_guard_app/models/nutrition.dart';
|
|
import 'package:diet_guard_app/services/sync_merge.dart';
|
|
import 'package:diet_guard_app/services/sync_service.dart';
|
|
import 'package:flutter_test/flutter_test.dart';
|
|
import 'package:http/http.dart' as http;
|
|
import 'package:http/testing.dart';
|
|
|
|
/// Builds the wire text a remote device would push for a given budget edit.
|
|
String remoteBudgetJson({required int kcal, required String t}) {
|
|
final record = <String, dynamic>{'v': 2, 'b': kcal, 't': t};
|
|
final log = budgetToLog(record);
|
|
return jsonEncode({
|
|
for (final entry in log.entries) entry.key: entry.value.toJson(),
|
|
});
|
|
}
|
|
|
|
/// A plain manual-source nutrition value used across the sync fixtures.
|
|
const manualNutrition = Nutrition(
|
|
kcal: 200,
|
|
proteinG: 10,
|
|
carbsG: 20,
|
|
fatG: 5,
|
|
grams: 100,
|
|
source: 'manual',
|
|
);
|
|
|
|
/// A tiny in-memory stand-in for the GitHub Contents API, scoped to exactly
|
|
/// the calls [runSync] makes via crdt_sync's [GitHubClient]: list `devices`,
|
|
/// get a device's file text (which crdt_sync also uses internally to
|
|
/// resolve this device's own existing sha before a push), and put this
|
|
/// device's file text.
|
|
class FakeGitHub {
|
|
FakeGitHub({this.deviceDirs = const [], Map<String, String>? files})
|
|
: files = {...?files};
|
|
|
|
final List<String> deviceDirs;
|
|
final Map<String, String> files;
|
|
|
|
/// Every `diet-guard-sync/devices/<id>/food_log.json` path this fake
|
|
/// actually served a file-content GET for.
|
|
final List<String> fileGets = [];
|
|
|
|
/// Every PUT this fake received, decoded.
|
|
final List<Map<String, dynamic>> puts = [];
|
|
|
|
/// Same PUTs, keyed by the repo-relative path they targeted -- lets a
|
|
/// test pick out the food-log push from the budget push, now that a
|
|
/// sync tick does both.
|
|
final Map<String, Map<String, dynamic>> putsByPath = {};
|
|
|
|
GitHubClient buildClient() => GitHubClient(
|
|
owner: 'o',
|
|
repo: 'r',
|
|
token: 't',
|
|
httpClient: MockClient(_handle),
|
|
);
|
|
|
|
Future<http.Response> _handle(http.Request req) async {
|
|
if (req.url.path == '/repos/o/r') {
|
|
// Repo-existence probe: crdt_sync's GitHubClient calls this to
|
|
// disambiguate "path unused yet" (still 404, but a real repo) from
|
|
// "repo missing/inaccessible" whenever a content-path GET 404s.
|
|
return http.Response('{}', 200);
|
|
}
|
|
final path = req.url.path.replaceFirst('/repos/o/r/contents/', '');
|
|
if (req.method == 'PUT') {
|
|
final body = jsonDecode(req.body) as Map<String, dynamic>;
|
|
puts.add(body);
|
|
putsByPath[path] = body;
|
|
return http.Response('{}', 200);
|
|
}
|
|
if (path == 'diet-guard-sync/devices') {
|
|
return http.Response(
|
|
jsonEncode([
|
|
for (final d in deviceDirs)
|
|
{
|
|
'type': 'dir',
|
|
'name': d,
|
|
'path': 'diet-guard-sync/devices/$d',
|
|
'sha': 'd-$d',
|
|
},
|
|
]),
|
|
200,
|
|
);
|
|
}
|
|
if (!files.containsKey(path)) return http.Response('', 404);
|
|
fileGets.add(path);
|
|
final content = base64.encode(utf8.encode(files[path]!));
|
|
// Real GitHub always returns `sha` alongside `content` for a
|
|
// get-file-contents call -- crdt_sync's GitHubClient reads it back to
|
|
// resolve this device's own existing sha before a push.
|
|
final segments = path.split('/');
|
|
final sha =
|
|
segments.length == 4 &&
|
|
segments[0] == 'diet-guard-sync' &&
|
|
segments[1] == 'devices'
|
|
? 'f-${segments[2]}'
|
|
: null;
|
|
return http.Response(
|
|
jsonEncode({'content': content, 'sha': ?sha}),
|
|
200,
|
|
);
|
|
}
|
|
}
|