Fix filter signature in test

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2485 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
inoussa
2012-08-12 01:07:26 +00:00
parent b44d85767b
commit 9622abc016

View File

@ -21,7 +21,7 @@ uses
{$ELSE} {$ELSE}
TestFrameWork, TestFrameWork,
{$ENDIF} {$ENDIF}
wst_types, filter_intf; wst_types, filter_intf, base_service_intf;
type type
@ -52,8 +52,16 @@ type
THexDataFilter = class(TBaseFilter,IDataFilter) THexDataFilter = class(TBaseFilter,IDataFilter)
protected protected
function GetName() : string;override; function GetName() : string;override;
function DoExecuteInput(const AData; const ASize : Integer) : TByteDynArray;override; function DoExecuteInput(
function DoExecuteOutput(const AData; const ASize : Integer) : TByteDynArray;override; const AData;
const ASize : Integer;
ADataProps : IPropertyManager
) : TByteDynArray;override;
function DoExecuteOutput(
const AData;
const ASize : Integer;
ADataProps : IPropertyManager
) : TByteDynArray;override;
end; end;
{ TMod256DataFilter } { TMod256DataFilter }
@ -61,8 +69,16 @@ type
TMod256DataFilter = class(TBaseFilter,IDataFilter) TMod256DataFilter = class(TBaseFilter,IDataFilter)
protected protected
function GetName() : string;override; function GetName() : string;override;
function DoExecuteInput(const AData; const ASize : Integer) : TByteDynArray;override; function DoExecuteInput(
function DoExecuteOutput(const AData; const ASize : Integer) : TByteDynArray;override; const AData;
const ASize : Integer;
ADataProps : IPropertyManager
) : TByteDynArray;override;
function DoExecuteOutput(
const AData;
const ASize : Integer;
ADataProps : IPropertyManager
) : TByteDynArray;override;
end; end;
{ TXorDataFilter } { TXorDataFilter }
@ -73,8 +89,16 @@ type
protected protected
function GetName() : string;override; function GetName() : string;override;
function ExecuteXor(const AData; const ASize : Integer) : TByteDynArray; function ExecuteXor(const AData; const ASize : Integer) : TByteDynArray;
function DoExecuteInput(const AData; const ASize : Integer) : TByteDynArray;override; function DoExecuteInput(
function DoExecuteOutput(const AData; const ASize : Integer) : TByteDynArray;override; const AData;
const ASize : Integer;
ADataProps : IPropertyManager
) : TByteDynArray;override;
function DoExecuteOutput(
const AData;
const ASize : Integer;
ADataProps : IPropertyManager
) : TByteDynArray;override;
published published
property XorConstant : Byte read FXorConstant write FXorConstant; property XorConstant : Byte read FXorConstant write FXorConstant;
end; end;
@ -82,7 +106,7 @@ type
implementation implementation
uses uses
Classes, Classes,
wst_consts, basex_encode, imp_utils, base_service_intf; wst_consts, basex_encode, imp_utils;
{ TXorDataFilter } { TXorDataFilter }
@ -107,12 +131,20 @@ begin
end; end;
end; end;
function TXorDataFilter.DoExecuteInput(const AData; const ASize : Integer) : TByteDynArray; function TXorDataFilter.DoExecuteInput(
const AData;
const ASize : Integer;
ADataProps : IPropertyManager
) : TByteDynArray;
begin begin
Result := ExecuteXor(AData,ASize); Result := ExecuteXor(AData,ASize);
end; end;
function TXorDataFilter.DoExecuteOutput(const AData; const ASize : Integer) : TByteDynArray; function TXorDataFilter.DoExecuteOutput(
const AData;
const ASize : Integer;
ADataProps : IPropertyManager
) : TByteDynArray;
begin begin
Result := ExecuteXor(AData,ASize); Result := ExecuteXor(AData,ASize);
end; end;
@ -130,9 +162,9 @@ begin
Move(s[1],inBuffer[0],Length(inBuffer)); Move(s[1],inBuffer[0],Length(inBuffer));
f := AFilter; f := AFilter;
outBuffer := f.ExecuteInput(inBuffer[0],Length(inBuffer)); outBuffer := f.ExecuteInput(inBuffer[0],Length(inBuffer),nil);
Check(Length(outBuffer) > 0); Check(Length(outBuffer) > 0);
calcBuffer := f.ExecuteOutput(outBuffer[0],Length(outBuffer)); calcBuffer := f.ExecuteOutput(outBuffer[0],Length(outBuffer),nil);
Check(Length(calcBuffer) > 0); Check(Length(calcBuffer) > 0);
SetLength(s2,Length(calcBuffer)); SetLength(s2,Length(calcBuffer));
Move(calcBuffer[0],s2[1],Length(calcBuffer)); Move(calcBuffer[0],s2[1],Length(calcBuffer));
@ -346,14 +378,22 @@ begin
Result := 'mod256'; Result := 'mod256';
end; end;
function TMod256DataFilter.DoExecuteInput(const AData; const ASize : Integer) : TByteDynArray; function TMod256DataFilter.DoExecuteInput(
const AData;
const ASize : Integer;
ADataProps : IPropertyManager
) : TByteDynArray;
begin begin
SetLength(Result,ASize + 1); SetLength(Result,ASize + 1);
Move(AData,Result[0],ASize); Move(AData,Result[0],ASize);
Result[ASize] := ASize mod 256; Result[ASize] := ASize mod 256;
end; end;
function TMod256DataFilter.DoExecuteOutput(const AData; const ASize : Integer) : TByteDynArray; function TMod256DataFilter.DoExecuteOutput(
const AData;
const ASize : Integer;
ADataProps : IPropertyManager
) : TByteDynArray;
var var
m : Byte; m : Byte;
begin begin
@ -374,7 +414,11 @@ begin
Result := 'hex'; Result := 'hex';
end; end;
function THexDataFilter.DoExecuteInput(const AData; const ASize : Integer) : TByteDynArray; function THexDataFilter.DoExecuteInput(
const AData;
const ASize : Integer;
ADataProps : IPropertyManager
) : TByteDynArray;
begin begin
if (ASize < 1) then begin if (ASize < 1) then begin
Result := nil; Result := nil;
@ -385,7 +429,11 @@ begin
Base16Encode(AData,ASize,PAnsiChar(@Result[0])); Base16Encode(AData,ASize,PAnsiChar(@Result[0]));
end; end;
function THexDataFilter.DoExecuteOutput(const AData; const ASize : Integer) : TByteDynArray; function THexDataFilter.DoExecuteOutput(
const AData;
const ASize : Integer;
ADataProps : IPropertyManager
) : TByteDynArray;
var var
i : Integer; i : Integer;
begin begin