Changeset 7

Timestamp:

Aug 19, 2022, 11:04:03 PM (21 months ago)

Author:

chronos

Message:

• Added: Merge test.

Location:

trunk

Files:

• SVNZero.lpr (modified) (1 diff)
• UTest.pas (modified) (1 diff)
• UTestCases.pas (modified) (8 diffs)

trunk/SVNZero.lpr

@@ -31 +31 @@
     with TTestCases.Create do
     try
-      AddNew('Add', TTestCaseAdd);
+{      AddNew('Add', TTestCaseAdd);
       AddNew('Update', TTestCaseUpdate);
       AddNew('Modify', TTestCaseModify);
       AddNew('Delete', TTestCaseDelete);
+ }     AddNew('Merge', TTestCaseMerge);
       Run;
     finally

trunk/UTest.pas

@@ -129 +129 @@
   Passed: Integer;
   Failed: Integer;
+  LastDir: string;
 begin
   for I := 0 to Count - 1 do
   with Items[I] do begin
     WriteLn('== ' + Name + ' ======= ');
+    LastDir := GetCurrentDir;
     Run;
+    ChDir(LastDir);
   end;
 

trunk/UTestCases.pas

@@ -23 +23 @@
   end;
 
+  { TTestCaseMerge }
+
+  TTestCaseMerge = class(TTestCaseSvn)
+    procedure Run; override;
+  end;
+
 
 implementation
+
+{ TTestCaseMerge }
+
+procedure TTestCaseMerge.Run;
+var
+  TestFile: string;
+begin
+  TestFile := 'TestFile.txt';
+  SvnAdmin(['create', RepoDir]);
+  Svn(['checkout', 'file:///' + RepoDir, WorkDir]);
+  ChDir(WorkDir);
+  SaveStringToFile('First line' + LineEnding + 'Second line' + LineEnding + 'Third line', TestFile);
+  Svn(['add', TestFile]);
+  Svn(['commit', '-m', '"Commit message"']);
+  SaveStringToFile('First line' + LineEnding + 'Second line' + LineEnding + 'Third line 2', TestFile);
+  Svn(['commit', '-m', '"Commit message 2"']);
+  Svn(['update', '-r', '1', TestFile]);
+  SaveStringToFile('First line 2' + LineEnding + 'Second line' + LineEnding + 'Third line', TestFile);
+  Svn(['update', TestFile]);
+  Svn(['commit', '-m', '"Commit message 3"']);
+  DeleteDirectory(WorkDir, False);
+  DeleteDirectory(RepoDir, False);
+  Evaluate(True);
+end;
 
 procedure TTestCaseAdd.Run;
 var
   TestFile: string;
-  LastDir: string;
 begin
-  TestResult := trNone;
-  LastDir := GetCurrentDir;
   TestFile := 'TestFile.txt';
   SvnAdmin(['create', RepoDir]);
@@ -40 +67 @@
   Svn(['add', TestFile]);
   Svn(['commit', '-m', '"Commit message"']);
-  ChDir(LastDir);
   DeleteDirectory(WorkDir, False);
   DeleteDirectory(RepoDir, False);
@@ -49 +75 @@
 var
   TestFile: string;
-  LastDir: string;
 begin
-  TestResult := trNone;
-  LastDir := GetCurrentDir;
   TestFile := 'TestFile.txt';
   SvnAdmin(['create', RepoDir]);
@@ -62 +85 @@
   SaveStringToFile('Different text', TestFile);
   Svn(['commit', '-m', '"Commit message 2"']);
-  ChDir(LastDir);
   DeleteDirectory(WorkDir, False);
   DeleteDirectory(RepoDir, False);
@@ -71 +93 @@
 var
   TestFile: string;
-  LastDir: string;
 begin
-  TestResult := trNone;
-  LastDir := GetCurrentDir;
   TestFile := 'TestFile.txt';
   SvnAdmin(['create', RepoDir]);
@@ -86 +105 @@
   Svn(['update', '-r', '1', TestFile]);
   Svn(['update']);
-  ChDir(LastDir);
   DeleteDirectory(WorkDir, False);
   DeleteDirectory(RepoDir, False);
@@ -95 +113 @@
 var
   TestFile: string;
-  LastDir: string;
 begin
-  TestResult := trNone;
-  LastDir := GetCurrentDir;
   TestFile := 'TestFile.txt';
   SvnAdmin(['create', RepoDir]);
@@ -108 +123 @@
   Svn(['delete', TestFile]);
   Svn(['commit', '-m', '"Commit message 2"']);
-  ChDir(LastDir);
   DeleteDirectory(WorkDir, False);
   DeleteDirectory(RepoDir, False);