Commit 86bbe8f6 authored by kravtsov's avatar kravtsov

[+] Добавлены регрессионные тесты

parent 927aff65
......@@ -4,6 +4,13 @@
Company : SHTRIH-M, Russia, Moscow, Masterkova 4
(495) 787-60-90, www.shtrih-m.ru
*******************************************************************
OposShtrih_1.13_486.exe
20 апреля 2018 17:30
[+] Добавлены регрессионные тесты
*******************************************************************
OposShtrih_1.13_485.exe
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,485
PRODUCTVERSION 1,13,0,485
FILEVERSION 1,13,0,486
PRODUCTVERSION 1,13,0,486
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x4L
......@@ -13,7 +13,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "SHTRIH-M\0"
VALUE "FileDescription", "OPOS setup utility\0"
VALUE "FileVersion", "1.13.0.485\0"
VALUE "FileVersion", "1.13.0.486\0"
VALUE "InternalName", "OPOS setup \0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "OposConfig.exe\0"
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,485
PRODUCTVERSION 1,13,0,485
FILEVERSION 1,13,0,486
PRODUCTVERSION 1,13,0,486
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x4L
......@@ -13,7 +13,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "SHTRIH-M\0"
VALUE "FileDescription", "OPOS test utility\0"
VALUE "FileVersion", "1.13.0.485\0"
VALUE "FileVersion", "1.13.0.486\0"
VALUE "InternalName", "OPOS test\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "OposTest.exe\0"
......
......@@ -7,7 +7,7 @@ uses
DeviceService;
const
GenericServiceVersion = deviceVersion113 + 485;
GenericServiceVersion = deviceVersion113 + 486;
implementation
......
This diff is collapsed.
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,485
PRODUCTVERSION 1,13,0,485
FILEVERSION 1,13,0,486
PRODUCTVERSION 1,13,0,486
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x4L
......@@ -13,7 +13,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "SHTRIH-M\0"
VALUE "FileDescription", "Fiscal printer service\0"
VALUE "FileVersion", "1.13.0.485\0"
VALUE "FileVersion", "1.13.0.486\0"
VALUE "InternalName", "Fiscal printer driver\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "SmFiscalPrinter.dll\0"
......
......@@ -185,7 +185,7 @@ type
function FSReadDocData(var P: TFSReadDocData): Integer;
function FSReadDocument(var P: TFSReadDocument): Integer;
function FSStartOpenDay: Integer;
function IsFiscalPrinter2: Boolean;
function IsMobilePrinter: Boolean;
procedure EkmCheckBarcode(const Barcode: TGS1Barcode);
function CheckItemBarcode(const Barcode: string): Integer;
function LoadBarcodeData(const Barcode: string): Integer;
......@@ -6549,7 +6549,7 @@ begin
end;
// Is fiscal printer firmware 2 (Semenov)
function TFiscalPrinterDevice.IsFiscalPrinter2: Boolean;
function TFiscalPrinterDevice.IsMobilePrinter: Boolean;
begin
Result := GetDeviceMetrics.Model = 19;
end;
......@@ -7638,7 +7638,7 @@ begin
end;
DIO_FPTR_PARAMETER_OFD_ADDRESS:
begin
if IsFiscalPrinter2 then
if IsMobilePrinter then
Result := ReadTableStr(15, 1, 1)
else
Result := ReadTableStr(19, 1, 1);
......@@ -7646,7 +7646,7 @@ begin
DIO_FPTR_PARAMETER_OFD_PORT:
begin
if IsFiscalPrinter2 then
if IsMobilePrinter then
Result := ReadTableStr(15, 1, 2)
else
Result := ReadTableStr(19, 1, 2);
......@@ -7654,7 +7654,7 @@ begin
DIO_FPTR_PARAMETER_OFD_TIMEOUT:
begin
if IsFiscalPrinter2 then
if IsMobilePrinter then
Result := ReadTableStr(15, 1, 3)
else
Result := ReadTableStr(19, 1, 3);
......@@ -7662,7 +7662,7 @@ begin
DIO_FPTR_PARAMETER_RNM:
begin
if IsFiscalPrinter2 then
if IsMobilePrinter then
Result := ReadTableStr(14, 1, 3)
else
Result := ReadTableStr(18, 1, 3);
......@@ -7670,21 +7670,21 @@ begin
DIO_FPTR_PARAMETER_INN:
begin
if IsFiscalPrinter2 then
if IsMobilePrinter then
Result := ReadTableStr(14, 1, 2)
else
Result := ReadTableStr(18, 1, 2);
end;
DIO_FPTR_PARAMETER_TAXSYSTEM:
begin
if IsFiscalPrinter2 then
if IsMobilePrinter then
Result := ReadTableStr(14, 1, 5)
else
Result := ReadTableStr(18, 1, 5);
end;
DIO_FPTR_PARAMETER_WORKMODE:
begin
if IsFiscalPrinter2 then
if IsMobilePrinter then
Result := ReadTableStr(14, 1, 6)
else
Result := ReadTableStr(18, 1, 6);
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,485
PRODUCTVERSION 1,13,0,485
FILEVERSION 1,13,0,486
PRODUCTVERSION 1,13,0,486
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x4L
......@@ -13,7 +13,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "SHTRIH-M\0"
VALUE "FileDescription", "Fiscal printer print server\0"
VALUE "FileVersion", "1.13.0.485\0"
VALUE "FileVersion", "1.13.0.486\0"
VALUE "InternalName", "Fiscal printer driver\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "SmFptrSrv.exe\0"
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,485
PRODUCTVERSION 1,13,0,485
FILEVERSION 1,13,0,486
PRODUCTVERSION 1,13,0,486
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x4L
......@@ -13,7 +13,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "SHTRIH-M\0"
VALUE "FileDescription", "Scale service\0"
VALUE "FileVersion", "1.13.0.485\0"
VALUE "FileVersion", "1.13.0.486\0"
VALUE "InternalName", "Scale driver\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "SmScale.dll\0"
......
This diff is collapsed.
This diff is collapsed.
......@@ -4,42 +4,42 @@ SmFiscalPrinterTest.exe=1
TOposStatisticsTest=1
TduSemaphore=1
TduFiscalPrinter=1
TCommandDefsTest=0
TFiscalPrinterTest=0
TDfmFileTest=0
TWideStringTest=0
TFiscalPrinterDeviceTest=0
TPrinterParametersTest=0
TEscPrinterTest=0
TPrinterEncodingTest=0
TIniFileTest=0
TXmlReceiptWriterTest=0
TCommandDefsTest=1
TFiscalPrinterTest=1
TDfmFileTest=1
TWideStringTest=1
TFiscalPrinterDeviceTest=1
TPrinterParametersTest=1
TEscPrinterTest=1
TPrinterEncodingTest=1
TIniFileTest=1
TXmlReceiptWriterTest=1
TZIntTest=1
TSharedPrinterTest=0
TTlvSenderTest=0
TOFDWriterTest=1
TSysUtilsTest=0
TSysUtilsTest=1
TOFDTest=0
TRosneftSalesReceiptTest=1
TElectronicJournalTest=0
TMalinaCardTest=0
TMalinaFilterTest=0
TTankFilterTest=0
TTankReaderTest=0
TUniposReaderTest=0
TFSSalesReceiptTest=0
TduSerialPort=0
TElectronicJournalTest=1
TMalinaCardTest=1
TMalinaFilterTest=1
TTankFilterTest=1
TTankReaderTest=1
TUniposReaderTest=1
TFSSalesReceiptTest=1
TduSerialPort=1
TStringUtilsTest=0
TRetalixTest=0
TDateTimeTest=0
TDateTimeTest=1
TTemplateItemTest=1
TReceiptTemplateTest=0
TReceiptTemplateTest=1
TResourceStringTest=1
TBitTest=0
TBitTest=1
TICMPClientTest=1
TSocketPortTest=0
TSocketPortTest=1
TLogFileTest=0
TGS1BarcodeTest=0
TGS1BarcodeTest=1
TRegressTests=1
[Tests.SmFiscalPrinterTest.exe.TOposStatisticsTest]
CheckReset=1
......@@ -244,250 +244,250 @@ CheckGetOpenResult=1
CheckPrintRecItemAdjustmentVoid=1
CheckPrintRecItemVoid=1
[Tests.SmFiscalPrinterTest.exe.TCommandDefsTest]
CheckSaveToXml=0
CheckSaveToXml=1
[GUITestRunner Config]
AutoSave=1
Left=246
Top=140
Width=1361
Height=808
Left=188
Top=148
Width=980
Height=658
Maximized=0
UseRegistry=0
ResultsPanel.Height=284
ErrorMessage.Height=200
ResultsPanel.Height=373
ErrorMessage.Height=76
ErrorMessage.Visible=1
FailureList.ColumnWidth[0]=241
FailureList.ColumnWidth[1]=200
FailureList.ColumnWidth[2]=800
FailureList.ColumnWidth[3]=92
FailureList.ColumnWidth[3]=-289
HideTestNodesOnOpen=0
BreakOnFailures=1
SelectTestedNode=1
[Tests.SmFiscalPrinterTest.exe.TFiscalPrinterTest]
CheckCapCompareFirmwareVersion=0
CheckCapPowerReporting=0
CheckCapStatisticsReporting=0
CheckCapUpdateFirmware=0
CheckCapUpdateStatistics=0
CheckCheckHealthText=0
CheckClaimed=0
CheckDataCount=0
CheckDataEventEnabled=0
CheckDeviceEnabled=0
CheckFreezeEvents=0
CheckOutputID=0
CheckPowerNotify=0
CheckPowerState=0
CheckState=0
CheckServiceObjectDescription=0
CheckServiceObjectVersion=0
CheckDeviceDescription=0
CheckDeviceName=0
CheckOpen=0
CheckClose=0
CheckClaim=0
CheckRelease=0
CheckCheckHealth=0
CheckClearInput=0
CheckClearInputProperties=0
CheckClearOutput=0
CheckDirectIO=0
CheckCompareFirmwareVersion=0
CheckResetStatistics=0
CheckRetrieveStatistics=0
CheckUpdateFirmware=0
CheckUpdateStatistics=0
CheckAmountDecimalPlaces=0
CheckAsyncMode=0
CheckCheckTotal=0
CheckCountryCode=0
CheckCoverOpen=0
CheckDayOpened=0
CheckDescriptionLength=0
CheckDuplicateReceipt=0
CheckErrorLevel=0
CheckErrorOutID=0
CheckErrorState=0
CheckErrorStation=0
CheckFlagWhenIdle=0
CheckJrnEmpty=0
CheckJrnNearEnd=0
CheckMessageLength=0
CheckNumHeaderLines=0
CheckNumTrailerLines=0
CheckNumVatRates=0
CheckPrinterState=0
CheckQuantityDecimalPlaces=0
CheckQuantityLength=0
CheckRecEmpty=0
CheckRecNearEnd=0
CheckRemainingFiscalMemory=0
CheckSlpEmpty=0
CheckSlpNearEnd=0
CheckSlipSelection=0
CheckTrainingModeActive=0
CheckActualCurrency=0
CheckContractorId=0
CheckDateType=0
CheckFiscalReceiptStation=0
CheckFiscalReceiptType=0
CheckMessageType=0
CheckTotalizerType=0
CheckCapAdditionalLines=0
CheckCapAmountAdjustment=0
CheckCapAmountNotPaid=0
CheckCapCheckTotal=0
CheckCapCoverSensor=0
CheckCapDoubleWidth=0
CheckCapDuplicateReceipt=0
CheckCapFixedOutput=0
CheckCapHasVatTable=0
CheckCapIndependentHeader=0
CheckCapItemList=0
CheckCapCompareFirmwareVersion=1
CheckCapPowerReporting=1
CheckCapStatisticsReporting=1
CheckCapUpdateFirmware=1
CheckCapUpdateStatistics=1
CheckCheckHealthText=1
CheckClaimed=1
CheckDataCount=1
CheckDataEventEnabled=1
CheckDeviceEnabled=1
CheckFreezeEvents=1
CheckOutputID=1
CheckPowerNotify=1
CheckPowerState=1
CheckState=1
CheckServiceObjectDescription=1
CheckServiceObjectVersion=1
CheckDeviceDescription=1
CheckDeviceName=1
CheckOpen=1
CheckClose=1
CheckClaim=1
CheckRelease=1
CheckCheckHealth=1
CheckClearInput=1
CheckClearInputProperties=1
CheckClearOutput=1
CheckDirectIO=1
CheckCompareFirmwareVersion=1
CheckResetStatistics=1
CheckRetrieveStatistics=1
CheckUpdateFirmware=1
CheckUpdateStatistics=1
CheckAmountDecimalPlaces=1
CheckAsyncMode=1
CheckCheckTotal=1
CheckCountryCode=1
CheckCoverOpen=1
CheckDayOpened=1
CheckDescriptionLength=1
CheckDuplicateReceipt=1
CheckErrorLevel=1
CheckErrorOutID=1
CheckErrorState=1
CheckErrorStation=1
CheckFlagWhenIdle=1
CheckJrnEmpty=1
CheckJrnNearEnd=1
CheckMessageLength=1
CheckNumHeaderLines=1
CheckNumTrailerLines=1
CheckNumVatRates=1
CheckPrinterState=1
CheckQuantityDecimalPlaces=1
CheckQuantityLength=1
CheckRecEmpty=1
CheckRecNearEnd=1
CheckRemainingFiscalMemory=1
CheckSlpEmpty=1
CheckSlpNearEnd=1
CheckSlipSelection=1
CheckTrainingModeActive=1
CheckActualCurrency=1
CheckContractorId=1
CheckDateType=1
CheckFiscalReceiptStation=1
CheckFiscalReceiptType=1
CheckMessageType=1
CheckTotalizerType=1
CheckCapAdditionalLines=1
CheckCapAmountAdjustment=1
CheckCapAmountNotPaid=1
CheckCapCheckTotal=1
CheckCapCoverSensor=1
CheckCapDoubleWidth=1
CheckCapDuplicateReceipt=1
CheckCapFixedOutput=1
CheckCapHasVatTable=1
CheckCapIndependentHeader=1
CheckCapItemList=1
CheckCapJrnEmptySensor=0
CheckCapJrnNearEndSensor=0
CheckCapJrnPresent=0
CheckCapNonFiscalMode=0
CheckCapOrderAdjustmentFirst=0
CheckCapPercentAdjustment=0
CheckCapPositiveAdjustment=0
CheckCapPowerLossReport=0
CheckCapPredefinedPaymentLines=0
CheckCapReceiptNotPaid=0
CheckCapRecEmptySensor=0
CheckCapRecNearEndSensor=0
CheckCapRecPresent=0
CheckCapRemainingFiscalMemory=0
CheckCapReservedWord=0
CheckCapSetHeader=0
CheckCapSetPOSID=0
CheckCapSetStoreFiscalID=0
CheckCapSetTrailer=0
CheckCapSetVatTable=0
CheckCapSlpEmptySensor=0
CheckCapSlpFiscalDocument=0
CheckCapSlpFullSlip=0
CheckCapSlpNearEndSensor=0
CheckCapSlpPresent=0
CheckCapSlpValidation=0
CheckCapSubAmountAdjustment=0
CheckCapSubPercentAdjustment=0
CheckCapSubtotal=0
CheckCapTrainingMode=0
CheckCapValidateJournal=0
CheckCapXReport=0
CheckCapAdditionalHeader=0
CheckCapAdditionalTrailer=0
CheckCapChangeDue=0
CheckCapEmptyReceiptIsVoidable=0
CheckCapFiscalReceiptStation=0
CheckCapFiscalReceiptType=0
CheckCapMultiContractor=0
CheckCapOnlyVoidLastItem=0
CheckCapPackageAdjustment=0
CheckCapPostPreLine=0
CheckCapSetCurrency=0
CheckCapTotalizerType=0
CheckCapPositiveSubtotalAdjustment=0
CheckErrorString=0
CheckPredefinedPaymentLines=0
CheckReservedWord=0
CheckAdditionalHeader=0
CheckAdditionalTrailer=0
CheckChangeDue=0
CheckPostLine=0
CheckPreLine=0
CheckBeginFiscalDocument=0
CheckBeginFiscalReceipt=0
CheckBeginFixedOutput=0
CheckBeginInsertion=0
CheckBeginItemList=0
CheckBeginNonFiscal=0
CheckBeginRemoval=0
CheckBeginTraining=0
CheckClearError=0
CheckEndFiscalDocument=0
CheckEndFiscalReceipt=0
CheckEndFixedOutput=0
CheckEndInsertion=0
CheckEndItemList=0
CheckEndNonFiscal=0
CheckEndRemoval=0
CheckEndTraining=0
CheckGetData=0
CheckGetDate=0
CheckGetTotalizer=0
CheckGetVatEntry=0
CheckPrintDuplicateReceipt=0
CheckPrintFiscalDocumentLine=0
CheckPrintFixedOutput=0
CheckPrintNormal=0
CheckPrintPeriodicTotalsReport=0
CheckPrintPowerLossReport=0
CheckPrintRecItem=0
CheckPrintRecItemAdjustment=0
CheckPrintRecMessage=0
CheckPrintRecNotPaid=0
CheckPrintRecRefund=0
CheckPrintRecSubtotal=0
CheckPrintRecSubtotalAdjustment=0
CheckPrintRecTotal=0
CheckPrintRecVoid=0
CheckPrintRecVoidItem=0
CheckPrintReport=0
CheckPrintXReport=0
CheckPrintZReport=0
CheckResetPrinter=0
CheckSetDate=0
CheckSetHeaderLine=0
CheckSetPOSID=0
CheckSetStoreFiscalID=0
CheckSetTrailerLine=0
CheckSetVatTable=0
CheckSetVatValue=0
CheckVerifyItem=0
CheckPrintRecCash=0
CheckPrintRecItemFuel=0
CheckPrintRecItemFuelVoid=0
CheckPrintRecPackageAdjustment=0
CheckPrintRecPackageAdjustVoid=0
CheckPrintRecRefundVoid=0
CheckPrintRecSubtotalAdjustVoid=0
CheckPrintRecTaxID=0
CheckSetCurrency=0
CheckGetOpenResult=0
CheckPrintRecItemAdjustmentVoid=0
CheckPrintRecItemVoid=0
CheckStornoReceipt=0
SaveTestDevice=0
TestEncoding=0
CheckNonFiscal=0
CheckCapJrnNearEndSensor=1
CheckCapJrnPresent=1
CheckCapNonFiscalMode=1
CheckCapOrderAdjustmentFirst=1
CheckCapPercentAdjustment=1
CheckCapPositiveAdjustment=1
CheckCapPowerLossReport=1
CheckCapPredefinedPaymentLines=1
CheckCapReceiptNotPaid=1
CheckCapRecEmptySensor=1
CheckCapRecNearEndSensor=1
CheckCapRecPresent=1
CheckCapRemainingFiscalMemory=1
CheckCapReservedWord=1
CheckCapSetHeader=1
CheckCapSetPOSID=1
CheckCapSetStoreFiscalID=1
CheckCapSetTrailer=1
CheckCapSetVatTable=1
CheckCapSlpEmptySensor=1
CheckCapSlpFiscalDocument=1
CheckCapSlpFullSlip=1
CheckCapSlpNearEndSensor=1
CheckCapSlpPresent=1
CheckCapSlpValidation=1
CheckCapSubAmountAdjustment=1
CheckCapSubPercentAdjustment=1
CheckCapSubtotal=1
CheckCapTrainingMode=1