Order posix file listings by type as well as name....

base/file_util_unittest.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
@@ skipping 1017 matching lines @@
   FilePath fileF = test_dir_.Append(FILE_PATH_LITERAL("f"));
 
   // Create files/directories in near random order.
   CreateTextFile(fileF, L"");
   CreateTextFile(fileA, L"");
   CreateTextFile(fileB, L"");
   EXPECT_TRUE(file_util::CreateDirectory(dirE));
   EXPECT_TRUE(file_util::CreateDirectory(dirC));
   EXPECT_TRUE(file_util::CreateDirectory(dirD));
 
-  // Files and directories are enumerated in the lexicographical order,
-  // ignoring case and whether they are files or directories.
+  // On Windows, files and directories are enumerated in the lexicographical
+  // order, ignoring case and whether they are files or directories. On posix,
+  // we order directories before files.
   file_util::FileEnumerator enumerator(test_dir_, false, FILES_AND_DIRECTORIES);
   FilePath cur_file = enumerator.Next();
+#if defined(OS_WIN)
   EXPECT_EQ(fileA.value(), cur_file.value());
   cur_file = enumerator.Next();
   EXPECT_EQ(fileB.value(), cur_file.value());
   cur_file = enumerator.Next();
   EXPECT_EQ(dirC.value(), cur_file.value());
   cur_file = enumerator.Next();
   EXPECT_EQ(dirD.value(), cur_file.value());
   cur_file = enumerator.Next();
   EXPECT_EQ(dirE.value(), cur_file.value());
   cur_file = enumerator.Next();
   EXPECT_EQ(fileF.value(), cur_file.value());
   cur_file = enumerator.Next();
+#elif defined(OS_POSIX)
+  EXPECT_EQ(dirC.value(), cur_file.value());
+  cur_file = enumerator.Next();
+  EXPECT_EQ(dirD.value(), cur_file.value());
+  cur_file = enumerator.Next();
+  EXPECT_EQ(dirE.value(), cur_file.value());
+  cur_file = enumerator.Next();
+  EXPECT_EQ(fileA.value(), cur_file.value());
+  cur_file = enumerator.Next();
+  EXPECT_EQ(fileB.value(), cur_file.value());
+  cur_file = enumerator.Next();
+  EXPECT_EQ(fileF.value(), cur_file.value());
+  cur_file = enumerator.Next();
+#endif
+
   EXPECT_EQ(FILE_PATH_LITERAL(""), cur_file.value());
 }
 
 void PathComponents(const std::wstring& path,
                     std::vector<std::wstring>* components) {
   DCHECK(components != NULL);
   if (components == NULL)
     return;
   std::wstring::size_type start = 0;
   std::wstring::size_type end = path.find('/', start);
@@ skipping 78 matching lines @@
 #elif defined(OS_LINUX)
   EXPECT_FALSE(file_util::ContainsPath(foo,
       foo_caps.Append(FILE_PATH_LITERAL("bar.txt"))));
 #else
   // We can't really do this test on osx since the case-sensitivity of the
   // filesystem is configurable.
 #endif
 }
 
 }  // namespace