You've already forked OpenIntegrations
							
							
				mirror of
				https://github.com/Bayselonarrend/OpenIntegrations.git
				synced 2025-10-30 23:47:46 +02:00 
			
		
		
		
	Main build (Jenkins)
This commit is contained in:
		
							
								
								
									
										4
									
								
								.github/workflows/oint_test_full_en.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/oint_test_full_en.yml
									
									
									
									
										vendored
									
									
								
							| @@ -408,6 +408,10 @@ jobs: | ||||
|         if: ${{ cancelled() }} == false | ||||
|         run: oscript /home/runner/.local/share/ovm/current/lib/1testrunner/src/main.os -run ./src/en/OInt/tests/Modules/internal/OPI_TestsCLI.os "CLI_SQLL_CommonMethods" | ||||
|  | ||||
|       - name: ORM | ||||
|         if: ${{ cancelled() }} == false | ||||
|         run: oscript /home/runner/.local/share/ovm/current/lib/1testrunner/src/main.os -run ./src/en/OInt/tests/Modules/internal/OPI_TestsCLI.os "CLI_SQLL_ORM" | ||||
|  | ||||
|       - name: Записать логи | ||||
|         if: ${{ cancelled() }} == false | ||||
|         uses: actions/cache/save@v3 | ||||
|   | ||||
							
								
								
									
										4
									
								
								ci/cli_ostesten
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								ci/cli_ostesten
									
									
									
									
										vendored
									
									
								
							| @@ -247,6 +247,10 @@ pipeline { | ||||
| 					powershell encoding: 'UTF-8', script:'1testrunner -run "./src/en/OInt/tests/Modules/internal/OPI_TestsCLI.os" "CLI_SQLL_CommonMethods"' | ||||
|                } | ||||
|  | ||||
|                catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {    | ||||
| 					powershell encoding: 'UTF-8', script:'1testrunner -run "./src/en/OInt/tests/Modules/internal/OPI_TestsCLI.os" "CLI_SQLL_ORM"' | ||||
|                } | ||||
|  | ||||
| 			} | ||||
| 		} | ||||
|  | ||||
|   | ||||
							
								
								
									
										4
									
								
								ci/ostesten
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								ci/ostesten
									
									
									
									
										vendored
									
									
								
							| @@ -247,6 +247,10 @@ pipeline { | ||||
| 					powershell encoding: 'UTF-8', script:'1testrunner -run "./src/en/OInt/tests/Modules/internal/OPI_Tests.os" "SQLL_CommonMethods"' | ||||
|                } | ||||
|  | ||||
|                catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {    | ||||
| 					powershell encoding: 'UTF-8', script:'1testrunner -run "./src/en/OInt/tests/Modules/internal/OPI_Tests.os" "SQLL_ORM"' | ||||
|                } | ||||
|  | ||||
| 			} | ||||
| 		} | ||||
|  | ||||
|   | ||||
							
								
								
									
										12058
									
								
								service/dictionaries/en.json
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										12058
									
								
								service/dictionaries/en.json
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										167
									
								
								src/en/OInt/tests/Modules/internal/OPI_TestsCLI.os
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										167
									
								
								src/en/OInt/tests/Modules/internal/OPI_TestsCLI.os
									
									
									
									
										vendored
									
									
								
							| @@ -1433,8 +1433,8 @@ Procedure CLI_OzonAPI_UploadingAndUpdatingProducts() Export | ||||
