Changeset 91 for trunk/Forms

Timestamp:

Feb 2, 2022, 4:33:25 PM (3 years ago)

Author:

chronos

Message:

• Added: A windows for showing log output for selected test case.
• Added: Various load-save tests.
• Modified: Improved parsing vCard format.

Location:

trunk/Forms

Files:

• UFormTest.lfm (modified) (3 diffs)
• UFormTest.lrj (modified) (1 diff)
• UFormTest.pas (modified) (9 diffs)
• UFormTestCase.lfm (added)
• UFormTestCase.lrj (added)
• UFormTestCase.pas (added)

trunk/Forms/UFormTest.lfm

@@ -22 +22 @@
       item
         Caption = 'Name'
-        Width = 200
+        Width = 300
       end    
       item
         Caption = 'Result'
-        Width = 869
+        Width = 769
       end>
     OwnerData = True
+    PopupMenu = PopupMenuTest
     ReadOnly = True
     RowSelect = True
@@ -34 +35 @@
     ViewStyle = vsReport
     OnData = ListViewTestCasesData
+    OnDblClick = AShowExecute
+    OnSelectItem = ListViewTestCasesSelectItem
   end
   object ButtonRun: TButton
@@ -45 +48 @@
     TabOrder = 1
   end
+  object ActionList1: TActionList
+    Left = 537
+    Top = 115
+    object AShow: TAction
+      Caption = 'Show'
+      OnExecute = AShowExecute
+    end
+    object ARun: TAction
+      Caption = 'Run'
+      OnExecute = ARunExecute
+    end
+  end
+  object PopupMenuTest: TPopupMenu
+    Left = 539
+    Top = 244
+    object MenuItem1: TMenuItem
+      Action = AShow
+    end
+    object MenuItem2: TMenuItem
+      Action = ARun
+    end
+  end
 end

trunk/Forms/UFormTest.lrj

@@ -3 +3 @@
 {"hash":346165,"name":"tformtest.listviewtestcases.columns[0].caption","sourcebytes":[78,97,109,101],"value":"Name"},
 {"hash":93105204,"name":"tformtest.listviewtestcases.columns[1].caption","sourcebytes":[82,101,115,117,108,116],"value":"Result"},
-{"hash":22974,"name":"tformtest.buttonrun.caption","sourcebytes":[82,117,110],"value":"Run"}
+{"hash":22974,"name":"tformtest.buttonrun.caption","sourcebytes":[82,117,110],"value":"Run"},
+{"hash":368487,"name":"tformtest.ashow.caption","sourcebytes":[83,104,111,119],"value":"Show"},
+{"hash":22974,"name":"tformtest.arun.caption","sourcebytes":[82,117,110],"value":"Run"}
 ]}

trunk/Forms/UFormTest.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ComCtrls, StdCtrls,
-  UTest;
+  ActnList, Menus, UTest;
 
 type
@@ -14 +14 @@
 
   TFormTest = class(TForm)
+    ARun: TAction;
+    AShow: TAction;
+    ActionList1: TActionList;
     ButtonRun: TButton;
     ListViewTestCases: TListView;
+    MenuItem1: TMenuItem;
+    MenuItem2: TMenuItem;
+    PopupMenuTest: TPopupMenu;
+    procedure ARunExecute(Sender: TObject);
+    procedure AShowExecute(Sender: TObject);
     procedure ButtonRunClick(Sender: TObject);
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
@@ -22 +30 @@
     procedure FormShow(Sender: TObject);
     procedure ListViewTestCasesData(Sender: TObject; Item: TListItem);
+    procedure ListViewTestCasesSelectItem(Sender: TObject; Item: TListItem;
+      Selected: Boolean);
   private
     procedure ReloadList;
+    procedure UpdateInterface;
   public
     TestCases: TTestCases;
@@ -37 +48 @@
 
 uses
-  UCore;
+  UCore, UFormTestCase;
 
 { TFormTest }
@@ -46 +57 @@
   with TestCases[Item.Index] do begin
     Item.Caption := Name;
+    Item.Data := TestCases[Item.Index];
+    Item.SubItems.Add(ResultText[Result]);
   end;
+end;
+
+procedure TFormTest.ListViewTestCasesSelectItem(Sender: TObject;
+  Item: TListItem; Selected: Boolean);
+begin
+  UpdateInterface;
 end;
 
@@ -53 +72 @@
   ListViewTestCases.Items.Count := TestCases.Count;
   ListViewTestCases.Refresh;
+end;
+
+procedure TFormTest.UpdateInterface;
+begin
+  ARun.Enabled := Assigned(ListViewTestCases.Selected);
+  AShow.Enabled := Assigned(ListViewTestCases.Selected);
 end;
 
@@ -66 +91 @@
   for I := 0 to TestCases.Count - 1 do
     TestCases[I].Run;
+  ReloadList;
+end;
+
+procedure TFormTest.AShowExecute(Sender: TObject);
+begin
+  if Assigned(ListViewTestCases.Selected) then
+  with TFormTestCase.Create(nil) do
+  try
+    MemoLog.Text := TTestCase(ListViewTestCases.Selected.Data).Log;
+    ShowModal;
+  finally
+    Free;
+  end;
+end;
+
+procedure TFormTest.ARunExecute(Sender: TObject);
+begin
+  if Assigned(ListViewTestCases.Selected) then begin
+    TTestCase(ListViewTestCases.Selected.Data).Run;
+    ReloadList;
+  end;
 end;
 
@@ -72 +118 @@
   TestCases := TTestCases.Create;
   with TestCases do begin
-    AddNew('Load and save');
-    AddNew('Multi-line');
-    AddNew('Encoding base64');
-    AddNew('Encoding quoted-printable');
-    AddNew('Image format');
+    with TTestCaseLoadSave(AddNew('Load and save', TTestCaseLoadSave)) do begin
+      Input := 'BEGIN:VCARD' + LineEnding +
+        'VERSION:2.1' + LineEnding +
+        'N:Surname;Name' + LineEnding +
+        'FN:Name Surname' + LineEnding +
+        'END:VCARD' + LineEnding;
+      Output := Input;
+    end;
+    with TTestCaseLoadSave(AddNew('Multi-line', TTestCaseLoadSave)) do begin
+      Input := 'BEGIN:VCARD' + LineEnding +
+        'VERSION:2.1' + LineEnding +
+        'NOTE:This is some long test which is really multi-lined\neach line\nis on' + LineEnding +
+        ' different\nline so it is on multiple\nlines.'  + LineEnding +
+        'END:VCARD' + LineEnding;
+      Output := Input;
+    end;
+    AddNew('Encoding base64', TTestCaseLoadSave);
+    AddNew('Encoding quoted-printable', TTestCaseLoadSave);
+    AddNew('Image format', TTestCaseLoadSave);
+    with TTestCaseLoadSave(AddNew('Empty', TTestCaseLoadSave)) do begin
+      Input := '';
+      Output := '';
+    end;
+    with TTestCaseLoadSave(AddNew('Begin only', TTestCaseLoadSave)) do begin
+      Input := 'BEGIN:VCARD';
+      Output := '';
+    end;
+    with TTestCaseLoadSave(AddNew('Missing end', TTestCaseLoadSave)) do begin
+      Input := 'BEGIN:VCARD' + LineEnding +
+        'VERSION:2.1' + LineEnding +
+        'N:Surname;Name' + LineEnding +
+        'FN:Name Surname' + LineEnding;
+      Output := '';
+    end;
   end;
 end;
@@ -89 +164 @@
   Core.PersistentForm1.Load(Self);
   ReloadList;
+  UpdateInterface;
 end;