Installer: adding ResolveShortcutProperties(); updating shortcut icons during shortcut migration.

base/win/shortcut_unittest.cc

 // Copyright (c) 2012 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 "base/win/shortcut.h"
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/test/test_file_util.h"
 #include "base/test/test_shortcut_win.h"
 #include "base/win/scoped_com_initializer.h"
+#include "base/win/windows_version.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 namespace win {
 
 namespace {
 
 static const char kFileContents[] = "This is a target.";
 static const char kFileContents2[] = "This is another target.";
 
 class ShortcutTest : public testing::Test {
  protected:
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     ASSERT_TRUE(temp_dir_2_.CreateUniqueTempDir());
 
     link_file_ = temp_dir_.path().Append(L"My Link.lnk");
 
     // Shortcut 1's properties
     {
       const FilePath target_file(temp_dir_.path().Append(L"Target 1.txt"));
       file_util::WriteFile(target_file, kFileContents,
                            arraysize(kFileContents));
 
       link_properties_.set_target(target_file);
       link_properties_.set_working_dir(temp_dir_.path());
       link_properties_.set_arguments(L"--magic --awesome");
       link_properties_.set_description(L"Chrome is awesome.");
       link_properties_.set_icon(link_properties_.target, 4);
-      link_properties_.set_app_id(L"Chrome");
-      link_properties_.set_dual_mode(false);
+      if (GetVersion() >= VERSION_WIN7) {

[gab, 2014/01/03 18:25:52]

I think it's good to set these unconditionally (to test that the implementation
correctly ignores them -- as opposed to trying to apply them and crash -- on
older Win versions).

[huangs, 2014/01/03 20:19:35]

Done.

+        link_properties_.set_app_id(L"Chrome");
+        link_properties_.set_dual_mode(false);
+      }
     }
 
     // Shortcut 2's properties (all different from properties of shortcut 1).
     {
       const FilePath target_file_2(temp_dir_.path().Append(L"Target 2.txt"));
       file_util::WriteFile(target_file_2, kFileContents2,
                            arraysize(kFileContents2));
 
       FilePath icon_path_2;
       base::CreateTemporaryFileInDir(temp_dir_.path(), &icon_path_2);
 
       link_properties_2_.set_target(target_file_2);
       link_properties_2_.set_working_dir(temp_dir_2_.path());
       link_properties_2_.set_arguments(L"--super --crazy");
       link_properties_2_.set_description(L"The best in the west.");
       link_properties_2_.set_icon(icon_path_2, 0);
-      link_properties_2_.set_app_id(L"Chrome.UserLevelCrazySuffix");
-      link_properties_2_.set_dual_mode(true);
+      if (GetVersion() >= VERSION_WIN7) {

[gab, 2014/01/03 18:25:52]

Remove condition here too.

[huangs, 2014/01/03 20:19:35]

Done.

+        link_properties_2_.set_app_id(L"Chrome.UserLevelCrazySuffix");
+        link_properties_2_.set_dual_mode(true);
+      }
     }
   }
 
   ScopedCOMInitializer com_initializer_;
   ScopedTempDir temp_dir_;
   ScopedTempDir temp_dir_2_;
 
   // The link file to be created/updated in the shortcut tests below.
   FilePath link_file_;
 
   // Properties for the created shortcut.
   ShortcutProperties link_properties_;
 
   // Properties for the updated shortcut.
   ShortcutProperties link_properties_2_;
 };
 
 }  // namespace
 
+TEST_F(ShortcutTest, CreateAndResolveShortcutProperties) {
+  uint32 properties_use = ShortcutProperties::PROPERTIES_BASIC;

[gab, 2014/01/03 18:25:52]

s/properties_use/valid_properties

[huangs, 2014/01/03 20:19:35]

Done.

+  if (GetVersion() >= VERSION_WIN7)
+    properties_use |= ShortcutProperties::PROPERTIES_WIN7;
+
+  // Test all properties.
+  FilePath file_1(temp_dir_.path().Append(L"Link1.lnk"));
+  ASSERT_TRUE(CreateOrUpdateShortcutLink(
+      file_1, link_properties_, SHORTCUT_CREATE_ALWAYS));
+
+  ShortcutProperties properties_read_1;
+  ASSERT_TRUE(
+      ResolveShortcutProperties(file_1, properties_use, &properties_read_1));

[gab, 2014/01/03 18:25:52]

Still resolve on PROPERTIES_ALL and expect the method is able to skip those on
its own prior to Win7

[huangs, 2014/01/03 20:19:35]

Done.

+  EXPECT_EQ(link_properties_.options, properties_use);
+  EXPECT_EQ(link_properties_.target, properties_read_1.target);
+  EXPECT_EQ(link_properties_.working_dir, properties_read_1.working_dir);
+  EXPECT_EQ(link_properties_.arguments, properties_read_1.arguments);
+  EXPECT_EQ(link_properties_.description, properties_read_1.description);
+  EXPECT_EQ(link_properties_.icon, properties_read_1.icon);
+  EXPECT_EQ(link_properties_.icon_index, properties_read_1.icon_index);
+  if (GetVersion() >= VERSION_WIN7) {
+    EXPECT_EQ(link_properties_.app_id, properties_read_1.app_id);
+    EXPECT_EQ(link_properties_.dual_mode, properties_read_1.dual_mode);
+  }
+
+  // Test simple shortcut with no special properties set.
+  FilePath file_2(temp_dir_.path().Append(L"Link2.lnk"));
+  ShortcutProperties only_target_properties;
+  only_target_properties.set_target(link_properties_.target);
+  ASSERT_TRUE(CreateOrUpdateShortcutLink(
+      file_2, only_target_properties, SHORTCUT_CREATE_ALWAYS));
+
+  ShortcutProperties properties_read_2;
+  ASSERT_TRUE(
+      ResolveShortcutProperties(file_2, properties_use, &properties_read_2));

[gab, 2014/01/03 18:25:52]

PROPERTIES_ALL here too

[huangs, 2014/01/03 20:19:35]

Done.

+  EXPECT_EQ(properties_use, properties_read_2.options);
+  EXPECT_EQ(only_target_properties.target, properties_read_2.target);
+  EXPECT_EQ(L"", properties_read_2.arguments);
+  EXPECT_EQ(L"", properties_read_2.description);

[gab, 2014/01/03 18:25:52]

Why not test all properties?

This will be good in particular to test handling of VT_EMPTY for
dual_mode/app_id.

[huangs, 2014/01/03 20:19:35]

Test for (empty) defaults. Will need to watch try job carefully, in case
different versions of Windows do different things.

+}
+
 TEST_F(ShortcutTest, CreateAndResolveShortcut) {
   ShortcutProperties only_target_properties;
   only_target_properties.set_target(link_properties_.target);
 
   ASSERT_TRUE(CreateOrUpdateShortcutLink(
       link_file_, only_target_properties, SHORTCUT_CREATE_ALWAYS));
 
   FilePath resolved_name;
   EXPECT_TRUE(ResolveShortcut(link_file_, &resolved_name, NULL));
 
@@ skipping 171 matching lines @@
   ASSERT_TRUE(CreateOrUpdateShortcutLink(
       link_file_, link_properties_2_, SHORTCUT_REPLACE_EXISTING));
 
   ShortcutProperties expected_properties(link_properties_2_);
   expected_properties.set_arguments(link_properties_.arguments);
   ValidateShortcut(link_file_, expected_properties);
 }
 
 }  // namespace win
 }  // namespace base