|     OPI_TestDataRetrieval.ParameterToCollection("Picture"       , TestParameters); | ||||
|     OPI_TestDataRetrieval.ParameterToCollection("Picture2"      , TestParameters); | ||||
|  | ||||
|     Message("Ozon product checkout is unavailable"); | ||||
|     Return; | ||||
|     // Message("Ozon product checkout is unavailable"); | ||||
|     // Return; | ||||
|  | ||||
|     // BSLLS:UnreachableCode-off | ||||
|  | ||||
| @@ -2207,6 +2207,40 @@ EndProcedure | ||||
|  | ||||
| #EndRegion | ||||
|  | ||||
| #Region SQLite | ||||
|  | ||||
| Procedure CLI_SQLL_CommonMethods() Export | ||||
|  | ||||
|     TestParameters = New Structure; | ||||
|     OPI_TestDataRetrieval.ParameterToCollection("Picture", TestParameters); | ||||
|  | ||||
|     CLI_SQLite_ExecuteSQLQuery(TestParameters); | ||||
|  | ||||
| EndProcedure | ||||
|  | ||||
| Procedure CLI_SQLL_ORM() Export | ||||
|  | ||||
|     TestParameters = New Structure; | ||||
|  | ||||
|     Base = GetTempFileName("sqlite"); | ||||
|     OPI_TestDataRetrieval.WriteParameter("CDEK_OrderUUID", Base); | ||||
|     OPI_Tools.AddField("SQLite_DB", Base, "String", TestParameters); | ||||
|  | ||||
|     OPI_TestDataRetrieval.ParameterToCollection("Picture", TestParameters); | ||||
|  | ||||
|     CLI_SQLite_CreateTable(TestParameters); | ||||
|  | ||||
|     Try | ||||
|        DeleteFiles(Base); | ||||
|     Except | ||||
|         OPI_TestDataRetrieval.WriteLogCLI(ErrorDescription(), "Database file deletion error", "SQLite"); | ||||
|     EndTry | ||||
|  | ||||
|  | ||||
| EndProcedure | ||||
|  | ||||
| #EndRegion | ||||
|  | ||||
| #EndRegion | ||||
|  | ||||
| #EndRegion | ||||
| @@ -10308,7 +10342,7 @@ Procedure CLI_Ozon_GetClustersList(FunctionParameters) | ||||
|  | ||||
|     Result = OPI_TestDataRetrieval.ExecuteTestCLI("ozon", "GetClustersList", Options); | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLog(Result, "GetClustersList", "Ozon"); | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Result, "GetClustersList", "Ozon"); | ||||
|     OPI_TestDataRetrieval.Check_OzonClusters(Result); | ||||
|  | ||||
| EndProcedure | ||||
| @@ -10326,7 +10360,7 @@ Procedure CLI_Ozon_GetShippingWarehousesList(FunctionParameters) | ||||
|  | ||||
|     Result = OPI_TestDataRetrieval.ExecuteTestCLI("ozon", "GetShippingWarehousesList", Options); | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLog(Result, "GetShippingWarehousesList", "Ozon"); | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Result, "GetShippingWarehousesList", "Ozon"); | ||||
|     OPI_TestDataRetrieval.Check_OzonSearch(Result); | ||||
|  | ||||
| EndProcedure | ||||
| @@ -10349,7 +10383,7 @@ Procedure CLI_Ozon_CreateFBODraft(FunctionParameters) | ||||
|  | ||||
|     Result = OPI_TestDataRetrieval.ExecuteTestCLI("ozon", "CreateFBODraft", Options); | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLog(Result, "CreateFBODraft", "Ozon"); | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Result, "CreateFBODraft", "Ozon"); | ||||
|     OPI_TestDataRetrieval.Check_OzonDraft(Result); | ||||
|  | ||||
|     DraftID = Result["operation_id"]; | ||||
| @@ -10382,7 +10416,7 @@ Procedure CLI_Ozon_GetFBODraft(FunctionParameters) | ||||
|  | ||||
|     // END | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLog(Result, "GetFBODraft", "Ozon"); | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Result, "GetFBODraft", "Ozon"); | ||||
|     OPI_TestDataRetrieval.Check_OzonReadyDraft(Result); | ||||
|  | ||||
| EndProcedure | ||||
| @@ -10394,7 +10428,7 @@ Procedure CLI_Ozon_GetShipmentAdditionalFields(FunctionParameters) | ||||
|  | ||||
|     Result = OPI_TestDataRetrieval.ExecuteTestCLI("ozon", "GetShipmentAdditionalFields", Options); | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLog(Result, "GetShipmentAdditionalFields", "Ozon"); | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Result, "GetShipmentAdditionalFields", "Ozon"); | ||||
|     OPI_TestDataRetrieval.Check_Map(Result); | ||||
|  | ||||
| EndProcedure | ||||
| @@ -10406,7 +10440,7 @@ Procedure CLI_Ozon_GetShipmentsFilterStructure(FunctionParameters) | ||||
|  | ||||
|     Result = OPI_TestDataRetrieval.ExecuteTestCLI("ozon", "GetShipmentsFilterStructure", Options); | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLog(Result, "GetShipmentsFilterStructure", "Ozon"); | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Result, "GetShipmentsFilterStructure", "Ozon"); | ||||
|     OPI_TestDataRetrieval.Check_Map(Result); | ||||
|  | ||||
| EndProcedure | ||||
| @@ -10432,7 +10466,7 @@ Procedure CLI_Ozon_GetFBOShipmentsList(FunctionParameters) | ||||
|  | ||||
|     Result = OPI_TestDataRetrieval.ExecuteTestCLI("ozon", "GetFBOShipmentsList", Options); | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLog(Result, "GetFBOShipmentsList", "Ozon"); | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Result, "GetFBOShipmentsList", "Ozon"); | ||||
|     OPI_TestDataRetrieval.Check_OzonArray(Result); | ||||
|  | ||||
| EndProcedure | ||||
| @@ -10458,7 +10492,7 @@ Procedure CLI_Ozon_GetFBOTimeslots(FunctionParameters) | ||||
|  | ||||
|     Result = OPI_TestDataRetrieval.ExecuteTestCLI("ozon", "GetFBOTimeslots", Options); | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLog(Result, "GetFBOTimeslots", "Ozon"); | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Result, "GetFBOTimeslots", "Ozon"); | ||||
|     OPI_TestDataRetrieval.Check_OzonTimeslots(Result); | ||||
|  | ||||
| EndProcedure | ||||
| @@ -16886,7 +16920,7 @@ Procedure CLI_YandexMetrika_GetActionsList(FunctionParameters) | ||||
|  | ||||
|     Result = OPI_TestDataRetrieval.ExecuteTestCLI("metrika", "GetActionsList", Options); | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLog(Result, "GetActionsList", "YandexMetrika"); | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Result, "GetActionsList", "YandexMetrika"); | ||||
|     OPI_TestDataRetrieval.Check_MetrikaActions(Result); | ||||
|  | ||||
| EndProcedure | ||||
| @@ -18110,13 +18144,122 @@ Procedure CLI_TCP_ProcessRequest(FunctionParameters) Export | ||||
|  | ||||
|     Result = ПолучитьСтрокуИзДвоичныхДанных(Result); | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLog(Result, "ProcessRequest", "TCP"); | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Result, "ProcessRequest", "TCP"); | ||||
|     OPI_TestDataRetrieval.Check_String(StrReplace(Result, Chars.LF, "\n"), Data); | ||||
|  | ||||
| EndProcedure | ||||
|  | ||||
| #EndRegion | ||||
|  | ||||
| #Region SQLite | ||||
|  | ||||
| Procedure CLI_SQLite_ExecuteSQLQuery(FunctionParameters) | ||||
|  | ||||
|     TFN = GetTempFileName("sqlite"); | ||||
|  | ||||
|     PictureFile = GetTempFileName("png"); | ||||
|  | ||||
|     Image = FunctionParameters["Picture"]; | ||||
|     CopyFile(Image, PictureFile); | ||||
|  | ||||
|     Blob = New Structure("blob", PictureFile); | ||||
|  | ||||
|     QueryText = " | ||||
|     |CREATE TABLE test_table ( | ||||
|     |id INTEGER PRIMARY KEY, | ||||
|     |name TEXT, | ||||
|     |age INTEGER, | ||||
|     |salary REAL, | ||||
|     |is_active BOOLEAN, | ||||
|     |created_at DATETIME, | ||||
|     |data BLOB | ||||
|     |);"; | ||||
|  | ||||
|     Options = New Structure; | ||||
|     Options.Insert("sql", StrReplace(QueryText, Chars.LF, "")); | ||||
|     Options.Insert("db" , TFN); | ||||
|  | ||||
|     Result = OPI_TestDataRetrieval.ExecuteTestCLI("sqlite", "ExecuteSQLQuery", Options); | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Result, "ExecuteSQLQuery (Create)", "SQLite"); // SKIP | ||||
|     OPI_TestDataRetrieval.Check_SQLiteSuccess(Result); // SKIP | ||||
|  | ||||
|     // INSERT with parameters | ||||
|  | ||||
|     QueryText = " | ||||
|     |INSERT INTO test_table (name, age, salary, is_active, created_at, data) | ||||
|     |VALUES (?1, ?2, ?3, ?4, ?5, ?6);"; | ||||
|  | ||||
|     ParameterArray = New Array; | ||||
|     ParameterArray.Add("Vitaly"); // TEXT | ||||
|     ParameterArray.Add(25); // INTEGER | ||||
|     ParameterArray.Add(1000.12); // REAL | ||||
|     ParameterArray.Add(True); // BOOL | ||||
|     ParameterArray.Add(OPI_Tools.GetCurrentDate()); // DATETIME | ||||
|     ParameterArray.Add(Blob); // BLOB | ||||
|  | ||||
|     Options = New Structure; | ||||
|     Options.Insert("sql"   , StrReplace(QueryText, Chars.LF, "")); | ||||
|     Options.Insert("params", ParameterArray); | ||||
|     Options.Insert("db"    , TFN); | ||||
|  | ||||
|     Result = OPI_TestDataRetrieval.ExecuteTestCLI("sqlite", "ExecuteSQLQuery", Options); | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Result, "ExecuteSQLQuery (Insert)", "SQLite"); // SKIP | ||||
|     OPI_TestDataRetrieval.Check_SQLiteSuccess(Result); // SKIP | ||||
|  | ||||
|     // SELECT (The result of this query is shown in the Result block) | ||||
|  | ||||
|     QueryText = "SELECT id, name, age, salary, is_active, created_at, data FROM test_table;"; | ||||
|  | ||||
|     Result = OPI_SQLite.ExecuteSQLQuery(QueryText, , , TFN); | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Result, "ExecuteSQLQuery (Select, code)", "SQLite"); | ||||
|     OPI_TestDataRetrieval.Check_SQLiteSuccess(Result); | ||||
|     OPI_TestDataRetrieval.Check_Equality(Base64Value(Result["data"][0]["data"]["blob"]).Size(), Image.Size()); // SKIP | ||||
|  | ||||
|     Try | ||||
|        DeleteFiles(TFN); | ||||
|        DeleteFiles(PictureFile); | ||||
|     Except | ||||
|         OPI_TestDataRetrieval.WriteLogCLI(ErrorDescription(), "Database file deletion error", "SQLite"); | ||||
|     EndTry | ||||
|  | ||||
| EndProcedure | ||||
|  | ||||
| Procedure CLI_SQLite_CreateTable(FunctionParameters) | ||||
|  | ||||
|     Base  = FunctionParameters["SQLite_DB"]; | ||||
|     Table = "test"; | ||||
|  | ||||
|     ColoumnsStruct = New Structure; | ||||
|     ColoumnsStruct.Insert("id"        , "INTEGER PRIMARY KEY"); | ||||
|     ColoumnsStruct.Insert("name"      , "TEXT"); | ||||
|     ColoumnsStruct.Insert("age"       , "INTEGER"); | ||||
|     ColoumnsStruct.Insert("salary"    , "REAL"); | ||||
|     ColoumnsStruct.Insert("is_active" , "BOOLEAN"); | ||||
|     ColoumnsStruct.Insert("created_at", "DATETIME"); | ||||
|     ColoumnsStruct.Insert("data"      , "BLOB"); | ||||
|  | ||||
|     Options = New Structure; | ||||
|     Options.Insert("table", Table); | ||||
|     Options.Insert("cols" , ColoumnsStruct); | ||||
|     Options.Insert("db"   , Base); | ||||
|  | ||||
|     Result = OPI_TestDataRetrieval.ExecuteTestCLI("sqlite", "CreateTable", Options); | ||||
|  | ||||
|     Options.Insert("noex", True); | ||||
|     Text = OPI_TestDataRetrieval.ExecuteTestCLI("sqlite", "CreateTable", Options); | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Text, "CreateTable (query)", "SQLite"); | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Result, "CreateTable", "SQLite"); | ||||
|     OPI_TestDataRetrieval.Check_SQLiteSuccess(Result); | ||||
|  | ||||
| EndProcedure | ||||
|  | ||||
| #EndRegion | ||||
|  | ||||
| #EndRegion | ||||
|  | ||||
| #EndRegion | ||||
|   | ||||
							
								
								
									
										167
									
								
								src/en/OPI/src/CommonModules/OPI_TestsCLI/Module.bsl
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										167
									
								
								src/en/OPI/src/CommonModules/OPI_TestsCLI/Module.bsl
									
									
									
									
										vendored
									
									
								
							| @@ -1433,8 +1433,8 @@ Procedure CLI_OzonAPI_UploadingAndUpdatingProducts() Export | ||||
