3030import de .gesellix .docker .remote .api .testutil .TarUtil ;
3131import de .gesellix .docker .remote .api .testutil .TestImage ;
3232import de .gesellix .docker .websocket .DefaultWebSocketListener ;
33- import okhttp3 .Response ;
3433import okhttp3 .WebSocket ;
3534import okhttp3 .WebSocketListener ;
3635import okio .BufferedSink ;
5756import java .util .TimerTask ;
5857import java .util .UUID ;
5958import java .util .concurrent .CountDownLatch ;
60- import java .util .concurrent .ExecutorService ;
61- import java .util .concurrent .Executors ;
6259import java .util .concurrent .TimeUnit ;
6360import java .util .stream .Collectors ;
6461
@@ -805,22 +802,11 @@ null, null, singletonList("/cat"),
805802 containerApi .containerCreate (containerCreateRequest , "container-attach-ws-non-interactive-test" );
806803 containerApi .containerStart ("container-attach-ws-non-interactive-test" , null );
807804
808- ExecutorService executor = Executors .newSingleThreadExecutor ();
809805 String ourMessage = "hallo welt " + UUID .randomUUID ();
810806
811807 CountDownLatch messageReceived = new CountDownLatch (1 );
812808 List <String > receivedMessages = new ArrayList <>();
813809 WebSocketListener listener = new DefaultWebSocketListener () {
814- @ Override
815- public void onOpen (@ NotNull WebSocket webSocket , @ NotNull Response response ) {
816- super .onOpen (webSocket , response );
817- executor .execute (() -> webSocket .send (ourMessage ));
818- }
819-
820- @ Override
821- public void onFailure (@ NotNull WebSocket webSocket , Throwable t , Response response ) {
822- super .onFailure (webSocket , t , response );
823- }
824810
825811 @ Override
826812 public void onMessage (@ NotNull WebSocket webSocket , @ NotNull String text ) {
@@ -835,29 +821,21 @@ public void onMessage(@NotNull WebSocket webSocket, ByteString bytes) {
835821 receivedMessages .add (bytes .utf8 ());
836822 messageReceived .countDown ();
837823 }
838-
839- @ Override
840- public void onClosing (@ NotNull WebSocket webSocket , int code , @ NotNull String reason ) {
841- super .onClosing (webSocket , code , reason );
842- }
843-
844- @ Override
845- public void onClosed (@ NotNull WebSocket webSocket , int code , @ NotNull String reason ) {
846- super .onClosed (webSocket , code , reason );
847- }
848824 };
849825
850826 WebSocket webSocket = tcpClient .getContainerApi ().containerAttachWebsocket (
851827 "container-attach-ws-non-interactive-test" ,
852828 null , true , true , true , true , true ,
853829 listener );
854830
855- // boolean enqueued = webSocket.send(ourMessage);
856- // assertTrue(enqueued);
831+ boolean enqueued = webSocket .send (ourMessage );
832+ assertTrue (enqueued );
857833
858834 Duration timeout = Duration .of (5 , SECONDS );
859835 boolean success = messageReceived .await (timeout .toMillis (), TimeUnit .MILLISECONDS );
860836
837+ System .out .println ("Received: " + receivedMessages );
838+
861839 webSocket .close (NORMAL_CLOSURE .getCode (), "cleanup" );
862840 socatContainer .stopSocatContainer ();
863841
0 commit comments