Changeset 146 for trunk

Timestamp:

Aug 30, 2022, 7:56:17 PM (2 years ago)

Author:

chronos

Message:

• Modified: General test part moved into Common package.

Location:

trunk

Files:

• Forms/UFormTest.lfm (modified) (2 diffs)
• Forms/UFormTest.pas (modified) (5 diffs)
• Languages/vCardStudio.cs.po (modified) (2 diffs)
• Languages/vCardStudio.pot (modified) (1 diff)
• Languages/vCardStudio.sv.po (modified) (1 diff)
• Packages/Common/Common.lpk (modified) (2 diffs)
• Packages/Common/Languages/UTestCase.cs.po (added)
• Packages/Common/Languages/UTestCase.pot (added)
• Packages/Common/UTestCase.pas (added)
• UCore.pas (modified) (2 diffs)
• UTest.pas (modified) (4 diffs)
• UTestCases.pas (modified) (1 diff)
• vCardStudio.lpi (modified) (1 diff)

trunk/Forms/UFormTest.lfm

@@ -10 +10 @@
   OnClose = FormClose
   OnCreate = FormCreate
-  OnDestroy = FormDestroy
   OnShow = FormShow
-  LCLVersion = '2.2.0.4'
+  LCLVersion = '2.2.2.0'
   object ListViewTestCases: TListView
     Left = 19
@@ -55 +54 @@
     Anchors = [akLeft, akBottom]
     Caption = '   '
+    ParentColor = False
   end
   object ActionList1: TActionList

trunk/Forms/UFormTest.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ComCtrls, StdCtrls,
-  ActnList, Menus, UTest;
+  ActnList, Menus, UTest, UTestCase;
 
 type
