Skip to content

Commit 108fe5f

Browse files
chkr1011chkr1011
committed
Extend publich broker test to also probe with different protocol versions
1 parent db4677f commit 108fe5f

File tree

1 file changed

+32
-23
lines changed

1 file changed

+32
-23
lines changed

‎Source/MQTTnet.TestApp/PublicBrokerTest.cs

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -42,113 +42,113 @@ public static async Task RunAsync()
4242
};
4343

4444
// mqtt.eclipseprojects.io
45-
await ExecuteTestAsync(
45+
await ExecuteTestsAsync(
4646
"mqtt.eclipseprojects.io TCP",
4747
new MqttClientOptionsBuilder().WithTcpServer("mqtt.eclipseprojects.io", 1883).WithProtocolVersion(MqttProtocolVersion.V311).Build());
4848

49-
await ExecuteTestAsync(
49+
await ExecuteTestsAsync(
5050
"mqtt.eclipseprojects.io WS",
5151
new MqttClientOptionsBuilder().WithWebSocketServer(o => o.WithUri("mqtt.eclipseprojects.io:80/mqtt")).WithProtocolVersion(MqttProtocolVersion.V311).Build());
5252

5353
#if NET5_0_OR_GREATER
54-
await ExecuteTestAsync("mqtt.eclipseprojects.io WS TLS13",
54+
await ExecuteTestsAsync("mqtt.eclipseprojects.io WS TLS13",
5555
new MqttClientOptionsBuilder().WithWebSocketServer(o => o.WithUri("mqtt.eclipseprojects.io:443/mqtt"))
5656
.WithProtocolVersion(MqttProtocolVersion.V311).WithTlsOptions(unsafeTls13).Build());
5757

58-
await ExecuteTestAsync("mqtt.eclipseprojects.io WS TLS13 (WebSocket4Net)",
58+
await ExecuteTestsAsync("mqtt.eclipseprojects.io WS TLS13 (WebSocket4Net)",
5959
new MqttClientOptionsBuilder().WithWebSocketServer(o => o.WithUri("mqtt.eclipseprojects.io:443/mqtt"))
6060
.WithProtocolVersion(MqttProtocolVersion.V311).WithTlsOptions(unsafeTls13).Build(),
6161
true);
6262
#endif
6363

6464
// test.mosquitto.org
65-
await ExecuteTestAsync(
65+
await ExecuteTestsAsync(
6666
"test.mosquitto.org TCP",
6767
new MqttClientOptionsBuilder().WithTcpServer("test.mosquitto.org", 1883).WithProtocolVersion(MqttProtocolVersion.V311).Build());
6868

69-
await ExecuteTestAsync(
69+
await ExecuteTestsAsync(
7070
"test.mosquitto.org TCP - Authenticated",
7171
new MqttClientOptionsBuilder().WithTcpServer("test.mosquitto.org", 1884).WithCredentials("rw", "readwrite").WithProtocolVersion(MqttProtocolVersion.V311).Build());
7272

73-
await ExecuteTestAsync(
73+
await ExecuteTestsAsync(
7474
"test.mosquitto.org TCP TLS12",
7575
new MqttClientOptionsBuilder().WithTcpServer("test.mosquitto.org", 8883).WithProtocolVersion(MqttProtocolVersion.V311).WithTlsOptions(unsafeTls12).Build());
7676

7777
#if NET5_0_OR_GREATER
78-
await ExecuteTestAsync("test.mosquitto.org TCP TLS13",
78+
await ExecuteTestsAsync("test.mosquitto.org TCP TLS13",
7979
new MqttClientOptionsBuilder().WithTcpServer("test.mosquitto.org", 8883)
8080
.WithProtocolVersion(MqttProtocolVersion.V311).WithTlsOptions(unsafeTls13).Build());
8181
#endif
8282

83-
await ExecuteTestAsync(
83+
await ExecuteTestsAsync(
8484
"test.mosquitto.org TCP TLS12 - Authenticated",
8585
new MqttClientOptionsBuilder().WithTcpServer("test.mosquitto.org", 8885)
8686
.WithCredentials("rw", "readwrite")
8787
.WithProtocolVersion(MqttProtocolVersion.V311)
8888
.WithTlsOptions(unsafeTls12)
8989
.Build());
9090

91-
await ExecuteTestAsync(
91+
await ExecuteTestsAsync(
9292
"test.mosquitto.org WS",
9393
new MqttClientOptionsBuilder().WithWebSocketServer(o => o.WithUri("test.mosquitto.org:8080/mqtt")).WithProtocolVersion(MqttProtocolVersion.V311).Build());
9494

95-
await ExecuteTestAsync(
95+
await ExecuteTestsAsync(
9696
"test.mosquitto.org WS (WebSocket4Net)",
9797
new MqttClientOptionsBuilder().WithWebSocketServer(o => o.WithUri("test.mosquitto.org:8080/mqtt")).WithProtocolVersion(MqttProtocolVersion.V311).Build(),
9898
true);
9999

100-
await ExecuteTestAsync(
100+
await ExecuteTestsAsync(
101101
"test.mosquitto.org WS TLS12",
102102
new MqttClientOptionsBuilder().WithWebSocketServer(o => o.WithUri("test.mosquitto.org:8081/mqtt")).WithProtocolVersion(MqttProtocolVersion.V311).WithTlsOptions(unsafeTls12).Build());
103103

104-
await ExecuteTestAsync(
104+
await ExecuteTestsAsync(
105105
"test.mosquitto.org WS TLS12 (WebSocket4Net)",
106106
new MqttClientOptionsBuilder().WithWebSocketServer(o => o.WithUri("test.mosquitto.org:8081/mqtt")).WithProtocolVersion(MqttProtocolVersion.V311).WithTlsOptions(unsafeTls12).Build(),
107107
true);
108108

109109
// broker.emqx.io
110-
await ExecuteTestAsync(
110+
await ExecuteTestsAsync(
111111
"broker.emqx.io TCP",
112112
new MqttClientOptionsBuilder().WithTcpServer("broker.emqx.io", 1883).WithProtocolVersion(MqttProtocolVersion.V311).Build());
113113

114-
await ExecuteTestAsync(
114+
await ExecuteTestsAsync(
115115
"broker.emqx.io TCP TLS12",
116116
new MqttClientOptionsBuilder().WithTcpServer("broker.emqx.io", 8883).WithProtocolVersion(MqttProtocolVersion.V311).WithTlsOptions(unsafeTls12).Build());
117117

118118
#if NET5_0_OR_GREATER
119-
await ExecuteTestAsync("broker.emqx.io TCP TLS13",
119+
await ExecuteTestsAsync("broker.emqx.io TCP TLS13",
120120
new MqttClientOptionsBuilder().WithTcpServer("broker.emqx.io", 8883)
121121
.WithProtocolVersion(MqttProtocolVersion.V311).WithTlsOptions(unsafeTls13).Build());
122122
#endif
123123

124-
await ExecuteTestAsync(
124+
await ExecuteTestsAsync(
125125
"broker.emqx.io WS",
126126
new MqttClientOptionsBuilder().WithWebSocketServer(o => o.WithUri("broker.emqx.io:8083/mqtt")).WithProtocolVersion(MqttProtocolVersion.V311).Build());
127127

128-
await ExecuteTestAsync(
128+
await ExecuteTestsAsync(
129129
"broker.emqx.io WS (WebSocket4Net)",
130130
new MqttClientOptionsBuilder().WithWebSocketServer(o => o.WithUri("broker.emqx.io:8084/mqtt")).WithProtocolVersion(MqttProtocolVersion.V311).Build(),
131131
true);
132132

133-
await ExecuteTestAsync(
133+
await ExecuteTestsAsync(
134134
"broker.emqx.io WS TLS12",
135135
new MqttClientOptionsBuilder().WithWebSocketServer(o => o.WithUri("broker.emqx.io:8084/mqtt")).WithProtocolVersion(MqttProtocolVersion.V311).WithTlsOptions(unsafeTls12).Build());
136136

137-
await ExecuteTestAsync(
137+
await ExecuteTestsAsync(
138138
"broker.emqx.io WS TLS12 (WebSocket4Net)",
139139
new MqttClientOptionsBuilder().WithWebSocketServer(o => o.WithUri("broker.emqx.io:8084/mqtt")).WithProtocolVersion(MqttProtocolVersion.V311).WithTlsOptions(unsafeTls12).Build(),
140140
true);
141141

142142
// broker.hivemq.com
143-
await ExecuteTestAsync(
143+
await ExecuteTestsAsync(
144144
"broker.hivemq.com TCP",
145145
new MqttClientOptionsBuilder().WithTcpServer("broker.hivemq.com", 1883).WithProtocolVersion(MqttProtocolVersion.V311).Build());
146146

147-
await ExecuteTestAsync(
147+
await ExecuteTestsAsync(
148148
"broker.hivemq.com WS",
149149
new MqttClientOptionsBuilder().WithWebSocketServer(o => o.WithUri("broker.hivemq.com:8000/mqtt")).WithProtocolVersion(MqttProtocolVersion.V311).Build());
150150

151-
await ExecuteTestAsync(
151+
await ExecuteTestsAsync(
152152
"broker.hivemq.com WS (WebSocket4Net)",
153153
new MqttClientOptionsBuilder().WithWebSocketServer(o => o.WithUri("broker.hivemq.com:8000/mqtt")).WithProtocolVersion(MqttProtocolVersion.V311).Build(),
154154
true);
@@ -160,6 +160,15 @@ await ExecuteTestAsync(
160160
Console.ReadLine();
161161
}
162162

163+
static async Task ExecuteTestsAsync(string name, MqttClientOptions options, bool useWebSocket4Net = false)
164+
{
165+
options.ProtocolVersion = MqttProtocolVersion.V311;
166+
await ExecuteTestAsync(name + " V3.1.1", options, useWebSocket4Net);
167+
168+
options.ProtocolVersion = MqttProtocolVersion.V500;
169+
await ExecuteTestAsync(name + " V5.0.0", options, useWebSocket4Net);
170+
}
171+
163172
static async Task ExecuteTestAsync(string name, MqttClientOptions options, bool useWebSocket4Net = false)
164173
{
165174
try

0 commit comments

Comments
 (0)