Files
clide/test/git/diff_test.dart
T
jpmschweitzerandClaude Opus 4.7 035491f7db
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 sweep: finish src/git/ (T-91)
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>
2026-05-13 07:04:30 +02:00

303 lines
8.3 KiB
Dart

import 'dart:io';
import 'package:clide/src/git/diff.dart';
import 'package:test/test.dart';
void main() {
group('parseDiffOutput', () {
test('parses a simple modification', () {
const output = '''diff --git a/file.txt b/file.txt
index abc1234..def5678 100644
--- a/file.txt
+++ b/file.txt
@@ -1,3 +1,4 @@
line1
-line2
+line2-modified
+line3-new
line4
''';
final diffs = parseDiffOutput(output);
expect(diffs, hasLength(1));
expect(diffs.first.path, 'file.txt');
expect(diffs.first.hunks, hasLength(1));
expect(diffs.first.additions, 2);
expect(diffs.first.removals, 1);
});
test('parses a new file', () {
const output = '''diff --git a/new.txt b/new.txt
new file mode 100644
index 0000000..abc1234
--- /dev/null
+++ b/new.txt
@@ -0,0 +1,2 @@
+hello
+world
''';
final diffs = parseDiffOutput(output);
expect(diffs, hasLength(1));
expect(diffs.first.isNew, isTrue);
expect(diffs.first.additions, 2);
});
test('parses a deleted file', () {
const output = '''diff --git a/old.txt b/old.txt
deleted file mode 100644
index abc1234..0000000
--- a/old.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-hello
-world
''';
final diffs = parseDiffOutput(output);
expect(diffs, hasLength(1));
expect(diffs.first.isDeleted, isTrue);
expect(diffs.first.removals, 2);
});
test('parses a rename', () {
const output = '''diff --git a/old.txt b/new.txt
similarity index 100%
rename from old.txt
rename to new.txt
''';
final diffs = parseDiffOutput(output);
expect(diffs, hasLength(1));
expect(diffs.first.isRenamed, isTrue);
expect(diffs.first.path, 'new.txt');
expect(diffs.first.oldPath, 'old.txt');
});
test('parses multiple hunks', () {
const output = '''diff --git a/multi.txt b/multi.txt
index abc..def 100644
--- a/multi.txt
+++ b/multi.txt
@@ -1,3 +1,3 @@
line1
-old2
+new2
line3
@@ -10,3 +10,3 @@
line10
-old11
+new11
line12
''';
final diffs = parseDiffOutput(output);
expect(diffs, hasLength(1));
expect(diffs.first.hunks, hasLength(2));
expect(diffs.first.hunks[0].oldStart, 1);
expect(diffs.first.hunks[1].oldStart, 10);
});
test('parses binary file', () {
const output = '''diff --git a/image.png b/image.png
Binary files a/image.png and b/image.png differ
''';
final diffs = parseDiffOutput(output);
expect(diffs, hasLength(1));
expect(diffs.first.isBinary, isTrue);
expect(diffs.first.hunks, isEmpty);
});
test('empty output returns empty list', () {
expect(parseDiffOutput(''), isEmpty);
});
test('hunk line numbers are correct', () {
const output = '''diff --git a/f.txt b/f.txt
index abc..def 100644
--- a/f.txt
+++ b/f.txt
@@ -5,4 +5,5 @@
ctx
-removed
+added1
+added2
ctx2
''';
final diffs = parseDiffOutput(output);
final hunk = diffs.first.hunks.first;
expect(hunk.oldStart, 5);
expect(hunk.newStart, 5);
final additions = hunk.lines.where((l) => l.kind == DiffLineKind.addition).toList();
expect(additions[0].newLineNo, 6);
expect(additions[1].newLineNo, 7);
final removals = hunk.lines.where((l) => l.kind == DiffLineKind.removal).toList();
expect(removals[0].oldLineNo, 6);
});
test('multiple diffs in one output', () {
const output = '''diff --git a/a.txt b/a.txt
index abc..def 100644
--- a/a.txt
+++ b/a.txt
@@ -1 +1 @@
-old
+new
diff --git a/b.txt b/b.txt
index abc..def 100644
--- a/b.txt
+++ b/b.txt
@@ -1 +1 @@
-old
+new
''';
final diffs = parseDiffOutput(output);
expect(diffs, hasLength(2));
expect(diffs[0].path, 'a.txt');
expect(diffs[1].path, 'b.txt');
});
});
group('gitDiff (live)', () {
late Directory sandbox;
setUp(() async {
sandbox = await Directory.systemTemp.createTemp('clide-git-diff-test-');
await Process.run('git', ['init'], workingDirectory: sandbox.path);
await Process.run(
'git',
['config', 'user.email', 'test@test.com'],
workingDirectory: sandbox.path,
);
await Process.run(
'git',
['config', 'user.name', 'Test'],
workingDirectory: sandbox.path,
);
await File('${sandbox.path}/file.txt').writeAsString('line1\nline2\n');
await Process.run('git', ['add', '.'], workingDirectory: sandbox.path);
await Process.run(
'git',
['commit', '-m', 'init'],
workingDirectory: sandbox.path,
);
});
tearDown(() async {
if (sandbox.existsSync()) sandbox.deleteSync(recursive: true);
});
test('returns unstaged diff after modification', () async {
await File('${sandbox.path}/file.txt').writeAsString('line1\nmodified\n');
final diffs = await gitDiff(sandbox);
expect(diffs, hasLength(1));
expect(diffs.first.path, 'file.txt');
expect(diffs.first.additions, greaterThan(0));
});
test('returns staged diff with staged: true', () async {
await File('${sandbox.path}/file.txt').writeAsString('line1\nmodified\n');
await Process.run(
'git',
['add', 'file.txt'],
workingDirectory: sandbox.path,
);
final diffs = await gitDiff(sandbox, staged: true);
expect(diffs, hasLength(1));
});
test('returns empty for clean repo', () async {
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));
});
});
}