|     OPI_TestDataRetrieval.ParameterToCollection("Picture"       , TestParameters); | ||||
|     OPI_TestDataRetrieval.ParameterToCollection("Picture2"      , TestParameters); | ||||
|  | ||||
|     Message("Ozon product checkout is unavailable"); | ||||
|     Return; | ||||
|     // Message("Ozon product checkout is unavailable"); | ||||
|     // Return; | ||||
|  | ||||
|     // BSLLS:UnreachableCode-off | ||||
|  | ||||
| @@ -2207,6 +2207,40 @@ EndProcedure | ||||
|  | ||||
| #EndRegion | ||||
|  | ||||
| #Region SQLite | ||||
|  | ||||
| Procedure CLI_SQLL_CommonMethods() Export | ||||
|  | ||||
|     TestParameters = New Structure; | ||||
|     OPI_TestDataRetrieval.ParameterToCollection("Picture", TestParameters); | ||||
|  | ||||
|     CLI_SQLite_ExecuteSQLQuery(TestParameters); | ||||
|  | ||||
| EndProcedure | ||||
|  | ||||
| Procedure CLI_SQLL_ORM() Export | ||||
|  | ||||
|     TestParameters = New Structure; | ||||
|  | ||||
|     Base = GetTempFileName("sqlite"); | ||||
|     OPI_TestDataRetrieval.WriteParameter("CDEK_OrderUUID", Base); | ||||
|     OPI_Tools.AddField("SQLite_DB", Base, "String", TestParameters); | ||||
|  | ||||
|     OPI_TestDataRetrieval.ParameterToCollection("Picture", TestParameters); | ||||
|  | ||||
|     CLI_SQLite_CreateTable(TestParameters); | ||||
|  | ||||
|     Try | ||||
|        DeleteFiles(Base); | ||||
|     Except | ||||
|         OPI_TestDataRetrieval.WriteLogCLI(ErrorDescription(), "Database file deletion error", "SQLite"); | ||||
|     EndTry | ||||
|  | ||||
|  | ||||
| EndProcedure | ||||
|  | ||||
| #EndRegion | ||||
|  | ||||
| #EndRegion | ||||
|  | ||||
| #EndRegion | ||||
| @@ -10308,7 +10342,7 @@ Procedure CLI_Ozon_GetClustersList(FunctionParameters) | ||||
|  | ||||
|     Result = OPI_TestDataRetrieval.ExecuteTestCLI("ozon", "GetClustersList", Options); | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLog(Result, "GetClustersList", "Ozon"); | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Result, "GetClustersList", "Ozon"); | ||||
|     OPI_TestDataRetrieval.Check_OzonClusters(Result); | ||||
|  | ||||
| EndProcedure | ||||
| @@ -10326,7 +10360,7 @@ Procedure CLI_Ozon_GetShippingWarehousesList(FunctionParameters) | ||||
|  | ||||
|     Result = OPI_TestDataRetrieval.ExecuteTestCLI("ozon", "GetShippingWarehousesList", Options); | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLog(Result, "GetShippingWarehousesList", "Ozon"); | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Result, "GetShippingWarehousesList", "Ozon"); | ||||
|     OPI_TestDataRetrieval.Check_OzonSearch(Result); | ||||
|  | ||||
| EndProcedure | ||||
| @@ -10349,7 +10383,7 @@ Procedure CLI_Ozon_CreateFBODraft(FunctionParameters) | ||||
|  | ||||
|     Result = OPI_TestDataRetrieval.ExecuteTestCLI("ozon", "CreateFBODraft", Options); | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLog(Result, "CreateFBODraft", "Ozon"); | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Result, "CreateFBODraft", "Ozon"); | ||||
|     OPI_TestDataRetrieval.Check_OzonDraft(Result); | ||||
|  | ||||
|     DraftID = Result["operation_id"]; | ||||
| @@ -10382,7 +10416,7 @@ Procedure CLI_Ozon_GetFBODraft(FunctionParameters) | ||||
|  | ||||
|     // END | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLog(Result, "GetFBODraft", "Ozon"); | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Result, "GetFBODraft", "Ozon"); | ||||
|     OPI_TestDataRetrieval.Check_OzonReadyDraft(Result); | ||||
|  | ||||
| EndProcedure | ||||
| @@ -10394,7 +10428,7 @@ Procedure CLI_Ozon_GetShipmentAdditionalFields(FunctionParameters) | ||||
|  | ||||
|     Result = OPI_TestDataRetrieval.ExecuteTestCLI("ozon", "GetShipmentAdditionalFields", Options); | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLog(Result, "GetShipmentAdditionalFields", "Ozon"); | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Result, "GetShipmentAdditionalFields", "Ozon"); | ||||
|     OPI_TestDataRetrieval.Check_Map(Result); | ||||
|  | ||||
| EndProcedure | ||||
| @@ -10406,7 +10440,7 @@ Procedure CLI_Ozon_GetShipmentsFilterStructure(FunctionParameters) | ||||
|  | ||||
|     Result = OPI_TestDataRetrieval.ExecuteTestCLI("ozon", "GetShipmentsFilterStructure", Options); | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLog(Result, "GetShipmentsFilterStructure", "Ozon"); | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Result, "GetShipmentsFilterStructure", "Ozon"); | ||||
|     OPI_TestDataRetrieval.Check_Map(Result); | ||||
|  | ||||
| EndProcedure | ||||
| @@ -10432,7 +10466,7 @@ Procedure CLI_Ozon_GetFBOShipmentsList(FunctionParameters) | ||||
|  | ||||
|     Result = OPI_TestDataRetrieval.ExecuteTestCLI("ozon", "GetFBOShipmentsList", Options); | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLog(Result, "GetFBOShipmentsList", "Ozon"); | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Result, "GetFBOShipmentsList", "Ozon"); | ||||
|     OPI_TestDataRetrieval.Check_OzonArray(Result); | ||||
|  | ||||
| EndProcedure | ||||
| @@ -10458,7 +10492,7 @@ Procedure CLI_Ozon_GetFBOTimeslots(FunctionParameters) | ||||
|  | ||||
|     Result = OPI_TestDataRetrieval.ExecuteTestCLI("ozon", "GetFBOTimeslots", Options); | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLog(Result, "GetFBOTimeslots", "Ozon"); | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Result, "GetFBOTimeslots", "Ozon"); | ||||
|     OPI_TestDataRetrieval.Check_OzonTimeslots(Result); | ||||
|  | ||||
| EndProcedure | ||||
| @@ -16886,7 +16920,7 @@ Procedure CLI_YandexMetrika_GetActionsList(FunctionParameters) | ||||
|  | ||||
|     Result = OPI_TestDataRetrieval.ExecuteTestCLI("metrika", "GetActionsList", Options); | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLog(Result, "GetActionsList", "YandexMetrika"); | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Result, "GetActionsList", "YandexMetrika"); | ||||
|     OPI_TestDataRetrieval.Check_MetrikaActions(Result); | ||||
|  | ||||
| EndProcedure | ||||
| @@ -18110,13 +18144,122 @@ Procedure CLI_TCP_ProcessRequest(FunctionParameters) Export | ||||
|  | ||||
|     Result = GetStringFromBinaryData(Result); | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLog(Result, "ProcessRequest", "TCP"); | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Result, "ProcessRequest", "TCP"); | ||||
|     OPI_TestDataRetrieval.Check_String(StrReplace(Result, Chars.LF, "\n"), Data); | ||||
|  | ||||
| EndProcedure | ||||
|  | ||||
| #EndRegion | ||||
|  | ||||
| #Region SQLite | ||||
|  | ||||
| Procedure CLI_SQLite_ExecuteSQLQuery(FunctionParameters) | ||||
|  | ||||
|     TFN = GetTempFileName("sqlite"); | ||||
|  | ||||
|     PictureFile = GetTempFileName("png"); | ||||
|  | ||||
|     Image = FunctionParameters["Picture"]; | ||||
|     FileCopy(Image, PictureFile); | ||||
|  | ||||
|     Blob = New Structure("blob", PictureFile); | ||||
|  | ||||
|     QueryText = " | ||||
|     |CREATE TABLE test_table ( | ||||
|     |id INTEGER PRIMARY KEY, | ||||
|     |name TEXT, | ||||
|     |age INTEGER, | ||||
|     |salary REAL, | ||||
|     |is_active BOOLEAN, | ||||
|     |created_at DATETIME, | ||||
|     |data BLOB | ||||
|     |);"; | ||||
|  | ||||
|     Options = New Structure; | ||||
|     Options.Insert("sql", StrReplace(QueryText, Chars.LF, "")); | ||||
|     Options.Insert("db" , TFN); | ||||
|  | ||||
|     Result = OPI_TestDataRetrieval.ExecuteTestCLI("sqlite", "ExecuteSQLQuery", Options); | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Result, "ExecuteSQLQuery (Create)", "SQLite"); // SKIP | ||||
|     OPI_TestDataRetrieval.Check_SQLiteSuccess(Result); // SKIP | ||||
|  | ||||
|     // INSERT with parameters | ||||
|  | ||||
|     QueryText = " | ||||
|     |INSERT INTO test_table (name, age, salary, is_active, created_at, data) | ||||
|     |VALUES (?1, ?2, ?3, ?4, ?5, ?6);"; | ||||
|  | ||||
|     ParameterArray = New Array; | ||||
|     ParameterArray.Add("Vitaly"); // TEXT | ||||
|     ParameterArray.Add(25); // INTEGER | ||||
|     ParameterArray.Add(1000.12); // REAL | ||||
|     ParameterArray.Add(True); // BOOL | ||||
|     ParameterArray.Add(OPI_Tools.GetCurrentDate()); // DATETIME | ||||
|     ParameterArray.Add(Blob); // BLOB | ||||
|  | ||||
|     Options = New Structure; | ||||
|     Options.Insert("sql"   , StrReplace(QueryText, Chars.LF, "")); | ||||
|     Options.Insert("params", ParameterArray); | ||||
|     Options.Insert("db"    , TFN); | ||||
|  | ||||
|     Result = OPI_TestDataRetrieval.ExecuteTestCLI("sqlite", "ExecuteSQLQuery", Options); | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Result, "ExecuteSQLQuery (Insert)", "SQLite"); // SKIP | ||||
|     OPI_TestDataRetrieval.Check_SQLiteSuccess(Result); // SKIP | ||||
|  | ||||
|     // SELECT (The result of this query is shown in the Result block) | ||||
|  | ||||
|     QueryText = "SELECT id, name, age, salary, is_active, created_at, data FROM test_table;"; | ||||
|  | ||||
|     Result = OPI_SQLite.ExecuteSQLQuery(QueryText, , , TFN); | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Result, "ExecuteSQLQuery (Select, code)", "SQLite"); | ||||
|     OPI_TestDataRetrieval.Check_SQLiteSuccess(Result); | ||||
|     OPI_TestDataRetrieval.Check_Equality(Base64Value(Result["data"][0]["data"]["blob"]).Size(), Image.Size()); // SKIP | ||||
|  | ||||
|     Try | ||||
|        DeleteFiles(TFN); | ||||
|        DeleteFiles(PictureFile); | ||||
|     Except | ||||
|         OPI_TestDataRetrieval.WriteLogCLI(ErrorDescription(), "Database file deletion error", "SQLite"); | ||||
|     EndTry | ||||
|  | ||||
| EndProcedure | ||||
|  | ||||
| Procedure CLI_SQLite_CreateTable(FunctionParameters) | ||||
|  | ||||
|     Base  = FunctionParameters["SQLite_DB"]; | ||||
|     Table = "test"; | ||||
|  | ||||
|     ColoumnsStruct = New Structure; | ||||
|     ColoumnsStruct.Insert("id"        , "INTEGER PRIMARY KEY"); | ||||
|     ColoumnsStruct.Insert("name"      , "TEXT"); | ||||
|     ColoumnsStruct.Insert("age"       , "INTEGER"); | ||||
|     ColoumnsStruct.Insert("salary"    , "REAL"); | ||||
|     ColoumnsStruct.Insert("is_active" , "BOOLEAN"); | ||||
|     ColoumnsStruct.Insert("created_at", "DATETIME"); | ||||
|     ColoumnsStruct.Insert("data"      , "BLOB"); | ||||
|  | ||||
|     Options = New Structure; | ||||
|     Options.Insert("table", Table); | ||||
|     Options.Insert("cols" , ColoumnsStruct); | ||||
|     Options.Insert("db"   , Base); | ||||
|  | ||||
|     Result = OPI_TestDataRetrieval.ExecuteTestCLI("sqlite", "CreateTable", Options); | ||||
|  | ||||
|     Options.Insert("noex", True); | ||||
|     Text = OPI_TestDataRetrieval.ExecuteTestCLI("sqlite", "CreateTable", Options); | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Text, "CreateTable (query)", "SQLite"); | ||||
|  | ||||
|     OPI_TestDataRetrieval.WriteLogCLI(Result, "CreateTable", "SQLite"); | ||||
|     OPI_TestDataRetrieval.Check_SQLiteSuccess(Result); | ||||
|  | ||||
| EndProcedure | ||||
|  | ||||
| #EndRegion | ||||
|  | ||||
| #EndRegion | ||||
|  | ||||
| #EndRegion | ||||
|   | ||||
| @@ -2225,18 +2225,18 @@ | ||||
|     База = ПолучитьИмяВременногоФайла("sqlite"); | ||||
|     OPI_ПолучениеДанныхТестов.ЗаписатьПараметр("CDEK_OrderUUID", База); | ||||
|     OPI_Инструменты.ДобавитьПоле("SQLite_DB", База, "Строка", ПараметрыТеста); | ||||
|      | ||||
| 
 | ||||
