[APITESTS]

[reactos.git] / rostests / apitests / ws2_32 / recv.c

diff --git a/rostests/apitests/ws2_32/tests/recv.c b/rostests/apitests/ws2_32/recv.c
similarity index 51%
rename from rostests/apitests/ws2_32/tests/recv.c
rename to rostests/apitests/ws2_32/recv.c
index 4df6c0e..aab7109 100644 (file)
--- a/rostests/apitests/ws2_32/tests/recv.c
+++ b/rostests/apitests/ws2_32/recv.c
@@ -1,20 +1,22 @@
 /*
- * PROJECT:     ws2_32.dll API tests
- * LICENSE:     GPLv2 or any later version
- * FILE:        apitests/ws2_32/tests/recv.c
- * PURPOSE:     Tests for the recv function
- * COPYRIGHT:   Copyright 2008 Colin Finck <mail@colinfinck.de>
+ * PROJECT:         ReactOS api tests
+ * LICENSE:         GPL - See COPYING in the top level directory
+ * PURPOSE:         Test for recv
+ * PROGRAMMERS:     Colin Finck
  */
 
-#include "../ws2_32.h"
+#include <stdio.h>
+#include <wine/test.h>
+#include <windows.h>
+#include "ws2_32.h"
 
 #define RECV_BUF   4
 
 /* For valid test results, the ReactOS Website needs to return at least 8 bytes on a "GET / HTTP/1.0" request.
    Also the first 4 bytes and the last 4 bytes need to be different.
    Both factors usually apply on standard HTTP responses. */
-INT
-Test_recv(PTESTINFO pti)
+
+int Test_recv()
 {
     const char szDummyBytes[RECV_BUF] = {0xFF, 0x00, 0xFF, 0x00};
 
@@ -25,45 +27,59 @@ Test_recv(PTESTINFO pti)
     WSADATA wdata;
 
     /* Start up Winsock */
-    TEST(WSAStartup(MAKEWORD(2, 2), &wdata) == 0);
+    iResult = WSAStartup(MAKEWORD(2, 2), &wdata);
+    ok(iResult == 0, "WSAStartup failed, iResult == %d\n", iResult);
 
     /* If we call recv without a socket, it should return with an error and do nothing. */
     memcpy(szBuf1, szDummyBytes, RECV_BUF);
-    TEST(recv(0, szBuf1, RECV_BUF, 0) == SOCKET_ERROR);
-    TEST(!memcmp(szBuf1, szDummyBytes, RECV_BUF));
+    iResult = recv(0, szBuf1, RECV_BUF, 0);
+    ok(iResult == SOCKET_ERROR, "iRseult = %d\n", iResult);
+    ok(!memcmp(szBuf1, szDummyBytes, RECV_BUF), "not equal\n");
 
     /* Create the socket */
-    iResult = CreateSocket(pti, &sck);
-    if(iResult != APISTATUS_NORMAL)
-        return iResult;
+    if (!CreateSocket(&sck))
+    {
+        ok(0, "CreateSocket failed. Aborting test.\n");
+        return 0;
+    }
 
     /* Now we can pass at least a socket, but we have no connection yet. Should return with an error and do nothing. */
     memcpy(szBuf1, szDummyBytes, RECV_BUF);
-    TEST(recv(sck, szBuf1, RECV_BUF, 0) == SOCKET_ERROR);
-    TEST(!memcmp(szBuf1, szDummyBytes, RECV_BUF));
+    iResult = recv(sck, szBuf1, RECV_BUF, 0);
+    ok(iResult == SOCKET_ERROR, "iResult = %d\n", iResult);
+    ok(!memcmp(szBuf1, szDummyBytes, RECV_BUF), "not equal\n");
 
     /* Connect to "www.reactos.org" */
-    iResult = ConnectToReactOSWebsite(pti, sck);
-    if(iResult != APISTATUS_NORMAL)
-        return iResult;
+    if (!ConnectToReactOSWebsite(sck))
+    {
+        ok(0, "ConnectToReactOSWebsite failed. Aborting test.\n");
+        return 0;
+    }
 
     /* Send the GET request */
-    iResult = GetRequestAndWait(pti, sck);
-    if(iResult != APISTATUS_NORMAL)
-        return iResult;
+    if (!GetRequestAndWait(sck))
+    {
+        ok(0, "GetRequestAndWait failed. Aborting test.\n");
+        return 0;
+    }
 
     /* Receive the data.
        MSG_PEEK will not change the internal number of bytes read, so that a subsequent request should return the same bytes again. */
     SCKTEST(recv(sck, szBuf1, RECV_BUF, MSG_PEEK));
     SCKTEST(recv(sck, szBuf2, RECV_BUF, 0));
-    TEST(!memcmp(szBuf1, szBuf2, RECV_BUF));
+    ok(!memcmp(szBuf1, szBuf2, RECV_BUF), "not equal\n");
 
     /* The last recv() call moved the internal file pointer, so that the next request should return different data. */
     SCKTEST(recv(sck, szBuf1, RECV_BUF, 0));
-    TEST(memcmp(szBuf1, szBuf2, RECV_BUF));
+    ok(memcmp(szBuf1, szBuf2, RECV_BUF), "equal\n");
 
     closesocket(sck);
     WSACleanup();
+    return 1;
+}
 
-    return APISTATUS_NORMAL;
+START_TEST(recv)
+{
+    Test_recv();
 }
+