Commit 0a413a26 authored by kravtsov's avatar kravtsov

[+] ДОбавлены тесты

parent f79f75e2
Pipeline #1354 failed with stage
in 1 minute and 40 seconds
......@@ -136,16 +136,23 @@ ProductVersion=1.13
Comments=http://www.shtrih-m.ru
[Excluded Packages]
C:\Program Files (x86)\Borland\Delphi7\Projects\Bpl\PngComponentsD7.bpl=Png components
[HistoryLists\hlDebugSourcePath]
Count=1
Item0=C:\Components\DUnit\src\
[HistoryLists\hlUnitAliases]
Count=1
Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
[HistoryLists\hlSearchPath]
Count=1
Item0=$(DELPHI)\Lib\Debug
Count=2
Item0=$(DELPHI)\Lib\Debug;C:\COMPON~1\JVCL\jcl\lib\d7\debug;C:\COMPON~1\jcl\lib\d7\debug
Item1=$(DELPHI)\Lib\Debug
[HistoryLists\hlUnitOutputDirectory]
Count=2
Item0=DCU
Item1=..\lib\D7
[HistoryLists\hlOutputDirectorry]
Count=1
Item0=Bin
[HistoryLists\hlBPLOutput]
Count=3
Item0=$(DELPHI)\Bin\
......
......@@ -12,7 +12,7 @@ BRCC = $(ROOT)\bin\brcc32.exe $**
PROJECTS = OposConfig.exe OposTest.exe SmFiscalPrinter.dll SmScale.dll \
OposConfigTest.exe OposConfigTestLib.dll SmFiscalPrinterTest.exe \
SmFiscalPrinterTestLib.dll OposTestTest.exe OposTestTestLib.dll SmScaleTest.exe \
SmScaleTestLib.dll SmFptrSrv.exe
SmScaleTestLib.dll SmFptrSrv.exe AcceptanceTest.exe
#------------------------------------------------------------------------------
default: $(PROJECTS)
#------------------------------------------------------------------------------
......@@ -56,4 +56,7 @@ SmScaleTest.exe: ..\Test\SmScaleTest\SmScaleTest.dpr
SmScaleTestLib.dll: ..\Test\SmScaleTest\SmScaleTestLib.dpr
$(DCC)
AcceptanceTest.exe: ..\Test\AcceptanceTest\AcceptanceTest.dpr
$(DCC)
[Closed Files]
File_0=SourceModule,'C:\projects\OPOSShtrih\Source\Opos\OposException.pas',0,1,68,74,77,0,0
File_1=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\oleFiscalPrinter.pas',0,1,1,1,1,0,0
File_2=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterImpl.pas',0,1,2605,55,2623,0,0
File_3=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\DirectIOAPI.pas',0,1,396,1,418,0,0
File_4=SourceModule,'C:\projects\OPOSShtrih\Source\Opos\OposFptr.pas',0,1,1,1,1,0,0
File_5=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FSSalesReceipt.pas',0,1,1,65,14,0,0
File_6=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\ReceiptItem.pas',0,1,473,5,493,0,0
File_7=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\CustomReceipt.pas',0,1,484,3,491,0,0
File_8=SourceModule,'C:\projects\OPOSShtrih\Source\Shared\DIOHandlers.pas',0,1,676,41,695,0,0
File_9=SourceModule,'C:\projects\OPOSShtrih\Source\OposTest\Units\DIODescription.pas',0,1,25,27,10,0,0
File_0=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\DirectIOAPI.pas',0,1,295,28,314,0,0
File_1=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterDevice.pas',0,1,4999,1,5011,0,0
File_2=SourceModule,'C:\projects\OPOSShtrih\Source\Opos\OposFiscalPrinter_1_12_Lib_TLB.pas',0,1,1,1,1,0,0
File_3=SourceModule,'c:\program files (x86)\borland\delphi7\Comp\jvcl\run\JvInterpreter.pas',0,1,966,19,977,0,0
File_4=SourceModule,'c:\program files (x86)\borland\delphi7\source\rtl\common\ComObj.pas',0,1,1384,1,1403,0,0
File_5=SourceModule,'C:\Program Files (x86)\RemObjects Software\Pascal Script for Delphi\Source\uPSComponent.pas',0,1,593,1,613,0,0
[Modules]
Count=0
EditWindowCount=0
Module0=C:\projects\OPOSShtrih\Test\AcceptanceTest\Units\duFiscalPrinter.pas
Module1=C:\projects\OPOSShtrih\Source\Shared\LogFile.pas
Module2=c:\program files (x86)\borland\delphi7\source\rtl\Sys\system.pas
Module3=C:\projects\OPOSShtrih\Source\Shared\FileUtils.pas
Count=4
EditWindowCount=1
TypeLibWindowCount=3
[C:\projects\OPOSShtrih\Source\SmFptrSrv\SmFptrSrv.dpr]
[C:\projects\OPOSShtrih\Test\AcceptanceTest\Units\duFiscalPrinter.pas]
ModuleType=SourceModule
FormState=0
FormOnTop=0
[C:\projects\OPOSShtrih\Source\Shared\LogFile.pas]
ModuleType=SourceModule
FormState=0
FormOnTop=0
[c:\program files (x86)\borland\delphi7\source\rtl\Sys\system.pas]
ModuleType=SourceModule
FormState=0
FormOnTop=0
[C:\projects\OPOSShtrih\Source\Shared\FileUtils.pas]
ModuleType=SourceModule
FormState=0
FormOnTop=0
[C:\projects\OPOSShtrih\Source\SmFiscalPrinter\SmFiscalPrinter.tlb]
FormState=0
FormOnTop=0
......@@ -39,10 +59,6 @@ FormOnTop=0
FormState=0
FormOnTop=0
[C:\projects\OPOSShtrih\Source\SmFiscalPrinter\SmFiscalPrinter.tlb]
FormState=0
FormOnTop=0
[C:\projects\OPOSShtrih\Source\SmScale\SmScale.dpr]
FormState=0
FormOnTop=0
......@@ -83,10 +99,76 @@ FormOnTop=0
FormState=0
FormOnTop=0
[C:\projects\OPOSShtrih\Source\SmFptrSrv\SmFptrSrv.dpr]
FormState=0
FormOnTop=0
[C:\projects\OPOSShtrih\Source\SmFptrSrv\SmFptrSrv.tlb]
FormState=0
FormOnTop=0
[C:\projects\OPOSShtrih\Test\AcceptanceTest\AcceptanceTest.dpr]
FormState=0
FormOnTop=0
[EditWindow0]
ViewCount=4
CurrentView=0
View0=0
View1=1
View2=2
View3=3
CodeExplorer=CodeExplorer@EditWindow0
MessageView=MessageView@EditWindow0
Create=1
Visible=1
State=2
Left=309
Top=138
Width=1302
Height=682
MaxLeft=-8
MaxTop=106
MaxWidth=1936
MaxHeight=952
ClientWidth=1920
ClientHeight=914
LeftPanelSize=0
LeftPanelClients=CodeExplorer@EditWindow0
LeftPanelData=00000400010000000C000000436F64654578706C6F7265720000000000000000000000000000000000FFFFFFFF
RightPanelSize=0
BottomPanelSize=0
BottomPanelClients=MessageView@EditWindow0
BottomPanelData=00000400010000000B0000004D6573736167655669657700000000000000000000000000000000000100000000000000000B0000004D65737361676556696577FFFFFFFF
[View0]
Module=C:\projects\OPOSShtrih\Test\AcceptanceTest\Units\duFiscalPrinter.pas
CursorX=30
CursorY=86
TopLine=71
LeftCol=1
[View1]
Module=C:\projects\OPOSShtrih\Source\Shared\LogFile.pas
CursorX=57
CursorY=308
TopLine=291
LeftCol=1
[View2]
Module=c:\program files (x86)\borland\delphi7\source\rtl\Sys\system.pas
CursorX=1
CursorY=13549
TopLine=13534
LeftCol=1
[View3]
Module=C:\projects\OPOSShtrih\Source\Shared\FileUtils.pas
CursorX=2
CursorY=168
TopLine=144
LeftCol=1
[TypeLibEditWindow0]
Create=1
Visible=0
......@@ -157,12 +239,7 @@ LRDockWidth=320
Dockable=1
[Breakpoints]
Count=5
Breakpoint0='C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\CustomReceipt.pas',161,'',0,1,'',1,0,0,'',1,'','',''
Breakpoint1='C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\MalinaPlugin.pas',194,'',0,1,'',1,0,0,'',1,'','',''
Breakpoint2='C:\projects\OPOSShtrih\Source\OposTest\Fmu\fmuFptrThreadTest.pas',129,'',0,1,'',1,0,0,'',1,'','',''
Breakpoint3='C:\projects\OPOSShtrih\Source\OposTest\Fmu\fmuFptrThreadTest.pas',148,'',0,1,'',1,0,0,'',1,'','',''
Breakpoint4='C:\projects\OPOSShtrih\Source\OposTest\Fmu\fmuFptrThreadTest.pas',151,'',0,1,'',1,0,0,'',1,'','',''
Count=0
[AddressBreakpoints]
Count=0
......@@ -175,8 +252,8 @@ Left=345
Top=0
Width=1575
Height=122
MaxLeft=-1
MaxTop=-1
MaxLeft=-8
MaxTop=-8
MaxWidth=1936
MaxHeight=122
ClientWidth=1920
......@@ -186,13 +263,13 @@ ClientHeight=84
Create=1
Visible=1
State=0
Left=8
Top=124
Width=554
Left=3
Top=115
Width=601
Height=589
MaxLeft=-1
MaxTop=-1
ClientWidth=538
ClientWidth=585
ClientHeight=555
TBDockHeight=681
LRDockWidth=445
......@@ -230,7 +307,7 @@ ClientHeight=60
[PropertyInspector]
Create=1
Visible=1
Visible=0
State=0
Left=-1
Top=110
......@@ -253,8 +330,8 @@ HiddenCategories=
Create=1
Visible=0
State=0
Left=980
Top=180
Left=660
Top=132
Width=835
Height=613
MaxLeft=-1
......@@ -415,6 +492,38 @@ Column2Width=545
EntryPointPane=225
CompUnitPane=104
[CodeExplorer@EditWindow0]
Create=1
Visible=0
State=0
Left=-113
Top=-6
Width=140
Height=305
MaxLeft=-1
MaxTop=-1
ClientWidth=140
ClientHeight=305
TBDockHeight=305
LRDockWidth=140
Dockable=1
[MessageView@EditWindow0]
Create=1
Visible=0
State=0
Left=12
Top=0
Width=1274
Height=85
MaxLeft=-1
MaxTop=-1
ClientWidth=1274
ClientHeight=85
TBDockHeight=85
LRDockWidth=443
Dockable=1
[DockHosts]
DockHostCount=1
......@@ -423,8 +532,8 @@ DockSiteType=0
Create=1
Visible=0
State=0
Left=226
Top=847
Left=488
Top=297
Width=1007
Height=500
MaxLeft=-1
......
object fmCashGeneral: TfmCashGeneral
Left = 489
Top = 119
Left = 858
Top = 305
BorderIcons = [biSystemMenu, biMinimize]
BorderStyle = bsSingle
Caption = 'General'
......
......@@ -134,16 +134,23 @@ OriginalFilename=OposTest.exe
ProductName=OPOS drivers
ProductVersion=1.13
Comments=http://www.shtrih-m.ru
[HistoryLists\hlDebugSourcePath]
Count=1
Item0=C:\Components\DUnit\src\
[HistoryLists\hlUnitAliases]
Count=1
Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
[HistoryLists\hlSearchPath]
Count=1
Item0=$(DELPHI)\Lib\Debug
Count=2
Item0=$(DELPHI)\Lib\Debug;C:\COMPON~1\JVCL\jcl\lib\d7\debug;C:\COMPON~1\jcl\lib\d7\debug
Item1=$(DELPHI)\Lib\Debug
[HistoryLists\hlUnitOutputDirectory]
Count=2
Item0=DCU
Item1=..\lib\D7
[HistoryLists\hlOutputDirectorry]
Count=1
Item0=Bin
[HistoryLists\hlBPLOutput]
Count=3
Item0=$(DELPHI)\Bin\
......
......@@ -1888,6 +1888,7 @@ begin
DriverParameterCacheReceiptNumber: pString := BoolToStr(Printer.Parameters.CacheReceiptNumber);
DriverParameterBarLineByteMode: pString := IntToStr(Printer.Parameters.BarLineByteMode);
DriverParameterLogFilePath: pString := Printer.Parameters.LogFilePath;
DriverParameterLogFileName: pString := Logger.FileName;
DriverParameterParam1: pString := Printer.Parameters.Parameter1;
DriverParameterParam2: pString := Printer.Parameters.Parameter2;
......
......@@ -16,6 +16,7 @@ function GetLongFileName(const FileName: WideString): WideString;
function GetSystemPath: WideString;
function CLSIDToFileName(const CLSID: TGUID): WideString;
procedure DeleteFiles(const FileMask: WideString);
procedure GetFileNames(const Mask: WideString; FileNames: TTntStrings);
implementation
......
......@@ -35,25 +35,27 @@ type
procedure LogParam(const ParamName: AnsiString; const ParamValue: Variant);
procedure GetFileNames(const Mask: AnsiString; FileNames: TTntStrings);
function GetSeparator: AnsiString;
function GetMaxCount: Integer;
function GetEnabled: Boolean;
function GetMaxCount: Integer;
function GetFilePath: AnsiString;
function GetDeviceName: AnsiString;
function GetFileName: AnsiString;
function GetSeparator: AnsiString;
function GetDeviceName: AnsiString;
function GetTimeStampEnabled: Boolean;
procedure CloseFile;
procedure CheckFilesMaxCount;
procedure SetEnabled(Value: Boolean);
procedure SetMaxCount(const Value: Integer);
procedure SetFileName(const Value: AnsiString);
procedure SetFilePath(const Value: AnsiString);
procedure SetSeparator(const Value: AnsiString);
procedure SetMaxCount(const Value: Integer);
procedure SetDeviceName(const Value: AnsiString);
function GetTimeStampEnabled: Boolean;
procedure SetTimeStampEnabled(const Value: Boolean);
procedure CloseFile;
procedure CheckFilesMaxCount;
property Enabled: Boolean read GetEnabled write SetEnabled;
property FilePath: AnsiString read GetFilePath write SetFilePath;
property FileName: AnsiString read GetFileName write SetFileName;
property MaxCount: Integer read GetMaxCount write SetMaxCount;
property Separator: AnsiString read GetSeparator write SetSeparator;
property DeviceName: AnsiString read GetDeviceName write SetDeviceName;
......@@ -75,33 +77,36 @@ type
FDeviceName: AnsiString;
FTimeStampEnabled: Boolean;
function GetOpened: Boolean;
function GetEnabled: Boolean;
function GetMaxCount: Integer;
function GetFilePath: AnsiString;
function GetFileName: AnsiString;
function GetSeparator: AnsiString;
function GetDeviceName: AnsiString;
function GetTimeStampEnabled: Boolean;
function GetDefaultFileName: AnsiString;
procedure OpenFile;
procedure CloseFile;
procedure SetDefaults;
procedure CheckFilesMaxCount;
function GetOpened: Boolean;
function GetFileName: AnsiString;
procedure SetEnabled(Value: Boolean);
procedure Write(const Data: AnsiString);
procedure AddLine(const Data: AnsiString);
procedure SetFileName(const Value: AnsiString);
property Opened: Boolean read GetOpened;
class function ParamsToStr(const Params: array of const): AnsiString;
class function VariantToStr(V: Variant): AnsiString;
class function VarArrayToStr(const AVarArray: TVariantArray): AnsiString;
procedure GetFileNames(const Mask: AnsiString; FileNames: TTntStrings);
function GetSeparator: AnsiString;
procedure SetSeparator(const Value: AnsiString);
function GetMaxCount: Integer;
procedure SetMaxCount(const Value: Integer);
function GetEnabled: Boolean;
procedure SetEnabled(Value: Boolean);
function GetFilePath: AnsiString;
procedure SetFilePath(const Value: AnsiString);
function GetDeviceName: AnsiString;
procedure SetFileName(const Value: AnsiString);
procedure SetSeparator(const Value: AnsiString);
procedure SetDeviceName(const Value: AnsiString);
function GetTimeStampEnabled: Boolean;
procedure SetTimeStampEnabled(const Value: Boolean);
procedure GetFileNames(const Mask: AnsiString; FileNames: TTntStrings);
class function VariantToStr(V: Variant): AnsiString;
class function ParamsToStr(const Params: array of const): AnsiString;
class function VarArrayToStr(const AVarArray: TVariantArray): AnsiString;
property Opened: Boolean read GetOpened;
public
constructor Create;
destructor Destroy; override;
......@@ -130,7 +135,7 @@ type
property Enabled: Boolean read GetEnabled write SetEnabled;
property FilePath: AnsiString read GetFilePath write SetFilePath;
property FileName: AnsiString read FFileName write SetFileName;
property FileName: AnsiString read GetFileName write SetFileName;
property MaxCount: Integer read GetMaxCount write SetMaxCount;
property Separator: AnsiString read GetSeparator write SetSeparator;
property DeviceName: AnsiString read GetDeviceName write SetDeviceName;
......@@ -283,12 +288,17 @@ begin
//FLock.Leave;
end;
function TLogFile.GetFileName: AnsiString;
function TLogFile.GetDefaultFileName: AnsiString;
begin
Result := IncludeTrailingBackSlash(FilePath) + DeviceName + '_' +
FormatDateTime('yyyy.mm.dd', Date) + '.log';
end;
function TLogFile.GetFileName: AnsiString;
begin
Result := FFileName;
end;
procedure TLogFile.SetDefaults;
begin
MaxCount := 10;
......
[FiscalPrinter_SHTRIH-M-OPOS-1]
Storage=0
Header=486561646572206C696E6520310D0A486561646572206C696E6520320D0A486561646572206C696E6520330D0A486561646572206C696E6520340D0A486561646572206C696E6520350D0A486561646572206C696E652036
Trailer=547261696C6572206C696E6520310D0A547261696C6572206C696E6520320D0A547261696C6572206C696E6520330D0A547261696C6572206C696E652034
HeaderPrinted=1
LogoSize=0
LogoReloadEnabled=0
LogoCenter=1
IsLogoLoaded=0
LogoFileName=
Department=1
ZeroReceiptNumber=1
ConnectionType=0
RemotePort=7778
RemoteHost=3139322E3136382E3133372E313131
PortNumber=56
BaudRate=115200
SysPassword=30
UsrPassword=1
SubtotalText=535542544F54414C
CloseRecText=
VoidRecText=5245434549505420564F49444544
FontNumber=1
ByteTimeout=1000
MaxRetryCount=3
SearchByPortEnabled=0
SearchByBaudRateEnabled=1
PollIntervalInSeconds=5
DeviceByteTimeout=1000
StatusInterval=100
LogFileEnabled=1
CutType=1
LogoPosition=0
NumHeaderLines=6
NumTrailerLines=4
HeaderFont=1
TrailerFont=1
Encoding=0
BarLinePrintDelay=100
StatusCommand=0
HeaderType=1
CompatLevel=0
ReceiptType=0
ZeroReceiptType=0
CCOType=0
TableEditEnabled=1
XmlZReportEnabled=0
CsvZReportEnabled=0
XmlZReportFileName=C:\projects\OPOSShtrih\bin\ZReport.xml
CsvZReportFileName=C:\projects\OPOSShtrih\bin\ZReport.csv
LogMaxCount=10
VoidReceiptOnMaxItems=0
MaxReceiptItems=100
JournalPrintHeader=1
JournalPrintTrailer=1
CacheReceiptNumber=0
BarLineByteMode=0
PrintRecSubtotal=1
StatusTimeout=60
SetHeaderLineEnabled=1
SetTrailerLineEnabled=1
RFAmountLength=10
RFQuantityLength=10
RFSeparatorLine=1
RFShowTaxLetters=0
MonitoringPort=50000
MonitoringEnabled=0
PropertyUpdateMode=0
ReceiptReportFileName=C:\projects\OPOSShtrih\bin\ZCheckReport.xml
ReceiptReportEnabled=0
ZReceiptBeforeZReport=1
DepartmentInText=0
CenterHeader=0
AmountDecimalPlaces=1
CapRecNearEndSensorMode=0
FPSerial=
LogFilePath=C:\projects\OPOSShtrih\bin\Logs
ReportDateStamp=0
FSBarcodeEnabled=0
FSAddressEnabled=0
FSUpdatePrice=0
BarcodePrefix=BARCODE:
BarcodeHeight=100
BarcodeType=0
BarcodeModuleWidth=2
BarcodeAlignment=0
BarcodeParameter1=0
BarcodeParameter2=0
BarcodeParameter3=0
XReport=0
WrapText=1
WritePaymentNameEnabled=1
TimeUpdateMode=0
ReceiptItemsHeader=2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
ReceiptItemsTrailer=2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
ReceiptItemFormat=253363504F5325202532306C5449544C45252025366C53554D25202A2025365155414E25203D253130544F54414C5F54415825
RecPrintType=0
PrintSingleQuantity=1
TableFilePath=C:\projects\OPOSShtrih\bin\Tables
VatCodeEnabled=0
HandleErrorCode=0
FSServiceEnabled=0
PrinterProtocol=0
PrintUnitName=0
OpenReceiptEnabled=0
QuantityDecimalPlaces=0
PingEnabled=0
DocumentBlockSize=50
PrintRecMessageMode=1
EkmServerHost=80.243.2.202
EkmServerPort=2003
EkmServerTimeout=5
EkmServerEnabled=0
FSMarkCheckEnabled=0
[FiscalPrinter_SHTRIH-M-OPOS-1_PaymentTypes]
0=0
1=1
2=2
3=3
4=4
5=5
6=6
7=7
8=8
9=9
10=10
11=11
12=12
13=13
14=14
15=15
[FiscalPrinter_SHTRIH-M-OPOS-1_VatCodes]
1=3
2=2
4=1
......@@ -143,16 +143,23 @@ ProductVersion=1.13
Comments=http://www.shtrih-m.ru
[Excluded Packages]
C:\Program Files (x86)\Borland\Delphi7\Projects\Bpl\PngComponentsD7.bpl=Png components
[HistoryLists\hlDebugSourcePath]
Count=1
Item0=C:\Components\DUnit\src\
[HistoryLists\hlUnitAliases]
Count=1
Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
[HistoryLists\hlSearchPath]
Count=1
Item0=$(DELPHI)\Lib\Debug
Count=2
Item0=$(DELPHI)\Lib\Debug;C:\COMPON~1\JVCL\jcl\lib\d7\debug;C:\COMPON~1\jcl\lib\d7\debug
Item1=$(DELPHI)\Lib\Debug
[HistoryLists\hlUnitOutputDirectory]
Count=2
Item0=DCU
Item1=..\lib\D7
[HistoryLists\hlOutputDirectorry]
Count=1
Item0=Bin