try get away other callback deprecations

Apollon77 · May 9, 2024 · 3b30980 · 3b30980
1 parent a4b6015
commit 3b30980
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/test/testSerial.js b/test/testSerial.js
@@ -26,6 +26,7 @@ describe('Native libmbus node-module Serial test ...', function() {
     it('Test Reading Serial', function (done) {
         this.timeout(300000); // because of first install from npm
 
+        let mbusMaster;
         let testSocket;
         let secondaryCase = "";
         const server = net.createServer(function (socket) {
@@ -38,6 +39,8 @@ describe('Native libmbus node-module Serial test ...', function() {
             socket.on('data', function (data) {
                 let sendBuf;
 
+                expect(mbusMaster.mbusMaster.communicationInProgress).to.be.true;
+
                 if (!data) {
                     console.log(new Date().toString() + ': mbus-Serial-Device: Received empty string!');
                     return;
@@ -154,7 +157,7 @@ describe('Native libmbus node-module Serial test ...', function() {
                         serialBaudRate: 9600
                     };
                 }
-                const mbusMaster = new MbusMaster(mbusOptions);
+                mbusMaster = new MbusMaster(mbusOptions);
 
                 mbusMaster.getData(3, function(err, data) {
                     expect(err.message).to.be.equal('Not connected and autoConnect is false');
@@ -232,9 +235,6 @@ describe('Native libmbus node-module Serial test ...', function() {
                                 });
                             });
                         });
-                        setImmediate(() => {
-                            expect(mbusMaster.mbusMaster.communicationInProgress).to.be.true;
-                        });
                     }, 2000);
                 });
 

diff --git a/test/testTcp.js b/test/testTcp.js
@@ -22,6 +22,7 @@ describe('Native libmbus node-module TCP test ...', function() {
     it('Test Reading TCP', function (done) {
         this.timeout(300000); // because of first install from npm
 
+        let mbusMaster;
         let testSocket;
         const server = net.createServer(function (socket) {
             console.log(new Date().toString() + ': mbus-TCP-Device: Connected ' + port + '!');
@@ -33,6 +34,8 @@ describe('Native libmbus node-module TCP test ...', function() {
                 let sendBuf;
                 let counterFD = 0;
 
+                expect(mbusMaster.mbusMaster.communicationInProgress).to.be.true;
+
                 if (!data) {
                     console.log(new Date().toString() + ': mbus-TCP-Device: Received empty string!');
                     return;
@@ -95,7 +98,7 @@ describe('Native libmbus node-module TCP test ...', function() {
                 port: port,
                 timeout: 100
             };
-            const mbusMaster = new MbusMaster(mbusOptions);
+            mbusMaster = new MbusMaster(mbusOptions);
             const connectResult = mbusMaster.connect();
             console.log(new Date().toString() + ': mbus-TCP-Master Open:' + connectResult);
             if (!connectResult) server.close();
@@ -156,9 +159,6 @@ describe('Native libmbus node-module TCP test ...', function() {
                         });
                     });
                 });
-                setImmediate(() => {
-                    expect(mbusMaster.mbusMaster.communicationInProgress).to.be.true;
-                });
             }, 2000);
         });
 

diff --git a/test/testTcpIPV6.js b/test/testTcpIPV6.js
@@ -22,6 +22,7 @@ describe('Native libmbus node-module TCP-IPv6 test ...', function() {
     it('Test Reading TCP-IPv6', function (done) {
         this.timeout(300000); // because of first install from npm
 
+        let mbusMaster;
         let testSocket;
         const server = net.createServer(function (socket) {
             console.log(new Date().toString() + ': mbus-TCPv6-Device: Connected ' + port + '!');
@@ -33,6 +34,8 @@ describe('Native libmbus node-module TCP-IPv6 test ...', function() {
                 let sendBuf;
                 let counterFD = 0;
 
+                expect(mbusMaster.mbusMaster.communicationInProgress).to.be.true;
+
                 if (!data) {
                     console.log(new Date().toString() + ': mbus-TCPv6-Device: Received empty string!');
                     return;
@@ -95,7 +98,7 @@ describe('Native libmbus node-module TCP-IPv6 test ...', function() {
                 port: port,
                 timeout: 100
             };
-            const mbusMaster = new MbusMaster(mbusOptions);
+            mbusMaster = new MbusMaster(mbusOptions);
             try {
                 const connectResult = mbusMaster.connect();
                 console.log(new Date().toString() + ': mbus-TCP-Master Open:' + connectResult);
@@ -161,9 +164,6 @@ describe('Native libmbus node-module TCP-IPv6 test ...', function() {
                         });
                     });
                 });
-                setImmediate(() => {
-                    expect(mbusMaster.mbusMaster.communicationInProgress).to.be.true;
-                });
             }, 2000);
         });