try to test new logic

moleculerjs · May 3, 2017 · 89dcee0 · 89dcee0
1 parent e685052
commit 89dcee0
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 7 deletions.
diff --git a/benchmark/perf-runner.js b/benchmark/perf-runner.js
@@ -55,7 +55,7 @@ let [b1, b2] = createBrokers(Transporters.Fake);
 let count = 0;
 function doRequest() {
 	count++;
-	return b2.call("echo.reply", { a: count }).then(res => {
+	return b1.call("echo.reply", { a: count }).then(res => {
 	//return b2.call("echo.get", { id: 5 }).then(res => {
 		if (count % 10000) {
 			// Fast cycle

diff --git a/examples/multi-server/client.js b/examples/multi-server/client.js
@@ -5,7 +5,7 @@ let chalk = require("chalk");
 
 let { STRATEGY_ROUND_ROBIN, STRATEGY_RANDOM } = require("../../src/constants");
 let ServiceBroker = require("../../src/service-broker");
-let NatsTransporter = require("../../src/transporters/mqtt");
+let NatsTransporter = require("../../src/transporters/nats");
 
 // Create broker
 let broker = new ServiceBroker({

diff --git a/examples/multi-server/server.js b/examples/multi-server/server.js
@@ -3,7 +3,7 @@
 let _ = require("lodash");
 let ServiceBroker = require("../../src/service-broker");
 let { CustomError } = require("../../src/errors");
-let NatsTransporter = require("../../src/transporters/mqtt");
+let NatsTransporter = require("../../src/transporters/nats");
 
 // Create broker
 let broker = new ServiceBroker({

diff --git a/src/transit.js b/src/transit.js
@@ -43,18 +43,22 @@ class Transit {
 		this.heartbeatTimer = null;
 		this.checkNodesTimer = null;
 
-		this.tx.init(this, this.messageHandler.bind(this));
+		if (this.tx)
+			this.tx.init(this, this.messageHandler.bind(this));
 
 		this.__connectResolve = null;
 	}
 
 	afterConnect(wasReconnect) {
 		return Promise.resolve()
+
 		.then(() => {
 			if (!wasReconnect) 
 				this.makeSubscriptions();
 		})
+
 		.then(() => this.discoverNodes())
+
 		.then(() => {
 			if (this.__connectResolve) {
 				this.__connectResolve();

diff --git a/src/transporters/mqtt.js b/src/transporters/mqtt.js
@@ -42,6 +42,7 @@ class MqttTransporter extends Transporter {
 		return new Promise((resolve, reject) => {
 			const mqtt = require("mqtt");
 			const client = mqtt.connect(this.opts.mqtt);
+			this._client = client; // For tests
 
 			client.on("connect", () => {
 				this.client = client;

diff --git a/test/unit/transporters/base.spec.js b/test/unit/transporters/base.spec.js
@@ -1,4 +1,5 @@
 const ServiceBroker = require("../../../src/service-broker");
+const Transit = require("../../../src/transit");
 const BaseTransporter = require("../../../src/transporters/base");
 
 
@@ -13,6 +14,7 @@ describe("Test BaseTransporter", () => {
 
 		expect(trans.init).toBeDefined();
 		expect(trans.connect).toBeDefined();
+		expect(trans.onConnected).toBeDefined();
 		expect(trans.disconnect).toBeDefined();
 		expect(trans.subscribe).toBeDefined();
 		expect(trans.publish).toBeDefined();
@@ -29,12 +31,34 @@ describe("Test BaseTransporter", () => {
 	it("check init", () => {
 		let broker = new ServiceBroker({ nodeID: "server1" });
 		let trans = new BaseTransporter();
+		let transit = new Transit(broker, trans);
 		let handler = jest.fn();
 
-		trans.init(broker, handler);
+		trans.init(transit, handler);
+		expect(trans.transit).toBe(transit);
 		expect(trans.broker).toBe(broker);
 		expect(trans.nodeID).toBe("server1");
 		expect(trans.logger).toBeDefined();
 		expect(trans.messageHandler).toBe(handler);
 	});
+
+	it("check onConnected", () => {
+		let broker = new ServiceBroker({ nodeID: "server1" });
+		let trans = new BaseTransporter();
+		let transit = new Transit(broker, trans);
+		transit.afterConnect = jest.fn();
+
+		expect(trans.connected).toBe(false);
+
+		trans.init(transit);
+
+		trans.onConnected();
+		expect(trans.connected).toBe(true);
+		expect(transit.afterConnect).toHaveBeenCalledTimes(1);
+
+		transit.afterConnect.mockClear();
+		trans.onConnected(true);
+		expect(transit.afterConnect).toHaveBeenCalledTimes(1);
+		expect(transit.afterConnect).toHaveBeenCalledWith(true);
+	});
 });
diff --git a/test/unit/transporters/mqtt.spec.js b/test/unit/transporters/mqtt.spec.js
@@ -1,4 +1,5 @@
 const ServiceBroker = require("../../../src/service-broker");
+const Transit = require("../../../src/transit");
 const MqttTransporter = require("../../../src/transporters/mqtt");
 const { PacketInfo } = require("../../../src/packets");
 
@@ -42,12 +43,13 @@ describe("Test NatsTransporter constructor", () => {
 
 describe("Test MqttTransporter connect & disconnect", () => {
 	let broker = new ServiceBroker();
+	let transit = new Transit(broker);
 	let msgHandler = jest.fn();
 	let trans;
 
 	beforeEach(() => {
 		trans = new MqttTransporter();
-		trans.init(broker, msgHandler);
+		trans.init(transit, msgHandler);
 	});
 
 	it("check connect", () => {
@@ -61,7 +63,7 @@ describe("Test MqttTransporter connect & disconnect", () => {
 			expect(trans.client.on).toHaveBeenCalledWith("message", jasmine.any(Function));
 		});
 
-		trans.client.onCallbacks.connect(); // Trigger the `resolve`
+		trans._client.onCallbacks.connect(); // Trigger the `resolve`
 
 		return p;
 	});