[PATCH v2 2/2] split tests between focus of the test

[John H. Freeman]

From: "John H. Freeman"

---
 dlls/iphlpapi/tests/iphlpapi.c | 48 ++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c
index 734f507b3a6..e476a45acb7 100644
--- a/dlls/iphlpapi/tests/iphlpapi.c
+++ b/dlls/iphlpapi/tests/iphlpapi.c
@@ -50,6 +50,7 @@
 #include <stdlib.h>

#define ICMP_MINLEN 8 /* copied from dlls/iphlpapi/ip_icmp.h file */
+static ULONG sizeForOverflowTest = 0x7fffffff;

static HMODULE hLibrary = NULL;

@@ -1747,31 +1748,43 @@ static void test_GetAdaptersAddressesInvalidParameterNULLsize(void)
     ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %lu\n", ret);
 }

-static void test_GetAdaptersAddresses(void)
+/* size should be ignored and overwritten if buffer is NULL */
+static void test_GetAdaptersAddressesBufferOverflowZeroFlags(void)
 {
-    BOOL dns_eligible_found = FALSE;
-    ULONG ret, size, osize, i;
-    IP_ADAPTER_ADDRESSES *aa, *ptr;
-    IP_ADAPTER_UNICAST_ADDRESS *ua;
-
-    /* size should be ignored and overwritten if buffer is NULL */
-    size = 0x7fffffff;
-    ret = GetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, &size);
+    ULONG ret;
+    ret = GetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, &sizeForOverflowTest);
     ok(ret == ERROR_BUFFER_OVERFLOW, "expected ERROR_BUFFER_OVERFLOW, got %lu\n", ret);
-    if (ret != ERROR_BUFFER_OVERFLOW) return;
+}

-    /* GAA_FLAG_SKIP_FRIENDLY_NAME is ignored */
+/* GAA_FLAG_SKIP_FRIENDLY_NAME is ignored */
+static void test_GetAdaptersAddressesBufferOverflow(void)
+{
+    ULONG ret, osize;
     osize = 0x7fffffff;
     ret = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_SKIP_FRIENDLY_NAME, NULL, NULL, &osize);
     ok(ret == ERROR_BUFFER_OVERFLOW, "expected ERROR_BUFFER_OVERFLOW, got %lu\n", ret);
-    ok(osize == size, "expected %ld, got %ld\n", size, osize);
+    ok(osize == sizeForOverflowTest, "expected %ld, got %ld\n", sizeForOverflowTest, osize);
+}

-    ptr = malloc(size);
-    ret = GetAdaptersAddresses(AF_UNSPEC, 0, NULL, ptr, &size);
+static void test_GetAdaptersAddressesErrorSuccess(void)
+{
+    IP_ADAPTER_ADDRESSES *ptr;
+    ptr = malloc(sizeForOverflowTest);
+    ULONG ret;
+    ret = GetAdaptersAddresses(AF_UNSPEC, 0, NULL, ptr, &sizeForOverflowTest);
     ok(!ret, "expected ERROR_SUCCESS got %lu\n", ret);
     free(ptr);
+}
+
+/* higher size must not be changed to lower size */
+static void test_GetAdaptersAddressesDoublingBufferOverlow(void)
+{
+    BOOL dns_eligible_found = FALSE;
+    ULONG ret, size, osize, i;
+    IP_ADAPTER_ADDRESSES *aa, *ptr;
+    IP_ADAPTER_UNICAST_ADDRESS *ua;
+    size = sizeForOverflowTest;

-    /* higher size must not be changed to lower size */
     size *= 2;
     osize = size;
     ptr = malloc(osize);
@@ -2938,7 +2951,10 @@ START_TEST(iphlpapi)

testWin2KFunctions();
     test_GetAdaptersAddressesInvalidParameterNULLsize();
-    test_GetAdaptersAddresses();
+    test_GetAdaptersAddressesBufferOverflowZeroFlags();
+    test_GetAdaptersAddressesBufferOverflow();
+    test_GetAdaptersAddressesErrorSuccess();
+    test_GetAdaptersAddressesDoublingBufferOverlow();
     test_GetExtendedTcpTable();
     test_GetExtendedUdpTable();
     test_AllocateAndGetTcpExTableFromStack();