|     OPI_ПолучениеДанныхТестов.ПараметрВКоллекцию("Picture", ПараметрыТеста); | ||||
|      | ||||
| 
 | ||||
|     CLI_SQLite_СоздатьТаблицу(ПараметрыТеста); | ||||
|      | ||||
| 
 | ||||
|     Попытка | ||||
|        УдалитьФайлы(База); | ||||
|     Исключение | ||||
|         OPI_ПолучениеДанныхТестов.ЗаписатьЛогCLI(ОписаниеОшибки(), "Ошибка удаления файла базы", "SQLite"); | ||||
|     КонецПопытки | ||||
|      | ||||
|          | ||||
| 
 | ||||
| 
 | ||||
| КонецПроцедуры | ||||
| 
 | ||||
| #КонецОбласти | ||||
| @@ -18158,10 +18158,10 @@ | ||||
|     ИВФ = ПолучитьИмяВременногоФайла("sqlite"); | ||||
| 
 | ||||
|     ФайлКартинки = ПолучитьИмяВременногоФайла("png"); | ||||
|      | ||||
| 
 | ||||
|     Картинка = ПараметрыФункции["Picture"]; | ||||
|     КопироватьФайл(Картинка, ФайлКартинки); | ||||
|      | ||||
| 
 | ||||
