Changeset 116 for trunk

Timestamp:

Feb 15, 2022, 5:09:10 PM (3 years ago)

Author:

chronos

Message:

• Fixed: Fully disable automatic max. line width detection.
• Added: More tests.
• Added: Show number of passing and failing tests in test window.

Location:

trunk

Files:

• Forms/UFormTest.lfm (modified) (1 diff)
• Forms/UFormTest.lrj (modified) (1 diff)
• Forms/UFormTest.pas (modified) (9 diffs)
• Languages/vCardStudio.cs.po (modified) (2 diffs)
• Languages/vCardStudio.pot (modified) (2 diffs)
• UContact.pas (modified) (2 diffs)
• UCore.pas (modified) (1 diff)

trunk/Forms/UFormTest.lfm

@@ -48 +48 @@
     TabOrder = 1
   end
+  object LabelResult: TLabel
+    Left = 22
+    Height = 27
+    Top = 607
+    Width = 15
+    Anchors = [akLeft, akBottom]
+    Caption = '   '
+  end
   object ActionList1: TActionList
     Left = 537

trunk/Forms/UFormTest.lrj

@@ -4 +4 @@
 {"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":8736,"name":"tformtest.labelresult.caption","sourcebytes":[32,32,32],"value":"   "},
 {"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

@@ -18 +18 @@
     ActionList1: TActionList;
     ButtonRun: TButton;
+    LabelResult: TLabel;
     ListViewTestCases: TListView;
     MenuItem1: TMenuItem;
@@ -51 +52 @@
   UCore, UFormTestCase, UContact;
 
+resourcestring
+  SPassed = 'Passed';
+  SFailed = 'Failed';
+
 { TFormTest }
 
@@ -78 +83 @@
 var
   Selected: Boolean;
+  Passed: Integer;
+  Failed: Integer;
+  I: Integer;
 begin
   Selected := Assigned(ListViewTestCases.Selected);
   ARun.Enabled := Selected;
   AShow.Enabled := Selected;
+
+  Passed := 0;
+  Failed := 0;
+  for I := 0 to TestCases.Count - 1 do begin
+    case TestCases[I].Result of
+      trPassed: Inc(Passed);
+      trFailed: Inc(Failed);
+    end;
+  end;
+  LabelResult.Caption := SPassed + ' ' + IntToStr(Passed) + ', ' +
+    SFailed + ' ' + IntToStr(Failed);
 end;
 
@@ -101 +120 @@
       Input := VCardBegin + LineEnding +
         VCardVersion + LineEnding +
-        'NOTE:This is some long test which is really multi-lined each line is on d' + LineEnding +
-        ' ifferent line so it is on multiple lines.' + LineEnding +
+        'NOTE:This is some long test which is really multi-lined each line is on dif' + LineEnding +
+        ' ferent line so it is on multiple lines.' + LineEnding +
         VCardEnd + LineEnding;
       Output := Input;
@@ -123 +142 @@
       Input := VCardBegin + LineEnding +
         VCardVersion + LineEnding +
-        'FN;ENCODING=QUOTED-PRINTABLE:Jm=C3=A9no=20P=C5=99=C3=ADjmen=C3=AD=' + LineEnding +
-        'Jm=C3=A9no=20P=C5=99=C3=ADjmen=C3=AD' + LineEnding +
-        VCardEnd + LineEnding;
-      Output := Input;
-    end;
-    //AddNew('Encoding base64', TTestCaseLoadSave);
-    //AddNew('Encoding quoted-printable', TTestCaseLoadSave);
+        'FN;ENCODING=QUOTED-PRINTABLE:Jm=C3=A9no=20P=C5=99=C3=ADjmen=C3=ADJm=C3=A9n=' + LineEnding +
+        'o=20P=C5=99=C3=ADjmen=C3=AD' + LineEnding +
+        VCardEnd + LineEnding;
+      Output := Input;
+    end;
+    with TTestCaseLoadSave(AddNew('Base64 load-save (encoding=base64)', TTestCaseLoadSave)) do begin
+      Input := VCardBegin + LineEnding +
+        VCardVersion + LineEnding +
+        'FN;ENCODING=BASE64:VGVzdCBzdHJpbmc=' + LineEnding +
+        VCardEnd + LineEnding;
+      Output := Input;
+    end;
+    with TTestCaseLoadSave(AddNew('Base64 load-save (base64)', TTestCaseLoadSave)) do begin
+      Input := VCardBegin + LineEnding +
+        VCardVersion + LineEnding +
+        'FN;BASE64:VGVzdCBzdHJpbmc=' + LineEnding +
+        VCardEnd + LineEnding;
+      Output := Input;
+    end;
+    with TTestCaseLoadSave(AddNew('Base64 load-save (encoding=b)', TTestCaseLoadSave)) do begin
+      Input := VCardBegin + LineEnding +
+        VCardVersion + LineEnding +
+        'FN;ENCODING=B:VGVzdCBzdHJpbmc=' + LineEnding +
+        VCardEnd + LineEnding;
+      Output := Input;
+    end;
+    with TTestCaseLoadSave(AddNew('Base64 load-save multi-line', TTestCaseLoadSave)) do begin
+      Input := VCardBegin + LineEnding +
+        VCardVersion + LineEnding +
+        'FN;ENCODING=BASE64:U29tZSB2ZXJ5IGxvbmcgc3RyaW5nIFNvbWUgdmVyeSBsb25nIHN0cmlu' + LineEnding +
+        ' ZyBTb21lIHZlcnkgbG9uZyBzdHJpbmcgU29tZSB2ZXJ5IGxvbmcgc3RyaW5n' + LineEnding +
+        VCardEnd + LineEnding;
+      Output := Input;
+    end;
     //AddNew('Image format', TTestCaseLoadSave);
     with TTestCaseLoadSave(AddNew('Empty', TTestCaseLoadSave)) do begin
@@ -153 +199 @@
       Output := '';
     end;
-    with TTestCaseCheckProperty(AddNew('Propery FN', TTestCaseCheckProperty)) do begin
+    with TTestCaseCheckProperty(AddNew('Property FN', TTestCaseCheckProperty)) do begin
       Index := cfFullName;
       Value := 'Name Surname';
@@ -185 +231 @@
         VCardEnd + LineEnding;
     end;
+    with TTestCaseCheckProperty(AddNew('Base64 special symbols', TTestCaseCheckProperty)) do begin
+      Index := cfFullName;
+      Value := 'Jméno Příjmení';
+      Input := VCardBegin + LineEnding +
+        VCardVersion + LineEnding +
+        'FN;ENCODING=BASE64:Sm3DqW5vIFDFmcOtam1lbsOt' + LineEnding +
+        VCardEnd + LineEnding;
+    end;
   end;
 end;
@@ -200 +254 @@
     TestCases[I].Run;
   ReloadList;
+  UpdateInterface;
 end;
 
@@ -219 +274 @@
     TTestCase(ListViewTestCases.Selected.Data).Run;
     ReloadList;
+    UpdateInterface;
   end;
 end;

trunk/Languages/vCardStudio.cs.po

@@ -1012 +1012 @@
 msgstr "Testování"
 
+#: tformtest.labelresult.caption
+msgid "   "
+msgstr "   "
+
 #: tformtest.listviewtestcases.columns[0].caption
 msgctxt "tformtest.listviewtestcases.columns[0].caption"
@@ -1517 +1521 @@
 msgstr "Hodnota"
 
+#: uformtest.sfailed
+msgid "Failed"
+msgstr "Selhalo"
+
+#: uformtest.spassed
+msgid "Passed"
+msgstr "Prošlo"
+
 #: uquotedprintable.sdecodeerror
 msgid "Decode error"

trunk/Languages/vCardStudio.pot

@@ -986 +986 @@
 msgstr ""
 
+#: tformtest.labelresult.caption
+msgid "   "
+msgstr ""
+
 #: tformtest.listviewtestcases.columns[0].caption
 msgctxt "tformtest.listviewtestcases.columns[0].caption"
@@ -1489 +1493 @@
 msgstr ""
 
+#: uformtest.sfailed
+msgid "Failed"
+msgstr ""
+
+#: uformtest.spassed
+msgid "Passed"
+msgstr ""
+
 #: uquotedprintable.sdecodeerror
 msgid "Decode error"

trunk/UContact.pas

@@ -1623 +1623 @@
   while I < Lines.Count do begin
     Line := Lines[I];
-    DetectMaxLineLength(Line);
+    //DetectMaxLineLength(Line);
 
     if Line = '' then begin
@@ -1652 +1652 @@
           if I >= Lines.Count then Break;
           Line2 := Lines[I];
-          DetectMaxLineLength(Line2);
+          //DetectMaxLineLength(Line2);
           if (Length(Line2) > 0) and (Line2[1] = ' ') then begin
             Value := Value + Copy(Line2, 2, MaxInt);

trunk/UCore.pas

@@ -196 +196 @@
     end;
     ModalResult := MessageDlg(SFileSplit,
-     Format(SFileSplitFinishedOpenDirectory, [C,
-     SelectDirectoryDialog1.FileName]), mtConfirmation, [mbYes, mbNo], 0);
+      Format(SFileSplitFinishedOpenDirectory, [C,
+      SelectDirectoryDialog1.FileName]), mtConfirmation, [mbYes, mbNo], 0);
     if ModalResult = mrYes then begin
       {$IFDEF WINDOWS}