|
@@ -80,6 +80,7 @@ type
|
|
TAssert = class(TTest)
|
|
TAssert = class(TTest)
|
|
public
|
|
public
|
|
class procedure Fail(const AMessage: string);
|
|
class procedure Fail(const AMessage: string);
|
|
|
|
+ class procedure Fail(const AFmt: string; Args : Array of const);
|
|
class procedure AssertTrue(const AMessage: string; ACondition: boolean); overload;
|
|
class procedure AssertTrue(const AMessage: string; ACondition: boolean); overload;
|
|
class procedure AssertTrue(ACondition: boolean); overload;
|
|
class procedure AssertTrue(ACondition: boolean); overload;
|
|
class procedure AssertFalse(const AMessage: string; ACondition: boolean); overload;
|
|
class procedure AssertFalse(const AMessage: string; ACondition: boolean); overload;
|
|
@@ -449,32 +450,38 @@ end;
|
|
|
|
|
|
{ TAssert }
|
|
{ TAssert }
|
|
|
|
|
|
-class procedure TAssert.Fail(const AMessage: String);
|
|
|
|
|
|
+class procedure TAssert.Fail(const AMessage: string);
|
|
begin
|
|
begin
|
|
raise EAssertionFailedError.Create(AMessage);
|
|
raise EAssertionFailedError.Create(AMessage);
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
+class procedure TAssert.Fail(const AFmt: string; Args: array of const);
|
|
|
|
+begin
|
|
|
|
+ raise EAssertionFailedError.CreateFmt(AFmt,Args);
|
|
|
|
+end;
|
|
|
|
+
|
|
|
|
|
|
-class procedure TAssert.AssertTrue(const AMessage: String; ACondition: Boolean);
|
|
|
|
|
|
+class procedure TAssert.AssertTrue(const AMessage: string; ACondition: boolean);
|
|
begin
|
|
begin
|
|
if (not ACondition) then
|
|
if (not ACondition) then
|
|
Fail(AMessage);
|
|
Fail(AMessage);
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
|
|
-class procedure TAssert.AssertTrue(ACondition: Boolean);
|
|
|
|
|
|
+class procedure TAssert.AssertTrue(ACondition: boolean);
|
|
begin
|
|
begin
|
|
AssertTrue('', ACondition);
|
|
AssertTrue('', ACondition);
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
|
|
-class procedure TAssert.AssertFalse(const AMessage: String; ACondition: Boolean);
|
|
|
|
|
|
+class procedure TAssert.AssertFalse(const AMessage: string; ACondition: boolean
|
|
|
|
+ );
|
|
begin
|
|
begin
|
|
AssertTrue(AMessage, not ACondition);
|
|
AssertTrue(AMessage, not ACondition);
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
|
|
-class procedure TAssert.AssertFalse(ACondition: Boolean);
|
|
|
|
|
|
+class procedure TAssert.AssertFalse(ACondition: boolean);
|
|
begin
|
|
begin
|
|
AssertFalse('', ACondition);
|
|
AssertFalse('', ACondition);
|
|
end;
|
|
end;
|
|
@@ -702,7 +709,7 @@ begin
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
|
|
-class procedure TAssert.AssertNullINtf(AInterface: IInterface);
|
|
|
|
|
|
+class procedure TAssert.AssertNullIntf(AInterface: IInterface);
|
|
begin
|
|
begin
|
|
AssertNull('', AInterface);
|
|
AssertNull('', AInterface);
|
|
end;
|
|
end;
|