Clar tests for status/ignore

Author: jasonpenny

tests/GitForDelphi.dpr

@@ -30,7 +30,9 @@ uses
   t10_refs in 'TestsFromLibGit2\t10_refs.pas',
   uGitForDelphi in '..\uGitForDelphi.pas',
   t15_config in 'TestsFromLibGit2\t15_config.pas',
-  t18_status in 'TestsFromLibGit2\t18_status.pas';
+  t18_status in 'TestsFromLibGit2\t18_status.pas',
+  status in 'TestsFromLibGit2\clar\status.pas',
+  uClar in 'TestsFromLibGit2\clar\uClar.pas';
 
 {$R *.RES}
 

tests/TestsFromLibGit2/clar/status.pas

@@ -0,0 +1,78 @@
+unit status;
+
+interface
+
+uses
+   TestFramework, SysUtils, Windows, Classes,
+   uTestsFromLibGit2, uGitForDelphi, uClar;
+
+type
+   Test_status_ignore = class(TClarTest)
+   private
+      g_repo: Pgit_repository;
+   protected
+      procedure SetUp; override;
+      procedure TearDown; override;
+   published
+      procedure TestIgnores;
+   end;
+
+implementation
+
+{ Test_status_ignore }
+
+procedure Test_status_ignore.SetUp;
+begin
+   inherited;
+   cl_fixture_sandbox('attr');
+   cl_git_pass(p_rename('attr/.gitted', 'attr/.git'));
+   cl_git_pass(p_rename('attr/gitignore', 'attr/.gitignore'));
+   cl_git_pass(git_repository_open(g_repo, 'attr/.git'));
+end;
+
+procedure Test_status_ignore.TearDown;
+begin
+   inherited;
+   git_repository_free(g_repo);
+   g_repo := nil;
+   cl_fixture_cleanup('attr');
+end;
+
+type
+   ignore_test_cases = record
+      path:       AnsiString;
+      expected:   Integer;
+   end;
+procedure Test_status_ignore.TestIgnores;
+const
+   test_cases: array [0..13] of ignore_test_cases = (
+      (path: 'file'; expected: 0),
+      (path: 'ign'; expected:1 ),
+      (path: 'sub'; expected:1 ),
+      (path: 'sub/file'; expected:0 ),
+      (path: 'sub/ign'; expected:1 ),
+      (path: 'sub/sub'; expected:1 ),
+      (path: 'sub/sub/file'; expected:0 ),
+      (path: 'sub/sub/ign'; expected:1 ),
+      (path: 'sub/sub/sub'; expected:1 ),
+      //* pattern 'dir/' from .gitignore */
+      (path: 'dir'; expected:1 ),
+      (path: 'dir/'; expected:1 ),
+      (path: 'sub/dir'; expected:1 ),
+      (path: 'sub/dir/'; expected:1 ),
+      (path: 'sub/sub/dir'; expected:0 ) //* dir is not actually a dir, but a file */
+   );
+var
+   i, ignored: Integer;
+begin
+   for i := Low(test_cases) to High(test_cases) do
+   begin
+      cl_git_pass(git_status_should_ignore(g_repo, PAnsiChar(test_cases[i].path), @ignored));
+      cl_assert_(ignored = test_cases[i].expected, test_cases[i].path);
+   end;
+end;
+
+initialization
+   RegisterTest('From libgit2/clar/status', Test_status_ignore.NamedSuite('ignore'));
+
+end.

tests/TestsFromLibGit2/clar/uClar.pas

@@ -0,0 +1,75 @@
+unit uClar;
+
+interface
+
+uses
+   TestFramework, SysUtils, Windows, Classes,
+   uTestsFromLibGit2, uGitForDelphi;
+
+type
+   TClarTest = class(TTestFromLibGit2)
+   public
+      function p_rename(const aFrom, aTo: AnsiString): Integer; override;
+
+      procedure cl_fixture_sandbox(const aFixtureName: AnsiString);
+      procedure cl_fixture_cleanup(const aFixtureName: AnsiString);
+      procedure cl_git_pass(expr: Integer);
+      procedure cl_assert_(b: Boolean; const aDescr: String); overload;
+      procedure cl_assert_(b: Boolean; const aDescr: AnsiString); overload;
+   end;
+
+implementation
+
+{ TClarTest }
+
+procedure TClarTest.cl_fixture_sandbox(const aFixtureName: AnsiString);
+var
+   path: AnsiString;
+begin
+   path := 'resources/' + aFixtureName;
+   copydir_recurs(path, aFixtureName);
+end;
+
+procedure TClarTest.cl_assert_(b: Boolean; const aDescr: String);
+begin
+   CheckTrue(b, aDescr);
+end;
+
+procedure TClarTest.cl_assert_(b: Boolean; const aDescr: AnsiString);
+begin
+   CheckTrue(b, String(aDescr));
+end;
+
+procedure TClarTest.cl_fixture_cleanup(const aFixtureName: AnsiString);
+var
+   path: AnsiString;
+begin
+   path := './' + aFixtureName;
+   rmdir_recurs(path);
+end;
+
+procedure TClarTest.cl_git_pass(expr: Integer);
+begin
+   git_clearerror();
+//   if ((expr) <> GIT_SUCCESS)
+//      clar__assert(0, __FILE__, __LINE__, 'Function call failed: ' #expr, git_lasterror(), 1);
+//   } while(0);
+
+   if expr <> GIT_SUCCESS then
+      Fail('Funciton failed ' + String(AnsiString(git_lasterror())),  CallerAddr);
+end;
+
+function TClarTest.p_rename(const aFrom, aTo: AnsiString): Integer;
+begin
+   if DirectoryExists(String(aFrom)) then
+   begin
+      if RenameDir(aFrom, aTo) then
+         Result := GIT_SUCCESS
+      else
+         Result := GIT_ERROR;
+   end
+   else
+      Result := inherited p_rename(aFrom, aTo);
+end;
+
+end.

tests/TestsFromLibGit2/uTestsFromLibGit2.pas

@@ -33,7 +33,7 @@    TTestFromLibGit2 = class (TTestCase)
       function remove_placeholders(directory_path, filename: PAnsiChar): Integer;
       function RenameDir(const aFrom, aTo: AnsiString): Boolean;
       function p_unlink(const aFileName: String): Integer;
-      function p_rename(const aFrom, aTo: AnsiString): Integer;
+      function p_rename(const aFrom, aTo: AnsiString): Integer; virtual;
    end;
 
    TTestSuiteForLibGit2 = class(TTestSuite, ITestSuite, ITest)
@@ -450,8 +450,8 @@ function TTestFromLibGit2.open_temp_repo(var repo: Pgit_repository; const path:
 
 function TTestFromLibGit2.p_rename(const aFrom, aTo: AnsiString): Integer;
 begin
-   RenameFile(aFrom, aTo);
-   if (not FileExists(aFrom)) and FileExists(aTo) then
+   RenameFile(String(aFrom), String(aTo));
+   if (not FileExists(String(aFrom))) and FileExists(String(aTo)) then
       Result := 0
    else
       Result := GIT_ERROR;