Changeset 201

Timestamp:

Jun 7, 2007, 8:54:24 PM (18 years ago)

Author:

RBRi

Message:

more uniti test for string util

Location:

trunk/NewView/unittests

Files:

• StringUtilsUnitTests.pas (modified) (5 diffs)
• newviewtests.spr (modified) (4 diffs)

trunk/NewView/unittests/StringUtilsUnitTests.pas

@@ -1574 +1574 @@
 
 
+  PROCEDURE testHexStrToLongInt_Empty;
+  VAR
+    tmpResult : LongInt;
+  BEGIN
+    tmpResult := -1;
+    try
+      tmpResult := HexStrToLongInt('');
+    except
+      on e:EConvertError do
+      begin
+        assertEqualsString('testHexStrToLongInt_Empty', 'No chars in hex string', e.message);
+      end;
+    end;
+
+
+    assertEqualsInt('testHexStrToLongInt_Empty', -1, tmpResult);
+  END;
+
+
+  PROCEDURE testHexStrToLongInt_IllegalChar;
+  VAR
+    tmpResult : LongInt;
+  BEGIN
+    tmpResult := -1;
+    try
+      tmpResult := HexStrToLongInt('abG');
+    except
+      on e:EConvertError do
+      begin
+        assertEqualsString('testHexStrToLongInt_IllegalChar', 'Invalid hex char: ''G'' in hex string ''abG''.', e.message);
+      end;
+    end;
+
+
+    assertEqualsInt('testHexStrToLongInt_IllegalChar', -1, tmpResult);
+  END;
+
+
+  PROCEDURE testHexStrToLongInt_IllegalCharMinus;
+  VAR
+    tmpResult : LongInt;
+  BEGIN
+    tmpResult := -1;
+    try
+      tmpResult := HexStrToLongInt('-F3');
+    except
+      on e:EConvertError do
+      begin
+        assertEqualsString('testHexStrToLongInt_IllegalCharMinus', 'Invalid hex char: ''-'' in hex string ''-F3''.', e.message);
+      end;
+    end;
+
+
+    assertEqualsInt('testHexStrToLongInt_IllegalCharMinus', -1, tmpResult);
+  END;
+
+
+  PROCEDURE testHexStrToLongInt_Zero;
+  VAR
+    tmpResult : LongInt;
+  BEGIN
+    tmpResult := HexStrToLongInt('000');
+
+    assertEqualsInt('testHexStrToLongInt_Zero', 0, tmpResult);
+  END;
+
+
+  PROCEDURE testHexStrToLongInt_Ten;
+  VAR
+    tmpResult : LongInt;
+  BEGIN
+    tmpResult := HexStrToLongInt('A');
+
+    assertEqualsInt('testHexStrToLongInt_Ten', 10, tmpResult);
+  END;
+
+
+  PROCEDURE testHexStrToLongInt_Big;
+  VAR
+    tmpResult : LongInt;
+  BEGIN
+    tmpResult := HexStrToLongInt('7fffFFFF');
+
+    assertEqualsLongWord('testHexStrToLongInt_Big', 2147483647, tmpResult);
+  END;
+
+
+  // ----------------------------------------------------------
+
+
   PROCEDURE testStrInSingleQuotes_Empty;
   VAR
@@ -1975 +2065 @@
 
 
-
   // -------------------------------------------------------------------
 
@@ -2066 +2155 @@
 
     assertEqualsInt('testLastPosOfChar_ManyHits', 7, tmpResult);
+  END;
+
+
+  // -------------------------------------------------------------------
+
+
+  PROCEDURE testSubstituteAllOccurencesOfChar_Empty;
+  VAR
+    tmpResult : String;
+  BEGIN
+    tmpResult := '';
+    SubstituteAllOccurencesOfChar(tmpResult, 'x', 'y');
+
+    assertEqualsString('testSubstituteAllOccurencesOfChar_Empty', '', tmpResult);
+  END;
+
+
+  PROCEDURE testSubstituteAllOccurencesOfChar_NotFound;
+  VAR
+    tmpResult : String;
+  BEGIN
+    tmpResult := 'abc';
+    SubstituteAllOccurencesOfChar(tmpResult, 'x', 'y');
+
+    assertEqualsString('testSubstituteAllOccurencesOfChar_NotFound', 'abc', tmpResult);
+  END;
+
+
+  PROCEDURE testSubstituteAllOccurencesOfChar_OneCharReplace;
+  VAR
+    tmpResult : String;
+  BEGIN
+    tmpResult := 'x';
+    SubstituteAllOccurencesOfChar(tmpResult, 'x', 'y');
+
+    assertEqualsString('testSubstituteAllOccurencesOfChar_OneCharReplace', 'y', tmpResult);
+  END;
+
+
+  PROCEDURE testSubstituteAllOccurencesOfChar_ReplaceAll;
+  VAR
+    tmpResult : String;
+  BEGIN
+    tmpResult := 'xxxx';
+    SubstituteAllOccurencesOfChar(tmpResult, 'x', 'y');
+
+    assertEqualsString('testSubstituteAllOccurencesOfChar_ReplaceAll', 'yyyy', tmpResult);
+  END;
+
+
+  PROCEDURE testSubstituteAllOccurencesOfChar_Some;
+  VAR
+    tmpResult : String;
+  BEGIN
+    tmpResult := 'xabxcxddx';
+    SubstituteAllOccurencesOfChar(tmpResult, 'x', 'y');
+
+    assertEqualsString('testSubstituteAllOccurencesOfChar_Some', 'yabycyddy', tmpResult);
   END;
 
