Changeset 68 for trunk/NewView

Timestamp:

Feb 6, 2007, 9:00:43 PM (19 years ago)

Author:

RBRi

Message:

+ LongWordToStr

Location:

trunk/NewView

Files:

• StringUtilsUnit.pas (modified) (2 diffs)
• unittests/StringUtilsUnitTests.pas (modified) (2 diffs)
• unittests/testassert.pas (modified) (2 diffs)

trunk/NewView/StringUtilsUnit.pas

@@ -61 +61 @@
   // this is case INsensitive
   Function StrEndsWithIgnoringCase(const aString: String; const anEndString: String): Boolean;
+
+  // the IntToStr generates wrong results
+  // in normal cases IntToStr returns a negative value
+  // and somtimes completly wrong values
+  Function LongWordToStr(const aLongWord: LongWord) : String;
 
   Function BoolToStr(const aBoolean : boolean ): string;
@@ -288 +293 @@
   end;
 
+  Function LongWordToStr(const aLongWord: LongWord) : String;
+  Var
+    l : LongWord;
+    i : Integer;
+  Begin
+    Result := '';
+    l := aLongWord;
+
+    if l = 0 then
+    begin
+      result := '0';
+      exit;
+    end;
+
+    while l > 0 do
+    begin
+      i := l mod 10;
+      l := l div 10;
+      Case i of
+           0 : result := '0' + result;
+           1 : result := '1' + result;
+           2 : result := '2' + result;
+           3 : result := '3' + result;
+           4 : result := '4' + result;
+           5 : result := '5' + result;
+           6 : result := '6' + result;
+           7 : result := '7' + result;
+           8 : result := '8' + result;
+           9 : result := '9' + result;
+      end;
+    end;
+
+  end;
+
+
   Function BoolToStr(const aBoolean : boolean ): string;
   begin

trunk/NewView/unittests/StringUtilsUnitTests.pas

@@ -636 +636 @@
     assertTrue('testStrEndsWithIgnoringCase_StringMatchCaseSensitive', tmpResult);
   END;
+
+
+  PROCEDURE testLongWordToStr_Zero;
+  VAR
+    tmpResult : String;
+  BEGIN
+    tmpResult := LongWordToStr(0);
+
+    assertEqualsString('testLongWordToStr_Zero', '0', tmpResult);
+  END;
+
+
+  PROCEDURE testLongWordToStr_Four;
+  VAR
+    tmpResult : String;
+  BEGIN
+    tmpResult := LongWordToStr(4);
+
+    assertEqualsString('testLongWordToStr_Four', '4', tmpResult);
+  END;
+
+  PROCEDURE testLongWordToStr_Max;
+  VAR
+    tmpResult : String;
+  BEGIN
+    tmpResult := LongWordToStr(4294967295);
+
+    assertEqualsString('testLongWordToStr_Max', '4294967295', tmpResult);
+  END;
+
 
 
@@ -720 +750 @@
     result.add(@testStrEndsWithIgnoringCase_StringMatchCaseInSensitive);
 
+    result.add(@testLongWordToStr_Zero);
+    result.add(@testLongWordToStr_Four);
+    result.add(@testLongWordToStr_Max);
+
     result.add(@testBoolToStr_true);
     result.add(@testBoolToStr_false);

trunk/NewView/unittests/testassert.pas

@@ -10 +10 @@
   PROCEDURE assertEqualsString(aTestDescription : String; anExpectedValue : String; aRealValue : String);
   PROCEDURE assertEqualsInt(aTestDescription : String; anExpectedValue : INTEGER; aRealValue : INTEGER);
+  PROCEDURE assertEqualsLongWord(aTestDescription : String; anExpectedValue : LongWord; aRealValue : LongWord);
   PROCEDURE assertTrue(aTestDescription : String; aRealValue : Boolean);
   PROCEDURE assertFalse(aTestDescription : String; aRealValue : Boolean);
@@ -33 +34 @@
 
   PROCEDURE assertEqualsInt(aTestDescription : String; anExpectedValue : INTEGER; aRealValue : INTEGER);
+  VAR
+    tmpMessage : String;
+    tmpIntString : String;
+  BEGIN
+    if (aRealValue <> anExpectedValue) then
+    begin
+      tmpMessage := 'Failed: ' + aTestDescription + ' Expected: ''';
+      Str(anExpectedValue, tmpIntString);
+      tmpMessage := tmpMessage + tmpIntString;
+      tmpMessage := tmpMessage + ''' but it was: ''';
+      Str(aRealValue, tmpIntString);
+      tmpMessage := tmpMessage + tmpIntString;
+      tmpMessage := tmpMessage + '''';
+      raise EAssertFailed.Create(tmpMessage);
+    end;
+  END;
+
+
+  PROCEDURE assertEqualsLongWord(aTestDescription : String; anExpectedValue : LongWord; aRealValue : LongWord);
   VAR
     tmpMessage : String;