Index: ProScan/UI/PalletScherm.pas
===================================================================
diff -u -r400 -r402
--- ProScan/UI/PalletScherm.pas (.../PalletScherm.pas) (revision 400)
+++ ProScan/UI/PalletScherm.pas (.../PalletScherm.pas) (revision 402)
@@ -152,7 +152,7 @@
procedure TfmPalletScherm.FormShow(Sender: TObject);
begin
- fBlPallet := TBlPallet.Create(UiContext);
+ fBlPallet := TBlPallet.Create(UiContext,nil);
btnLinksOnder.Action := nil;
btnCentraalOnder.Action := actHome;
btnRechtsOnder.Action := actVolgende;
Index: ProScan/Test/ProScanTests.dproj
===================================================================
diff -u -r399 -r402
--- ProScan/Test/ProScanTests.dproj (.../ProScanTests.dproj) (revision 399)
+++ ProScan/Test/ProScanTests.dproj (.../ProScanTests.dproj) (revision 402)
@@ -70,6 +70,9 @@
displaymode=desktop server=tve-w10
+ E:\svn\Delphi\Mocks\Source;E:\svn\Delphi\ProScan\UI;E:\svn\Delphi\ProScan\WS;E:\svn\Delphi\ProScan\;$(DCC_UnitSearchPath)
+ 1033
+ None
false
@@ -84,6 +87,9 @@
+
+
+
Cfg_2
Base
@@ -131,6 +137,10 @@
ProScanTests.dpr
+
+ Microsoft Office 2000 Sample Automation Server Wrapper Components
+ Microsoft Office XP Sample Automation Server Wrapper Components
+
Index: ProScan/Test/ProScanTests.dproj.local
===================================================================
diff -u -r399 -r402
--- ProScan/Test/ProScanTests.dproj.local (.../ProScanTests.dproj.local) (revision 399)
+++ ProScan/Test/ProScanTests.dproj.local (.../ProScanTests.dproj.local) (revision 402)
@@ -3,5 +3,8 @@
2020/06/11 10:59:02.000.460,=E:\svn\Delphi\ProScan\UI\CommonFunctions.pas
2020/06/11 10:59:02.000.352,=E:\svn\Delphi\ProScan\Test\TestCommonFunctions.pas
+ 2020/06/11 14:41:47.976,=E:\svn\Delphi\ProScan\Test\TestBlPallet.pas
+ 2020/06/11 14:41:48.046,=E:\svn\Delphi\ProScan\BL\BlPallet.pas
+ 2020/06/11 14:50:29.956,=E:\svn\Delphi\Mocks\Source\Delphi.Mocks.pas
Index: ProScan/Test/ProScanTests.dpr
===================================================================
diff -u -r398 -r402
--- ProScan/Test/ProScanTests.dpr (.../ProScanTests.dpr) (revision 398)
+++ ProScan/Test/ProScanTests.dpr (.../ProScanTests.dpr) (revision 402)
@@ -17,7 +17,10 @@
uses
DUnitTestRunner,
TestCommonFunctions in 'TestCommonFunctions.pas',
- CommonFunctions in '..\UI\CommonFunctions.pas';
+ CommonFunctions in '..\UI\CommonFunctions.pas',
+ TestBlPallet in 'TestBlPallet.pas',
+ BlPallet in '..\BL\BlPallet.pas',
+ Delphi.Mocks in '..\..\Mocks\Source\Delphi.Mocks.pas';
{$R *.RES}
Index: ProScan/BL/BlPallet.pas
===================================================================
diff -u -r400 -r402
--- ProScan/BL/BlPallet.pas (.../BlPallet.pas) (revision 400)
+++ ProScan/BL/BlPallet.pas (.../BlPallet.pas) (revision 402)
@@ -3,14 +3,15 @@
interface
uses
- UiContext;
+ UiContext, Agent;
type
TBlPallet = Class
private
fUiContext: TUiContext;
+ fAgent: TAgent;
public
- constructor Create(aUiContext: TUiContext);
+ constructor Create(aUiContext: TUiContext; aAgent: TAgent);
function GenereerTbp: string;
procedure SetContext(GescandeWaarde: string);
End;
@@ -19,21 +20,25 @@
implementation
uses
- DnaCodeService, Agent, CommonFunctions, SysUtils;
+ DnaCodeService, CommonFunctions, SysUtils;
{ TBlPallet }
-constructor TBlPallet.Create(aUiContext: TUiContext);
+constructor TBlPallet.Create(aUiContext: TUiContext; aAgent: TAgent);
begin
fUiContext := aUiContext;
+ if assigned(aAgent) then
+ fAgent := aAgent
+ else
+ fAgent := TAgent.Create(fUiContext);
end;
function TBlPallet.GenereerTbp: string;
var
fGeefVolgendeTbpCodeResponse: GeefVolgendeTbpCodeResponse;
begin
inherited;
- fGeefVolgendeTbpCodeResponse := TAgent.Create(fUiContext).GeefVolgendeTbpCode();
+ fGeefVolgendeTbpCodeResponse := fAgent.GeefVolgendeTbpCode();
try
if fGeefVolgendeTbpCodeResponse.Header.Status <> '200' then begin
raise EExternalException.Create(fGeefVolgendeTbpCodeResponse.Header.Omschrijving);
Index: ProScan/ProScan.dproj
===================================================================
diff -u -r399 -r402
--- ProScan/ProScan.dproj (.../ProScan.dproj) (revision 399)
+++ ProScan/ProScan.dproj (.../ProScan.dproj) (revision 402)
@@ -70,6 +70,7 @@
true
+ E:\svn\Delphi\Mocks\Source;$(DCC_UnitSearchPath)
displaymode=desktop server=cache01
ProScan_Icon.ico
true