Skip to content

Commit 7cd1af7

Browse files
committed
Reorganization to better reflect libgit2 tests
Rename files for combined types of tests, like tag: read, write Show group names in DUnit GUI runner Rename tests to match names, spaces replaced with underscores
1 parent f26dfd8 commit 7cd1af7

File tree

10 files changed

+178
-170
lines changed

10 files changed

+178
-170
lines changed

GitForDelphi.dpr

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,11 @@ uses
2222
uTestsFromLibGit2 in 'TestsFromLibGit2\uTestsFromLibGit2.pas',
2323
uGitForDelphi in 'uGitForDelphi.pas',
2424
uTestGitRecords in 'uTestGitRecords.pas',
25-
t0402_details in 'TestsFromLibGit2\t0402_details.pas',
26-
t0501_walk in 'TestsFromLibGit2\t0501_walk.pas',
25+
t04_commit in 'TestsFromLibGit2\t04_commit.pas',
26+
t05_revwalk in 'TestsFromLibGit2\t05_revwalk.pas',
2727
t06_index in 'TestsFromLibGit2\t06_index.pas',
28-
t0801_readtag in 'TestsFromLibGit2\t0801_readtag.pas',
29-
t0802_write in 'TestsFromLibGit2\t0802_write.pas',
30-
t0901_readtree in 'TestsFromLibGit2\t0901_readtree.pas',
31-
t0902_modify in 'TestsFromLibGit2\t0902_modify.pas',
28+
t08_tag in 'TestsFromLibGit2\t08_tag.pas',
29+
t09_tree in 'TestsFromLibGit2\t09_tree.pas',
3230
uTestHelpers in 'uTestHelpers.pas',
3331
t10_refs in 'TestsFromLibGit2\t10_refs.pas';
3432

TestsFromLibGit2/t0402_details.pas renamed to TestsFromLibGit2/t04_commit.pas

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
unit t0402_details;
1+
unit t04_commit;
22

33
interface
44

@@ -7,15 +7,15 @@ interface
77
uTestsFromLibGit2, uGitForDelphi;
88

99
type
10-
Test0402_details = class(TTestFromLibGit2)
11-
procedure query_details_test_0402;
10+
Test04_commit_details = class(TTestFromLibGit2)
11+
procedure query_the_details_on_a_parsed_commit;
1212
end;
1313

1414
implementation
1515

16-
{ Test0402_details }
16+
{ Test04_commit_details }
1717