|     Блоб = Новый Структура("blob", ФайлКартинки); | ||||
| 
 | ||||
|     ТекстЗапроса = " | ||||
| @@ -18180,7 +18180,7 @@ | ||||
|     Опции.Вставить("db" , ИВФ); | ||||
| 
 | ||||
|     Результат = OPI_ПолучениеДанныхТестов.ВыполнитьТестCLI("sqlite", "ВыполнитьЗапросSQL", Опции); | ||||
|      | ||||
| 
 | ||||
|     OPI_ПолучениеДанныхТестов.ЗаписатьЛогCLI(Результат, "ВыполнитьЗапросSQL (Create)", "SQLite"); // SKIP | ||||
|     OPI_ПолучениеДанныхТестов.Проверка_SQLiteУспех(Результат);                                    // SKIP | ||||
| 
 | ||||
| @@ -18215,7 +18215,7 @@ | ||||
|     Результат = OPI_SQLite.ВыполнитьЗапросSQL(ТекстЗапроса, , , ИВФ); | ||||
| 
 | ||||
|     OPI_ПолучениеДанныхТестов.ЗаписатьЛогCLI(Результат, "ВыполнитьЗапросSQL (Select, код)", "SQLite"); | ||||
|     OPI_ПолучениеДанныхТестов.Проверка_SQLiteУспех(Результат);                                 | ||||
|     OPI_ПолучениеДанныхТестов.Проверка_SQLiteУспех(Результат); | ||||
|     OPI_ПолучениеДанныхТестов.Проверка_Равенство(Base64Значение(Результат["data"][0]["data"]["blob"]).Размер(), Картинка.Размер()); // SKIP | ||||
| 
 | ||||
