Issues #1163, #1173 - refactor CPluginUserSettings

test/plugin/UserSettingsTest.cpp

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gtest/gtest.h>
 
-#include <OAIdl.h>
 #include "../../src/plugin/PluginUserSettings.h"
 
 //----------------------------------
 // GetIDsOfNames
 //----------------------------------
 
 namespace
 {
   void single_method_name_found(std::wstring name, DISPID expected_id)
   {
     CPluginUserSettings x;
     wchar_t *names[1];
     names[0] = const_cast<wchar_t *>(name.c_str());
     DISPID ids[1];
     HRESULT h = x.GetIDsOfNames(IID_NULL, names, 1, 0, ids);
     ASSERT_EQ(S_OK, h);
     DISPID id=ids[0];
     ASSERT_EQ(expected_id, id);
   }
 
   void single_method_name_notfound(std::wstring name)
   {
     CPluginUserSettings x;
     wchar_t *names[1];
     names[0] = const_cast<wchar_t *>(name.c_str());
     DISPID ids[1];
     HRESULT h = x.GetIDsOfNames(IID_NULL, names, 1, 0, ids);
     ASSERT_NE(S_OK, h);
-    // The old version returns a nonstandard error code.
-    if (h == DISP_E_MEMBERNOTFOUND)
-    {
-      return;
-    }
     EXPECT_EQ(DISP_E_UNKNOWNNAME, h);
   }
 }
 
 TEST(CPluginUserSettings_GetIDsOfNames_Test, all_defined_found)
 {
   CPluginUserSettings x;
   single_method_name_found(L"GetMessage", 0);
   single_method_name_found(L"GetLanguageCount", 1);
   single_method_name_found(L"GetLanguageByIndex", 2);
@@ skipping 26 matching lines @@
   {
     CPluginUserSettings x;
     DISPPARAMS params;
     params.rgvarg = nullptr;
     params.rgdispidNamedArgs = nullptr;
     params.cArgs = 0;
     params.cNamedArgs = 0;
     EXCEPINFO ex;
     HRESULT h = x.Invoke(-1, IID_NULL, 0, 0, &params, nullptr, &ex, nullptr);
     ASSERT_NE(S_OK, h);
-    // The old version returns a nonstandard error code.
-    if (h == DISP_E_BADINDEX)
-    {
-      return;
-    }
     EXPECT_EQ(DISP_E_MEMBERNOTFOUND, h);
   }
 }
 
 TEST(CPluginUserSettings_Invoke_Test, invalid_dispatch_id_underflow)
 {
   invoke_invalid_dispatch_id(-1);
 }
 
 TEST(CPluginUserSettings_Invoke_Test, invalid_dispatch_id_overflow)
 {
   invoke_invalid_dispatch_id(13);
 }