Просмотр исходного кода

:recycle: fix some imports and destructured calls for tests

master
toj 1 год назад
Родитель
Сommit
4e2e115609
4 измененных файлов: 18 добавлений и 6 удалений
  1. 2
    2
      src/api.js
  2. 2
    0
      src/controller.js
  3. 13
    3
      src/core/channel.js
  4. 1
    1
      test/channel.spec.js

+ 2
- 2
src/api.js Просмотреть файл

1
 import { fromLiquid } from './core/utils.js'
1
 import { fromLiquid } from './core/utils.js'
2
 
2
 
3
 import { Container } from './core/container.js'
3
 import { Container } from './core/container.js'
4
-import { Reading, Channel } from './core/channel'
5
-import { Controller } from './core/controller'
4
+import { Reading, Channel } from './core/channel.js'
5
+import { Controller } from './controller.js'
6
 import { InputConf } from './input.js'
6
 import { InputConf } from './input.js'
7
 
7
 
8
 /**
8
 /**

+ 2
- 0
src/controller.js Просмотреть файл

1
+import { updateChannel } from "./core/channel.js"
2
+
1
 let allWarnings = []
3
 let allWarnings = []
2
 
4
 
3
 // const _makeWarning = (msg, channelOrSensor) => ({
5
 // const _makeWarning = (msg, channelOrSensor) => ({

+ 13
- 3
src/core/channel.js Просмотреть файл

17
      * @param {*} param0.min
17
      * @param {*} param0.min
18
      * @param {*} param0.max
18
      * @param {*} param0.max
19
      */
19
      */
20
-    constructor({ onRead, unit, min, max }) {
20
+    constructor({ onRead=() => "err", unit, min, max }) {
21
         this._readVal = onRead
21
         this._readVal = onRead
22
         this.unit = unit
22
         this.unit = unit
23
         this.max = max
23
         this.max = max
81
     get val() {
81
     get val() {
82
         return this._reader.val
82
         return this._reader.val
83
     }
83
     }
84
+    // Just used to simplify updateChannel()
85
+    get onRead() {
86
+        return this._reader._readVal
87
+    }
88
+    get min() {
89
+        return this._reader.min
90
+    }
91
+    get max() {
92
+        return this._reader.max
93
+    }
84
     get unit() {
94
     get unit() {
85
         return this._reader.unit
95
         return this._reader.unit
86
     }
96
     }
87
     get aboveRange() {
97
     get aboveRange() {
88
-        return this._reader.val > this._reader.max
98
+        return this.val > this.max
89
     }
99
     }
90
     get belowRange() {
100
     get belowRange() {
91
-        return this._reader.val < this._reader.min
101
+        return this.val < this.min
92
     }
102
     }
93
     get inRange() {
103
     get inRange() {
94
         return this._reader.val && !this.aboveRange && !this.belowRange
104
         return this._reader.val && !this.aboveRange && !this.belowRange

+ 1
- 1
test/channel.spec.js Просмотреть файл

13
     let testChan = new Channel({ interval: 1, reader: testReader })
13
     let testChan = new Channel({ interval: 1, reader: testReader })
14
 
14
 
15
     // Test that the channel and channel.reader are working
15
     // Test that the channel and channel.reader are working
16
-    expect(testChan.lastUpdate == now).toStrictEqual(true)
16
+    expect(testChan.lastUpdate - now < 10).toStrictEqual(true)
17
     expect(testChan.val).toStrictEqual(70)
17
     expect(testChan.val).toStrictEqual(70)
18
     expect(testChan.unit).toStrictEqual('F')
18
     expect(testChan.unit).toStrictEqual('F')
19
 
19
 

Загрузка…
Отмена
Сохранить