diff --git a/tests/Makefile.am b/tests/Makefile.am
index fce1d5a9..d537e7f0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -84,9 +84,5 @@ test_timeo_SOURCES = test_timeo.cpp
test_fork_SOURCES = test_fork.cpp
endif
-# Deprecated test cases
-noinst_PROGRAMS += test_raw_sock
-test_raw_sock_SOURCES = test_raw_sock.cpp
-
# Run the test cases
-TESTS = $(noinst_PROGRAMS)
\ No newline at end of file
+TESTS = $(noinst_PROGRAMS)
diff --git a/tests/test_raw_sock.cpp b/tests/test_raw_sock.cpp
deleted file mode 100644
index 05d1c891..00000000
--- a/tests/test_raw_sock.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
-
- This file is part of 0MQ.
-
- 0MQ is free software; you can redistribute it and/or modify it under
- the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- 0MQ is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this program. If not, see .
-*/
-
-#include "../include/zmq.h"
-#include
-#include "testutil.hpp"
-
-// ZMTP protocol greeting structure
-
-typedef unsigned char byte;
-typedef struct {
- byte signature [10]; // 0xFF 8*0x00 0x7F
- byte version [2]; // 0x03 0x00 for ZMTP/3.0
- byte mechanism [20]; // "NULL"
- byte as_server;
- byte filler [31];
-} zmtp_greeting_t;
-
-#define ZMTP_DEALER 5 // Socket type constants
-#define ZMTP_ROUTER 6
-
-// This is a greeting matching what 0MQ will send us; note the
-// 8-byte size is set to 1 for backwards compatibility
-
-static zmtp_greeting_t greeting
- = { { 0xFF, 0, 0, 0, 0, 0, 0, 0, 1, 0x7F }, {3, 0}, { 'N', 'U', 'L', 'L'} };
-
-int main (void)
-{
- setup_test_environment();
- int rc;
-
- // Set up our context and sockets
- void *ctx = zmq_ctx_new ();
- assert (ctx);
-
- // We'll be using this socket in raw mode
- void *router = zmq_socket (ctx, ZMQ_ROUTER);
- assert (router);
-
- int on = 1;
- rc = zmq_setsockopt (router, ZMQ_ROUTER_RAW, &on, sizeof (on));
- assert (rc == 0);
- int zero = 0;
- rc = zmq_setsockopt (router, ZMQ_LINGER, &zero, sizeof (zero));
- assert (rc == 0);
- rc = zmq_bind (router, "tcp://*:5555");
- assert (rc == 0);
-
- // We'll be using this socket as the other peer
- void *dealer = zmq_socket (ctx, ZMQ_DEALER);
- assert (dealer);
- rc = zmq_setsockopt (dealer, ZMQ_LINGER, &zero, sizeof (zero));
- assert (rc == 0);
- rc = zmq_connect (dealer, "tcp://localhost:5555");
-
- // Send a message on the dealer socket
- rc = zmq_send (dealer, "Hello", 5, 0);
- assert (rc == 5);
-
- // First frame is identity
- zmq_msg_t identity;
- rc = zmq_msg_init (&identity);
- assert (rc == 0);
- rc = zmq_msg_recv (&identity, router, 0);
- assert (rc > 0);
- assert (zmq_msg_more (&identity));
-
- // Second frame is greeting signature
- byte buffer [255];
- rc = zmq_recv (router, buffer, 255, 0);
- assert (rc == 10);
- assert (memcmp (buffer, greeting.signature, 10) == 0);
-
- // Send our own protocol greeting
- rc = zmq_msg_send (&identity, router, ZMQ_SNDMORE);
- assert (rc > 0);
- rc = zmq_send (router, &greeting, sizeof (greeting), 0);
- assert (rc == sizeof (greeting));
-
- // Now we expect the data from the DEALER socket
- // First frame is, again, the identity of the connection
- rc = zmq_msg_recv (&identity, router, 0);
- assert (rc > 0);
- assert (zmq_msg_more (&identity));
-
- // Second frame contains the rest of greeting along with
- // the Ready command
- rc = zmq_recv (router, buffer, 255, 0);
- assert (rc == 97);
-
- // First two bytes are major and minor version numbers.
- assert (buffer [0] == 3); // ZMTP/3.0
- assert (buffer [1] == 0);
-
- // Mechanism is "NULL"
- assert (memcmp (buffer + 2, "NULL\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 22) == 0);
- assert (memcmp (buffer + 54, "\0\51READY\0", 8) == 0);
- assert (memcmp (buffer + 62, "\13Socket-Type\0\0\0\6DEALER", 22) == 0);
- assert (memcmp (buffer + 84, "\10Identity\0\0\0\0", 13) == 0);
-
- // Announce we are ready
- memcpy (buffer, "\0\51READY\0", 8);
- memcpy (buffer + 8, "\13Socket-Type\0\0\0\6ROUTER", 22);
- memcpy (buffer + 30, "\10Identity\0\0\0\0", 13);
-
- // Send Ready command
- rc = zmq_msg_send (&identity, router, ZMQ_SNDMORE);
- assert (rc > 0);
- rc = zmq_send (router, buffer, 43, 0);
- assert (rc == 43);
-
- // Now we expect the data from the DEALER socket
- // First frame is, again, the identity of the connection
- rc = zmq_msg_recv (&identity, router, 0);
- assert (rc > 0);
- assert (zmq_msg_more (&identity));
-
- // Third frame contains Hello message from DEALER
- rc = zmq_recv (router, buffer, sizeof buffer, 0);
- assert (rc == 7);
-
- // Then we have a 5-byte message "Hello"
- assert (buffer [0] == 0); // Flags = 0
- assert (buffer [1] == 5); // Size = 5
- assert (memcmp (buffer + 2, "Hello", 5) == 0);
-
- // Send "World" back to DEALER
- rc = zmq_msg_send (&identity, router, ZMQ_SNDMORE);
- assert (rc > 0);
- byte world [] = { 0, 5, 'W', 'o', 'r', 'l', 'd' };
- rc = zmq_send (router, world, sizeof (world), 0);
- assert (rc == sizeof (world));
-
- // Expect response on DEALER socket
- rc = zmq_recv (dealer, buffer, 255, 0);
- assert (rc == 5);
- assert (memcmp (buffer, "World", 5) == 0);
-
- rc = zmq_close (dealer);
- assert (rc == 0);
-
- rc = zmq_close (router);
- assert (rc == 0);
-
- rc = zmq_ctx_term (ctx);
- assert (rc == 0);
-
- return 0;
-}