@@ -26 +26 @@
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
-    procedure FormDestroy(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure ListViewTestCasesData(Sender: TObject; Item: TListItem);
@@ -59 +58 @@
     Item.Caption := Name;
     Item.Data := TestCases[Item.Index];
-    Item.SubItems.Add(ResultText[Result]);
+    Item.SubItems.Add(ResultText[TestResult]);
   end;
 end;
@@ -97 +96 @@
   Failed := 0;
   for I := 0 to TestCases.Count - 1 do begin
-    case TestCases[I].Result of
+    case TestCases[I].TestResult of
       trPassed: Inc(Passed);
       trFailed: Inc(Failed);
@@ -148 +147 @@
 end;
 
-procedure TFormTest.FormDestroy(Sender: TObject);
-begin
-end;
-
 procedure TFormTest.FormShow(Sender: TObject);
 begin

trunk/Languages/vCardStudio.cs.po

@@ -1260 +1260 @@
 msgstr "Očekáváno:"
 
-#: utest.sfailed
-msgctxt "utest.sfailed"
-msgid "Failed"
-msgstr "Selhalo"
-
-#: utest.snone
-msgid "None"
-msgstr "Žádný"
-
 #: utest.soutput
 msgid "Output:"
 msgstr "Výstup:"
-
-#: utest.spassed
-msgctxt "utest.spassed"
-msgid "Passed"
-msgstr "Prošlo"
 
 #: uvcardfile.svcardfile
@@ -1282 +1268 @@
 msgid "vCard file"
 msgstr "Soubor vCard"
+

trunk/Languages/vCardStudio.pot

@@ -1233 +1233 @@
 msgstr ""
 
-#: utest.sfailed
-msgctxt "utest.sfailed"
-msgid "Failed"
-msgstr ""
-
-#: utest.snone
-msgid "None"
-msgstr ""
-
 #: utest.soutput
 msgid "Output:"
-msgstr ""
-
-#: utest.spassed
-msgctxt "utest.spassed"
-msgid "Passed"
 msgstr ""
 

trunk/Languages/vCardStudio.sv.po

@@ -1272 +1272 @@
 msgstr ""
 
-#: utest.sfailed
-msgctxt "utest.sfailed"
-msgid "Failed"
-msgstr ""
-
-#: utest.snone
-msgid "None"
-msgstr ""
-
 #: utest.soutput
 msgid "Output:"
-msgstr ""
-
-#: utest.spassed
-msgctxt "utest.spassed"
-msgid "Passed"
 msgstr ""
 

trunk/Packages/Common/Common.lpk

@@ -42 +42 @@
     <License Value="Copy left."/>
     <Version Minor="10"/>
-    <Files Count="30">
+    <Files Count="31">
       <Item1>
         <Filename Value="StopWatch.pas"/>
@@ -175 +175 @@
         <UnitName Value="UDataFile"/>
       </Item30>
+      <Item31>
+        <Filename Value="UTestCase.pas"/>
+        <UnitName Value="UTestCase"/>
+      </Item31>
     </Files>
     <CompatibilityMode Value="True"/>

trunk/UCore.pas

@@ -115 +115 @@
 
 uses
-  UFormMain, UFormSettings, UFormContacts, UFormFindDuplicity, UTest,
+  UFormMain, UFormSettings, UFormContacts, UFormFindDuplicity, UTestCase,
   UFormGenerate, UFormError, UFormFind, UFormTest, UFormSource, UFormCompare,
   UTestCases, UVCardFile;
@@ -453 +453 @@
 procedure TCore.TranslatorTranslate(Sender: TObject);
 begin
-  UTest.Translate;
+  UTestCase.Translate;
 end;
 

trunk/UTest.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Generics.Collections, UVCard;
+  Classes, SysUtils, Generics.Collections, UVCard, UTestCase;
 
 type
-  TTestResult = (trNone, trPassed, trFailed);
-
-  { TTestCase }
-
-  TTestCase = class
-  public
-    Name: string;
-    Result: TTestResult;
-    Log: string;
-    procedure Run; virtual;
-    procedure Evaluate(Passed: Boolean);
-    procedure Pass;
-    procedure Fail;
-  end;
-
-  TTestCaseClass = class of TTestCase;
-
-  { TTestCases }
-
-  TTestCases = class(TObjectList<TTestCase>)
-    function AddNew(Name: string; TestClass: TTestCaseClass): TTestCase;
-  end;
 
   TTestCaseActionKind = (akNone, akRemoveExactDuplicates);
@@ -51 +29 @@
   end;
 
-resourcestring
-  SNone = 'None';
-  SPassed = 'Passed';
-  SFailed = 'Failed';
-
-const
-  ResultText: array[TTestResult] of string = (SNone, SPassed, SFailed);
-
-procedure Translate;
-
 
 implementation
@@ -70 +38 @@
   SExpected = 'Expected:';
   SOutput = 'Output:';
-
-procedure Translate;
-begin
-  ResultText[trNone] := SNone;
-  ResultText[trPassed] := SPassed;
-  ResultText[trFailed] := SFailed;
-end;
 
 { TTestCaseCheckProperty }
@@ -138 +99 @@
 end;
 
-{ TTestCase }
-
-procedure TTestCase.Run;
-begin
-end;
-
-procedure TTestCase.Evaluate(Passed: Boolean);
-begin
-  if Passed then Result := trPassed
-    else Result := trFailed;
-end;
-
-procedure TTestCase.Pass;
-begin
-  Result := trPassed;
-end;
-
-procedure TTestCase.Fail;
-begin
-  Result := trFailed;
-end;
-
-{ TTestCases }
-
-function TTestCases.AddNew(Name: string; TestClass: TTestCaseClass): TTestCase;
-begin
-  Result := TestClass.Create;
-  Result.Name := Name;
-  Add(Result);
-end;
-
 end.
 

trunk/UTestCases.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, UTest;
+  Classes, SysUtils, UTest, UTestCase;
 
 function InitTestCases: TTestCases;

trunk/vCardStudio.lpi

@@ -271 +271 @@
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormColumns"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
       </Unit23>