Issue #41 - Bring method of determining IE version up to date

test/RegistryTest.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 "../src/shared/Registry.h"
 #include "../src/shared/IE_Version.h"
 
 using namespace AdblockPlus;
 
 //----------------------------------
 // Registry_Key
 //----------------------------------
-
-class Registry_Test
-  : public ::testing::Test
+TEST(RegistryTest, simple_0)
 {
-};
-
-TEST( Registry_Test, roots_0 )

[Oleksandr, 2014/07/25 22:23:46]

Formatting in this file is incorrect as well

-{
-  // Test succeeds if it does not throw
-  auto r = Registry_Key( Registry_Key::Predefined::HKCR );
-  r =  Registry_Key( Registry_Key::Predefined::HKCC );
-  r =  Registry_Key( Registry_Key::Predefined::HKCU );
-  r =  Registry_Key( Registry_Key::Predefined::HKLM );
-  r =  Registry_Key( Registry_Key::Predefined::HKU );
+  ASSERT_NO_THROW({ auto r = RegistryKey(HKEY_CLASSES_ROOT, L"CLSID"); });
 }
 
-TEST( Registry_Test, roots_1 )
+TEST(RegistryTest, constructor_illegal_argument_0)
 {
-  // Test succeeds if it does not throw
-  auto r = Registry_Key( Registry_Key::Predefined::HKCR, L"" );
-  r =  Registry_Key( Registry_Key::Predefined::HKCC, L"" );
-  r =  Registry_Key( Registry_Key::Predefined::HKCU, L"" );
-  r =  Registry_Key( Registry_Key::Predefined::HKLM, L"" );
-  r =  Registry_Key( Registry_Key::Predefined::HKU, L"" );
+  ASSERT_ANY_THROW({ auto r1 = RegistryKey(HKEY_CLASSES_ROOT, L""); });
 }
 
-TEST( Registry_Test, value_notfound_0 )
+TEST(RegistryTest, value_notfound_0)
 {
-  auto r1 = Registry_Key( Registry_Key::Predefined::HKCR );
-  ASSERT_ANY_THROW( { r1.value_wstring( L"nonexistent" ); } );
-}
-
-TEST( Registry_Test, value_notfound_1 )
-{
-  auto r1 = Registry_Key( Registry_Key::Predefined::HKCR, L"" );
-  ASSERT_ANY_THROW( { r1.value_wstring( L"nonexistent" ); } );
-}
-
-TEST( Registry_Test, value_notfound_2 )
-{
-  auto r1 = Registry_Key( Registry_Key::Predefined::HKCR, L"CLSID" );
-  ASSERT_ANY_THROW( { r1.value_wstring( L"nonexistent" ); } );
+  auto r1 = RegistryKey(HKEY_CLASSES_ROOT, L"CLSID");
+  ASSERT_ANY_THROW({ r1.value_wstring(L"nonexistent"); });
 }
 
 //----------------------------------
 // IE_Version

[sergei, 2015/01/06 13:39:11]

The tests below should be in IE_versionTest.cpp

[Eric, 2015/01/06 17:10:34]

OK. I'll do it in a later change. We need to move the registry and IE version
classes into a library shared by both the plugin/engine and the installer. We
don't currently have such a library in our build system.

 //----------------------------------
+/*
+ * 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

[sergei, 2015/01/06 13:39:11]

What is the aim of it?

I would remove it.

[Eric, 2015/01/06 17:10:34]

Ordinarily unit tests should always run independent of the system that they're
installed on. Unfortunately that can't work for testing the installed version of
IE, since the relevant data is held in system-global variable in the registry.

These definitions allow a working copy to adapt these unit tests to local
conditions.

+#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
 
-class IE_Version_Test
-  : public ::testing::Test
+TEST(IE_Version_Test, sanity_string)
 {
-};
-
-TEST( IE_Version_Test, sanity_string )
-{
-  std::wstring version = AdblockPlus::IE::installed_version_string();
-  ASSERT_NE( version, L"" );
-  // Replace with local version prefix as appropriate
-  if (false)
-  {
-    EXPECT_EQ( 0, version.compare( 0, 3, L"11." ) );
-  }
+  std::wstring version = AdblockPlus::IE::InstalledVersionString();
+  ASSERT_FALSE(version.length() == 0); // separate test for default value
+  ASSERT_TRUE(version.length() >= 2);
 }
 
-TEST( IE_Version_Test, sanity_major )
+TEST(IE_Version_Test, sanity_major)
 {
-  int version = AdblockPlus::IE::installed_major_version();
-  ASSERT_NE( version, 0 );
-  // Replace with local major version
-  if (false)
-  {
-    EXPECT_EQ( version, 11 );
-  }
+  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);
+}