Issues #1163, #1173 - refactor CPluginUserSettings

test/plugin/UserSettingsTest.cpp

Index: test/plugin/UserSettingsTest.cpp
===================================================================
--- a/test/plugin/UserSettingsTest.cpp
+++ b/test/plugin/UserSettingsTest.cpp
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2014 Eyeo GmbH
+ * Copyright (C) 2006-2015 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
@@ -14,7 +14,6 @@
  * 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>
@@ -44,11 +43,6 @@
     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);
   }
 }
@@ -69,6 +63,7 @@
   SingleMethodNameFound(L"GetDocumentationLink", 10);
   SingleMethodNameFound(L"IsAcceptableAdsEnabled", 11);
   SingleMethodNameFound(L"SetAcceptableAdsEnabled", 12);
+  SingleMethodNameFound(L"IsUpdate", 13);
 }
 
 TEST(CPluginUserSettingsGetIDsOfNames, UndefinedMethodsMustNotBeFound)
@@ -95,11 +90,6 @@
     EXCEPINFO ex;
     HRESULT h = x.Invoke(id, IID_NULL, 0, DISPATCH_METHOD, &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);
   }
 }
@@ -117,5 +107,5 @@
  */
 TEST(CPluginUserSettingsInvoke, InvalidDispatchIdShouldOverflow)
 {
-  InvokeInvalidDispatchId(13);
+  InvokeInvalidDispatchId(14);
 }