Skip to content

Commit 1d37242

Browse files
crazyrokrcrazyrokr
committed
[broker-30] Fix tests
1 parent c2ac2ad commit 1d37242

File tree

2 files changed

+12
-36
lines changed

2 files changed

+12
-36
lines changed

‎core-service/src/test/groovy/javasabr/mqtt/service/publish/handler/impl/Qos1MqttPublishOutMessageHandlerTest.groovy‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ class Qos1MqttPublishOutMessageHandlerTest extends QosMqttPublishOutMessageHandl
2222

2323
def "should deliver publish to subscriber"() {
2424
given:
25-
def publishOutHandler = new Qos1MqttPublishOutMessageHandler(
26-
defaultSubscriptionService,
27-
defaultMessageOutFactoryService)
25+
def publishOutHandler = new Qos1MqttPublishOutMessageHandler(defaultMessageOutFactoryService)
2826
def connection = mockedExternalConnection(MqttVersion.MQTT_5)
2927
def user = connection.user() as TestExternalNetworkMqttUser
3028
def testTopicName = defaultTopicService.createTopicName(user, "Qos1MqttPublishOutMessageHandlerTest/1")
@@ -50,9 +48,7 @@ class Qos1MqttPublishOutMessageHandlerTest extends QosMqttPublishOutMessageHandl
5048

5149
def "should wait for ack response for publish"() {
5250
given:
53-
def publishOutHandler = new Qos1MqttPublishOutMessageHandler(
54-
defaultSubscriptionService,
55-
defaultMessageOutFactoryService)
51+
def publishOutHandler = new Qos1MqttPublishOutMessageHandler(defaultMessageOutFactoryService)
5652
def connection = mockedExternalConnection(MqttVersion.MQTT_5)
5753
def user = connection.user() as TestExternalNetworkMqttUser
5854
def session = user.session()
@@ -98,9 +94,7 @@ class Qos1MqttPublishOutMessageHandlerTest extends QosMqttPublishOutMessageHandl
9894

9995
def "should correctly handle publish ack when no stored trackable meta about the publish"() {
10096
given:
101-
def publishOutHandler = new Qos1MqttPublishOutMessageHandler(
102-
defaultSubscriptionService,
103-
defaultMessageOutFactoryService)
97+
def publishOutHandler = new Qos1MqttPublishOutMessageHandler(defaultMessageOutFactoryService)
10498
def connection = mockedExternalConnection(MqttVersion.MQTT_5)
10599
def user = connection.user() as TestExternalNetworkMqttUser
106100
def session = user.session()
@@ -149,9 +143,7 @@ class Qos1MqttPublishOutMessageHandlerTest extends QosMqttPublishOutMessageHandl
149143

150144
def "should handle as protocol error receiving unexpected response message"() {
151145
given:
152-
def publishOutHandler = new Qos1MqttPublishOutMessageHandler(
153-
defaultSubscriptionService,
154-
defaultMessageOutFactoryService)
146+
def publishOutHandler = new Qos1MqttPublishOutMessageHandler(defaultMessageOutFactoryService)
155147
def connection = mockedExternalConnection(MqttVersion.MQTT_5)
156148
def user = connection.user() as TestExternalNetworkMqttUser
157149
def session = user.session()
@@ -191,9 +183,7 @@ class Qos1MqttPublishOutMessageHandlerTest extends QosMqttPublishOutMessageHandl
191183

192184
def "should handle as protocol error for unexpected flow state"() {
193185
given:
194-
def publishOutHandler = new Qos1MqttPublishOutMessageHandler(
195-
defaultSubscriptionService,
196-
defaultMessageOutFactoryService)
186+
def publishOutHandler = new Qos1MqttPublishOutMessageHandler(defaultMessageOutFactoryService)
197187
def connection = mockedExternalConnection(MqttVersion.MQTT_5)
198188
def user = connection.user() as TestExternalNetworkMqttUser
199189
def session = user.session()

‎core-service/src/test/groovy/javasabr/mqtt/service/publish/handler/impl/Qos2MqttPublishOutMessageHandlerTest.groovy‎

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ class Qos2MqttPublishOutMessageHandlerTest extends QosMqttPublishOutMessageHandl
2525

2626
def "should deliver publish to subscriber"() {
2727
given:
28-
def publishOutHandler = new Qos2MqttPublishOutMessageHandler(
29-
defaultSubscriptionService,
30-
defaultMessageOutFactoryService)
28+
def publishOutHandler = new Qos2MqttPublishOutMessageHandler(defaultMessageOutFactoryService)
3129
def connection = mockedExternalConnection(MqttVersion.MQTT_5)
3230
def user = connection.user() as TestExternalNetworkMqttUser
3331
def testTopicName = defaultTopicService.createTopicName(user, "Qos2MqttPublishOutMessageHandlerTest/1")
@@ -53,9 +51,7 @@ class Qos2MqttPublishOutMessageHandlerTest extends QosMqttPublishOutMessageHandl
5351

5452
def "should wait for receive-complete responses for publish"() {
5553
given:
56-
def publishOutHandler = new Qos2MqttPublishOutMessageHandler(
57-
defaultSubscriptionService,
58-
defaultMessageOutFactoryService)
54+
def publishOutHandler = new Qos2MqttPublishOutMessageHandler(defaultMessageOutFactoryService)
5955
def connection = mockedExternalConnection(MqttVersion.MQTT_5)
6056
def user = connection.user() as TestExternalNetworkMqttUser
6157
def session = user.session()
@@ -124,9 +120,7 @@ class Qos2MqttPublishOutMessageHandlerTest extends QosMqttPublishOutMessageHandl
124120

125121
def "should correctly handle publish receive when no stored trackable meta about the publish"() {
126122
given:
127-
def publishOutHandler = new Qos2MqttPublishOutMessageHandler(
128-
defaultSubscriptionService,
129-
defaultMessageOutFactoryService)
123+
def publishOutHandler = new Qos2MqttPublishOutMessageHandler(defaultMessageOutFactoryService)
130124
def connection = mockedExternalConnection(MqttVersion.MQTT_5)
131125
def user = connection.user() as TestExternalNetworkMqttUser
132126
def session = user.session()
@@ -176,9 +170,7 @@ class Qos2MqttPublishOutMessageHandlerTest extends QosMqttPublishOutMessageHandl
176170

177171
def "should handle as protocol error receiving unexpected response message for first stage"() {
178172
given:
179-
def publishOutHandler = new Qos2MqttPublishOutMessageHandler(
180-
defaultSubscriptionService,
181-
defaultMessageOutFactoryService)
173+
def publishOutHandler = new Qos2MqttPublishOutMessageHandler(defaultMessageOutFactoryService)
182174
def connection = mockedExternalConnection(MqttVersion.MQTT_5)
183175
def user = connection.user() as TestExternalNetworkMqttUser
184176
def session = user.session()
@@ -218,9 +210,7 @@ class Qos2MqttPublishOutMessageHandlerTest extends QosMqttPublishOutMessageHandl
218210

219211
def "should handle as protocol error receiving unexpected response message for second stage"() {
220212
given:
221-
def publishOutHandler = new Qos2MqttPublishOutMessageHandler(
222-
defaultSubscriptionService,
223-
defaultMessageOutFactoryService)
213+
def publishOutHandler = new Qos2MqttPublishOutMessageHandler(defaultMessageOutFactoryService)
224214
def connection = mockedExternalConnection(MqttVersion.MQTT_5)
225215
def user = connection.user() as TestExternalNetworkMqttUser
226216
def session = user.session()
@@ -271,9 +261,7 @@ class Qos2MqttPublishOutMessageHandlerTest extends QosMqttPublishOutMessageHandl
271261

272262
def "should handle as protocol error for unexpected flow state for publish received"() {
273263
given:
274-
def publishOutHandler = new Qos2MqttPublishOutMessageHandler(
275-
defaultSubscriptionService,
276-
defaultMessageOutFactoryService)
264+
def publishOutHandler = new Qos2MqttPublishOutMessageHandler(defaultMessageOutFactoryService)
277265
def connection = mockedExternalConnection(MqttVersion.MQTT_5)
278266
def user = connection.user() as TestExternalNetworkMqttUser
279267
def session = user.session()
@@ -316,9 +304,7 @@ class Qos2MqttPublishOutMessageHandlerTest extends QosMqttPublishOutMessageHandl
316304

317305
def "should handle as protocol error for unexpected flow state for publish complete"() {
318306
given:
319-
def publishOutHandler = new Qos2MqttPublishOutMessageHandler(
320-
defaultSubscriptionService,
321-
defaultMessageOutFactoryService)
307+
def publishOutHandler = new Qos2MqttPublishOutMessageHandler(defaultMessageOutFactoryService)
322308
def connection = mockedExternalConnection(MqttVersion.MQTT_5)
323309
def user = connection.user() as TestExternalNetworkMqttUser
324310
def session = user.session()

0 commit comments

Comments
 (0)