From 090e1e658280152c14e9f264e6693fbcd3d4c95d Mon Sep 17 00:00:00 2001
From: kenorb <kenorb@users.noreply.github.com>
Date: Sun, 18 Feb 2024 01:50:30 +0000
Subject: [PATCH] Adds new testing params

---
 .github/workflows/action.yml |  17 +--
 README.md                    | 157 ++++++++---------------
 action.yml                   | 237 +++++++++++++++++++++--------------
 3 files changed, 200 insertions(+), 211 deletions(-)

diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml
index 232283d..2bd7d83 100644
--- a/.github/workflows/action.yml
+++ b/.github/workflows/action.yml
@@ -17,9 +17,7 @@ jobs:
       - name: Run PrintPaths
         uses: ./
         with:
-          OptTrace: ${{ runner.debug }}
-          OptVerbose: true
-          Script: "PrintPaths"
+          Script: PrintPaths
   Experts:
     runs-on: ubuntu-latest
     strategy:
@@ -30,20 +28,13 @@ jobs:
       - name: Run TestBands
         uses: ./
         with:
-          OptTrace: ${{ runner.debug }}
-          OptVerbose: true
-          TestExpert: "TestBands.mq4"
+          TestExpert: TestBands.mq4
       - name: Run TestEnvelopes
         uses: ./
         with:
-          OptTrace: ${{ runner.debug }}
-          OptVerbose: true
-          TestExpert: "TestEnvelopes.mq4"
+          TestExpert: TestEnvelopes.mq4
           TestPeriod: M1
-          RunOnFail: "exit 0"
       - name: Run TestTimeframes
         uses: ./
         with:
-          OptTrace: ${{ runner.debug }}
-          OptVerbose: true
-          TestExpert: "TestTimeframes.mq4"
+          TestExpert: TestTimeframes.mq4
diff --git a/README.md b/README.md
index c2062db..fdc377a 100644
--- a/README.md
+++ b/README.md
@@ -48,86 +48,66 @@ with:
 
 ## Inputs
 
-### Main Inputs
+### Common
 
-#### `Script`
-
-The name of the script to run.
-
-#### `TestExpert`
-
-The name of the Expert Advisor to test.
-
-### Backtest Inputs
-
-#### `BtPair` (string)
-
-Symbol pair to use. Default: *EURUSD*.
+#### `Login`
 
-#### `BtCurrency` (string)
+Account number.
 
-Base currency to use. Default: *USD*.
+#### `Password`
 
-#### `BtDeposit` (int)
+Password to the account.
 
-Deposit amount to use. Default: *10000*.
+### `Server`
 
-#### `BtDigits` (int)
+Trade server.
 
-Specifies number of digits after decimal point
-for the current symbol prices (default: 5).
+### Start Up
 
-#### `BtSpread` (int)
+#### `Expert`
 
-Specifies spread to use in points (e.g. 10).
+The name of the EA file to run.
 
-#### `BtDays` (int/string)
+#### `Period`
 
-Specifies range of days in each month to test (default: 1-31).
+The default timeframe of the chart.
 
-#### `BtMonths` (int/string)
-
-Specifies range of months in each year to test (default: 1).
-
-#### `BtYears` (int/string)
-
-Specifies year or range of years to test (default: 2019).
-
-#### `SetFile` (string)
+#### `Script`
 
-Specifies SET file to use for the test.
+The name of the script file to run.
 
-#### `SetOpts` (string)
+### Tester
 
-Specifies comma-separated custom params to set for EA (e.g. SomeOption=1,AnotherOption=0).
+#### `Optimization`
 
-#### `TestPeriod` (string)
+#### `TestDeposit`
 
-Timeframe to use for the test (default: *M30*).
+Initial deposit to use for testing. MT5 only.
 
-### Test Results
+#### `TestExpert`
 
-#### `BtDest` (string)
+The name of the Expert Advisor file to test.
 
-Specifies directory to copy the results.
+#### `TestFromDate`
 
-Default: */github/workspace* (indicated by github.workspace variable).
+The date to start testing (yyyy.mm.dd).
 
-#### `TestReportName` (string)
+#### `TestExecutionMode`
 
-Specifies the name of the test report file.
+Trading execution mode. Default *0* (normal).
 
