tests - reorg; base-tests, etc..

CONTRIBUTING.md

@@ -1072,7 +1072,7 @@ node run-tests --python-async kraken # test Kraken with Python async test, requi
 Follow this steps to add a test:
 
 - Create a file in [ts/tests/Exchange](ts/test/Exchange/) following syntax that can be transpiled.
-- Add test to `runPrivateTests` or `runPublicTests` to [ts/src/test/test.ts](ts/src/test/test.ts#L354) or for ccxt.pro endpoints to [ts/src/pro/test/test.ts](ts/src/pro/test/test.ts#L121)
+- Add test to `runPrivateTests` or `runPublicTests` to [ts/src/test/tests.ts](ts/src/test/tests.ts#L354) or for ccxt.pro endpoints to [ts/src/pro/test/tests.ts](ts/src/pro/test/tests.ts#L121)
 - run `npm run transpile` to generate the test file in javascript, python and php.
 - Call tests `node run-tests`
 

build.sh

@@ -34,14 +34,14 @@ function run_tests {
   if [ -z "$rest_pid" ]; then
     if [ -z "$rest_args" ] || { [ -n "$rest_args" ] && [ "$rest_args" != "skip" ]; }; then
       # shellcheck disable=SC2086
-      node run-tests --js --python-async --php-async --csharp --useProxy $rest_args &
+      npm run live-tests -- --js --python-async --php-async --csharp $rest_args &
       local rest_pid=$!
     fi
   fi
   if [ -z "$ws_pid" ]; then
     if [ -z "$ws_args" ] || { [ -n "$ws_args" ] && [ "$ws_args" != "skip" ]; }; then
       # shellcheck disable=SC2086
-      node run-tests --ws --js --python-async --php-async --csharp --useProxy $ws_args &
+      npm run live-tests -- --js --python-async --php-async --csharp --ws $ws_args &
       local ws_pid=$!
     fi
   fi
@@ -80,9 +80,12 @@ build_and_test_all () {
       #   cd  ..
       # fi
     fi
-    npm run test-base
+    npm run test-base-rest
     npm run test-base-ws
-    node ./utils/test-commonjs.cjs
+    npm run id-tests
+    npm run request-tests
+    npm run response-tests
+    npm run commonjs-test
     npm run package-test
     npm run test-freshness
     if [ "$IS_TRAVIS" = "TRUE" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
@@ -197,7 +200,7 @@ npm run buildCS
 
 # run base tests (base js,py,php, brokerId )
 # npm run test-base
-npm run test-js-base && npm run test-python-base && npm run test-php-base && npm run id-tests
+npm run test-base-rest && npm run test-base-ws && npm run id-tests
 
 # rest_args=${REST_EXCHANGES[*]} || "skip"
 rest_args=$(IFS=" " ; echo "${REST_EXCHANGES[*]}") || "skip"
@@ -209,15 +212,15 @@ ws_args=$(IFS=" " ; echo "${WS_EXCHANGES[*]}") || "skip"
 for exchange in "${REST_EXCHANGES[@]}"; do
   npm run request-js -- $exchange
   npm run request-py -- $exchange
-  php php/test/test_async.php $exchange --requestTests
+  npm run request-php -- $exchange
   npm run request-cs -- $exchange
 done
 
 #response static tests
 for exchange in "${REST_EXCHANGES[@]}"; do
   npm run response-js -- $exchange
   npm run response-py -- $exchange
-  php php/test/test_async.php $exchange --responseTests
+  npm run response-php -- $exchange
   npm run response-cs -- $exchange
 done
 

build/csharpTranspiler.ts

@@ -3,7 +3,7 @@ import ts from "typescript";
 import path from 'path'
 import errors from "../js/src/base/errors.js"
 import { basename, join, resolve } from 'path'
-import { createFolderRecursively, replaceInFile, overwriteFile } from './fsLocal.js'
+import { createFolderRecursively, replaceInFile, overwriteFile, writeFile, checkCreateFolder } from './fsLocal.js'
 import { platform } from 'process'
 import fs from 'fs'
 import log from 'ololog'
@@ -23,6 +23,14 @@ const exchangeIds = exchanges.ids
 
 let __dirname = new URL('.', import.meta.url).pathname;
 
+function overwriteFileAndFolder (path, content) {
+    if (!(fs.existsSync(path))) {
+        checkCreateFolder (path);
+    }
+    overwriteFile (path, content);
+    writeFile (path, content);
+}
+
 // this is necessary because for some reason
 // pathname keeps the first '/' for windows paths
 // making them invalid
@@ -620,7 +628,7 @@ class NewTranspiler {
         ].join('\n')
         log.magenta ('→', (path as any).yellow)
 
-        overwriteFile (path, file);
+        overwriteFileAndFolder (path, file);
     }
 
     transpileErrorHierarchy () {
@@ -686,7 +694,7 @@ class NewTranspiler {
             log.bright.cyan (message, (ERRORS_FILE as any).yellow)
             // const csharpRegex = /(?<=public partial class Exchange\n{)((.|\n)+)(?=})/g
             // replaceInFile (ERRORS_FILE, csharpRegex, csharpBodyIntellisense)
-            overwriteFile (ERRORS_FILE, csharpBodyIntellisense)
+            overwriteFileAndFolder (ERRORS_FILE, csharpBodyIntellisense)
         }
 
         log.bright.cyan (message, (ERRORS_FILE as any).yellow)
@@ -795,7 +803,7 @@ class NewTranspiler {
                     '}'
                 ].join('\n');
 
-                overwriteFile (EXAMPLES_OUTPUT_FOLDER + fileName + '.cs', finalFile);
+                overwriteFileAndFolder (EXAMPLES_OUTPUT_FOLDER + fileName + '.cs', finalFile);
             }
         }
     }
@@ -983,13 +991,13 @@ class NewTranspiler {
         const csharp  = this.createCSharpClass (csharpResult, ws)
 
         if (csharpFolder) {
-            overwriteFile (csharpFolder + csharpFilename, csharp)
+            overwriteFileAndFolder (csharpFolder + csharpFilename, csharp)
             // fs.utimesSync (csharpFolder + csharpFilename, new Date (), new Date (tsMtime))
         }
     }
 
     // ---------------------------------------------------------------------------------------------
-    transpileOrderbookTestsToCSharp (outDir: string) {
+    transpileWsOrderbookTestsToCSharp (outDir: string) {
 
         const jsFile = './ts/src/pro/test/base/test.OrderBook.ts';
         const csharpFile = `${outDir}/Orderbook.cs`;
@@ -1019,20 +1027,17 @@ class NewTranspiler {
             this.createGeneratedHeader().join('\n'),
             'public partial class BaseTest',
             '{',
-            '    public void OrderBookTests()',
-            '    {',
             contentIdented,
-            '    }',
             '}',
         ].join('\n')
 
         log.magenta ('→', (csharpFile as any).yellow)
 
-        overwriteFile (csharpFile, file);
+        overwriteFileAndFolder (csharpFile, file);
     }
 
     // ---------------------------------------------------------------------------------------------
-    transpileCacheTestsToCSharp (outDir: string) {
+    transpileWsCacheTestsToCSharp (outDir: string) {
 
         const jsFile = './ts/src/pro/test/base/test.Cache.ts';
         const csharpFile = `${outDir}/Cache.cs`;
@@ -1062,60 +1067,21 @@ class NewTranspiler {
             this.createGeneratedHeader().join('\n'),
             'public partial class BaseTest',
             '{',
-            '    public void CacheTests()',
-            '    {',
             contentIdented,
-            '    }',
             '}',
         ].join('\n')
 
         log.magenta ('→', (csharpFile as any).yellow)
 
-        overwriteFile (csharpFile, file);
+        overwriteFileAndFolder (csharpFile, file);
     }
 
     // ---------------------------------------------------------------------------------------------
 
-    transpilePrecisionTestsToCSharp (outDir: string) {
-
-        const jsFile = './ts/src/test/base/functions/test.number.ts';
-        const csharpFile = `${outDir}/Precision.cs`;
-
-        log.magenta ('Transpiling from', (jsFile as any).yellow)
-
-        const csharp = this.transpiler.transpileCSharpByPath(jsFile);
-        let content = csharp.content;
-        content = this.regexAll (content, [
-            [ /object  = functions;/g, '' ], // tmp fix
-            [/assert/g, 'Assert'],
-        ]).trim ()
-
-        const contentLines = content.split ('\n');
-        const contentIdented = contentLines.map (line => '        ' + line).join ('\n');
-
-        const file = [
-            'using ccxt;',
-            'namespace Tests;',
-            '',
-            this.createGeneratedHeader().join('\n'),
-            'public partial class BaseTest',
-            '{',
-            '    public void PrecisionTests()',
-            '    {',
-            contentIdented,
-            '    }',
-            '}',
-        ].join('\n')
-
-        log.magenta ('→', (csharpFile as any).yellow)
-
-        overwriteFile (csharpFile, file);
-    }
-
     transpileCryptoTestsToCSharp (outDir: string) {
 
-        const jsFile = './ts/src/test/base/functions/test.crypto.ts';
-        const csharpFile = `${outDir}/Crypto.cs`;
+        const jsFile = './ts/src/test/base/test.cryptography.ts';
+        const csharpFile = `${outDir}/Cryptography.cs`;
 
         log.magenta ('[csharp] Transpiling from', (jsFile as any).yellow)
 
@@ -1138,16 +1104,13 @@ class NewTranspiler {
             this.createGeneratedHeader().join('\n'),
             'public partial class BaseTest',
             '{',
-            '    public void CryptoTests()',
-            '    {',
             contentIdented,
-            '    }',
             '}',
         ].join('\n')
 
         log.magenta ('→', (csharpFile as any).yellow)
 
-        overwriteFile (csharpFile, file);
+        overwriteFileAndFolder (csharpFile, file);
     }
 
     transpileExchangeTest(name: string, path: string): [string, string] {
@@ -1198,49 +1161,59 @@ class NewTranspiler {
         await Promise.all (transpiledFiles.map ((file, idx) => promisedWriteFile (outDir + file[0] + '.cs', file[1])))
     }
 
-    transpileDatetimeTestsToCSharp (outDir: string) {
+    transpileBaseTestsToCSharp () {
+        const outDir = BASE_TESTS_FOLDER;
+        this.transpileBaseTests(outDir);
+        this.transpileCryptoTestsToCSharp(outDir);
+        this.transpileWsCacheTestsToCSharp(outDir);
+        this.transpileWsOrderbookTestsToCSharp(outDir);
+    }
 
-        const jsFile = './ts/src/test/base/functions/test.datetime.ts';
-        const csharpFile = `${outDir}/Datetime.cs`;
+    transpileBaseTests (outDir) {
 
-        log.magenta ('Transpiling from', (jsFile as any).yellow)
+        const baseFolders = {
+            ts: './ts/src/test/base/',
+        };
 
-        const csharp = this.transpiler.transpileCSharpByPath(jsFile);
-        let content = csharp.content;
-        content = this.regexAll (content, [
-            [ /\s*object\s+=\sfunctions;\n/gm, '' ],
-            [/assert/g, 'Assert'],
-        ]).trim ()
+        let baseFunctionTests = fs.readdirSync (baseFolders.ts).filter(filename => filename.endsWith('.ts')).map(filename => filename.replace('.ts', ''));
 
-        const contentLines = content.split ('\n');
-        const contentIdented = contentLines.map (line => '        ' + line).join ('\n');
+        for (const testName of baseFunctionTests) {
+            const tsFile = baseFolders.ts + testName + '.ts';
+            const tsContent = fs.readFileSync(tsFile).toString();
+            if (!tsContent.includes ('// AUTO_TRANSPILE_ENABLED')) {
+                continue;
+            }
+
+            const csFileName = this.capitalize(testName.replace ('test.', ''));
+            const csharpFile = `${outDir}/${csFileName}.cs`;
 
-        const file = [
-            'using ccxt;',
-            'namespace Tests;',
-            '',
-            this.createGeneratedHeader().join('\n'),
-            'public partial class BaseTest',
-            '{',
-            '    public void DateTimeTests()',
-            '    {',
-            contentIdented,
-            '    }',
-            '}',
-        ].join('\n')
+            log.magenta ('Transpiling from', (tsFile as any).yellow)
 
-        log.magenta ('→', (csharpFile as any).yellow)
+            const csharp = this.transpiler.transpileCSharpByPath(tsFile);
+            let content = csharp.content;
+            content = this.regexAll (content, [
+                [/object  = functions;/g, '' ], // tmp fix
+                [/assert/g, 'Assert'],
+            ]).trim ()
 
-        overwriteFile (csharpFile, file);
-    }
+            const contentLines = content.split ('\n');
+            const contentIdented = contentLines.map (line => '        ' + line).join ('\n');
 
-    transpileBaseTestsToCSharp () {
-        const outDir = BASE_TESTS_FOLDER;
-        this.transpilePrecisionTestsToCSharp(outDir);
-        this.transpileCryptoTestsToCSharp(outDir);
-        this.transpileDatetimeTestsToCSharp(outDir);
-        this.transpileCacheTestsToCSharp(outDir);
-        this.transpileOrderbookTestsToCSharp(outDir);
+            const file = [
+                'using ccxt;',
+                'namespace Tests;',
+                '',
+                this.createGeneratedHeader().join('\n'),
+                'public partial class BaseTest',
+                '{',
+                contentIdented,
+                '}',
+            ].join('\n')
+
+            log.magenta ('→', (csharpFile as any).yellow)
+
+            overwriteFileAndFolder (csharpFile, file);
+        } 
     }
 
     capitalize(s: string) {
@@ -1255,10 +1228,7 @@ class NewTranspiler {
             [ /\'use strict\';?\s+/g, '' ],
         ])
 
-        const commentStartLine = '***** AUTO-TRANSPILER-START *****';
-        const commentEndLine = '***** AUTO-TRANSPILER-END *****';
-
-        const mainContent = ts.split (commentStartLine)[1].split (commentEndLine)[0];
+        const mainContent = ts;
         const csharp = this.transpiler.transpileCSharp(mainContent);
         // let contentIndentend = csharp.content.split('\n').map(line => line ? '    ' + line : line).join('\n');
         let contentIndentend = csharp.content;
@@ -1282,12 +1252,12 @@ class NewTranspiler {
             contentIndentend,
         ].join('\n')
 
-        overwriteFile (files.csharpFile, file);
+        overwriteFileAndFolder (files.csharpFile, file);
     }
 
     transpileExchangeTests(){
         this.transpileMainTest({
-            'tsFile': './ts/src/test/test.ts',
+            'tsFile': './ts/src/test/tests.ts',
             'csharpFile': BASE_TESTS_FILE,
         });
 
@@ -1402,7 +1372,7 @@ class NewTranspiler {
                     '}',
                 ].join('\n');
             }
-            overwriteFile (tests[idx].csharpFile, csharp);
+            overwriteFileAndFolder (tests[idx].csharpFile, csharp);
         });
     }
 
@@ -1415,7 +1385,7 @@ class NewTranspiler {
 
 if (isMainEntry(import.meta.url)) {
     const ws = process.argv.includes ('--ws')
-    const baseOnly = process.argv.includes ('--base')
+    const baseOnly = process.argv.includes ('--baseTests')
     const test = process.argv.includes ('--test') || process.argv.includes ('--tests')
     const examples = process.argv.includes ('--examples');
     const force = process.argv.includes ('--force')