refactor: Переработаны скрипты конвертации конфигурации, сокращено количество скриптов, оставшиеся сделаны универсальными по входящим данным.

tests: Поправлены тесты.
2024-11-24 08:33:30 +02:00 · 2023-07-25 14:47:32 +03:00 · 2023-07-25 14:47:32 +03:00 · 62085f8113
commit 62085f8113
parent 318ffbcc6e
31 changed files with 107 additions and 252 deletions
--- a/scripts/conf2cf.cmd
+++ b/scripts/conf2cf.cmd
@ -1,7 +1,7 @@
@ECHO OFF

 rem Convert (load) 1C configuration from 1C:EDT format to 1C configuration file (*.cf)
-rem %1 - path to folder contains configuration files in 1C:EDT format
+rem %1 - path to 1C configuration source (infobase, 1C:Designer XML files or 1C:EDT project)
 rem %2 - path to 1C configuration file (*.cf)
 rem %3 - convertion tool to use:
 rem      ibcmd - ibcmd tool (default)
@ -20,8 +20,8 @@ set IB_PATH=%V8_TEMP%\tmp_db
 set XML_PATH=%V8_TEMP%\tmp_xml
 set WS_PATH=%V8_TEMP%\edt_ws

-set CONFIG_PATH=%1
-IF defined CONFIG_PATH set CONFIG_PATH=%CONFIG_PATH:"=%
+set CONFIG_SOURCE=%1
+IF defined CONFIG_SOURCE set CONFIG_SOURCE=%CONFIG_SOURCE:"=%
 set CONFIG_FILE=%2
 IF defined CONFIG_FILE (
    set CONFIG_FILE=%CONFIG_FILE:"=%
@ -32,8 +32,8 @@ IF defined CONV_TOOL (
    set CONV_TOOL=%CONV_TOOL:"=%
 ) ELSE set CONV_TOOL=ibcmd

-IF not defined CONFIG_PATH (
-    echo Missed parameter 1 "path to folder contains configuration files in 1C:EDT format"
+IF not defined CONFIG_SOURCE (
+    echo Missed parameter 1 "path to 1C configuration source (infobase, 1C:Designer XML files or 1C:EDT project)"
    exit /b 1
 )
 IF not defined CONFIG_FILE (
@ -49,8 +49,33 @@ md "%XML_PATH%"
 md "%WS_PATH%"
 IF not exist "%CONFIG_FILE_PATH%" md "%CONFIG_FILE_PATH%"

-echo Export "%CONFIG_PATH%" to 1C:Designer XML format "%XML_PATH%"...
-call %RING_TOOL% edt workspace export --project "%CONFIG_PATH%" --configuration-files "%XML_PATH%" --workspace-location "%WS_PATH%"
+echo Checking configuration source type...
+
+IF exist "%CONFIG_SOURCE%\DT-INF\" (
+    echo Source type: 1C:EDT project
+    goto export_edt
+)
+IF exist "%CONFIG_SOURCE%\Configuration.xml" (
+    echo Source type: 1C:Designer XML files
+    set XML_PATH=%CONFIG_SOURCE%
+    goto export_xml
+)
+IF exist "%CONFIG_SOURCE%\1cv8.1cd" (
+    echo Source type: Infobase
+    set IB_PATH=%CONFIG_SOURCE%
+    goto export_ib
+)
+
+echo Error cheking type of configuration "%CONFIG_SOURCE%"!
+echo Infobase, 1C:Designer XML files or 1C:EDT project expected.
+exit /b 1
+
+:export_edt
+
+echo Export "%CONFIG_SOURCE%" to 1C:Designer XML format "%XML_PATH%"...
+call %RING_TOOL% edt workspace export --project "%CONFIG_SOURCE%" --configuration-files "%XML_PATH%" --workspace-location "%WS_PATH%"
+
+:export_xml

 IF "%CONV_TOOL%" equ "designer" (
    echo Creating infobase "%IB_PATH%"...
@ -63,6 +88,8 @@ IF "%CONV_TOOL%" equ "designer" (
    %IBCMD_TOOL% infobase create --db-path="%IB_PATH%" --create-database --import="%XML_PATH%"
 )

+:export_ib
+
 echo Export infobase "%IB_PATH%" configuration to "%CONFIG_FILE%"...
 IF "%CONV_TOOL%" equ "designer" (
    %V8_TOOL% DESIGNER /IBConnectionString File=%IB_PATH%; /DisableStartupDialogs /DumpCfg %CONFIG_FILE%
--- a/scripts/conf2edt.cmd
+++ b/scripts/conf2edt.cmd
@ -1,7 +1,7 @@
@ECHO OFF

 rem Convert (dump) 1C configuration file (*.cf) to 1C:EDT format
-rem %1 - path to 1C configuration file (*.cf)
+rem %1 - path to 1C configuration source (1C configuration file (*.cf), infobase or 1C:Designer XML files)
 rem %2 - path to folder to save configuration files in 1C:EDT format
 rem %3 - convertion tool to use:
 rem      ibcmd - ibcmd tool (default)
@ -20,8 +20,8 @@ set IB_PATH=%V8_TEMP%\tmp_db
 set XML_PATH=%V8_TEMP%\tmp_xml
 set WS_PATH=%V8_TEMP%\edt_ws

-set CONFIG_FILE=%1
-IF defined CONFIG_FILE set CONFIG_FILE=%CONFIG_FILE:"=%
+set CONFIG_SOURCE=%1
+IF defined CONFIG_SOURCE set CONFIG_SOURCE=%CONFIG_SOURCE:"=%
 set CONFIG_PATH=%2
 IF defined CONFIG_PATH set CONFIG_PATH=%CONFIG_PATH:"=%
 set CONV_TOOL=%3
@ -29,8 +29,8 @@ IF defined CONV_TOOL (
    set CONV_TOOL=%CONV_TOOL:"=%
 ) ELSE set CONV_TOOL=ibcmd

-IF not defined CONFIG_FILE (
-    echo Missed parameter 1 "path to 1C configuration file"
+IF not defined CONFIG_SOURCE (
+    echo Missed parameter 1 "path to 1C configuration source (1C configuration file (*.cf), infobase or 1C:Designer XML files)"
    exit /b 1
 )
 IF not defined CONFIG_PATH (
@ -47,6 +47,29 @@ md "%WS_PATH%"
 IF exist "%CONFIG_PATH%" rd /S /Q "%CONFIG_PATH%"
 md "%CONFIG_PATH%"

+echo Checking configuration source type...
+
+IF /i "%CONFIG_SOURCE:~-3%" equ ".cf" (
+    echo Source type: Configuration file ^(CF^)
+    goto export_cf
+)
+IF exist "%CONFIG_SOURCE%\1cv8.1cd" (
+    echo Source type: Infobase
+    set IB_PATH=%CONFIG_SOURCE%
+    goto export_ib
+)
+IF exist "%CONFIG_SOURCE%\Configuration.xml" (
+    echo Source type: 1C:Designer XML files
+    set XML_PATH=%CONFIG_SOURCE%
+    goto export_xml
+)
+
+echo Error cheking type of configuration "%CONFIG_SOURCE%"!
+echo Infobase, configuration file (*.cf) or 1C:Designer XML files expected.
+exit /b 1
+
+:export_cf
+
 echo Creating infobase "%IB_PATH%" from file "%CONFIG_FILE%"...
 IF "%CONV_TOOL%" equ "designer" (
    %V8_TOOL% CREATEINFOBASE File="%IB_PATH%"; /DisableStartupDialogs /UseTemplate "%CONFIG_FILE%"
@ -54,6 +77,8 @@ IF "%CONV_TOOL%" equ "designer" (
    %IBCMD_TOOL% infobase create --db-path="%IB_PATH%" --create-database --load="%CONFIG_FILE%"
 )

+:export_ib
+
 echo Export configuration from infobase "%IB_PATH%" to 1C:Designer XML format "%XML_PATH%"...
 IF "%CONV_TOOL%" equ "designer" (
    %V8_TOOL% DESIGNER /IBConnectionString File="%IB_PATH%"; /DisableStartupDialogs /DumpConfigToFiles "%XML_PATH%" -force
@ -61,6 +86,8 @@ IF "%CONV_TOOL%" equ "designer" (
    %IBCMD_TOOL% infobase config export --db-path="%IB_PATH%" "%XML_PATH%" --force
 )

+:export_xml
+
 echo Export configuration from "%XML_PATH%" to 1C:EDT format "%CONFIG_PATH%"...
 call %RING_TOOL% edt workspace import --project "%CONFIG_PATH%" --configuration-files "%XML_PATH%" --workspace-location "%WS_PATH%" --version "%V8_VERSION%"

--- a/scripts/conf2ib.cmd
+++ b/scripts/conf2ib.cmd
@ -40,6 +40,7 @@ md "%IB_PATH%"
 echo Checking configuration source type...

 IF /i "%CONFIG_SOURCE:~-3%" equ ".cf" (
+    echo Source type: Configuration file ^(CF^)
    md "%IB_PATH%"
    echo Creating infobase "%IB_PATH%" from file "%CONFIG_SOURCE%"...
    IF "%CONV_TOOL%" equ "designer" (
@ -50,12 +51,14 @@ IF /i "%CONFIG_SOURCE:~-3%" equ ".cf" (
    goto end
 )
 IF exist "%CONFIG_SOURCE%\DT-INF\" (
+    echo Source type: 1C:EDT project
    echo Export "%CONFIG_SOURCE%" to 1C:Designer XML format "%XML_PATH%"...
    call %RING_TOOL% edt workspace export --project "%CONFIG_SOURCE%" --configuration-files "%XML_PATH%" --workspace-location "%WS_PATH%"
    goto export
 )
 IF exist "%CONFIG_SOURCE%\Configuration.xml" (
-    set XML_PATH=CONFIG_SOURCE
+    echo Source type: 1C:Designer XML files
+    set XML_PATH=%CONFIG_SOURCE%
    goto export
 )

--- a/scripts/conf2xml.cmd
+++ b/scripts/conf2xml.cmd
@ -43,6 +43,7 @@ md "%CONFIG_PATH%"
 echo Checking configuration source type...

 IF /i "%CONFIG_SOURCE:~-3%" equ ".cf" (
+    echo Source type: Configuration file ^(CF^)
    md "%IB_PATH%"
    echo Creating infobase "%IB_PATH%" from file "%CONFIG_SOURCE%"...
    IF "%CONV_TOOL%" equ "designer" (
@ -53,13 +54,14 @@ IF /i "%CONFIG_SOURCE:~-3%" equ ".cf" (
    goto export
 )
 IF exist "%CONFIG_SOURCE%\DT-INF\" (
+    echo Source type: 1C:EDT project
    echo Export "%EDT_PATH%" to 1C:Designer XML format "%CONFIG_PATH%"...
-    set WS_PATH=%V8_TEMP%\edt_ws
    md "%WS_PATH%"
    call %RING_TOOL% edt workspace export --project "%CONFIG_SOURCE%" --configuration-files "%CONFIG_PATH%" --workspace-location "%WS_PATH%"
    goto end
 )
 IF exist "%CONFIG_SOURCE%\1cv8.1cd" (
+    echo Source type: Infobase
    set IB_PATH=%CONFIG_SOURCE%
    goto export
 )
--- a/scripts/ib2cf.cmd
+++ b/scripts/ib2cf.cmd
@ -1,43 +0,0 @@
-@ECHO OFF
-
-rem Save 1C configuration from 1C infobase (file) to 1C configuration file (*.cf)
-rem %1 - path to folder contains 1C infobase
-rem %2 - path to 1C configuration file (*.cf)
-rem %3 - convertion tool to use:
-rem      ibcmd - ibcmd tool (default)
-rem      designer - batch run of 1C:Designer
-
-IF not defined V8_VERSION set V8_VERSION=8.3.20.2290
-
-set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe"
-set IBCMD_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\ibcmd.exe"
-
-set IB_PATH=%1
-IF defined IB_PATH set IB_PATH=%IB_PATH:"=%
-set CONFIG_FILE=%2
-IF defined CONFIG_FILE (
-    set CONFIG_FILE=%CONFIG_FILE:"=%
-    set CONFIG_FILE_PATH=%~dp2
-)
-set CONV_TOOL=%3
-IF defined CONV_TOOL (
-    set CONV_TOOL=%CONV_TOOL:"=%
-) ELSE set CONV_TOOL=ibcmd
-
-IF not defined IB_PATH (
-    echo Missed parameter 1 "path to folder contains 1C infobase"
-    exit /b 1
-)
-IF not defined CONFIG_FILE (
-    echo Missed parameter 2 "path to 1C configuration file (*.cf)"
-    exit /b 1
-)
-
-md "%CONFIG_FILE_PATH%"
-
-echo Export infobase "%IB_PATH%" configuration to "%CONFIG_FILE%"...
-IF "%CONV_TOOL%" equ "designer" (
-    %V8_TOOL% DESIGNER /IBConnectionString File=%IB_PATH%; /DisableStartupDialogs /DumpCfg %CONFIG_FILE%
-) ELSE (
-    %IBCMD_TOOL% infobase config save --db-path="%IB_PATH%" "%CONFIG_FILE%"
-)
--- a/scripts/ib2edt.cmd
+++ b/scripts/ib2edt.cmd
@ -1,59 +0,0 @@
-@ECHO OFF
-
-rem Save 1C configuration from 1C infobase (file) to files in 1C:EDT format
-rem %1 - path to folder contains 1C infobase
-rem %2 - path to 1C configuration files in 1C:EDT format
-rem %3 - convertion tool to use:
-rem      ibcmd - ibcmd tool (default)
-rem      designer - batch run of 1C:Designer
-
-IF not defined V8_VERSION set V8_VERSION=8.3.20.2290
-IF not defined V8_TEMP set V8_TEMP=%TEMP%\1c
-
-set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe"
-set IBCMD_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\ibcmd.exe"
-FOR /F "usebackq tokens=1 delims=" %%i IN (`where ring`) DO (
-    set RING_TOOL="%%i"
-)
-
-set XML_PATH=%V8_TEMP%\tmp_xml
-set WS_PATH=%V8_TEMP%\edt_ws
-
-set IB_PATH=%1
-IF defined IB_PATH set IB_PATH=%IB_PATH:"=%
-set CONFIG_PATH=%2
-IF defined CONFIG_PATH set CONFIG_PATH=%CONFIG_PATH:"=%
-set CONV_TOOL=%3
-IF defined CONV_TOOL (
-    set CONV_TOOL=%CONV_TOOL:"=%
-) ELSE set CONV_TOOL=ibcmd
-
-IF not defined IB_PATH (
-    echo Missed parameter 1 "path to folder contains 1C infobase"
-    exit /b 1
-)
-IF not defined CONFIG_PATH (
-    echo Missed parameter 2 "path to 1C configuration files in 1C:EDT format"
-    exit /b 1
-)
-
-echo Clear temporary files...
-IF exist "%V8_TEMP%" rd /S /Q "%V8_TEMP%"
-md "%V8_TEMP%"
-md "%XML_PATH%"
-md "%WS_PATH%"
-IF exist "%CONFIG_PATH%" rd /S /Q "%CONFIG_PATH%"
-md "%CONFIG_PATH%"
-
-echo Export configuration from infobase "%IB_PATH%" to 1C:Designer XML format "%XML_PATH%"...
-IF "%CONV_TOOL%" equ "designer" (
-    %V8_TOOL% DESIGNER /IBConnectionString File="%IB_PATH%"; /DisableStartupDialogs /DumpConfigToFiles "%XML_PATH%" -force
-) ELSE (
-    %IBCMD_TOOL% infobase config export --db-path="%IB_PATH%" "%XML_PATH%" --force
-)
-
-echo Export configuration from "%XML_PATH%" to 1C:EDT format "%CONFIG_PATH%"...
-call %RING_TOOL% edt workspace import --project "%CONFIG_PATH%" --configuration-files "%XML_PATH%" --workspace-location "%WS_PATH%" --version "%V8_VERSION%"
-
-echo Clear temporary files...
-IF exist "%V8_TEMP%" rd /S /Q "%V8_TEMP%"
--- a/scripts/xml2cf.cmd
+++ b/scripts/xml2cf.cmd
@ -1,63 +0,0 @@
-@ECHO OFF
-
-rem Convert (load) 1C configuration from 1C:Designer XML format to 1C configuration file (*.cf)
-rem %1 - path to folder contains configuration files in 1C:Designer XML format
-rem %2 - path to 1C configuration file (*.cf)
-rem %3 - convertion tool to use:
-rem      ibcmd - ibcmd tool (default)
-rem      designer - batch run of 1C:Designer
-
-IF not defined V8_VERSION set V8_VERSION=8.3.20.2290
-IF not defined V8_TEMP set V8_TEMP=%TEMP%\1c
-
-set V8_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\1cv8.exe"
-set IBCMD_TOOL="C:\Program Files\1cv8\%V8_VERSION%\bin\ibcmd.exe"
-
-set IB_PATH=%V8_TEMP%\tmp_db
-set CONFIG_PATH=%1
-IF defined CONFIG_PATH set CONFIG_PATH=%CONFIG_PATH:"=%
-set CONFIG_FILE=%2
-IF defined CONFIG_FILE (
-    set CONFIG_FILE=%CONFIG_FILE:"=%
-    set CONFIG_FILE_PATH=%~dp2
-)
-set CONV_TOOL=%3
-IF defined CONV_TOOL (
-    set CONV_TOOL=%CONV_TOOL:"=%
-) ELSE set CONV_TOOL=ibcmd
-
-IF not defined CONFIG_PATH (
-    echo Missed parameter 1 "path to folder contains configuration files in 1C:Designer XML format"
-    exit /b 1
-)
-IF not defined CONFIG_FILE (
-    echo Missed parameter 2 "path to 1C configuration file (*.cf)"
-    exit /b 1
-)
-
-echo Clear temporary files...
-IF exist "%V8_TEMP%" rd /S /Q "%V8_TEMP%"
-md "%V8_TEMP%"
-md "%IB_PATH%"
-IF not exist "%CONFIG_FILE_PATH%" md "%CONFIG_FILE_PATH%"
-
-IF "%CONV_TOOL%" equ "designer" (
-    echo Creating infobase "%IB_PATH%"...
-    %V8_TOOL% CREATEINFOBASE File=%IB_PATH%; /DisableStartupDialogs
-
-    echo Loading infobase "%IB_PATH%" configuration from XML-files "%CONFIG_PATH%"...
-    %V8_TOOL% DESIGNER /IBConnectionString File=%IB_PATH%; /DisableStartupDialogs /LoadConfigFromFiles %CONFIG_PATH%
-) ELSE (
-    echo Creating infobase "%IB_PATH%" from XML files "%CONFIG_PATH%"...
-    %IBCMD_TOOL% infobase create --db-path="%IB_PATH%" --create-database --import="%CONFIG_PATH%"
-)
-
-echo Export infobase "%IB_PATH%" configuration to "%CONFIG_FILE%"...
-IF "%CONV_TOOL%" equ "designer" (
-    %V8_TOOL% DESIGNER /IBConnectionString File=%IB_PATH%; /DisableStartupDialogs /DumpCfg %CONFIG_FILE%
-) ELSE (
-    %IBCMD_TOOL% infobase config save --db-path="%IB_PATH%" "%CONFIG_FILE%"
-)
-
-echo Clear temporary files...
-IF exist "%V8_TEMP%" rd /S /Q "%V8_TEMP%"
--- a/scripts/xml2edt.cmd
+++ b/scripts/xml2edt.cmd
@ -1,39 +0,0 @@
-@ECHO OFF
-
-rem Convert 1C configuration from 1C:Designer XML format to 1C:EDT format
-rem %1 - path to folder contains configuration files in 1C:Designer XML format
-rem %2 - path to folder to save configuration files in 1C:EDT format
-
-IF not defined V8_VERSION set V8_VERSION=8.3.20.2290
-IF not defined V8_TEMP set V8_TEMP=%TEMP%\1c
-
-set IB_PATH=%V8_TEMP%\tmp_db
-set WS_PATH=%V8_TEMP%\edt_ws
-
-set CONFIG_PATH=%1
-IF defined CONFIG_PATH set CONFIG_PATH=%CONFIG_PATH:"=%
-set EDT_PATH=%2
-IF defined EDT_PATH set EDT_PATH=%EDT_PATH:"=%
-
-IF not defined CONFIG_PATH (
-    echo Missed parameter 1 "path to folder contains configuration files in 1C:Designer XML format"
-    exit /b 1
-)
-IF not defined EDT_PATH (
-    echo Missed parameter 2 "path to folder to save configuration files in 1C:EDT format"
-    exit /b 1
-)
-
-echo Clear temporary files...
-IF exist "%V8_TEMP%" rd /S /Q "%V8_TEMP%"
-md "%V8_TEMP%"
-md "%IB_PATH%"
-md "%WS_PATH%"
-IF exist "%EDT_PATH%" rd /S /Q "%EDT_PATH%"
-md "%EDT_PATH%"
-
-echo Export "%CONFIG_PATH%" to 1C:EDT format "%EDT_PATH%"...
-call %RING_TOOL% edt workspace import --project "%EDT_PATH%" --configuration-files "%CONFIG_PATH%" --workspace-location "%WS_PATH%" --version "%V8_VERSION%"
-
-echo Clear temporary files...
-IF exist "%V8_TEMP%" rd /S /Q "%V8_TEMP%"
--- a/tests/before/03_test_cf_edt.cmd
+++ b/tests/before/03_test_cf_edt.cmd
@ -8,4 +8,4 @@ echo ===
 echo Prepare %TEST_COUNT%. ^(%~n0^) %TEST_NAME%
 echo ===

-call %SCRIPTS_PATH%\xml2edt.cmd "%TEST_XML_CF%" "%TEST_OUT_PATH%"
+call %SCRIPTS_PATH%\conf2edt.cmd "%TEST_XML_CF%" "%TEST_OUT_PATH%"
--- a/tests/tests/111_cf2xml_i.cmd
+++ b/tests/tests/111_cf2xml_i.cmd
@ -1,6 +1,6 @@
@ECHO OFF

-set TEST_NAME="CF -> XML (ibcmd)"
+set TEST_NAME="Conf CF -> XML (ibcmd)"
 set TEST_OUT_PATH=%OUT_PATH%\%~n0
 set TEST_CHECK_PATH=%TEST_OUT_PATH%\Configuration.xml

--- a/tests/tests/112_cf2xml_d.cmd
+++ b/tests/tests/112_cf2xml_d.cmd
@ -1,6 +1,6 @@
@ECHO OFF

-set TEST_NAME="CF -> XML (designer)"
+set TEST_NAME="Conf CF -> XML (designer)"
 set TEST_OUT_PATH=%OUT_PATH%\%~n0
 set TEST_CHECK_PATH=%TEST_OUT_PATH%\Configuration.xml

--- a/tests/tests/113_cf2ib_i.cmd
+++ b/tests/tests/113_cf2ib_i.cmd
@ -1,6 +1,6 @@
@ECHO OFF

-set TEST_NAME="CF -> infobase (ibcmd)"
+set TEST_NAME="Conf CF -> infobase (ibcmd)"
 set TEST_OUT_PATH=%OUT_PATH%\%~n0
 set TEST_CHECK_PATH=%TEST_OUT_PATH%\1cv8.1cd

--- a/tests/tests/114_cf2ib_d.cmd
+++ b/tests/tests/114_cf2ib_d.cmd
@ -1,6 +1,6 @@
@ECHO OFF

-set TEST_NAME="CF -> infobase (designer)"
+set TEST_NAME="Conf CF -> infobase (designer)"
 set TEST_OUT_PATH=%OUT_PATH%\%~n0
 set TEST_CHECK_PATH=%TEST_OUT_PATH%\1cv8.1cd

--- a/tests/tests/115_cf2edt_i.cmd
+++ b/tests/tests/115_cf2edt_i.cmd
@ -1,10 +1,10 @@
@ECHO OFF

-set TEST_NAME="CF -> EDT (ibcmd)"
+set TEST_NAME="Conf CF -> EDT (ibcmd)"
 set TEST_OUT_PATH=%OUT_PATH%\%~n0
 set TEST_CHECK_PATH=%TEST_OUT_PATH%\src\Configuration\Configuration.mdo

 echo ===
 echo Test %TEST_COUNT%. ^(%~n0^) %TEST_NAME%
 echo ===
-call %SCRIPTS_PATH%\cf2edt.cmd "%TEST_BINARY%\1cv8.cf" "%TEST_OUT_PATH%" ibcmd
+call %SCRIPTS_PATH%\conf2edt.cmd "%TEST_BINARY%\1cv8.cf" "%TEST_OUT_PATH%" ibcmd
--- a/tests/tests/116_cf2edt_d.cmd
+++ b/tests/tests/116_cf2edt_d.cmd
@ -1,10 +1,10 @@
@ECHO OFF

-set TEST_NAME="CF -> EDT (designer)"
+set TEST_NAME="Conf CF -> EDT (designer)"
 set TEST_OUT_PATH=%OUT_PATH%\%~n0
 set TEST_CHECK_PATH=%TEST_OUT_PATH%\src\Configuration\Configuration.mdo

 echo ===
 echo Test %TEST_COUNT%. ^(%~n0^) %TEST_NAME%
 echo ===
-call %SCRIPTS_PATH%\cf2edt.cmd "%TEST_BINARY%\1cv8.cf" "%TEST_OUT_PATH%" designer
+call %SCRIPTS_PATH%\conf2edt.cmd "%TEST_BINARY%\1cv8.cf" "%TEST_OUT_PATH%" designer
--- a/tests/tests/121_xml2cf_i.cmd
+++ b/tests/tests/121_xml2cf_i.cmd
@ -1,10 +1,10 @@
@ECHO OFF

-set TEST_NAME="XML -> CF (ibcmd)"
+set TEST_NAME="Conf XML -> CF (ibcmd)"
 set TEST_OUT_PATH=%OUT_PATH%\%~n0\1cv8.cf
 set TEST_CHECK_PATH=%TEST_OUT_PATH%

 echo ===
 echo Test %TEST_COUNT%. ^(%~n0^) %TEST_NAME%
 echo ===
-call %SCRIPTS_PATH%\xml2cf.cmd "%TEST_XML_CF%" "%TEST_OUT_PATH%" ibcmd
+call %SCRIPTS_PATH%\conf2cf.cmd "%TEST_XML_CF%" "%TEST_OUT_PATH%" ibcmd
--- a/tests/tests/122_xml2cf_d.cmd
+++ b/tests/tests/122_xml2cf_d.cmd
@ -1,10 +1,10 @@
@ECHO OFF

-set TEST_NAME="Test: XML -> CF (designer)"
+set TEST_NAME="Conf XML -> CF (designer)"
 set TEST_OUT_PATH=%OUT_PATH%\%~n0\1cv8.cf
 set TEST_CHECK_PATH=%TEST_OUT_PATH%

 echo ===
 echo Test %TEST_COUNT%. ^(%~n0^) %TEST_NAME%
 echo ===
-call %SCRIPTS_PATH%\xml2cf.cmd "%TEST_XML_CF%" "%TEST_OUT_PATH%" designer
+call %SCRIPTS_PATH%\conf2cf.cmd "%TEST_XML_CF%" "%TEST_OUT_PATH%" designer
--- a/tests/tests/123_xml2ib_i.cmd
+++ b/tests/tests/123_xml2ib_i.cmd
@ -1,6 +1,6 @@
@ECHO OFF

-set TEST_NAME="Test: XML -> infobase (ibcmd)"
+set TEST_NAME="Conf XML -> infobase (ibcmd)"
 set TEST_OUT_PATH=%OUT_PATH%\%~n0
 set TEST_CHECK_PATH=%TEST_OUT_PATH%\1cv8.1cd

--- a/tests/tests/124_xml2ib_d.cmd
+++ b/tests/tests/124_xml2ib_d.cmd
@ -1,6 +1,6 @@
@ECHO OFF

-set TEST_NAME="Test: XML -> infobase (designer)"
+set TEST_NAME="Conf XML -> infobase (designer)"
 set TEST_OUT_PATH=%OUT_PATH%\%~n0
 set TEST_CHECK_PATH=%TEST_OUT_PATH%\1cv8.1cd

--- a/tests/tests/125_xml2edt.cmd
+++ b/tests/tests/125_xml2edt.cmd
@ -1,10 +1,10 @@
@ECHO OFF

-set TEST_NAME="CF -> XML (ibcmd)"
+set TEST_NAME="Conf XML -> EDT"
 set TEST_OUT_PATH=%OUT_PATH%\%~n0
 set TEST_CHECK_PATH=%TEST_OUT_PATH%\src\Configuration\Configuration.mdo

 echo ===
 echo Test %TEST_COUNT%. ^(%~n0^) %TEST_NAME%
 echo ===
-call %SCRIPTS_PATH%\xml2edt.cmd "%TEST_XML_CF%" "%TEST_OUT_PATH%"
+call %SCRIPTS_PATH%\conf2edt.cmd "%TEST_XML_CF%" "%TEST_OUT_PATH%"
--- a/tests/tests/131_xml2cf_i.cmd
+++ b/tests/tests/131_xml2cf_i.cmd
@ -1,10 +1,10 @@
@ECHO OFF

-set TEST_NAME="infobase -> CF (ibcmd)"
+set TEST_NAME="Conf infobase -> CF (ibcmd)"
 set TEST_OUT_PATH=%OUT_PATH%\%~n0\1cv8.cf
 set TEST_CHECK_PATH=%TEST_OUT_PATH%

 echo ===
 echo Test %TEST_COUNT%. ^(%~n0^) %TEST_NAME%
 echo ===
-call %SCRIPTS_PATH%\ib2cf.cmd "%TEST_IB%" "%TEST_OUT_PATH%" ibcmd
+call %SCRIPTS_PATH%\conf2cf.cmd "%TEST_IB%" "%TEST_OUT_PATH%" ibcmd
--- a/tests/tests/132_xml2cf_d.cmd
+++ b/tests/tests/132_xml2cf_d.cmd
@ -1,10 +1,10 @@
@ECHO OFF

-set TEST_NAME="infobase -> CF (designer)"
+set TEST_NAME="Conf infobase -> CF (designer)"
 set TEST_OUT_PATH=%OUT_PATH%\%~n0\1cv8.cf
 set TEST_CHECK_PATH=%TEST_OUT_PATH%

 echo ===
 echo Test %TEST_COUNT%. ^(%~n0^) %TEST_NAME%
 echo ===
-call %SCRIPTS_PATH%\ib2cf.cmd "%TEST_IB%" "%TEST_OUT_PATH%" designer
+call %SCRIPTS_PATH%\conf2cf.cmd "%TEST_IB%" "%TEST_OUT_PATH%" designer
--- a/tests/tests/133_ib2xml_i.cmd
+++ b/tests/tests/133_ib2xml_i.cmd
@ -1,6 +1,6 @@
@ECHO OFF

-set TEST_NAME="infobase -> XML (ibcmd)"
+set TEST_NAME="Conf infobase -> XML (ibcmd)"
 set TEST_OUT_PATH=%OUT_PATH%\%~n0
 set TEST_CHECK_PATH=%TEST_OUT_PATH%\Configuration.xml

--- a/tests/tests/134_ib2xml_d.cmd
+++ b/tests/tests/134_ib2xml_d.cmd
@ -1,6 +1,6 @@
@ECHO OFF

-set TEST_NAME="infobase -> XML (designer)"
+set TEST_NAME="Conf infobase -> XML (designer)"
 set TEST_OUT_PATH=%OUT_PATH%\%~n0
 set TEST_CHECK_PATH=%TEST_OUT_PATH%\Configuration.xml

--- a/tests/tests/135_xml2edt_i.cmd
+++ b/tests/tests/135_xml2edt_i.cmd
@ -1,10 +1,10 @@
@ECHO OFF

-set TEST_NAME="infobase -> EDT (ibcmd)"
+set TEST_NAME="Conf infobase -> EDT (ibcmd)"
 set TEST_OUT_PATH=%OUT_PATH%\%~n0
 set TEST_CHECK_PATH=%TEST_OUT_PATH%\src\Configuration\Configuration.mdo

 echo ===
 echo Test %TEST_COUNT%. ^(%~n0^) %TEST_NAME%
 echo ===
-call %SCRIPTS_PATH%\ib2edt.cmd "%TEST_IB%" "%TEST_OUT_PATH%" ibcmd
+call %SCRIPTS_PATH%\conf2edt.cmd "%TEST_IB%" "%TEST_OUT_PATH%" ibcmd
--- a/tests/tests/136_xml2edt_d.cmd
+++ b/tests/tests/136_xml2edt_d.cmd
@ -1,10 +1,10 @@
@ECHO OFF

-set TEST_NAME="infobase -> EDT (designer)"
+set TEST_NAME="Conf infobase -> EDT (designer)"
 set TEST_OUT_PATH=%OUT_PATH%\%~n0
 set TEST_CHECK_PATH=%TEST_OUT_PATH%\src\Configuration\Configuration.mdo

 echo ===
 echo Test %TEST_COUNT%. ^(%~n0^) %TEST_NAME%
 echo ===
-call %SCRIPTS_PATH%\ib2edt.cmd "%TEST_IB%" "%TEST_OUT_PATH%" designer
+call %SCRIPTS_PATH%\conf2edt.cmd "%TEST_IB%" "%TEST_OUT_PATH%" designer
--- a/tests/tests/141_edt2cf_i.cmd
+++ b/tests/tests/141_edt2cf_i.cmd
@ -1,10 +1,10 @@
@ECHO OFF

-set TEST_NAME="Test: EDT -> CF (ibcmd)"
+set TEST_NAME="Conf EDT -> CF (ibcmd)"
 set TEST_OUT_PATH=%OUT_PATH%\%~n0\1cv8.cf
 set TEST_CHECK_PATH=%TEST_OUT_PATH%

 echo ===
 echo Test %TEST_COUNT%. ^(%~n0^) %TEST_NAME%
 echo ===
-call %SCRIPTS_PATH%\edt2cf.cmd "%TEST_EDT_CF%" "%TEST_OUT_PATH%" ibcmd
+call %SCRIPTS_PATH%\conf2cf.cmd "%TEST_EDT_CF%" "%TEST_OUT_PATH%" ibcmd
--- a/tests/tests/142_edt2cf_d.cmd
+++ b/tests/tests/142_edt2cf_d.cmd
@ -1,10 +1,10 @@
@ECHO OFF

-set TEST_NAME="EDT -> CF (designer)"
+set TEST_NAME="Conf EDT -> CF (designer)"
 set TEST_OUT_PATH=%OUT_PATH%\%~n0\1cv8.cf
 set TEST_CHECK_PATH=%TEST_OUT_PATH%

 echo ===
 echo Test %TEST_COUNT%. ^(%~n0^) %TEST_NAME%
 echo ===
-call %SCRIPTS_PATH%\edt2cf.cmd "%TEST_EDT_CF%" "%TEST_OUT_PATH%" designer
+call %SCRIPTS_PATH%\conf2cf.cmd "%TEST_EDT_CF%" "%TEST_OUT_PATH%" designer
--- a/tests/tests/143_edt2ib_i.cmd
+++ b/tests/tests/143_edt2ib_i.cmd
@ -1,6 +1,6 @@
@ECHO OFF

-set TEST_NAME="EDT -> IB (ibcmd)"
+set TEST_NAME="Conf EDT -> IB (ibcmd)"
 set TEST_OUT_PATH=%OUT_PATH%\%~n0
 set TEST_CHECK_PATH=%TEST_OUT_PATH%\1cv8.1cd

--- a/tests/tests/144_edt2ib_d.cmd
+++ b/tests/tests/144_edt2ib_d.cmd
@ -1,6 +1,6 @@
@ECHO OFF

-set TEST_NAME="EDT -> IB (designer)"
+set TEST_NAME="Conf EDT -> IB (designer)"
 set TEST_OUT_PATH=%OUT_PATH%\%~n0
 set TEST_CHECK_PATH=%TEST_OUT_PATH%\1cv8.1cd

--- a/tests/tests/145_edt2xml.cmd
+++ b/tests/tests/145_edt2xml.cmd
@ -1,6 +1,6 @@
@ECHO OFF

-set TEST_NAME="EDT -> XML"
+set TEST_NAME="Conf EDT -> XML"
 set TEST_OUT_PATH=%OUT_PATH%\%~n0
 set TEST_CHECK_PATH=%TEST_OUT_PATH%\Configuration.xml