|     Попытка | ||||
| @@ -18250,7 +18250,7 @@ | ||||
| 
 | ||||
|     Опции.Вставить("noex", Истина); | ||||
|     Текст = OPI_ПолучениеДанныхТестов.ВыполнитьТестCLI("sqlite", "СоздатьТаблицу", Опции); | ||||
|      | ||||
| 
 | ||||
|     OPI_ПолучениеДанныхТестов.ЗаписатьЛогCLI(Текст, "СоздатьТаблицу (запрос)", "SQLite"); | ||||
| 
 | ||||
|     OPI_ПолучениеДанныхТестов.ЗаписатьЛогCLI(Результат, "СоздатьТаблицу", "SQLite"); | ||||
|   | ||||
| @@ -2111,9 +2111,9 @@ | ||||
| КонецФункции | ||||
|  | ||||
| Функция ПолучитьОбщийМодуль(Знач Имя) | ||||
|      | ||||
|  | ||||
|     Модуль = Вычислить(Имя); | ||||
|      | ||||
|  | ||||
|     Возврат Модуль; | ||||
| КонецФункции | ||||
|  | ||||
|   | ||||
| @@ -2225,18 +2225,18 @@ | ||||
|     База = ПолучитьИмяВременногоФайла("sqlite"); | ||||
|     OPI_ПолучениеДанныхТестов.ЗаписатьПараметр("CDEK_OrderUUID", База); | ||||
|     OPI_Инструменты.ДобавитьПоле("SQLite_DB", База, "Строка", ПараметрыТеста); | ||||
|      | ||||
| 
 | ||||
