move tests for nodejs to its own package

Signed-off-by: Andrey Parfenov <[email protected]>
brainflow-dev · Sep 13, 2023 · b7aedb2 · b7aedb2
1 parent 06deccb
commit b7aedb2
Show file tree

Hide file tree

Showing 19 changed files with 200 additions and 65 deletions.
diff --git a/.github/workflows/run_unix.yml b/.github/workflows/run_unix.yml
@@ -101,7 +101,12 @@ jobs:
     - name: Build Node Package
       run: |
         cd $GITHUB_WORKSPACE/nodejs_package/brainflow
-        npm install --force
+        npm install
+        npm run build
+    - name: Install Node Tests
+      run: |
+        cd $GITHUB_WORKSPACE/nodejs_package/tests
+        npm install
     - name: Setup Java package
       run: |
         cd $GITHUB_WORKSPACE/java_package/brainflow
@@ -318,27 +323,31 @@ jobs:
         LD_LIBRARY_PATH: ${{ github.workspace }}/installed/lib
     - name: Synthetic Node
       run: |
-        cd $GITHUB_WORKSPACE/nodejs_package/brainflow
+        cd $GITHUB_WORKSPACE/nodejs_package/tests
         npm run brainflow_get_data
     - name: Signal Filters Node
       run: |
-        cd $GITHUB_WORKSPACE/nodejs_package/brainflow
+        cd $GITHUB_WORKSPACE/nodejs_package/tests
         npm run signal_filtering
     - name: Serialization Node
       run: |
-        cd $GITHUB_WORKSPACE/nodejs_package/brainflow
+        cd $GITHUB_WORKSPACE/nodejs_package/tests
         npm run serialization
     - name: Downsampling Node
       run: |
-        cd $GITHUB_WORKSPACE/nodejs_package/brainflow
+        cd $GITHUB_WORKSPACE/nodejs_package/tests
         npm run downsampling
     - name: Denoising Node
       run: |
-        cd $GITHUB_WORKSPACE/nodejs_package/brainflow
+        cd $GITHUB_WORKSPACE/nodejs_package/tests
         npm run denoising
+    - name: EEG Metrics Node
+      run: |
+        cd $GITHUB_WORKSPACE/nodejs_package/tests
+        npm run eeg_metrics
     - name: BandPowerAll Node
       run: |
-        cd $GITHUB_WORKSPACE/nodejs_package/brainflow
+        cd $GITHUB_WORKSPACE/nodejs_package/tests
         npm run bandpower_all
     # deploy started
     - name: Install AWS CLI

diff --git a/.github/workflows/run_windows.yml b/.github/workflows/run_windows.yml
@@ -122,7 +122,13 @@ jobs:
     - name: Build Node Package
       run: |
         cd %GITHUB_WORKSPACE%\nodejs_package\brainflow
-        npm install --force
+        npm install
+        npm run build
+      shell: cmd
+    - name: Build Install Node Tests
+      run: |
+        cd %GITHUB_WORKSPACE%\nodejs_package\tests
+        npm install
       shell: cmd
     - name: Build Java Package
       run: |
@@ -296,7 +302,7 @@ jobs:
       shell: cmd
     - name: Synthetic Node
       run: |
-        cd %GITHUB_WORKSPACE%\nodejs_package\brainflow
+        cd %GITHUB_WORKSPACE%\nodejs_package\tests
         npm run brainflow_get_data
       shell: cmd
     # Start Deploy Stage

diff --git a/docs/Examples.rst b/docs/Examples.rst
@@ -545,61 +545,61 @@ Typescript
 Typescript Get Data from a Board
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. literalinclude:: ../nodejs_package/brainflow/tests/brainflow_get_data.ts
+.. literalinclude:: ../nodejs_package/tests/brainflow_get_data.ts
    :language: javascript
 
 Typescript Markers
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. literalinclude:: ../nodejs_package/brainflow/tests/markers.ts
+.. literalinclude:: ../nodejs_package/tests/markers.ts
    :language: javascript
 
 Typescript Read Write File
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. literalinclude:: ../nodejs_package/brainflow/tests/serialization.ts
+.. literalinclude:: ../nodejs_package/tests/serialization.ts
    :language: javascript
 
 Typescript Downsample Data
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. literalinclude:: ../nodejs_package/brainflow/tests/downsampling.ts
+.. literalinclude:: ../nodejs_package/tests/downsampling.ts
    :language: javascript
 
 Typescript Transforms
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. literalinclude:: ../nodejs_package/brainflow/tests/transforms.ts
+.. literalinclude:: ../nodejs_package/tests/transforms.ts
    :language: javascript
 
 Typescript Signal Filtering
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. literalinclude:: ../nodejs_package/brainflow/tests/signal_filtering.ts
+.. literalinclude:: ../nodejs_package/tests/signal_filtering.ts
    :language: javascript
 
 Typescript Denoising
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. literalinclude:: ../nodejs_package/brainflow/tests/denoising.ts
+.. literalinclude:: ../nodejs_package/tests/denoising.ts
    :language: javascript
 
 Typescript Band Power
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. literalinclude:: ../nodejs_package/brainflow/tests/bandpower.ts
+.. literalinclude:: ../nodejs_package/tests/bandpower.ts
    :language: javascript
 
 Typescript EEG Metrics
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. literalinclude:: ../nodejs_package/brainflow/tests/eeg_metrics.ts
+.. literalinclude:: ../nodejs_package/tests/eeg_metrics.ts
    :language: javascript
 
 Typescript ICA
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. literalinclude:: ../nodejs_package/brainflow/tests/ica.ts
+.. literalinclude:: ../nodejs_package/tests/ica.ts
    :language: javascript
 
 Notebooks

