Updates tests

examples/autobahn-client.rs

@@ -1,11 +1,13 @@
 use log::*;
 use url::Url;
 
-use tungstenite::client::connect_with_config;
+use tungstenite::{
-use tungstenite::extensions::compression::deflate::DeflateConfigBuilder;
+    client::connect_with_config,
-use tungstenite::extensions::compression::WsCompression;
+    connect,
-use tungstenite::protocol::WebSocketConfig;
+    extensions::compression::{deflate::DeflateConfigBuilder, WsCompression},
-use tungstenite::{connect, Error, Message, Result};
+    protocol::WebSocketConfig,
+    Error, Message, Result,
+};
 
 const AGENT: &str = "Tungstenite";
 
@@ -26,22 +28,17 @@ fn update_reports() -> Result<()> {
 
 fn run_test(case: u32) -> Result<()> {
     info!("Running test case {}", case);
-    let case_url = Url::parse(&format!(
+    let case_url =
-        "ws://localhost:9001/runCase?case={}&agent={}",
+        Url::parse(&format!("ws://localhost:9001/runCase?case={}&agent={}", case, AGENT)).unwrap();
-        case, AGENT
+    let deflate_config = DeflateConfigBuilder::default().max_message_size(None).build();
-    ))
-    .unwrap();
-    let deflate_config = DeflateConfigBuilder::default()
-        .max_message_size(None)
-        .build();
 
     let (mut socket, _) = connect_with_config(
         case_url,
         Some(WebSocketConfig {
-            max_send_queue: None,
-            max_frame_size: Some(16 << 20),
             compression: WsCompression::Deflate(deflate_config),
+            ..Default::default()
         }),
+        3,
     )?;
 
     loop {

examples/autobahn-server.rs

@@ -4,13 +4,13 @@ use std::{
 };
 
 use log::*;
-use tungstenite::{accept, handshake::HandshakeRole, Error, HandshakeError, Message, Result};
+use tungstenite::{
-use tungstenite::extensions::compression::deflate::DeflateConfigBuilder;
+    extensions::compression::{deflate::DeflateConfigBuilder, WsCompression},
-use tungstenite::extensions::compression::WsCompression;
+    handshake::HandshakeRole,
-use tungstenite::handshake::HandshakeRole;
+    protocol::WebSocketConfig,
-use tungstenite::protocol::WebSocketConfig;
+    server::accept_with_config,
-use tungstenite::server::accept_with_config;
+    Error, HandshakeError, Message, Result,
-use tungstenite::{Error, HandshakeError, Message, Result};
+};
 
 fn must_not_block<Role: HandshakeRole>(err: HandshakeError<Role>) -> Error {
     match err {
@@ -20,16 +20,13 @@ fn must_not_block<Role: HandshakeRole>(err: HandshakeError<Role>) -> Error {
 }
 
 fn handle_client(stream: TcpStream) -> Result<()> {
-    let deflate_config = DeflateConfigBuilder::default()
+    let deflate_config = DeflateConfigBuilder::default().max_message_size(None).build();
-        .max_message_size(None)
-        .build();
 
     let mut socket = accept_with_config(
         stream,
         Some(WebSocketConfig {
-            max_send_queue: None,
-            max_frame_size: Some(16 << 20),
             compression: WsCompression::Deflate(deflate_config),
+            ..Default::default()
         }),
     )
     .map_err(must_not_block)?;