Issue #1163 - add unit tests for CPluginUserSettings

adblockplus.gyp

Index: adblockplus.gyp
===================================================================
--- a/adblockplus.gyp
+++ b/adblockplus.gyp
@@ -217,5 +217,88 @@
         'EntryPointSymbol': 'mainCRTStartup',
       },
     },
+  },
+
+  {

[Felix Dahlke, 2014/09/30 13:50:59]

Not really a fan of duplicating source listing, include_dirs etc. in this
target. I'm fine with this as a temporary thing, but we should at least file a
follow-up issue for removing the duplication here.

[Eric, 2014/10/07 16:58:10]

You noticed part of what was bothering me when I originally got this unit test
module to compile, namely, that the tests themselves are only about a single
class, and yet it takes eighteen extra non-header source files just to get the
tests to link correctly. A few extra files wouldn't be all that surprising, but
so many is indicative of larger issues in the structure of the code.
We certainly could, but I don't know what that issue would be, exactly. We could
build a static library to house code common to the plugin and its tests, for
example, or we could simple put common build elements in GYP variables. Nothing
was obviously the right thing when I set this up, and that hasn't changed since.

[Felix Dahlke, 2014/11/03 04:21:56]

I'd generally find a static library cleaner, but I'm not sure if that's going to
get rid of all the duplication here. Either way, the follow-up issue doesn't
need to be too specific, it can just say that we want to remove duplication
between the application and test targets.

+    'target_name': 'tests_plugin',
+    'type': 'executable',
+    'dependencies': [
+      'shared',
+      'libadblockplus/third_party/googletest.gyp:googletest_main',
+    ],
+    'sources': [
+      'src/plugin/PluginUserSettings.cpp',
+      'src/plugin/PluginUserSettings.h',
+      'test/plugin/UserSettingsTest.cpp',
+      #
+      # required only for linking
+      #
+      'src/plugin/AdblockPlusClient.cpp',
+      'src/plugin/AdblockPlusDomTraverser.cpp',
+      'src/plugin/AdblockPlusTab.cpp',
+      'src/plugin/ATL_Deprecate.cpp',
+      'src/plugin/NotificationMessage.cpp',
+      'src/plugin/Plugin.cpp',
+      'src/plugin/PluginClientBase.cpp',
+      'src/plugin/PluginClientFactory.cpp',
+      'src/plugin/PluginClass.cpp',
+      'src/plugin/PluginDebug.cpp',
+      'src/plugin/PluginFilter.cpp',
+      'src/plugin/PluginMimeFilterClient.cpp',
+      'src/plugin/PluginMutex.cpp',
+      'src/plugin/PluginSettings.cpp',
+      'src/plugin/PluginSystem.cpp',
+      'src/plugin/PluginTabBase.cpp',
+      'src/plugin/PluginUtil.cpp',
+      'src/plugin/PluginWbPassthrough.cpp',
+    ],
+    'include_dirs': [
+      '$(WINDDKDIR)/inc/atl71',
+    ],
+    'defines': [
+      'WINVER=0x0501',
+      'PRODUCT_ADBLOCKPLUS'
+    ],
+    'link_settings': {
+      'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-lComctl32', '-lGdi32'],
+    },
+    'msvs_settings': {
+      'VCLinkerTool': {
+        'SubSystem': '1',   # Console
+        'EntryPointSymbol': 'mainCRTStartup',
+        'conditions': [[
+          'target_arch=="ia32"', {
+            'AdditionalLibraryDirectories': [
+              '$(VCInstallDir)atlmfc/lib',
+              '$(WindowsSDK_LibraryPath_x86)',
+              '$(WINDDKDIR)/lib/ATL/i386',
+            ],
+          }, {
+            'AdditionalLibraryDirectories': [
+              '$(VCInstallDir)atlmfc/lib/amd64',
+              '$(WindowsSDK_LibraryPath_x64)',
+              '$(WINDDKDIR)/lib/ATL/amd64',
+            ],
+          }
+        ]],
+      },
+    },
+    'configurations': {
+      # 'libraries' is not allowed under 'configurations' :-(
+      'Debug': {
+        'msvs_settings': {
+          'VCLinkerTool': {
+            'AdditionalDependencies': ['atlsd.lib'],
+          },
+        },
+      },
+      'Release': {
+        'msvs_settings': {
+          'VCLinkerTool': {
+            'AdditionalDependencies': ['atls.lib'],
+          },
+        },
+      },
+    },
   }]
 }