[PATCH v4 4/4] ntdll/tests: Corrected and refactored tests

[Rayhan Faizel]

From: Rayhan Faizel

---
 dlls/ntdll/tests/path.c | 30 ++++++++----------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c
index 6b5a5f04e17..a67c108c14d 100644
--- a/dlls/ntdll/tests/path.c
+++ b/dlls/ntdll/tests/path.c
@@ -636,28 +636,14 @@ static void test_RtlDosPathNameToNtPathName_U(void)
             status = pRtlDosPathNameToRelativeNtPathName_U_WithStatus(tests[i].dos, &nameW, &file_part, &rtl);
             ok(status == STATUS_SUCCESS, "%s: Got status %#lx.\n", debugstr_w(tests[i].dos), status);

-
-            if (tests[i].relative)
-            {
-                ok(rtl.RelativeName.Buffer && 
-                !wcscmp(rtl.RelativeName.Buffer,tests[i].relative) ,
-                    "%s: Expected relative path %s, got %s.\n", debugstr_w(tests[i].dos), debugstr_w(tests[i].relative), debugstr_w(rtl.RelativeName.Buffer));
-                ok(rtl.ContainerDirectory != 0, "%s: containing directory handle not created.\n",debugstr_w(tests[i].dos));
-            }
-            else if (broken(tests[i].alt_relative != NULL))
-            {
-                ok(rtl.RelativeName.Buffer != NULL && 
-                !wcscmp(rtl.RelativeName.Buffer,tests[i].alt_relative) ,
-                    "%s: Expected alternate relative path %s, got %s.\n", debugstr_w(tests[i].dos), debugstr_w(tests[i].relative), debugstr_w(rtl.RelativeName.Buffer));
-                ok(rtl.ContainerDirectory != 0, "%s: containing directory handle not created.\n",debugstr_w(tests[i].dos));
-            }
-            else
-            {
-                ok(rtl.RelativeName.Buffer == NULL,
-                    "%s: Expected NULL relative path, got %s\n", debugstr_w(tests[i].dos),debugstr_w(rtl.RelativeName.Buffer));
-                ok(rtl.ContainerDirectory == 0, "%s: containing directory handle created.\n",debugstr_w(tests[i].dos));
-
-            }
+            ok((tests[i].relative && rtl.RelativeName.Buffer && !wcscmp(rtl.RelativeName.Buffer,tests[i].relative)) 
+                || broken(tests[i].alt_relative && rtl.RelativeName.Buffer && !wcscmp(rtl.RelativeName.Buffer,tests[i].alt_relative))
+                || (tests[i].relative == NULL && rtl.RelativeName.Buffer == NULL)
+            ,
+                "%s: Expected relative path %s, got %s.\n", debugstr_w(tests[i].dos), debugstr_w(tests[i].relative), debugstr_w(rtl.RelativeName.Buffer));
+            
+            ok((rtl.RelativeName.Buffer && rtl.ContainerDirectory != 0) || (rtl.RelativeName.Buffer == NULL && rtl.ContainerDirectory == 0),
+            "Unexpected Directory Handle: %p.\n",rtl.ContainerDirectory);
         }
         RtlFreeUnicodeString(&nameW);
     }