simplify-tests

shimaore · Jan 11, 2024 · 9a72958 · 9a72958
1 parent 45d36a0
commit 9a72958
Show file tree

Hide file tree

Showing 17 changed files with 458 additions and 153 deletions.
diff --git a/test/01-args.ts b/test/01-args.ts
@@ -4,7 +4,7 @@ import {
   FreeSwitchResponse
 } from 'esl'
 import { type Socket } from 'net'
-import { responseLogger as logger } from './tools.js'
+import { responseLogger as logger } from './utils.js'
 
 const socket = {
   once: function () { },

diff --git a/test/01-buffer-at-end.ts b/test/01-buffer-at-end.ts
@@ -10,7 +10,8 @@ import {
   createServer
 } from 'node:net'
 
-import { clientLogger, sleep } from './tools.js'
+import { sleep } from './tools.js'
+import { clientLogger } from './utils.js'
 
 const client_port = 5621
 

diff --git a/test/02.ts b/test/02.ts
@@ -6,14 +6,11 @@ import {
 } from 'esl'
 
 import {
+  clientLogger,
   start,
   stop
 } from './utils.js'
 
-import {
-  clientLogger
-} from './tools.js'
-
 const client_port = 8024
 
 test.before(start)

diff --git a/test/03.ts b/test/03.ts
@@ -9,14 +9,11 @@ import {
 
 import {
   start,
-  stop
-} from './utils.js'
-
-import {
+  stop,
   clientLogger,
   serverLogger,
   DoCatch
-} from './tools.js'
+} from './utils.js'
 
 const client_port = 8024
 const domain = '127.0.0.1:5062'

diff --git a/test/10-client-image.ts b/test/10-client-image.ts
@@ -9,10 +9,11 @@ import {
 } from 'esl'
 
 import {
+  clientLogger,
   start,
   stop
 } from './utils.js'
-import { clientLogger, sleep } from './tools.js'
+import { sleep } from './tools.js'
 
 // We start two FreeSwitch docker.io instances, one is used as the "client" (and is basically our SIP test runner), while the other one is the "server" (and is used to test the `server` side of the package).
 const client_port = 8024

diff --git a/test/10-server-image.ts b/test/10-server-image.ts
@@ -9,10 +9,10 @@ import {
 } from 'esl'
 
 import {
+  clientLogger,
   start_server,
   stop
 } from './utils.js'
-import { clientLogger } from './tools.js'
 
 const server_port = 8022
 

diff --git a/test/10-uuid.ts b/test/10-uuid.ts
@@ -14,9 +14,10 @@ import {
 
 import {
   start_server,
-  stop
+  stop,
+  clientLogger, serverLogger
 } from './utils.js'
-import { clientLogger, serverLogger, second, sleep } from './tools.js'
+import { second, sleep } from './tools.js'
 
 // Using UUID (in client mode)
 // ---------------------------

diff --git a/test/10-wrapper.ts b/test/10-wrapper.ts
@@ -10,7 +10,8 @@ import {
   createServer
 } from 'node:net'
 
-import { clientLogger, sleep } from './tools.js'
+import { sleep } from './tools.js'
+import { clientLogger } from './utils.js'
 
 const client_port = 5624
 

diff --git a/test/14-base-server.ts b/test/14-base-server.ts
@@ -9,15 +9,15 @@ import {
 
 import {
   start,
-  stop
+  stop, clientLogger, serverLogger, DoCatch
 } from './utils.js'
 
 import {
   once,
   FreeSwitchEventEmitter
 } from 'esl'
 
-import { second, sleep, clientLogger, serverLogger, DoCatch } from './tools.js'
+import { second, sleep } from './tools.js'
 
 const domain = '127.0.0.1:5062'
 

diff --git a/test/15-base-client.ts b/test/15-base-client.ts
@@ -11,7 +11,10 @@ import {
 
 import {
   start,
-  stop
+  stop,
+  clientLogger as logger,
+  clientLogger,
+  DoCatch
 } from './utils.js'
 
 import {
@@ -26,10 +29,7 @@ import {
   second,
   sleep,
   timer,
-  clientLogger as logger,
-  options_text,
-  clientLogger,
-  DoCatch
+  options_text
 } from './tools.js'
 
 const domain = '127.0.0.1:5062'

diff --git a/test/70-reconnect.ts b/test/70-reconnect.ts
@@ -8,7 +8,8 @@ import {
   type Socket,
   createServer
 } from 'node:net'
-import { clientLogger, sleep } from './tools.js'
+import { sleep } from './tools.js'
+import { clientLogger } from './utils.js'
 
 const client_port = 5623
 

diff --git a/test/80-errors.ts b/test/80-errors.ts
@@ -10,15 +10,15 @@ import {
 } from 'esl'
 
 import {
-  start,
+  clientLogger as logger, start,
   stop
 } from './utils.js'
 
 import {
   v4 as uuidv4
 } from 'uuid'
 
-import { second, sleep, timer, clientLogger as logger, options_text } from './tools.js'
+import { second, sleep, timer, options_text } from './tools.js'
 
 const client_port = 8024
 

diff --git a/test/90-base-server-2cps.ts b/test/90-base-server-2cps.ts
@@ -12,10 +12,10 @@ import {
 
 import {
   start,
-  stop
+  stop, clientLogger as logger, clientLogger, DoCatch
 } from './utils.js'
 
-import { second, sleep, clientLogger as logger, clientLogger, DoCatch } from './tools.js'
+import { second, sleep } from './tools.js'
 
 const domain = '127.0.0.1:5062'
 
@@ -117,7 +117,7 @@ test.before(async function (t) {
       }
       return
     }
-    if (destination.match(/^answer-wait-3000-\d+$/) != null) {
+    if (destination?.match(/^answer-wait-3000-\d+$/) != null) {
       await call.command('hangup', `200 destination ${destination}`)
       return
     }