-Default: *tester/Report*.
+#### `TestExpertParameters`
 
-### Optimization Inputs
+The name of the SET file with EA parameters.
 
-#### `OptOptimize` (bool)
+#### `TestLeverage`
 
-Runs test in optimization mode.
+Leverage to use for testing/optimization.
 
-#### `BtTestModel` (int)
+#### `TestModel` (int)
 
-Specifies type of backtest data being tested.
+Specifies type of modelling to use.
+Default *1* (1 minute OHLC).
 
 Values:
 
@@ -135,80 +115,47 @@ Values:
 - 1 - Control points
 - 2 - Open prices only
 
-#### `TestLimitOpts` (string)
-
-Specifies EA limit test parameters
-in a sequence of comma-separated values (e.g. *genetic=0,maxdrawdown_enable=1,maxdrawdown=20.00*).
+#### `TestOptimization`
 
-#### `SetParams` (string)
+Specifies testing mode. Default: *0* (backtest).
 
-Specifies parameters to optimize in SET file (`SetFile`)
-in a sequence of comma-separated values.
+#### `TestOptimizationCriterion` (int)
 
-### Run Inputs
+Specifies optimization criterion. MT5 only.
 
-#### `RunOnStart` (string)
+#### `TestPeriod`
 
-Runs command on startup (before the test).
+Timeframe to use for the test.
 
-Default: *clean_sources* (to remove source code files from the platform directory).
+#### `TestReport`
 
-#### `RunOnSet` (string)
-
-Runs command on SET configuration (e.g. `file_get URL`).
-
-#### `RunOnSuccess` (string)
-
-Runs command after successful test.
-
-#### `RunOnError` (string)
-
-Runs command on test error (including warnings).
-
-#### `RunOnExit` (string)
-
-Runs command on exit (after the test).
-
-#### `RunOnFail` (string)
-
-Runs command after test failure.
-
-#### `RunOnWarning` (string)
-
-Runs command on test warnings (excluding errors).
-
-### Result Inputs
-
-#### `OptFormatBrief` (bool)
-
-Converts test report file to brief text format. Default: *false*.
+Specifies the name of the test report file.
 
-#### `OptFormatJson` (bool)
+#### `TestReplaceReport` (bool)
 
-Converts test report file to JSON formatted file. Default: *false*.
+Specifies whether to enable overwriting of the report file.
 
-### Advanced Inputs
+#### `TestScriptParameters`
 
-#### `GitHubApiToken` (string)
+The name of the SET file with script parameters.
 
-Specifies GitHub Personal access token (PAT) to increase API limits.
+#### `TestSpread`
 
-#### `MtDest` (string)
+Specifies spread to use in points (e.g. 10). MT4 only.
 
-Destination path to install MetaTrader platform.
-Default is the working directory (e.g. `/github/workspace`).
+#### `TestSymbol`
 
-#### `MtVersion` (string)
+Symbol pair for the test to use. Default: *EURUSD*.
 
-Version of the MetaTrader platform to install. Default: 4.
+#### `TestToDate`
 
-#### `OptTrace` (bool)
+The date to finish testing (yyyy.mm.dd).
 
-Enables trace mode. It provides extensive debugging messages. Default: *false*.
+### Platform
 
-#### `OptVerbose` (bool)
+#### `Version`
 
-Enables verbose mode. It provides more detailed messages. Default: *false*.
+Version of platform to use. Default: *5*.
 
 <!--
 ## Outputs
diff --git a/action.yml b/action.yml
index 90a9b4c..a2c6997 100644
--- a/action.yml
+++ b/action.yml
@@ -6,88 +6,76 @@ branding:
   color: green
 description: Runs MQL program
 inputs:
-  BtCurrency:
-    description: Base currency to use
-    default: USD
-  BtDeposit:
-    description: Deposit amount to use
+  Currency:
+    default:
+    description: Deposit currency to use.
+  Expert:
+    default:
+    description: The name of the EA file to run.
+  Login:
+    default:
+    description: Account number.
+  Password:
+    default:
+    description: Password to the account.
+  Period:
+    default:
+    description: The default timeframe of the chart.
+  Server:
+    default:
+    description: Trade server.
+  Script:
+    default:
+    description: The name of the script to run.
+  TestDeposit:
+    description: Initial deposit to use for testing.
     default: 10000