diff --git a/docs/UserAPI.rst b/docs/UserAPI.rst
@@ -167,5 +167,5 @@ Typescript binding calls C/C++ code as any other binding. Use Typescript example
 
 Example:
 
-.. literalinclude:: ../nodejs_package/brainflow/tests/brainflow_get_data.ts
+.. literalinclude:: ../nodejs_package/tests/brainflow_get_data.ts
    :language: javascript
diff --git a/nodejs_package/package.json b/nodejs_package/package.json
@@ -9,18 +9,7 @@
     "test": "jest",
     "test:watch": "jest --watchAll",
     "build": "tsc",
-    "watch": "tsc -w",
-    "markers": "ts-node brainflow/tests/markers.ts",
-    "ica": "ts-node brainflow/tests/ica.ts",
-    "brainflow_get_data": "ts-node brainflow/tests/brainflow_get_data.ts",
-    "signal_filtering": "ts-node brainflow/tests/signal_filtering.ts",
-    "serialization": "ts-node brainflow/tests/serialization.ts",
-    "downsampling": "ts-node brainflow/tests/downsampling.ts",
-    "transforms": "ts-node brainflow/tests/transforms.ts",
-    "denoising": "ts-node brainflow/tests/denoising.ts",
-    "bandpower": "ts-node brainflow/tests/bandpower.ts",
-    "bandpower_all": "ts-node brainflow/tests/bandpower_all.ts",
-    "eeg_metrics": "ts-node brainflow/tests/eeg_metrics.ts"
+    "watch": "tsc -w"
   },
   "repository": {
     "type": "git",

diff --git a/nodejs_package/brainflow/tests/bandpower.ts → nodejs_package/tests/bandpower.ts b/nodejs_package/brainflow/tests/bandpower.ts → nodejs_package/tests/bandpower.ts
@@ -1,6 +1,4 @@
-import {BoardShim} from '../board_shim';
-import {BoardIds, WindowOperations} from '../brainflow.types';
-import {DataFilter} from '../data_filter';
+import {BoardIds, BoardShim, DataFilter, WindowOperations} from 'brainflow';
 
 function sleep (ms: number)
 {

diff --git a/..._package/brainflow/tests/bandpower_all.ts → nodejs_package/tests/bandpower_all.ts b/..._package/brainflow/tests/bandpower_all.ts → nodejs_package/tests/bandpower_all.ts
@@ -1,6 +1,4 @@
-import {BoardShim} from '../board_shim';
-import {BoardIds} from '../brainflow.types';
-import {DataFilter} from '../data_filter';
+import {BoardIds, BoardShim, DataFilter} from 'brainflow';
 
 function sleep (ms: number)
 {

diff --git a/...age/brainflow/tests/brainflow_get_data.ts → nodejs_package/tests/brainflow_get_data.ts b/...age/brainflow/tests/brainflow_get_data.ts → nodejs_package/tests/brainflow_get_data.ts
@@ -1,5 +1,4 @@
-import {BoardShim} from '../board_shim';
-import {BoardIds} from '../brainflow.types';
+import {BoardIds, BoardShim} from 'brainflow';
 
 function sleep (ms: number)
 {

diff --git a/nodejs_package/brainflow/tests/denoising.ts → nodejs_package/tests/denoising.ts b/nodejs_package/brainflow/tests/denoising.ts → nodejs_package/tests/denoising.ts
@@ -1,6 +1,4 @@
-import {BoardShim} from '../board_shim';
-import {BoardIds, WaveletTypes} from '../brainflow.types';
-import {DataFilter} from '../data_filter';
+import {BoardIds, BoardShim, DataFilter, WaveletTypes} from 'brainflow';
 
 function sleep (ms: number)
 {

diff --git a/...s_package/brainflow/tests/downsampling.ts → nodejs_package/tests/downsampling.ts b/...s_package/brainflow/tests/downsampling.ts → nodejs_package/tests/downsampling.ts
@@ -1,6 +1,4 @@
-import {BoardShim} from '../board_shim';
-import {AggOperations, BoardIds} from '../brainflow.types';
-import {DataFilter} from '../data_filter';
+import {AggOperations, BoardIds, BoardShim, DataFilter} from 'brainflow';
 
 function sleep (ms: number)
 {

diff --git a/...js_package/brainflow/tests/eeg_metrics.ts → nodejs_package/tests/eeg_metrics.ts b/...js_package/brainflow/tests/eeg_metrics.ts → nodejs_package/tests/eeg_metrics.ts
@@ -1,7 +1,11 @@
-import {BoardShim} from '../board_shim';
-import {BoardIds, BrainFlowClassifiers, BrainFlowMetrics} from '../brainflow.types';
-import {DataFilter} from '../data_filter'
-import {MLModel} from '../ml_model';
+import {
+    BoardIds,
+    BoardShim,
+    BrainFlowClassifiers,
+    BrainFlowMetrics,
+    DataFilter,
+    MLModel
+} from 'brainflow';
 
 function sleep (ms: number)
 {

diff --git a/nodejs_package/brainflow/tests/ica.ts → nodejs_package/tests/ica.ts b/nodejs_package/brainflow/tests/ica.ts → nodejs_package/tests/ica.ts
@@ -1,6 +1,4 @@
-import {BoardShim} from '../board_shim';
-import {BoardIds} from '../brainflow.types';
-import {DataFilter} from '../data_filter';
+import {BoardIds, BoardShim, DataFilter} from 'brainflow';
 
 function sleep (ms: number)
 {

diff --git a/nodejs_package/brainflow/tests/markers.ts → nodejs_package/tests/markers.ts b/nodejs_package/brainflow/tests/markers.ts → nodejs_package/tests/markers.ts
@@ -1,5 +1,4 @@
-import {BoardShim} from '../board_shim';
-import {BoardIds} from '../brainflow.types';
+import {BoardIds, BoardShim} from 'brainflow';
 
 function sleep (ms: number)
 {

diff --git a/nodejs_package/tests/package.json b/nodejs_package/tests/package.json
@@ -0,0 +1,29 @@
+{
+  "name": "tests",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "markers": "ts-node markers.ts",
+    "ica": "ts-node ica.ts",
+    "brainflow_get_data": "ts-node brainflow_get_data.ts",
+    "signal_filtering": "ts-node signal_filtering.ts",
+    "serialization": "ts-node serialization.ts",
+    "downsampling": "ts-node downsampling.ts",
+    "transforms": "ts-node transforms.ts",
+    "denoising": "ts-node denoising.ts",
+    "bandpower": "ts-node bandpower.ts",
+    "bandpower_all": "ts-node bandpower_all.ts",
+    "eeg_metrics": "ts-node eeg_metrics.ts"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@types/node": "^20.6.0",
+    "typescript": "^5.2.2"
+  },
+  "dependencies": {
+    "brainflow": "file:.."
+  }
+}
diff --git a/..._package/brainflow/tests/serialization.ts → nodejs_package/tests/serialization.ts b/..._package/brainflow/tests/serialization.ts → nodejs_package/tests/serialization.ts
@@ -1,6 +1,4 @@
-import {BoardShim} from '../board_shim';
-import {BoardIds} from '../brainflow.types';
-import {DataFilter} from '../data_filter';
+import {BoardIds, BoardShim, DataFilter} from 'brainflow';
 
 function sleep (ms: number)
 {

diff --git a/...ckage/brainflow/tests/signal_filtering.ts → nodejs_package/tests/signal_filtering.ts b/...ckage/brainflow/tests/signal_filtering.ts → nodejs_package/tests/signal_filtering.ts
@@ -1,6 +1,4 @@
-import {BoardShim} from '../board_shim';
-import {BoardIds, FilterTypes} from '../brainflow.types';
-import {DataFilter} from '../data_filter';
+import {BoardIds, BoardShim, DataFilter, FilterTypes} from 'brainflow';
 
 function sleep (ms: number)
 {

diff --git a/nodejs_package/brainflow/tests/transforms.ts → nodejs_package/tests/transforms.ts b/nodejs_package/brainflow/tests/transforms.ts → nodejs_package/tests/transforms.ts
@@ -1,6 +1,11 @@
-import {BoardShim} from '../board_shim';
-import {BoardIds, WaveletExtensionTypes, WaveletTypes, WindowOperations} from '../brainflow.types';
-import {DataFilter} from '../data_filter';
+import {
+    BoardIds,
+    BoardShim,
+    DataFilter,
+    WaveletExtensionTypes,
+    WaveletTypes,
+    WindowOperations
+} from 'brainflow';
 
 function sleep (ms: number)
 {