18-
procedure Test0402_details.query_details_test_0402;
18+
procedure Test04_commit_details.query_the_details_on_a_parsed_commit;
1919
const
2020
commit_ids: array[0..5] of AnsiString = (
2121
'a4a7dce85cf63874e984719f4fdd239f5145052f', { 0 }
@@ -75,6 +75,6 @@ procedure Test0402_details.query_details_test_0402;
7575
end;
7676

7777
initialization
78-
RegisterTest('From libgit2', Test0402_details.Suite);
78+
RegisterTest('From libgit2.t04-commit', Test04_commit_details.NamedSuite('details'));
7979

8080
end.

TestsFromLibGit2/t0501_walk.pas renamed to TestsFromLibGit2/t05_revwalk.pas

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
unit t0501_walk;
1+
unit t05_revwalk;
22

33
interface
44

@@ -7,15 +7,15 @@ interface
77
uTestsFromLibGit2, uGitForDelphi;
88

99
type
10-
Test0501_walk = class(TTestFromLibGit2)
11-
procedure simple_walk_test_0501;
10+
Test05_revwalk_walk = class(TTestFromLibGit2)
11+
procedure do_a_simple_walk_on_a_repo_with_different_sorting_modes;
1212
end;
1313

1414
implementation
1515

16-
{ Test0501_walk }
16+
{ Test05_revwalk_walk }
1717

18-
procedure Test0501_walk.simple_walk_test_0501;
18+
procedure Test05_revwalk_walk.do_a_simple_walk_on_a_repo_with_different_sorting_modes;
1919
type
2020
TArray6 = array[0..5] of Integer;
2121
const
@@ -129,6 +129,6 @@ procedure Test0501_walk.simple_walk_test_0501;
129129
end;
130130

131131
initialization
132-
RegisterTest('From libgit2', Test0501_walk.Suite);
132+
RegisterTest('From libgit2.t05-revwalk', Test05_revwalk_walk.NamedSuite('walk'));
133133

134134
end.

TestsFromLibGit2/t06_index.pas

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,25 @@ interface
88

99
type
1010
Test06_index_read = class(TTestFromLibGit2)
11-
procedure index_loadempty_test_0601;
12-
procedure index_load_test_0601;
13-
procedure index2_load_test_0601;
14-
procedure index_find_test_0601;
15-
procedure index_findempty_test_0601;
11+
procedure load_an_empty_index;
12+
procedure load_a_standard_index__default_test_index_;
13+
procedure load_a_standard_index__git_git_index_;
14+
end;
15+
16+
Test06_index_find = class(TTestFromLibGit2)
17+
procedure find_an_entry_on_an_index;
18+
procedure find_an_entry_in_an_empty_index;
1619
end;
1720

1821
Test06_index_write = class(TTestFromLibGit2)
19-
procedure index_write_test;
22+
procedure write_an_index_back_to_disk;
2023
end;
2124

2225
implementation
2326

24-
{ Test0601_read }
27+
{ Test06_index_read }
2528

26-
procedure Test06_index_read.index_loadempty_test_0601;
29+
procedure Test06_index_read.load_an_empty_index;
2730
var
2831
index: Pgit_index;
2932
begin
@@ -39,17 +42,14 @@ procedure Test06_index_read.index_loadempty_test_0601;
3942
git_index_free(index);
4043
end;
4144

42-
procedure Test06_index_read.index_load_test_0601;
45+
procedure Test06_index_read.load_a_standard_index__default_test_index_;
4346
var
44-
path: AnsiString;
4547
index: Pgit_index;
4648
i, offset: Integer;
4749
entries: PPgit_index_entry;
4850
e: Pgit_index_entry;
4951
begin
50-
path := AnsiString(StringReplace(ExtractFilePath(ParamStr(0)) + TEST_INDEX_PATH, '/', '\', [rfReplaceAll]));
51-
52-
must_pass(git_index_open_bare(index, PAnsiChar(path)));
52+
must_pass(git_index_open_bare(index, TEST_INDEX_PATH));
5353

5454
CheckTrue(index.on_disk = 1);
5555

@@ -74,7 +74,7 @@ procedure Test06_index_read.index_load_test_0601;
7474
git_index_free(index);
7575
end;
7676

77-
procedure Test06_index_read.index2_load_test_0601;
77+
procedure Test06_index_read.load_a_standard_index__git_git_index_;
7878
var
7979
index: Pgit_index;
8080
begin
@@ -91,7 +91,9 @@ procedure Test06_index_read.index2_load_test_0601;
9191
git_index_free(index);
9292
end;
9393

94-
procedure Test06_index_read.index_find_test_0601;
94+
{ Test06_index_find }
95+
96+
procedure Test06_index_find.find_an_entry_on_an_index;
9597
var
9698
index: Pgit_index;
9799
i, idx: Integer;
@@ -108,7 +110,7 @@ procedure Test06_index_read.index_find_test_0601;
108110
git_index_free(index);
109111
end;
110112

111-
procedure Test06_index_read.index_findempty_test_0601;
113+
procedure Test06_index_find.find_an_entry_in_an_empty_index;
112114
var
113115
index: Pgit_index;
114116
i, idx: Integer;
@@ -124,7 +126,9 @@ procedure Test06_index_read.index_findempty_test_0601;
124126
git_index_free(index);
125127
end;
126128

127-
procedure Test06_index_write.index_write_test;
129+
{ Test06_index_write }
130+
131+
procedure Test06_index_write.write_an_index_back_to_disk;
128132
var
129133
index: Pgit_index;
130134
begin
@@ -143,7 +147,8 @@ procedure Test06_index_write.index_write_test;
143147
end;
144148

145149
initialization
146-
RegisterTest('From libgit2.t06-index', Test06_index_read.Suite);
147-
RegisterTest('From libgit2.t06-index', Test06_index_write.Suite);
150+
RegisterTest('From libgit2.t06-index', Test06_index_read.NamedSuite('read'));
151+
RegisterTest('From libgit2.t06-index', Test06_index_find.NamedSuite('find'));
152+
RegisterTest('From libgit2.t06-index', Test06_index_write.NamedSuite('write'));
148153

149154
end.

TestsFromLibGit2/t0801_readtag.pas

Lines changed: 0 additions & 52 deletions
This file was deleted.

TestsFromLibGit2/t0802_write.pas renamed to TestsFromLibGit2/t08_tag.pas

Lines changed: 44 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
unit t0802_write;
1+
unit t08_tag;
22

33
interface
44

@@ -7,15 +7,52 @@ interface
77
uTestsFromLibGit2, uGitForDelphi;
88

99
type
10-
Test0802_write = class(TTestFromLibGit2)
11-
procedure tag_writeback_test_0802;
10+
Test08_tag_read = class(TTestFromLibGit2)
11+
procedure read_and_parse_a_tag_from_the_repository;
12+
end;
13+
14+
Test08_tag_write = class(TTestFromLibGit2)
15+
procedure write_a_tag_to_the_repository_and_read_it_again;
1216
end;
1317

1418
implementation
1519

16-
{ Test0802_write }
20+
{ Test08_tag_read }
21+
22+
procedure Test08_tag_read.read_and_parse_a_tag_from_the_repository;
23+
var
24+
repo: Pgit_repository;
25+
tag1, tag2: Pgit_tag;
26+
commit: Pgit_commit;
27+
id1, id2, id_commit: git_oid;
28+
begin
29+
must_pass(git_repository_open(repo, REPOSITORY_FOLDER));
30+
31+
git_oid_mkstr(@id1, tag1_id);
32+
git_oid_mkstr(@id2, tag2_id);
33+
git_oid_mkstr(@id_commit, tagged_commit);
34+
35+
must_pass(git_tag_lookup(tag1, repo, @id1));
36+
37+
CheckTrue(StrComp(git_tag_name(tag1), 'test') = 0);
38+
CheckTrue(git_tag_type(tag1) = GIT_OBJ_TAG);
39+
40+
must_pass(git_tag_target(Pgit_object(tag2), tag1));
41+
CheckTrue(tag2 <> nil);
42+
43+
CheckTrue(git_oid_cmp(@id2, git_tag_id(tag2)) = 0);
44+
45+
must_pass(git_tag_target(Pgit_object(commit), tag2));
46+
CheckTrue(commit <> nil);
47+
48+
CheckTrue(git_oid_cmp(@id_commit, git_commit_id(commit)) = 0);
49+
50+
git_repository_free(repo);
51+
end;
52+
53+
{ Test08_tag_write }
1754

18-
procedure Test0802_write.tag_writeback_test_0802;
55+
procedure Test08_tag_write.write_a_tag_to_the_repository_and_read_it_again;
1956
const
2057
TAGGER_NAME: PAnsiChar = 'Vicent Marti';
2158
TAGGER_EMAIL: PAnsiChar = '[email protected]';
@@ -72,6 +109,7 @@ procedure Test0802_write.tag_writeback_test_0802;
72109
end;
73110

74111
initialization
75-
RegisterTest('From libgit2', Test0802_write.Suite);
112+
RegisterTest('From libgit2.t08-tag', Test08_tag_read.NamedSuite('read'));
113+
RegisterTest('From libgit2.t08-tag', Test08_tag_write.NamedSuite('write'));
76114

77115
end.

TestsFromLibGit2/t0902_modify.pas

Lines changed: 0 additions & 19 deletions
This file was deleted.

TestsFromLibGit2/t0901_readtree.pas renamed to TestsFromLibGit2/t09_tree.pas

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
unit t0901_readtree;
1+
unit t09_tree;
22

33
interface
44

@@ -7,16 +7,19 @@ interface
77
uTestsFromLibGit2, uGitForDelphi;
88

99
type
10-
Test0901_readtree = class(TTestFromLibGit2)
11-
procedure tree_entry_access_test_0901;
12-
procedure tree_read_test_0901;
10+
Test09_tree_read = class(TTestFromLibGit2)
11+
procedure access_randomly_the_entries_on_a_loaded_tree;
12+
procedure read_a_tree_from_the_repository;
13+
end;
14+
15+
Test09_tree_write = class(TTestFromLibGit2)
1316
end;
1417

1518
implementation
1619

17-
{ Test0901_readtree }
20+
{ Test09_tree_read }
1821

19-
procedure Test0901_readtree.tree_entry_access_test_0901;
22+
procedure Test09_tree_read.access_randomly_the_entries_on_a_loaded_tree;
2023
var
2124
id: git_oid ;
2225
repo: Pgit_repository;
@@ -39,7 +42,7 @@ procedure Test0901_readtree.tree_entry_access_test_0901;
3942
git_repository_free(repo);
4043
end;
4144

42-
procedure Test0901_readtree.tree_read_test_0901;
45+
procedure Test09_tree_read.read_a_tree_from_the_repository;
4346
var
4447
id: git_oid;
4548
repo: Pgit_repository;
@@ -66,6 +69,7 @@ procedure Test0901_readtree.tree_read_test_0901;
6669
end;
6770

6871
initialization
69-
RegisterTest('From libgit2', Test0901_readtree.Suite);
72+
RegisterTest('From libgit2.t09-tree', Test09_tree_read.NamedSuite('read'));
73+
// RegisterTest('From libgit2.t09-tree', Test09_tree_write.Suite('write')); // TODO THREADSAFE
7074

7175
end.

0 commit comments

Comments
 (0)