Skip to content

Commit ad9cd4c

Browse files
aminyaaminya
committed
test: convert all proxy compat tests to TypeScript
1 parent cd82f49 commit ad9cd4c

File tree

6 files changed

+56
-57
lines changed

6 files changed

+56
-57
lines changed

‎test/unit/compat/load.js

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎test/unit/compat/socket-test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
if (process.env.INCLUDE_COMPAT_TESTS) {
2-
const zmq = require("./load")
3-
const {assert} = require("chai")
1+
import * as zmq from "../../../v5-compat"
2+
import {assert} from "chai"
43

4+
if (process.env.INCLUDE_COMPAT_TESTS) {
55
describe("compat socket", function () {
6-
let sock
6+
let sock: zmq.Socket
77

88
beforeEach(function () {
99
sock = zmq.socket("req")

‎test/unit/compat/zmq-proxy-push-pull-test.js renamed to ‎test/unit/compat/zmq-proxy-push-pull-test.ts

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
1-
if (process.env.INCLUDE_COMPAT_TESTS) {
2-
const zmq = require("./load")
3-
const {assert} = require("chai")
4-
const {testProtos, uniqAddress} = require("../helpers")
1+
import * as zmq from "../../../v5-compat"
2+
import {assert} from "chai"
3+
import {testProtos, uniqAddress} from "../helpers"
54

5+
if (process.env.INCLUDE_COMPAT_TESTS) {
66
for (const proto of testProtos("tcp")) {
77
describe(`compat proxy with ${proto} push-pull`, function () {
8-
const sockets = []
8+
const sockets: zmq.Socket[] = []
9+
let frontendAddr: string
10+
let backendAddr: string
11+
let captureAddr: string
12+
13+
beforeEach(async function () {
14+
frontendAddr = await uniqAddress(proto)
15+
backendAddr = await uniqAddress(proto)
16+
captureAddr = await uniqAddress(proto)
17+
})
918

1019
afterEach(function () {
11-
while (sockets.length) {
12-
sockets.pop().close()
20+
if (sockets.length) {
21+
sockets.pop()?.close()
1322
}
1423
})
1524

1625
it("should proxy push-pull connected to pull-push", function (done) {
17-
const frontendAddr = uniqAddress(proto)
18-
const backendAddr = uniqAddress(proto)
19-
2026
const frontend = zmq.socket("pull")
2127
const backend = zmq.socket("push")
2228

@@ -48,10 +54,6 @@ if (process.env.INCLUDE_COMPAT_TESTS) {
4854
})
4955

5056
it("should proxy pull-push connected to push-pull with capture", function (done) {
51-
const frontendAddr = uniqAddress(proto)
52-
const backendAddr = uniqAddress(proto)
53-
const captureAddr = uniqAddress(proto)
54-
5557
const frontend = zmq.socket("push")
5658
const backend = zmq.socket("pull")
5759

‎test/unit/compat/zmq-proxy-router-dealer-test.js renamed to ‎test/unit/compat/zmq-proxy-router-dealer-test.ts

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
1-
if (process.env.INCLUDE_COMPAT_TESTS) {
2-
const zmq = require("./load")
3-
const {assert} = require("chai")
4-
const {testProtos, uniqAddress} = require("../helpers")
1+
import * as zmq from "../../../v5-compat"
2+
import {assert} from "chai"
3+
import {testProtos, uniqAddress} from "../helpers"
54

5+
if (process.env.INCLUDE_COMPAT_TESTS) {
66
for (const proto of testProtos("tcp")) {
77
describe(`compat proxy with ${proto} router-dealer`, function () {
8-
const sockets = []
8+
const sockets: zmq.Socket[] = []
9+
let frontendAddr: string
10+
let backendAddr: string
11+
let captureAddr: string
12+
13+
beforeEach(async function () {
14+
frontendAddr = await uniqAddress(proto)
15+
backendAddr = await uniqAddress(proto)
16+
captureAddr = await uniqAddress(proto)
17+
})
918

1019
afterEach(function () {
1120
while (sockets.length) {
12-
sockets.pop().close()
21+
sockets.pop()?.close()
1322
}
1423
})
1524

1625
it("should proxy req-rep connected over router-dealer", function (done) {
17-
const frontendAddr = uniqAddress(proto)
18-
const backendAddr = uniqAddress(proto)
19-
2026
const frontend = zmq.socket("router")
2127
const backend = zmq.socket("dealer")
2228

@@ -53,10 +59,6 @@ if (process.env.INCLUDE_COMPAT_TESTS) {
5359
})
5460

5561
it("should proxy rep-req connections with capture", function (done) {
56-
const frontendAddr = uniqAddress(proto)
57-
const backendAddr = uniqAddress(proto)
58-
const captureAddr = uniqAddress(proto)
59-
6062
const frontend = zmq.socket("router")
6163
const backend = zmq.socket("dealer")
6264

‎test/unit/compat/zmq-proxy-test.js renamed to ‎test/unit/compat/zmq-proxy-test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
if (process.env.INCLUDE_COMPAT_TESTS) {
2-
const zmq = require("./load")
3-
const {assert} = require("chai")
1+
import * as zmq from "../../../v5-compat"
2+
import {assert} from "chai"
43

4+
if (process.env.INCLUDE_COMPAT_TESTS) {
55
describe("compat proxy", function () {
66
it("should be a function off the module namespace", function () {
77
assert.typeOf(zmq.proxy, "function")

‎test/unit/compat/zmq-proxy-xpub-xsub-test.js renamed to ‎test/unit/compat/zmq-proxy-xpub-xsub-test.ts

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,30 @@
1-
if (process.env.INCLUDE_COMPAT_TESTS) {
2-
const zmq = require("./load")
3-
const {assert} = require("chai")
4-
const {testProtos, uniqAddress} = require("../helpers")
1+
import * as zmq from "../../../v5-compat"
2+
import {assert} from "chai"
3+
import {testProtos, uniqAddress} from "../helpers"
4+
import {isFullError} from "../../../src/errors"
55

6+
if (process.env.INCLUDE_COMPAT_TESTS) {
67
for (const proto of testProtos("tcp")) {
78
describe(`compat proxy with ${proto} xpub-xsub`, function () {
8-
const sockets = []
9+
const sockets: zmq.Socket[] = []
10+
11+
let frontendAddr: string
12+
let backendAddr: string
13+
let captureAddr: string
14+
15+
beforeEach(async function () {
16+
frontendAddr = await uniqAddress(proto)
17+
backendAddr = await uniqAddress(proto)
18+
captureAddr = await uniqAddress(proto)
19+
})
920

1021
afterEach(function () {
1122
while (sockets.length) {
12-
sockets.pop().close()
23+
sockets.pop()?.close()
1324
}
1425
})
1526

1627
it("should proxy pub-sub connected to xpub-xsub", function (done) {
17-
const frontendAddr = uniqAddress(proto)
18-
const backendAddr = uniqAddress(proto)
19-
2028
const frontend = zmq.socket("xpub")
2129
const backend = zmq.socket("xsub")
2230

@@ -50,10 +58,6 @@ if (process.env.INCLUDE_COMPAT_TESTS) {
5058
})
5159

5260
it("should proxy connections with capture", function (done) {
53-
const frontendAddr = uniqAddress(proto)
54-
const backendAddr = uniqAddress(proto)
55-
const captureAddr = uniqAddress(proto)
56-
5761
const frontend = zmq.socket("xpub")
5862
const backend = zmq.socket("xsub")
5963

@@ -119,6 +123,7 @@ if (process.env.INCLUDE_COMPAT_TESTS) {
119123
try {
120124
zmq.proxy(backend, frontend)
121125
} catch (err) {
126+
assert(isFullError(err))
122127
assert.include(
123128
[
124129
"wrong socket order to proxy",

0 commit comments

Comments
 (0)