Moving away from shell api to support long path names on windows for filesystem.

base/file_util_unittest.cc

 // Copyright (c) 2010 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 <winioctl.h>
 #include <shellapi.h>
@@ skipping 674 matching lines @@
   // Test recursive case, create a new file
   file_name = temp_dir_.path().Append(FPL("Test DeleteFile 2.txt"));
   CreateTextFile(file_name, bogus_content);
   ASSERT_TRUE(file_util::PathExists(file_name));
 
   // Make sure it's deleted
   EXPECT_TRUE(file_util::Delete(file_name, true));
   EXPECT_FALSE(file_util::PathExists(file_name));
 }
 
+

[kinuko, 2010/12/10 23:03:43]

Do we need these two empty lines?

+
 #if defined(OS_WIN)
 // Tests that the Delete function works for wild cards, especially
 // with the recursion flag.  Also coincidentally tests PathExists.
 // TODO(erikkay): see if anyone's actually using this feature of the API
-TEST_F(FileUtilTest, DeleteWildCard) {
+TEST_F(FileUtilTest, DISABLED_DeleteWildCard) {
   // Create a file and a directory
   FilePath file_name = temp_dir_.path().Append(FPL("Test DeleteWildCard.txt"));
   CreateTextFile(file_name, bogus_content);
   ASSERT_TRUE(file_util::PathExists(file_name));
 
   FilePath subdir_path = temp_dir_.path().Append(FPL("DeleteWildCardDir"));
   file_util::CreateDirectory(subdir_path);
   ASSERT_TRUE(file_util::PathExists(subdir_path));
 
   // Create the wildcard path
@@ skipping 71 matching lines @@
   ASSERT_TRUE(file_util::PathExists(test_subdir));
 
   FilePath file_name = test_subdir.Append(FPL("Test DeleteDirRecursive.txt"));
   CreateTextFile(file_name, bogus_content);
   ASSERT_TRUE(file_util::PathExists(file_name));
 
   FilePath subdir_path1 = test_subdir.Append(FPL("TestSubDir1"));
   file_util::CreateDirectory(subdir_path1);
   ASSERT_TRUE(file_util::PathExists(subdir_path1));
 
+  FilePath sub_subdir_path1 = subdir_path1.Append(FPL("TestSubSubDir1"));
+  file_util::CreateDirectory(sub_subdir_path1);
+  ASSERT_TRUE(file_util::PathExists(sub_subdir_path1));
+
+  FilePath subdir_file_name =
+      sub_subdir_path1.Append(FPL("DeleteDirRecursiveSubDir.txt"));
+  CreateTextFile(subdir_file_name, bogus_content);
+  ASSERT_TRUE(file_util::PathExists(subdir_file_name));
+
   FilePath subdir_path2 = test_subdir.Append(FPL("TestSubDir2"));
   file_util::CreateDirectory(subdir_path2);
   ASSERT_TRUE(file_util::PathExists(subdir_path2));
 
   // Delete recursively and check that the empty dir got deleted
   EXPECT_TRUE(file_util::Delete(subdir_path2, true));
   EXPECT_FALSE(file_util::PathExists(subdir_path2));
 
   // Delete recursively and check that everything got deleted
   EXPECT_TRUE(file_util::Delete(test_subdir, true));
@@ skipping 1026 matching lines @@
   EXPECT_TRUE(file_util::IsDirectoryEmpty(empty_dir));
 
   FilePath foo(empty_dir.Append(FILE_PATH_LITERAL("foo.txt")));
   std::string bar("baz");
   ASSERT_TRUE(file_util::WriteFile(foo, bar.c_str(), bar.length()));
 
   EXPECT_FALSE(file_util::IsDirectoryEmpty(empty_dir));
 }
 
 }  // namespace