@@ -2575 +2722 @@
     result.add(@testStrInSingleQuotes_Empty);
     result.add(@testStrInSingleQuotes);
+
+    result.add(@testHexStrToLongInt_Empty);
+    result.add(@testHexStrToLongInt_IllegalChar);
+    result.add(@testHexStrToLongInt_IllegalCharMinus);
+    result.add(@testHexStrToLongInt_Zero);
+    result.add(@testHexStrToLongInt_Ten);
+    result.add(@testHexStrToLongInt_Big);
 
     result.add(@testStrInDoubleQuotes_Empty);
@@ -2614 +2768 @@
     result.add(@testLastPosOfChar_ManyHits);
 
+    result.add(@testSubstituteAllOccurencesOfChar_Empty);
+    result.add(@testSubstituteAllOccurencesOfChar_NotFound);
+    result.add(@testSubstituteAllOccurencesOfChar_OneCharReplace);
+    result.add(@testSubstituteAllOccurencesOfChar_ReplaceAll);
+    result.add(@testSubstituteAllOccurencesOfChar_Some);
 
   // --------------------

trunk/NewView/unittests/newviewtests.spr

@@ -60 +60 @@
 [Directories]
 
-LastDir=P:\NEWVIEW_DEV\NewView
+LastDir=P:\NEWVIEW_DEV\NewView\unittests
 OutDir=P:\NEWVIEW_DEV\build\unittest
 LibDir=P:\NEWVIEW_DEV\build\newview;P:\NEWVIEW_DEV\build\library;P:\NEWVIEW_DEV\build\components;P:\NEWVIEW_DEV\build\sibyl\lib
@@ -69 +69 @@
 [Find History]
 
-Find0=path_
-Find1=MakeDir
-Find2=StrExtractStrings
-Find3=exxws
-Find4=Rmdir
-Find5=parentdir
-Find6=ParentDir
-Find7=MakeDirs
-Find8=GetFilesForPath
-Find9=assertEqualsInt
-Find10=ex3
-Find11=p:\
-Find12=var
-Find13=FileIsReadOnly
-Find14=24
-Find15=StrEndsw
+Find0=hex
+Find1=1
+Find2=try
+Find3=Hex
+Find4=testStrInSingleQuotes_Empty
+Find5=StringInSingleQ
+Find6=abc
+Find7=repl
+Find8=path_
+Find9=MakeDir
+Find10=StrExtractStrings
+Find11=exxws
+Find12=Rmdir
+Find13=parentdir
+Find14=ParentDir
+Find15=MakeDirs
 
 [General]
@@ -100 +100 @@
 [Last Closed Files]
 
-File0=..\..\.\Library\ACLStringUtility.pas
-File1=..\..\.\Library\FileUtilsUnit.pas
-File2=.\FileUtilsUnitTests.pas
-File3=..\..\.\Library\ACLFileUtility._pas
-File4=..\..\.\LIBRARY\StringUtilsUnit.pas
-File5=..\.\CmdLineParameterUnit.pas
+File0=.\StringUtilsUnitTests.pas
+File1=..\.\SearchUnit.pas
+File2=..\..\.\Library\FileUtilsUnit.pas
+File3=.\FileUtilsUnitTests.pas
+File4=..\..\.\Library\ACLFileUtility._pas
 
 [Last Open Files]
@@ -115 +114 @@
 File0.Height=629
 File0.Column=3
-File0.Line=7
-File1=.\CmdLineParameterUnitTests.pas
+File0.Line=76
+File1=..\..\.\Library\StringUtilsUnit.pas
 File1.Left=-4
 File1.Bottom=-5
 File1.Width=1399
 File1.Height=629
-File1.Column=3
-File1.Line=8
+File1.Column=36
+File1.Line=732
+File2=..\..\.\Library\ACLStringUtility.pas
+File2.Left=-4
+File2.Bottom=-5
+File2.Width=1399
+File2.Height=629
+File2.Column=1
+File2.Line=441
+File3=.\CmdLineParameterUnitTests.pas
+File3.Left=-4
+File3.Bottom=-5
+File3.Width=1399
+File3.Height=629
+File3.Column=3
+File3.Line=8
+File4=..\.\CmdLineParameterUnit.pas
+File4.Left=-4
+File4.Bottom=-5
+File4.Width=1399
+File4.Height=629
+File4.Column=1
+File4.Line=1
+File5=..\..\.\Library\DebugUnit.pas
+File5.Left=-4
+File5.Bottom=-5
+File5.Width=1399
+File5.Height=629
+File5.Column=76
+File5.Line=25
+File6=.\testassert.pas
+File6.Left=-4
+File6.Bottom=-5
+File6.Width=1399
+File6.Height=629
+File6.Column=28
+File6.Line=13
 
 [Linker Options]