|     OPI_ПолучениеДанныхТестов.ПараметрВКоллекцию("Picture", ПараметрыТеста); | ||||
|      | ||||
| 
 | ||||
|     CLI_SQLite_СоздатьТаблицу(ПараметрыТеста); | ||||
|      | ||||
| 
 | ||||
|     Попытка | ||||
|        УдалитьФайлы(База); | ||||
|     Исключение | ||||
|         OPI_ПолучениеДанныхТестов.ЗаписатьЛогCLI(ОписаниеОшибки(), "Ошибка удаления файла базы", "SQLite"); | ||||
|     КонецПопытки | ||||
|      | ||||
|          | ||||
| 
 | ||||
| 
 | ||||
| КонецПроцедуры | ||||
| 
 | ||||
| #КонецОбласти | ||||
| @@ -18158,10 +18158,10 @@ | ||||
|     ИВФ = ПолучитьИмяВременногоФайла("sqlite"); | ||||
| 
 | ||||
|     ФайлКартинки = ПолучитьИмяВременногоФайла("png"); | ||||
|      | ||||
| 
 | ||||
|     Картинка = ПараметрыФункции["Picture"]; | ||||
|     КопироватьФайл(Картинка, ФайлКартинки); | ||||
|      | ||||
| 
 | ||||
