test sweep: finish src/git/ (T-91)
test / unit + widget + golden + a11y (push) Failing after 30s
test / integration_test (xvfb) (push) Has been skipped
test / bundle smoke (xvfb 5s) (push) Has been skipped
test / daemon subprocess + web WASM smoke (push) Has been skipped
test / dart doc (lib API) (push) Failing after 1m1s
test / unit + widget + golden + a11y (push) Failing after 30s
test / integration_test (xvfb) (push) Has been skipped
test / bundle smoke (xvfb 5s) (push) Has been skipped
test / daemon subprocess + web WASM smoke (push) Has been skipped
test / dart doc (lib API) (push) Failing after 1m1s
Closes out the three remaining files in src/git/ following the client.dart batch: operations.dart (25 new tests): - GitException.toString - GitLogEntry.toJson (body present + absent) - gitStage / gitUnstage / gitStashPop / gitPush / gitPull error paths (no remote, empty stash, bogus path) - gitUnstage with empty paths (unstage everything) - gitStageHunk + gitUnstageHunk via _applyPatch - _applyPatch surfaces stderr in GitException on a bad patch - gitBranches happy + non-repo - gitCheckout happy + unknown-branch error - gitPull + gitPush round-trip against a local bare remote - gitLog / gitCurrentBranch / gitBranches non-repo fallbacks - gitDiscard with empty list short-circuit - gitBin resolver diff.dart (7 new tests): - gitDiff with paths argument and non-repo fallback - GitHunk.toPatch round-tripping header + every DiffLineKind - GitDiff.toJson with / without oldPath - parseDiffOutput edge cases: pre-diff garbage skipped, "\ No newline" marker captured as a header line, malformed @@ header skipped via _parseHunk null return status.dart (4 new tests): - branch.upstream + branch.ab populated from a local bare remote - non-git directory returns an empty branchless status - rename in porcelain output captures the original path - parsePorcelainV1 short-part / empty-part / empty-input edge cases Coverage: src/git/diff.dart 106/124 -> 124/124 (100%); src/git/operations.dart 88/155 -> 148/155 (95% — remaining 7 lines are gitPull/gitPush variants that need credentials, and the gitBranches non-zero stderr path); src/git/status.dart 86/98 -> 95/98 (97% — remaining 3 are the ProcessException-during-call catch branches, only reachable if git crashes mid-call). Total coverage 76.04% -> 77.05%; floor bumped to 77. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -207,5 +207,96 @@ index abc..def 100644
|
||||
final diffs = await gitDiff(sandbox);
|
||||
expect(diffs, isEmpty);
|
||||
});
|
||||
|
||||
test('paths argument narrows the diff to that file', () async {
|
||||
await File('${sandbox.path}/file.txt').writeAsString('hello\nworld\n');
|
||||
await File('${sandbox.path}/other.txt').writeAsString('o\n');
|
||||
final scoped = await gitDiff(sandbox, paths: ['file.txt']);
|
||||
expect(scoped, hasLength(1));
|
||||
expect(scoped.first.path, 'file.txt');
|
||||
});
|
||||
|
||||
test('returns empty on a non-git directory (exit != 0)', () async {
|
||||
final notGit = await Directory.systemTemp.createTemp('clide-diff-not-');
|
||||
addTearDown(() => notGit.deleteSync(recursive: true));
|
||||
expect(await gitDiff(notGit), isEmpty);
|
||||
});
|
||||
});
|
||||
|
||||
group('GitHunk shape', () {
|
||||
test('toPatch round-trips header + every line kind', () {
|
||||
const hunk = GitHunk(
|
||||
header: '@@ -1,3 +1,4 @@ ctx',
|
||||
oldStart: 1,
|
||||
oldCount: 3,
|
||||
newStart: 1,
|
||||
newCount: 4,
|
||||
lines: [
|
||||
DiffLine(kind: DiffLineKind.context, text: 'line1', oldLineNo: 1, newLineNo: 1),
|
||||
DiffLine(kind: DiffLineKind.removal, text: 'line2', oldLineNo: 2),
|
||||
DiffLine(kind: DiffLineKind.addition, text: 'line2-new', newLineNo: 2),
|
||||
DiffLine(kind: DiffLineKind.header, text: r'\ No newline at end of file'),
|
||||
],
|
||||
);
|
||||
final patch = hunk.toPatch();
|
||||
expect(patch, contains('@@ -1,3 +1,4 @@ ctx'));
|
||||
expect(patch, contains(' line1'));
|
||||
expect(patch, contains('-line2'));
|
||||
expect(patch, contains('+line2-new'));
|
||||
expect(patch, contains(r'\ No newline at end of file'));
|
||||
});
|
||||
|
||||
test('GitDiff.toJson serialises with optional oldPath only when set', () {
|
||||
const withOld = GitDiff(path: 'b.txt', oldPath: 'a.txt', hunks: [], isRenamed: true);
|
||||
expect(withOld.toJson().containsKey('oldPath'), isTrue);
|
||||
const noOld = GitDiff(path: 'b.txt', hunks: []);
|
||||
expect(noOld.toJson().containsKey('oldPath'), isFalse);
|
||||
});
|
||||
});
|
||||
|
||||
group('parseDiffOutput — edge cases', () {
|
||||
test('skips lines outside any diff --git block', () {
|
||||
const output = '''pre-diff garbage
|
||||
another non-diff line
|
||||
diff --git a/f.txt b/f.txt
|
||||
--- a/f.txt
|
||||
+++ b/f.txt
|
||||
@@ -1 +1 @@
|
||||
-old
|
||||
+new
|
||||
''';
|
||||
final diffs = parseDiffOutput(output);
|
||||
expect(diffs, hasLength(1));
|
||||
});
|
||||
|
||||
test('captures the "\\ No newline at end of file" marker as a header line', () {
|
||||
const output = '''diff --git a/f.txt b/f.txt
|
||||
--- a/f.txt
|
||||
+++ b/f.txt
|
||||
@@ -1,1 +1,1 @@
|
||||
-old
|
||||
+new
|
||||
\\ No newline at end of file
|
||||
''';
|
||||
final diffs = parseDiffOutput(output);
|
||||
expect(diffs, hasLength(1));
|
||||
final hunk = diffs.first.hunks.single;
|
||||
expect(hunk.lines.any((l) => l.kind == DiffLineKind.header), isTrue);
|
||||
});
|
||||
|
||||
test('skips a malformed @@ header (parseHunk returns null)', () {
|
||||
const output = '''diff --git a/f.txt b/f.txt
|
||||
--- a/f.txt
|
||||
+++ b/f.txt
|
||||
@@ not a valid hunk header @@
|
||||
@@ -1 +1 @@
|
||||
-old
|
||||
+new
|
||||
''';
|
||||
final diffs = parseDiffOutput(output);
|
||||
expect(diffs, hasLength(1));
|
||||
// Only the valid @@ produces a hunk.
|
||||
expect(diffs.first.hunks, hasLength(1));
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@@ -104,4 +104,162 @@ void main() {
|
||||
final branch = await gitCurrentBranch(sandbox);
|
||||
expect(branch, isNotNull);
|
||||
});
|
||||
|
||||
test('GitException.toString includes the message', () {
|
||||
const e = GitException('boom');
|
||||
expect(e.toString(), contains('boom'));
|
||||
});
|
||||
|
||||
test('GitLogEntry.toJson serialises every field (body omitted when empty)', () {
|
||||
const a = GitLogEntry(
|
||||
hash: 'h',
|
||||
shortHash: 's',
|
||||
subject: 'sub',
|
||||
author: 'a',
|
||||
date: 'd',
|
||||
);
|
||||
expect(a.toJson().containsKey('body'), isFalse);
|
||||
const b = GitLogEntry(
|
||||
hash: 'h',
|
||||
shortHash: 's',
|
||||
subject: 'sub',
|
||||
author: 'a',
|
||||
date: 'd',
|
||||
body: 'bd',
|
||||
);
|
||||
expect(b.toJson()['body'], 'bd');
|
||||
});
|
||||
|
||||
test('gitStage with a bogus path throws GitException', () async {
|
||||
try {
|
||||
await gitStage(sandbox, ['no-such-file-here']);
|
||||
fail('expected GitException');
|
||||
} on GitException catch (_) {}
|
||||
});
|
||||
|
||||
test('gitUnstage with no paths unstages everything', () async {
|
||||
await File('${sandbox.path}/a.txt').writeAsString('x');
|
||||
await File('${sandbox.path}/b.txt').writeAsString('y');
|
||||
await gitStage(sandbox, ['a.txt', 'b.txt']);
|
||||
await gitUnstage(sandbox, const []);
|
||||
final r = await Process.run(
|
||||
'git',
|
||||
['diff', '--cached', '--name-only'],
|
||||
workingDirectory: sandbox.path,
|
||||
);
|
||||
expect((r.stdout as String).trim(), isEmpty);
|
||||
});
|
||||
|
||||
test('gitStageHunk + gitUnstageHunk apply a patch via _applyPatch', () async {
|
||||
await File('${sandbox.path}/file.txt').writeAsString('hello\nworld\n');
|
||||
final patchResult = await Process.run(
|
||||
'git',
|
||||
['diff', '-U0'],
|
||||
workingDirectory: sandbox.path,
|
||||
);
|
||||
final patch = patchResult.stdout as String;
|
||||
await gitStageHunk(sandbox, patch);
|
||||
final cached = await Process.run(
|
||||
'git',
|
||||
['diff', '--cached', '--name-only'],
|
||||
workingDirectory: sandbox.path,
|
||||
);
|
||||
expect((cached.stdout as String).trim(), 'file.txt');
|
||||
await gitUnstageHunk(sandbox, patch);
|
||||
final cleared = await Process.run(
|
||||
'git',
|
||||
['diff', '--cached', '--name-only'],
|
||||
workingDirectory: sandbox.path,
|
||||
);
|
||||
expect((cleared.stdout as String).trim(), isEmpty);
|
||||
});
|
||||
|
||||
test('_applyPatch surfaces stderr in the GitException on a bad patch', () async {
|
||||
try {
|
||||
await gitStageHunk(sandbox, 'not a valid patch\n');
|
||||
fail('expected GitException');
|
||||
} on GitException catch (e) {
|
||||
expect(e.stderr, isNotEmpty);
|
||||
}
|
||||
});
|
||||
|
||||
test('gitBranches lists branches and marks the current one', () async {
|
||||
await Process.run('git', ['branch', 'feature/a'], workingDirectory: sandbox.path);
|
||||
final branches = await gitBranches(sandbox);
|
||||
final names = branches.map((b) => b.name).toList();
|
||||
expect(names, containsAll(['feature/a']));
|
||||
expect(branches.any((b) => b.current), isTrue);
|
||||
});
|
||||
|
||||
test('gitBranches returns empty on a non-git directory', () async {
|
||||
final notGit = await Directory.systemTemp.createTemp('clide-git-not-');
|
||||
addTearDown(() => notGit.deleteSync(recursive: true));
|
||||
expect(await gitBranches(notGit), isEmpty);
|
||||
});
|
||||
|
||||
test('gitCheckout switches branches; an unknown branch throws', () async {
|
||||
await Process.run('git', ['branch', 'next'], workingDirectory: sandbox.path);
|
||||
await gitCheckout(sandbox, 'next');
|
||||
expect(await gitCurrentBranch(sandbox), 'next');
|
||||
try {
|
||||
await gitCheckout(sandbox, 'does-not-exist');
|
||||
fail('expected GitException');
|
||||
} on GitException catch (_) {}
|
||||
});
|
||||
|
||||
test('gitPull + gitPush round-trip against a local bare remote', () async {
|
||||
final remote = await Directory.systemTemp.createTemp('clide-git-remote-');
|
||||
addTearDown(() => remote.deleteSync(recursive: true));
|
||||
await Process.run('git', ['init', '--bare'], workingDirectory: remote.path);
|
||||
await Process.run('git', ['remote', 'add', 'origin', remote.path], workingDirectory: sandbox.path);
|
||||
final pushOut = await gitPush(sandbox, remote: 'origin', branch: 'main', setUpstream: true);
|
||||
expect(pushOut, isNotEmpty);
|
||||
// Clone elsewhere and pull on the original. Cheaper: just call gitPull
|
||||
// and confirm it doesn't throw (already up-to-date).
|
||||
final pullOut = await gitPull(sandbox);
|
||||
expect(pullOut, isA<String>());
|
||||
});
|
||||
|
||||
test('gitPush against no remote throws GitException', () async {
|
||||
try {
|
||||
await gitPush(sandbox);
|
||||
fail('expected GitException');
|
||||
} on GitException catch (_) {}
|
||||
});
|
||||
|
||||
test('gitPull against no remote throws GitException', () async {
|
||||
try {
|
||||
await gitPull(sandbox);
|
||||
fail('expected GitException');
|
||||
} on GitException catch (_) {}
|
||||
});
|
||||
|
||||
test('gitLog returns empty on a non-git directory', () async {
|
||||
final notGit = await Directory.systemTemp.createTemp('clide-git-log-');
|
||||
addTearDown(() => notGit.deleteSync(recursive: true));
|
||||
expect(await gitLog(notGit), isEmpty);
|
||||
});
|
||||
|
||||
test('gitCurrentBranch returns null on a non-git directory', () async {
|
||||
final notGit = await Directory.systemTemp.createTemp('clide-git-cb-');
|
||||
addTearDown(() => notGit.deleteSync(recursive: true));
|
||||
expect(await gitCurrentBranch(notGit), isNull);
|
||||
});
|
||||
|
||||
test('gitStashPop on an empty stash throws GitException', () async {
|
||||
try {
|
||||
await gitStashPop(sandbox);
|
||||
fail('expected GitException');
|
||||
} on GitException catch (_) {}
|
||||
});
|
||||
|
||||
test('gitDiscard with an empty list returns without invoking git', () async {
|
||||
// Empty list short-circuits before the subprocess call; just verify
|
||||
// it doesn't throw.
|
||||
await gitDiscard(sandbox, const []);
|
||||
});
|
||||
|
||||
test('gitBin resolves to a usable binary path', () {
|
||||
expect(gitBin, isNotEmpty);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -92,4 +92,45 @@ void main() {
|
||||
expect(status.ahead, isZero);
|
||||
expect(status.behind, isZero);
|
||||
});
|
||||
|
||||
test('branch.upstream + branch.ab populate upstream/ahead/behind', () async {
|
||||
final remote = await Directory.systemTemp.createTemp('clide-status-remote-');
|
||||
addTearDown(() => remote.deleteSync(recursive: true));
|
||||
await Process.run('git', ['init', '--bare'], workingDirectory: remote.path);
|
||||
await Process.run('git', ['remote', 'add', 'origin', remote.path], workingDirectory: sandbox.path);
|
||||
await Process.run('git', ['push', '-u', 'origin', 'HEAD'], workingDirectory: sandbox.path);
|
||||
// Add a commit so we have ahead > 0.
|
||||
await File('${sandbox.path}/ahead.txt').writeAsString('x');
|
||||
await Process.run('git', ['add', '.'], workingDirectory: sandbox.path);
|
||||
await Process.run('git', ['commit', '-m', 'ahead'], workingDirectory: sandbox.path);
|
||||
final s = await gitStatus(sandbox);
|
||||
expect(s.upstream, contains('origin/'));
|
||||
expect(s.ahead, 1);
|
||||
expect(s.behind, 0);
|
||||
});
|
||||
|
||||
test('gitStatus on a non-git directory returns an empty branchless status', () async {
|
||||
final notGit = await Directory.systemTemp.createTemp('clide-status-not-');
|
||||
addTearDown(() => notGit.deleteSync(recursive: true));
|
||||
final s = await gitStatus(notGit);
|
||||
expect(s.entries, isEmpty);
|
||||
});
|
||||
|
||||
test('rename in porcelain output captures the original path', () async {
|
||||
await File('${sandbox.path}/a.txt').writeAsString('content\n');
|
||||
await Process.run('git', ['add', '.'], workingDirectory: sandbox.path);
|
||||
await Process.run('git', ['commit', '-m', 'add a'], workingDirectory: sandbox.path);
|
||||
await Process.run('git', ['mv', 'a.txt', 'renamed.txt'], workingDirectory: sandbox.path);
|
||||
final s = await gitStatus(sandbox);
|
||||
final renamed = s.entries.firstWhere((e) => e.path == 'renamed.txt');
|
||||
expect(renamed.origPath, 'a.txt');
|
||||
});
|
||||
|
||||
test('parsePorcelainV1 handles empty input + short / empty parts', () {
|
||||
expect(parsePorcelainV1(''), isEmpty);
|
||||
// 'X' is too short (< 4 chars), should be skipped.
|
||||
expect(parsePorcelainV1('X\x00'), isEmpty);
|
||||
// Empty token-only input — skipped.
|
||||
expect(parsePorcelainV1('\x00'), isEmpty);
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user