Simplefied test

AliceO2Group · Dec 2, 2024 · 67ddc35 · 67ddc35
1 parent 0fcbd85
commit 67ddc35
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 36 deletions.
diff --git a/Framework/Backend/test/mocha-ws.js b/Framework/Backend/test/mocha-ws.js
@@ -232,41 +232,10 @@ describe('websocket', () => {
     });
   });
 
-  it('Accept filter and log criteria', (done) => {
-    const connection = new WebSocketClient(`ws://localhost:${config.http.port}/?token=${token}`);
-
-    connection.on('open', () => {
-      const message = { command: 'filter',
-        token: token,
-        filter: function (returnCriteriasOnly = false) {
-          if (returnCriteriasOnly) {
-            return filters;
-          }
-          return;
-        }.toString() };
-      connection.send(JSON.stringify(message));
-    });
-
-    connection.on('message', (message) => {
-      const parsed = JSON.parse(message);
-      if (parsed.command == 'authed') {
-        return;
-      }
-      new WebSocketMessage().parse(message)
-        .then((parsed) => {
-          if (parsed.getCommand() == 'filter' && parsed.getPayload()) {
-            connection.filter = new Function(`return ${parsed.getPayload()}`)();
-            const criterias = this.minifyCriteria(connection.filter(message, true));
-            if (criterias != false) {
-              this.logger.debugMessage(`New live filter applied: ${JSON.stringify(criterias)}`);
-              assert.strictEqual(criterias, minifiedFilters);
-            }
-          }
-        });
-
-      connection.terminate();
-      done();
-    });
+  it('minifyCriteria() works as expected', (done) => {
+    const criterias = ws.minifyCriteria(filters);
+    assert.strictEqual(JSON.stringify(criterias), minifiedFilters);
+    done();
   });
 
   it('Request message broadcast with 200', (done) => {

diff --git a/Framework/Backend/websocket/server.js b/Framework/Backend/websocket/server.js
@@ -183,7 +183,9 @@ class WebSocket {
         if (parsed.getCommand() == 'filter' && parsed.getPayload()) {
           client.filter = new Function(`return ${parsed.getPayload()}`)();
           const criterias = this.minifyCriteria(client.filter(message, true));
-          this.logger.debugMessage(JSON.stringify(criterias));
+          if (criterias != false) {
+            this.logger.debugMessage(`New live filter applied: ${JSON.stringify(criterias)}`);
+          }
         }
         // 3. Get reply if callback exists
         this.processRequest(parsed)