Issue #404 - Create common library shared between plugin/engine and installer

common/test/RegistryTest.cpp

Index: common/test/RegistryTest.cpp
===================================================================
rename from test/RegistryTest.cpp
rename to common/test/RegistryTest.cpp
--- a/test/RegistryTest.cpp
+++ b/common/test/RegistryTest.cpp
@@ -1,91 +1,43 @@
-/*
- * 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/>.
+/*
+ * This file is part of Adblock Plus <http://adblockplus.org/>,
+ * 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
+ * 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 "../src/shared/Registry.h"
-#include "../src/shared/IE_Version.h"
+#include "Registry.h"
 
 using namespace AdblockPlus;
 
-//----------------------------------
-// Registry_Key
-//----------------------------------
-TEST(RegistryTest, simple_0)
+TEST(RegistryTest, Simple00)
 {
   ASSERT_NO_THROW({ auto r = RegistryKey(HKEY_CLASSES_ROOT, L"CLSID"); });
 }
 
-TEST(RegistryTest, constructor_illegal_argument_0)
+TEST(RegistryTest, Simple01)
 {
-  ASSERT_ANY_THROW({ auto r1 = RegistryKey(HKEY_CLASSES_ROOT, L""); });
+  ASSERT_ANY_THROW({ auto r = RegistryKey(HKEY_CLASSES_ROOT, L"IREALLYHOPENOBODYHASREGISTEREDTHISKEY"); });
 }
 
-TEST(RegistryTest, value_notfound_0)
+TEST(RegistryTest, ConstructorIllegalArgument00)
 {
-  auto r1 = RegistryKey(HKEY_CLASSES_ROOT, L"CLSID");
-  ASSERT_ANY_THROW({ r1.value_wstring(L"nonexistent"); });
+  // Empty string arguments are illegal by fiat; there's an explicit check
+  ASSERT_ANY_THROW({ auto r = RegistryKey(HKEY_CLASSES_ROOT, L""); });
 }
 
-//----------------------------------
-// IE_Version
-//----------------------------------
-/*
- * Exact version tests enabled by default.
- * If they are disabled, gtext will report 2 disabled tests.
- */
-#if !defined(DISABLE_EXACT_TESTS)
-#define exact(x) exact_##x
-#else
-#define exact(x) DISABLED_exact_##x
-#endif
-/*
- * Define a default version as the current version of IE in general release.
- * Predefine on the command line to compile tests for non-standard development environments.
- */
-#ifndef INSTALLED_IE_VERSION
-#define INSTALLED_IE_VERSION 11
-#endif
-
-TEST(IE_Version_Test, sanity_string)
+TEST(RegistryTest, ValueNotFound00)
 {
-  std::wstring version = AdblockPlus::IE::InstalledVersionString();
-  ASSERT_FALSE(version.length() == 0); // separate test for default value
-  ASSERT_TRUE(version.length() >= 2);
+  auto r = RegistryKey(HKEY_CLASSES_ROOT, L"CLSID");
+  ASSERT_ANY_THROW({ r.value_wstring(L"nonexistent"); });
 }
-
-TEST(IE_Version_Test, sanity_major)
-{
-  int version = AdblockPlus::IE::InstalledMajorVersion();
-  ASSERT_NE(version, 0); // separate test for default value
-  ASSERT_GE(version, 6);
-  ASSERT_LE(version, 12);
-  EXPECT_NE(version, 12); // This check will point out when the test needs updating.
-}
-
-TEST(IE_Version_Test, exact(string))
-{
-    std::wstring version = AdblockPlus::IE::InstalledVersionString();
-    std::wstring expected = std::to_wstring(INSTALLED_IE_VERSION) + L".";
-    ASSERT_EQ(expected, version.substr(0, expected.length()));
-}
-
-TEST(IE_Version_Test, exact(major))
-{
-  int version = AdblockPlus::IE::InstalledMajorVersion();
-  ASSERT_EQ(version, INSTALLED_IE_VERSION);
-}