|     Блоб = Новый Структура("blob", ФайлКартинки); | ||||
| 
 | ||||
|     ТекстЗапроса = " | ||||
| @@ -18180,7 +18180,7 @@ | ||||
|     Опции.Вставить("db" , ИВФ); | ||||
| 
 | ||||
|     Результат = OPI_ПолучениеДанныхТестов.ВыполнитьТестCLI("sqlite", "ВыполнитьЗапросSQL", Опции); | ||||
|      | ||||
| 
 | ||||
|     OPI_ПолучениеДанныхТестов.ЗаписатьЛогCLI(Результат, "ВыполнитьЗапросSQL (Create)", "SQLite"); // SKIP | ||||
|     OPI_ПолучениеДанныхТестов.Проверка_SQLiteУспех(Результат);                                    // SKIP | ||||
| 
 | ||||
| @@ -18215,7 +18215,7 @@ | ||||
|     Результат = OPI_SQLite.ВыполнитьЗапросSQL(ТекстЗапроса, , , ИВФ); | ||||
| 
 | ||||
|     OPI_ПолучениеДанныхТестов.ЗаписатьЛогCLI(Результат, "ВыполнитьЗапросSQL (Select, код)", "SQLite"); | ||||
|     OPI_ПолучениеДанныхТестов.Проверка_SQLiteУспех(Результат);                                 | ||||
|     OPI_ПолучениеДанныхТестов.Проверка_SQLiteУспех(Результат); | ||||
|     OPI_ПолучениеДанныхТестов.Проверка_Равенство(Base64Значение(Результат["data"][0]["data"]["blob"]).Размер(), Картинка.Размер()); // SKIP | ||||
| 
 | ||||
|     Попытка | ||||
| @@ -18250,7 +18250,7 @@ | ||||
| 
 | ||||
|     Опции.Вставить("noex", Истина); | ||||
|     Текст = OPI_ПолучениеДанныхТестов.ВыполнитьТестCLI("sqlite", "СоздатьТаблицу", Опции); | ||||
|      | ||||
| 
 | ||||
|     OPI_ПолучениеДанныхТестов.ЗаписатьЛогCLI(Текст, "СоздатьТаблицу (запрос)", "SQLite"); | ||||
| 
 | ||||
|     OPI_ПолучениеДанныхТестов.ЗаписатьЛогCLI(Результат, "СоздатьТаблицу", "SQLite"); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user