From f97105eba0c535fa28062024e51789ccfd6bc3fe Mon Sep 17 00:00:00 2001 From: Vitaly the Alpaca Date: Mon, 3 Jun 2024 11:12:15 +0000 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B5=D0=BE=D0=B1=D1=80=D0=B0?= =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20OPI=20->=20OInt=20?= =?UTF-8?q?(workflow)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OInt/tests/Modules/internal/OPI_Tests.os | 24 ++++++++--------- .../tools/Modules/OPI_TestDataRetrieval.os | 2 +- .../OInt/tools/Modules/OPI_TypeConversion.os | 2 +- .../internal/Modules/OPI_Cryptography.os | 2 +- .../Modules/internal/Modules/OPI_Tools.os | 2 +- .../CommonModules/OPI_Cryptography/Module.bsl | 2 +- .../OPI_TestDataRetrieval/Module.bsl | 2 +- .../src/CommonModules/OPI_Tests/Module.bsl | 26 +++++++++---------- .../src/CommonModules/OPI_Tools/Module.bsl | 2 +- .../OPI_TypeConversion/Module.bsl | 2 +- 10 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/en/OInt/tests/Modules/internal/OPI_Tests.os b/src/en/OInt/tests/Modules/internal/OPI_Tests.os index 60b82647ac..0326077780 100644 --- a/src/en/OInt/tests/Modules/internal/OPI_Tests.os +++ b/src/en/OInt/tests/Modules/internal/OPI_Tests.os @@ -1,4 +1,4 @@ -// +// OneScript: ./OInt/tests/Modules/internal/OPI_Tests.os // MIT License @@ -500,7 +500,7 @@ Procedure VKAPI_CreateAdCampaign() Export Parameters = GetVKParameters(); CabinetID = OPI_TestDataRetrieval.GetParameter("VK_AdsCabinetID"); - Name = ""; + Name = "Test ads"; TypeMatch = Type("Map"); TypeNumber = Type("Number"); Response_ = "response"; @@ -709,16 +709,16 @@ Procedure VKAPI_CreateProductWithProperties() Export TypeNumber = Type("Number"); MII_ = "market_item_id"; Response_ = "response"; - = "Yellow"; - = "Red"; + Yellow_ = "Yellow"; + Red_ = "Red"; Image = OPI_TestDataRetrieval.GetBinary("Picture"); AndVF = GetTempFileName("png"); Image.Write(AndVF); OptionArray = New Array; - OptionArray.Add(); + OptionArray.Add(Yellow_); OptionArray.Add("Blue"); - OptionArray.Add(); + OptionArray.Add(Red_); Result = OPI_VK.CreateProductProperty("Color", Parameters); @@ -772,7 +772,7 @@ Procedure VKAPI_CreateProductWithProperties() Export ImageArray.Add(Image); Product = New Map(); - Product.Insert("Name" , "TestProduct (" + + ")"); + Product.Insert("Name" , "TestProduct (" + Yellow_ + ")"); Product.Insert("Description" , "Product description"); Product.Insert("Category" , "20173"); Product.Insert("Price" , 1); @@ -788,7 +788,7 @@ Procedure VKAPI_CreateProductWithProperties() Export Product.Insert("Weight" , 100); Product.Insert("SKU" , 12345); Product.Insert("AvailableBalance" , "10"); - Product.Insert("PropertyValues" , PropertyMatch[]); + Product.Insert("PropertyValues" , PropertyMatch[Yellow_]); Result = OPI_VK.AddProduct(Product, , Parameters); // Adding product @@ -801,8 +801,8 @@ Procedure VKAPI_CreateProductWithProperties() Export OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch); OPI_TestDataRetrieval.ExpectsThat(Result[Response_][MII_]).ИмеетТип(TypeNumber).Заполнено(); - Product.Insert("Name" , "TestProduct (" + + ")"); - Product.Insert("PropertyValues", PropertyMatch[]); + Product.Insert("Name" , "TestProduct (" + Red_ + ")"); + Product.Insert("PropertyValues", PropertyMatch[Red_]); Result = OPI_VK.AddProduct(Product, , Parameters); // Adding product @@ -1955,10 +1955,10 @@ Procedure GT_CreateTable() Export OPI_TestDataRetrieval.WriteParameter("GS_Spreadsheet", Book); OPI_TestDataRetrieval.WriteParameter("GS_Sheet" , Sheet); - Name = ".)"; + Name = "Test table (new.)"; Result = OPI_GoogleSheets.CreateBook(Token, Name, SheetArray); - OPI_TestDataRetrieval.WriteLog(Result, "CopySheet (add.)"); + OPI_TestDataRetrieval.WriteLog(Result, ".)"); Book2 = Result["spreadsheetId"]; diff --git a/src/en/OInt/tools/Modules/OPI_TestDataRetrieval.os b/src/en/OInt/tools/Modules/OPI_TestDataRetrieval.os index 6cccd9129c..694dc59a25 100644 --- a/src/en/OInt/tools/Modules/OPI_TestDataRetrieval.os +++ b/src/en/OInt/tools/Modules/OPI_TestDataRetrieval.os @@ -1,4 +1,4 @@ -// +// OneScript: ./OInt/tools/Modules/OPI_TestDataRetrieval.os // MIT License diff --git a/src/en/OInt/tools/Modules/OPI_TypeConversion.os b/src/en/OInt/tools/Modules/OPI_TypeConversion.os index 2badcb788e..10ea87668a 100644 --- a/src/en/OInt/tools/Modules/OPI_TypeConversion.os +++ b/src/en/OInt/tools/Modules/OPI_TypeConversion.os @@ -1,4 +1,4 @@ -// +// OneScript: ./OInt/tools/Modules/OPI_TypeConversion.os // MIT License diff --git a/src/en/OInt/tools/Modules/internal/Modules/OPI_Cryptography.os b/src/en/OInt/tools/Modules/internal/Modules/OPI_Cryptography.os index f62770cc15..27e9946f98 100644 --- a/src/en/OInt/tools/Modules/internal/Modules/OPI_Cryptography.os +++ b/src/en/OInt/tools/Modules/internal/Modules/OPI_Cryptography.os @@ -1,4 +1,4 @@ -// +// OneScript: ./OInt/tools/Modules/internal/Modules/OPI_Cryptography.os // MIT License diff --git a/src/en/OInt/tools/Modules/internal/Modules/OPI_Tools.os b/src/en/OInt/tools/Modules/internal/Modules/OPI_Tools.os index afe8c74fc8..c092c18289 100644 --- a/src/en/OInt/tools/Modules/internal/Modules/OPI_Tools.os +++ b/src/en/OInt/tools/Modules/internal/Modules/OPI_Tools.os @@ -1,4 +1,4 @@ -// +// OneScript: ./OInt/tools/Modules/internal/Modules/OPI_Tools.os // MIT License diff --git a/src/en/OPI/src/CommonModules/OPI_Cryptography/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Cryptography/Module.bsl index aac7e79934..d25802708c 100644 --- a/src/en/OPI/src/CommonModules/OPI_Cryptography/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_Cryptography/Module.bsl @@ -1,4 +1,4 @@ -// +// OneScript: ./OInt/tools/Modules/internal/Modules/OPI_Cryptography.os // MIT License diff --git a/src/en/OPI/src/CommonModules/OPI_TestDataRetrieval/Module.bsl b/src/en/OPI/src/CommonModules/OPI_TestDataRetrieval/Module.bsl index 7b18db317b..676da723a0 100644 --- a/src/en/OPI/src/CommonModules/OPI_TestDataRetrieval/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_TestDataRetrieval/Module.bsl @@ -1,4 +1,4 @@ -// +// OneScript: ./OInt/tools/Modules/OPI_TestDataRetrieval.os // MIT License diff --git a/src/en/OPI/src/CommonModules/OPI_Tests/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Tests/Module.bsl index 9de7c66b12..45a267bb32 100644 --- a/src/en/OPI/src/CommonModules/OPI_Tests/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_Tests/Module.bsl @@ -1,4 +1,4 @@ -// +// OneScript: ./OInt/tests/Modules/internal/OPI_Tests.os // MIT License @@ -500,7 +500,7 @@ Procedure VKAPI_CreateAdCampaign() Export Parameters = GetVKParameters(); CabinetID = OPI_TestDataRetrieval.GetParameter("VK_AdsCabinetID"); - Name = ""; + Name = "Test ads"; TypeMatch = Type("Map"); TypeNumber = Type("Number"); Response_ = "response"; @@ -709,16 +709,16 @@ Procedure VKAPI_CreateProductWithProperties() Export TypeNumber = Type("Number"); MII_ = "market_item_id"; Response_ = "response"; - = "Yellow"; - = "Red"; + Yellow_ = "Yellow"; + Red_ = "Red"; Image = OPI_TestDataRetrieval.GetBinary("Picture"); AndVF = GetTempFileName("png"); Image.Write(AndVF); OptionArray = New Array; - OptionArray.Add(); + OptionArray.Add(Yellow_); OptionArray.Add("Blue"); - OptionArray.Add(); + OptionArray.Add(Red_); Result = OPI_VK.CreateProductProperty("Color", Parameters); @@ -772,7 +772,7 @@ Procedure VKAPI_CreateProductWithProperties() Export ImageArray.Add(Image); Product = New Map(); - Product.Insert("Name" , "TestProduct (" + + ")"); + Product.Insert("Name" , "TestProduct (" + Yellow_ + ")"); Product.Insert("Description" , "Product description"); Product.Insert("Category" , "20173"); Product.Insert("Price" , 1); @@ -788,7 +788,7 @@ Procedure VKAPI_CreateProductWithProperties() Export Product.Insert("Weight" , 100); Product.Insert("SKU" , 12345); Product.Insert("AvailableBalance" , "10"); - Product.Insert("PropertyValues" , PropertyMatch[]); + Product.Insert("PropertyValues" , PropertyMatch[Yellow_]); Result = OPI_VK.AddProduct(Product, , Parameters); // Adding product @@ -801,8 +801,8 @@ Procedure VKAPI_CreateProductWithProperties() Export OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch); OPI_TestDataRetrieval.ExpectsThat(Result[Response_][MII_]).ИмеетТип(TypeNumber).Заполнено(); - Product.Insert("Name" , "TestProduct (" + + ")"); - Product.Insert("PropertyValues", PropertyMatch[]); + Product.Insert("Name" , "TestProduct (" + Red_ + ")"); + Product.Insert("PropertyValues", PropertyMatch[Red_]); Result = OPI_VK.AddProduct(Product, , Parameters); // Adding product @@ -1173,7 +1173,7 @@ Procedure YDisk_MoveObject() Export Result = OPI_YandexDisk.UploadFileByURL(Token, OriginalPath, URL); - // "); + // !OInt OPI_TestDataRetrieval.WriteLog(Result, "UploadFileByURL"); OPI_Tools.Pause(15); @@ -1955,10 +1955,10 @@ Procedure GT_CreateTable() Export OPI_TestDataRetrieval.WriteParameter("GS_Spreadsheet", Book); OPI_TestDataRetrieval.WriteParameter("GS_Sheet" , Sheet); - Name = ".)"; + Name = "Test table (new.)"; Result = OPI_GoogleSheets.CreateBook(Token, Name, SheetArray); - // .)"); + // !OInt OPI_TestDataRetrieval.WriteLog(Result, "CopySheet (new.)"); Book2 = Result["spreadsheetId"]; diff --git a/src/en/OPI/src/CommonModules/OPI_Tools/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Tools/Module.bsl index 8f7c38df53..93a06b7696 100644 --- a/src/en/OPI/src/CommonModules/OPI_Tools/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_Tools/Module.bsl @@ -1,4 +1,4 @@ -// +// OneScript: ./OInt/tools/Modules/internal/Modules/OPI_Tools.os // MIT License diff --git a/src/en/OPI/src/CommonModules/OPI_TypeConversion/Module.bsl b/src/en/OPI/src/CommonModules/OPI_TypeConversion/Module.bsl index 53b046aa37..2134fdbec4 100644 --- a/src/en/OPI/src/CommonModules/OPI_TypeConversion/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_TypeConversion/Module.bsl @@ -1,4 +1,4 @@ -// +// OneScript: ./OInt/tools/Modules/OPI_TypeConversion.os // MIT License