-  BtDest:
-    description: Specifies directory to copy the results
-    default: ${{ github.workspace }}
-  BtDigits:
-    description: Specifies number of digits after decimal point
-    default: 5
-  BtPair:
-    description: Symbol pair to use
-    default: EURUSD
-  BtSpread:
-    description: Specifies spread to use in points
-  BtTestModel:
-    description: Specifies type of backtest data being tested
+  TestExecutionMode:
     default: 0
-  BtDays:
-    description: Specifies range of days in each month to test
-    default: 1-31
-  BtMonths:
-    description: Specifies range of months in each year to test
+    description: Trading execution mode.
+  TestFromDate:
+    default:
+    description: The date to start testing (yyyy.mm.dd).
+  TestExpert:
+    default:
+    description: The name of the Expert Advisor file to test.
+  TestExpertParameters:
+    default:
+    description: The name of the SET file with EA parameters.
+  TestLeverage:
+    default:
+    description: Leverage to use for testing/optimization.
+  TestModel:
+    description: Specifies type of modelling to use.
     default: 1
-  BtYears:
-    description: Specifies year or range of years to test
-    default: 2019
-  GitHubApiToken:
-    description: Specifies GitHub PAT to increase API limits.
-    default:
-  MtDest:
-    description: Destination path to install platform
-    default: "${{ github.workspace }}"
-  MtVersion:
-    description: Version of the platform to install
-    default: 4
-  OptFormatBrief:
-    description: Converts report to brief format
-  OptFormatJson:
-    description: Converts report to JSON format
-  OptOptimize:
-    description: Runs test in optimization mode
-  OptTrace:
-    description: Enables trace mode (debug)
-  OptVerbose:
-    description: Enables verbose mode
-  Script:
-    description: The name of the script to run
-  SetFile:
-    description: Specifies SET file to use
-  SetOpts:
-    description: Specifies comma-separated custom params to set for EA
-  SetParams:
-    description: Specifies parameters to optimize
+  TestOptimization:
+    default: 0
+    description: Specifies testing mode.
+  TestOptimizationCriterion:
+    default:
+    description: Specifies optimization criterion.
   TestPeriod:
-    description: Timeframe to use for the test
-    default: M30
-  TestReportName:
+    description: Timeframe to use for the test.
+  TestReport:
+    default:
     description: Specifies the name of the test report file
-    default: tester/Report
-  TestExpert:
-    description: The name of the EA to test
-    # required: true
-  TestLimitOpts:
-    description: Specifies EA limit test parameters
-  RunOnStart:
-    description: Runs command on startup (before the test)
-    default: clean_sources
-  RunOnSet:
-    description: Runs command on SET configuration (before the test)
-  RunOnSuccess:
-    description: Runs command after successful test
-  RunOnError:
-    description: Runs command on test errors (including warnings)
-  RunOnExit:
-    description: Runs command on exit (after the test)
-  RunOnFail:
-    description: Runs command after test failure
-  RunOnWarning:
-    description: Runs command on test warnings (excluding errors)
+  TestReplaceReport:
+    default:
+    description: Specifies whether to enable overwriting of the report file.
+  TestScriptParameters:
+    default:
+    description: The name of the SET file with script parameters.
+  TestSpread:
+    description: Specifies spread to use in points.
+  TestSymbol:
+    default: EURUSD
+    description: Symbol pair to test.
+  TestToDate:
+    default:
+    description: The date to finish testing (yyyy.mm.dd).
+  Version:
+    default: 5
+    description: Version of platform to use.
 name: EA Tester
 
 # outputs:
@@ -109,25 +97,89 @@ runs:
                 ansible.builtin.import_role:
                   name: ea31337.mt_runner
                 vars:
-                  metatrader_version: ${{ inputs.MtVersion }}
+                  metatrader_version: ${{ inputs.Version }}
+                  mt_runner_bt_mt4_config:
+                    AutoConfiguration: false
+                    DataServer: 127.0.0.1:443
+                    EnableDDE: false
+                    EnableNews: false
+                    Expert: ${{ inputs.Expert }}
+                    ExpertParameters: ${{ inputs.TestExpertParameters }}
+                    ExpertsDllConfirm: false
+                    ExpertsDllImport: true
+                    ExpertsEnable: true
+                    ExpertsExpImport: true
+                    ExpertsTrades: true
+                    ExpertsTradesConfirm: false
+                    FTPAccount: 12345
+                    FTPEnable: false
+                    FTPLogin: anonymous
+                    FTPPassiveMode: false
+                    FTPPassword: anonymous
+                    FTPPath: /inetpub
+                    FTPPeriod: 10
+                    FTPServer: ftp.example.com
+                    Login: ${{ inputs.Login }}
+                    Password: ${{ inputs.Password }}
+                    Period: ${{ inputs.Period }}
+                    Profile: default
+                    ProxyEnable: false
+                    ProxyLogin: user45
+                    ProxyPassword: xxx
+                    ProxyServer: example.com:3128
+                    ProxyType: HTTP
+                    Script: ${{ inputs.Script }}
+                    ScriptParameters:
+                    Server: ${{ inputs.Server }}
+                    Symbol: ${{ inputs.TestSymbol }}
+                    Template:  # popular.tpl
+                    TestDateEnable: true
+                    TestExpert: ${{ inputs.TestExpert }}
+                    TestExpertParameters: ${{ inputs.TestExpertParameters }}
+                    TestFromDate: ${{ inputs.TestFromDate }}
+                    TestModel: ${{ inputs.TestModel }}
+                    TestOptimization: ${{ inputs.TestOptimization }}
+                    TestPeriod: ${{ inputs.TestPeriod }}
+                    TestReplaceReport: ${{ inputs.TestReplaceReport }}
+                    TestReport: ${{ inputs.TestReport }}
+                    TestShutdownTerminal: true
+                    TestSpread: 10
+                    TestSymbol: ${{ inputs.TestSymbol }}
+                    TestToDate: ${{ inputs.TestToDate }}
+                    TestVisualEnable: false
                   mt_runner_bt_mt5_config:
                     Common:
-                      Login:
-                      Password:
-                      Server: MetaQuotes-Demo
+                      Login: ${{ inputs.Login }}
+                      Password: ${{ inputs.Password }}
+                      Server: ${{ inputs.Server }}
+                    StartUp:
+                      Expert: ${{ inputs.Expert }}
+                      ExpertParameters: ${{ inputs.TestExpertParameters }}
+                      Period: ${{ inputs.Period }}
+                      Script: ${{ inputs.Script }}
+                      ScriptParameters: ${{ inputs.TestScriptParameters }}
+                      Symbol: ${{ inputs.TestSymbol }}
+                      Template:
                     Tester:
-                      Deposit: 10000
-                      ExecutionMode: 0
-                      Expert: Advisors\Dummy.ex5
-                      FromDate: 2024.01.01
-                      Leverage: 1:500
-                      Login: 12345
-                      Model: 1
-                      Report: report.html
-                      ReplaceReport: 1
+                      Deposit: ${{ inputs.TestDeposit }}
+                      ExecutionMode: ${{ inputs.TestExecutionMode }}
+                      Expert: ${{ inputs.TestExpert }}
+                      ExpertParameters: ${{ inputs.TestExpertParameters }}
+                      ForwardDate:
+                      ForwardMode:
+                      FromDate: ${{ inputs.TestFromDate }}
+                      Leverage: ${{ inputs.TestLeverage }}
+                      Login: ${{ inputs.Login }}
+                      Model: ${{ inputs.TestModel }}
+                      Optimizaton: ${{ inputs.TestOptimization }}
+                      OptimizationCriterion: ${{ inputs.TestOptimizationCriterion }}
+                      Period: ${{ inputs.TestPeriod }}
+                      Report: ${{ inputs.TestReport }}
+                      ReplaceReport: ${{ inputs.TestReplaceReport }}
                       ShutdownTerminal: 1
-                      Symbol: EURUSD
-                      ToDate: 2024.01.11
+                      Symbol: ${{ inputs.TestSymbol }}
+                      ToDate: ${{ inputs.TestToDate }}
+                      Visual: 0
     - name: Runs playbook
       uses: dawidd6/action-ansible-playbook@v2
       with:
@@ -138,7 +190,6 @@ runs:
         directory: ansible
         options: |
           --connection local
-          --extra-vars hello=there
           --inventory localhost,
           --verbose
         playbook: run.yml