From b98a26853c32af992db1eb9bf253833cc90e3a49 Mon Sep 17 00:00:00 2001
From: Saulius Krasuckas <saulius.krasuckas@ieee.org>
Date: Tue, 21 Jun 2005 20:04:17 +0000
Subject: [PATCH] Cleanup the shlfolder test a bit more.

---
 dlls/shell32/tests/shlfolder.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c
index fe63a59cb5..82c9ecc6cc 100644
--- a/dlls/shell32/tests/shlfolder.c
+++ b/dlls/shell32/tests/shlfolder.c
@@ -447,7 +447,7 @@ static void test_SHGetPathFromIDList(void)
     ILFree(pidlMyComputer);
 }
 
-START_TEST(shlfolder)
+static void test_EnumObjects_and_CompareIDs(void)
 {
     ITEMIDLIST *newPIDL;
     IShellFolder *IDesktopFolder, *testIShellFolder;
@@ -479,10 +479,6 @@ START_TEST(shlfolder)
     ok(hr == S_OK, "BindToObject failed %08lx\n", hr);
         
     test_EnumObjects(testIShellFolder);
-    test_BindToObject();
-    test_GetDisplayName();
-    test_GetAttributesOf();
-    test_SHGetPathFromIDList();
 
     hr = IShellFolder_Release(testIShellFolder);
     ok(hr == S_OK, "IShellFolder_Release failed %08lx\n", hr);
@@ -491,3 +487,12 @@ START_TEST(shlfolder)
 
     Cleanup();
 }
+
+START_TEST(shlfolder)
+{
+    test_EnumObjects_and_CompareIDs();
+    test_BindToObject();
+    test_GetDisplayName();
+    test_GetAttributesOf();
+    test_SHGetPathFromIDList();
+}