Merge lp:~3v1n0/unity/gtest-1.8-fixes into lp:unity

[Marco Trevisan (Treviño)]

CMakeLists.txt: add support to compile with GTest 1.8

[Andrea Azzarone (azzar1)]

+1

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-10-26 21:19:33 +0000
+++ CMakeLists.txt	2016-11-30 11:04:07 +0000
@@ -304,56 +304,7 @@
 add_subdirectory(gnome)
 
 if (ENABLE_UNIT_TESTS)
-  # Check for google test and build it locally
-  set (
-    GMOCK_ROOT_DIR
-    "/usr/src/gmock"
-    CACHE
-    PATH
-    "Path to Google mock srcs"
-  )
-
-  set (
-    GMOCK_INCLUDE_DIR
-    "/usr/include/gmock/include"
-    CACHE
-    PATH
-    "Path to Google mock include"
-  )
-
-  set(
-    GTEST_ROOT_DIR
-    "${GMOCK_ROOT_DIR}/gtest" # Default value, adjustable by user with e.g., ccmake
-    CACHE
-    PATH
-    "Path to Google test srcs"
-  )
-
-  set(
-    GTEST_INCLUDE_DIR
-    "${GMOCK_ROOT_DIR}/gtest/include"
-    CACHE
-    PATH
-    "Path to Google tests include"
-  )
-
-  if (GTEST_INCLUDE_DIR AND GMOCK_INCLUDE_DIR)
-    include_directories (
-      ${GMOCK_INCLUDE_DIR}
-      ${GTEST_INCLUDE_DIR}
-    )
-    add_subdirectory(
-      ${GMOCK_ROOT_DIR}
-      "${CMAKE_CURRENT_BINARY_DIR}/gmock"
-    )
-  elseif (GTEST_INCLUDE_DIR AND NOT GMOCK_INCLUDE_DIR)
-    include_directories (
-      ${GTEST_INCLUDE_DIR}
-    )
-  endif(GTEST_INCLUDE_DIR AND GMOCK_INCLUDE_DIR)
-
   add_subdirectory(tests)
-
 else (ENABLE_UNIT_TESTS)
   set (MISSING_TESTS_MSG "-- Tests disabled, compile with -DENABLE_UNIT_TESTS=ON")
   add_custom_target (check COMMAND echo ${MISSING_TESTS_MSG})
@@ -390,3 +341,4 @@
          ADDITIONAL_MAKE_CLEAN_FILES api-doc)
 
 endif (DOXYGEN_FOUND STREQUAL "YES")
+

=== modified file 'UnityCore/CMakeLists.txt'
--- UnityCore/CMakeLists.txt	2016-02-09 01:26:22 +0000
+++ UnityCore/CMakeLists.txt	2016-11-30 11:04:07 +0000
@@ -145,7 +145,8 @@
 set_target_properties(${CORE_LIB_NAME} PROPERTIES
                       VERSION ${CORE_LIB_LT_CURRENT}.${CORE_LIB_LT_REV}.${CORE_LIB_LT_AGE}
                       SOVERSION ${CORE_LIB_LT_CURRENT}
-                      INSTALL_RPATH "${PRIVATE_CORE_DEPS_LIBRARY_DIRS}")
+                      INSTALL_RPATH "${PRIVATE_CORE_DEPS_LIBRARY_DIRS}"
+                      BUILD_WITH_INSTALL_RPATH TRUE)
 add_pch(pch/unitycore_pch.hh ${CORE_LIB_NAME})
 
 install (TARGETS ${CORE_LIB_NAME}

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2016-11-07 11:44:45 +0000
+++ tests/CMakeLists.txt	2016-11-30 11:04:07 +0000
@@ -6,6 +6,37 @@
 file (COPY ${CMAKE_CURRENT_SOURCE_DIR}/data DESTINATION ${CMAKE_BINARY_DIR}/tests)
 
 #
+# Google Tests
+#
+
+# Check for google test and build it locally
+set (GTEST_PREFIX "/usr/src/googletest")
+
+if (EXISTS "${GTEST_PREFIX}")
+  # As of version 1.8.0
+  set (GMOCK_SOURCE_DIR "${GTEST_PREFIX}/googlemock" CACHE PATH "gmock source directory")
+  set (GMOCK_INCLUDE_DIR "${GMOCK_SOURCE_DIR}/include" CACHE PATH "gmock source include directory")
+  set (GTEST_INCLUDE_DIR "${GTEST_PREFIX}/googletest/include" CACHE PATH "gtest source include directory")
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-sign-compare")
+else()
+  set (GMOCK_SOURCE_DIR "/usr/src/gmock" CACHE PATH "gmock source directory")
+  set (GMOCK_INCLUDE_DIR "/usr/include/gmock/include" CACHE PATH "gmock source include directory")
+  set (GTEST_INCLUDE_DIR "${GMOCK_SOURCE_DIR}/gtest/include" CACHE PATH "gtest source include directory")
+endif()
+
+if (GTEST_INCLUDE_DIR AND GMOCK_INCLUDE_DIR)
+  include_directories (${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR})
+  add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")
+elseif (GTEST_INCLUDE_DIR AND NOT GMOCK_INCLUDE_DIR)
+  include_directories (${GTEST_INCLUDE_DIR})
+endif(GTEST_INCLUDE_DIR AND GMOCK_INCLUDE_DIR)
+
+if (GMOCK_SOURCE_DIR)
+  set(GMOCK_LIB gmock)
+  set(GMOCK_MAIN_LIB gmock_main)
+endif (GMOCK_SOURCE_DIR)
+
+#
 # Unit tests
 #
 set (TEST_DEPS "${UNITY_PLUGIN_DEPS};unity>=4.99.0;libupstart;xtst")
@@ -44,8 +75,6 @@
 #
 
 enable_testing()
-set(GMOCK_LIB gmock)
-set(GMOCK_MAIN_LIB gmock_main)
 
 if (GMOCK_LIB AND
     GMOCK_MAIN_LIB)
@@ -375,7 +404,7 @@
   && ${DUMMY_XORG_TEST_RUNNER} ${GTEST_TEST_COMMAND_SLOW}
   && ${TEST_COMMAND_XLESS})
 
-if (GTEST_ROOT_DIR)
+if (GMOCK_SOURCE_DIR)
   if (ENABLE_X_SUPPORT)
     add_custom_target (check COMMAND  ${TEST_COMMAND} DEPENDS test-gtest test-gtest-slow test-gtest-xless test-gtest-dbus test-gestures)
     add_custom_target (check-headless COMMAND ${TEST_COMMAND_HEADLESS} DEPENDS test-gtest test-gtest-slow test-gtest-xless test-gtest-dbus test-gestures)
@@ -386,9 +415,10 @@
     add_custom_target (gcheck COMMAND  ${DBUS_TEST_COMMAND} DEPENDS test-gtest-xless)
   endif ()
   add_custom_target (check-report COMMAND ${TEST_UNIT_COMMAND} && gtester-report ${TEST_RESULT_XML} > ${TEST_RESULT_HTML})
-endif (GTEST_ROOT_DIR)
+endif (GMOCK_SOURCE_DIR)
 # make target to allow devs to run "make autopilot" from build dir:
 set (AUTOPILOTDIR "${CMAKE_CURRENT_SOURCE_DIR}/autopilot")
 # Rules to install autopilot files and executable script:
 install(CODE "execute_process(COMMAND python2.7 setup.py install --prefix ${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ${AUTOPILOTDIR})")
 add_custom_target (autopilot COMMAND cd ${AUTOPILOTDIR} && make check)
+

=== modified file 'tests/autopilot/unity/tests/test_dash.py'
--- tests/autopilot/unity/tests/test_dash.py	2016-03-18 01:47:08 +0000
+++ tests/autopilot/unity/tests/test_dash.py	2016-11-30 11:04:07 +0000
@@ -1136,18 +1136,18 @@
 
     def setUp(self):
         super(PreviewClickCancelTests, self).setUp()
-        gettext.install("unity-scope-applications")
-        scope = self.unity.dash.reveal_application_scope(clear_search=False)
+        gettext.install("unity-scope-files")
+        scope = self.unity.dash.reveal_file_scope(clear_search=False)
         self.addCleanup(self.unity.dash.ensure_hidden)
         # Only testing an application preview for this test.
 
-        search_string = "Software Updater"
+        search_string = "Videos"
         if self.unity.dash.search_string != search_string:
             self.unity.dash.clear_search()
             self.keyboard.type(search_string)
 
         # wait for "Installed" category
-        category = self.wait_for_category(scope, _("Installed"))
+        category = self.wait_for_category(scope, _("Folders"))
 
         # wait for results
         self.assertThat(lambda: len(category.get_results()), Eventually(GreaterThan(0), timeout=20))

=== modified file 'tests/test-gestures/CMakeLists.txt'
--- tests/test-gestures/CMakeLists.txt	2013-07-09 10:35:03 +0000
+++ tests/test-gestures/CMakeLists.txt	2016-11-30 11:04:07 +0000
@@ -1,4 +1,4 @@
-if (GTEST_ROOT_DIR)
+if (GMOCK_SOURCE_DIR)
   set(UNITY_SRC ${CMAKE_SOURCE_DIR}/plugins/unityshell/src)
 
   add_custom_command(OUTPUT CompoundGestureRecognizer.cpp
@@ -76,4 +76,4 @@
   add_dependencies(test-gestures gtest unity-core-${UNITY_API_VERSION})
 
   add_custom_target (check-gestures COMMAND ./test-gestures DEPENDS test-gestures)
-endif (GTEST_ROOT_DIR)
+endif (GMOCK_SOURCE_DIR)

=== modified file 'tests/test-gestures/test_gesture_broker.cpp'
--- tests/test-gestures/test_gesture_broker.cpp	2013-11-06 11:21:43 +0000
+++ tests/test-gestures/test_gesture_broker.cpp	2016-11-30 11:04:07 +0000
@@ -111,11 +111,11 @@
   // Gesture shouldn't be accepted as constructions hasn't finished
   ASSERT_EQ(0, g_gesture_event_accept_count[0]);
   ASSERT_EQ(0, g_gesture_event_reject_count[0]);
-  ASSERT_EQ(1, g_window_target_mocks.size());
+  ASSERT_EQ(1u, g_window_target_mocks.size());
   WindowGestureTargetMock *target_mock = *g_window_target_mocks.begin();
   ASSERT_TRUE(target_mock->window == middle_window);
   // No events yet as the broker didn't accept the gesture yet
-  ASSERT_EQ(0, target_mock->events_received.size());
+  ASSERT_EQ(0u, target_mock->events_received.size());
 
   fake_event.type = nux::EVENT_GESTURE_UPDATE;
   fake_event.touches.push_back(nux::TouchPoint(4, 132.0f, 142.0f));
@@ -128,5 +128,5 @@
   // Check that this gesture target is still valid
   ASSERT_EQ(1, g_window_target_mocks.count(target_mock));
   // Gesture events should have been sent to the target by now
-  ASSERT_EQ(2, target_mock->events_received.size());
+  ASSERT_EQ(2u, target_mock->events_received.size());
 }

=== modified file 'tests/test_action_handle.cpp'
--- tests/test_action_handle.cpp	2013-10-04 16:58:29 +0000
+++ tests/test_action_handle.cpp	2016-11-30 11:04:07 +0000
@@ -29,7 +29,7 @@
 TEST(TestActionHandle, Initialization)
 {
   action::handle handle;
-  EXPECT_EQ(handle, 0);
+  EXPECT_EQ(handle, 0u);
 
   uint64_t val = g_random_int();
   action::handle random = val;
@@ -39,7 +39,7 @@
 TEST(TestActionHandle, Assignment)
 {
   action::handle handle;
-  ASSERT_EQ(handle, 0);
+  ASSERT_EQ(handle, 0u);
 
   uint64_t val = g_random_int();
   handle = val;
@@ -49,21 +49,21 @@
 TEST(TestActionHandle, CastToScalarType)
 {
   action::handle handle = 5;
-  ASSERT_EQ(handle, 5);
+  ASSERT_EQ(handle, 5u);
 
   int int_handle = handle;
   EXPECT_EQ(int_handle, 5);
 
   unsigned uint_handle = handle;
-  EXPECT_EQ(uint_handle, 5);
+  EXPECT_EQ(uint_handle, 5u);
 }
 
 TEST(TestActionHandle, PrefixIncrementOperator)
 {
   action::handle handle;
-  ASSERT_EQ(handle, 0);
+  ASSERT_EQ(handle, 0u);
 
-  for (auto i = 1; i <= 10; ++i)
+  for (auto i = 1u; i <= 10u; ++i)
   {
     ASSERT_EQ(++handle, i);
     ASSERT_EQ(handle, i);
@@ -73,9 +73,9 @@
 TEST(TestActionHandle, PostfixIncrementOperator)
 {
   action::handle handle;
-  ASSERT_EQ(handle, 0);
+  ASSERT_EQ(handle, 0u);
 
-  for (auto i = 1; i <= 10; ++i)
+  for (auto i = 1u; i <= 10u; ++i)
   {
     ASSERT_EQ(handle++, i-1);
     ASSERT_EQ(handle, i);
@@ -85,9 +85,9 @@
 TEST(TestActionHandle, PrefixDecrementOperator)
 {
   action::handle handle(10);
-  ASSERT_EQ(handle, 10);
+  ASSERT_EQ(handle, 10u);
 
-  for (auto i = 10; i > 0; --i)
+  for (auto i = 10u; i > 0u; --i)
   {
     ASSERT_EQ(--handle, i-1);
     ASSERT_EQ(handle, i-1);
@@ -97,9 +97,9 @@
 TEST(TestActionHandle, PostfixDecrementOperator)
 {
   action::handle handle(10);
-  ASSERT_EQ(handle, 10);
+  ASSERT_EQ(handle, 10u);
 
-  for (auto i = 10; i > 0; --i)
+  for (auto i = 10u; i > 0u; --i)
   {
     ASSERT_EQ(handle--, i);
     ASSERT_EQ(handle, i-1);

=== modified file 'tests/test_animation_utils.cpp'
--- tests/test_animation_utils.cpp	2013-10-18 03:57:12 +0000
+++ tests/test_animation_utils.cpp	2016-11-30 11:04:07 +0000
@@ -60,8 +60,8 @@
 
 TYPED_TEST(TestAnimationUtilsIntegers, StartValueForDirection)
 {
-  EXPECT_EQ(0, StartValueForDirection<TypeParam>(Direction::FORWARD));
-  EXPECT_EQ(100, StartValueForDirection<TypeParam>(Direction::BACKWARD));
+  EXPECT_EQ(static_cast<TypeParam>(0), StartValueForDirection<TypeParam>(Direction::FORWARD));
+  EXPECT_EQ(static_cast<TypeParam>(100), StartValueForDirection<TypeParam>(Direction::BACKWARD));
 }
 
 TYPED_TEST(TestAnimationUtilsFloating, FinishValueForDirection)
@@ -72,8 +72,8 @@
 
 TYPED_TEST(TestAnimationUtilsIntegers, FinishValueForDirection)
 {
-  EXPECT_EQ(100, FinishValueForDirection<TypeParam>(Direction::FORWARD));
-  EXPECT_EQ(0, FinishValueForDirection<TypeParam>(Direction::BACKWARD));
+  EXPECT_EQ(static_cast<TypeParam>(100), FinishValueForDirection<TypeParam>(Direction::FORWARD));
+  EXPECT_EQ(static_cast<TypeParam>(0), FinishValueForDirection<TypeParam>(Direction::BACKWARD));
 }
 
 TYPED_TEST(TestAnimationUtils, StartNotRunning)

=== modified file 'tests/test_application_launcher_icon.cpp'
--- tests/test_application_launcher_icon.cpp	2016-02-19 21:54:04 +0000
+++ tests/test_application_launcher_icon.cpp	2016-11-30 11:04:07 +0000
@@ -725,11 +725,11 @@
   mock_icon->SetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, false);
 
   EXPECT_THAT(WM->GetWindowsInStackingOrder(), testing::ElementsAre(7, 6, 5, 4, 3, 2, 1, 8));
-  ASSERT_EQ(WM->GetActiveWindow(), 8);
+  ASSERT_EQ(WM->GetActiveWindow(), 8u);
 
   mock_icon->PerformScroll(AbstractLauncherIcon::ScrollDirection::DOWN, 200);
   EXPECT_THAT(WM->GetWindowsInStackingOrder(), testing::ElementsAre(7, 6, 5, 4, 3, 2, 8, 1));
-  ASSERT_EQ(WM->GetActiveWindow(), 1);
+  ASSERT_EQ(WM->GetActiveWindow(), 1u);
 }
 
 TEST_F(TestApplicationLauncherIcon, PerformScrollSingleUnfocusedWindow)
@@ -741,12 +741,12 @@
   mock_icon->SetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, false);
 
   EXPECT_THAT(WM->GetWindowsInStackingOrder(), testing::ElementsAre(1, 2));
-  ASSERT_EQ(WM->GetActiveWindow(), 2);
+  ASSERT_EQ(WM->GetActiveWindow(), 2u);
 
   mock_icon->PerformScroll(AbstractLauncherIcon::ScrollDirection::DOWN, 200);
 
   EXPECT_THAT(WM->GetWindowsInStackingOrder(), testing::ElementsAre(2, 1));
-  ASSERT_EQ(WM->GetActiveWindow(), 1);
+  ASSERT_EQ(WM->GetActiveWindow(), 1u);
 }
 
 TEST_F(TestApplicationLauncherIcon, ActiveQuirkWMCrossCheck)

=== modified file 'tests/test_bamf_application.cpp'
--- tests/test_bamf_application.cpp	2015-07-10 15:18:35 +0000
+++ tests/test_bamf_application.cpp	2016-11-30 11:04:07 +0000
@@ -56,7 +56,7 @@
 
 TEST_F(TestBamfApplication, GetWindows)
 {
-  ASSERT_EQ(application_.GetWindows().size(), 0);
+  ASSERT_EQ(application_.GetWindows().size(), 0u);
 
   GList* children = nullptr;
   for (int i = 0; i<5; ++i)
@@ -73,9 +73,9 @@
   AddFakeWindowToWM(3, true);
   AddFakeWindowToWM(4, false);
 
-  EXPECT_EQ(application_.GetWindows().size(), 5);
+  EXPECT_EQ(application_.GetWindows().size(), 5u);
 
   g_list_free_full(children, g_object_unref);
 }
 
-}
\ No newline at end of file
+}

=== modified file 'tests/test_categories.cpp'
--- tests/test_categories.cpp	2013-07-12 15:38:12 +0000
+++ tests/test_categories.cpp	2016-11-30 11:04:07 +0000
@@ -49,7 +49,7 @@
   Category cat(nullptr, nullptr, nullptr);
 
   bool added = false;
-  ASSERT_EQ(model.row_added.size(), 1);
+  ASSERT_EQ(model.row_added.size(), 1u);
   model.category_added.connect([&added] (Category const&) { added = true; });
   model.row_added.emit(cat);
   EXPECT_TRUE(added);
@@ -60,7 +60,7 @@
   Category cat(nullptr, nullptr, nullptr);
 
   bool changed = false;
-  ASSERT_EQ(model.row_changed.size(), 1);
+  ASSERT_EQ(model.row_changed.size(), 1u);
   model.category_changed.connect([&changed] (Category const&) { changed = true; });
   model.row_changed.emit(cat);
   EXPECT_TRUE(changed);
@@ -71,7 +71,7 @@
   Category cat(nullptr, nullptr, nullptr);
 
   bool removed = false;
-  ASSERT_EQ(model.row_removed.size(), 1);
+  ASSERT_EQ(model.row_removed.size(), 1u);
   model.category_removed.connect([&removed] (Category const&) { removed = true; });
   model.row_removed.emit(cat);
   EXPECT_TRUE(removed);

=== modified file 'tests/test_connection_manager.cpp'
--- tests/test_connection_manager.cpp	2013-10-04 16:58:29 +0000
+++ tests/test_connection_manager.cpp	2016-11-30 11:04:07 +0000
@@ -163,7 +163,7 @@
 {
   connection::Manager manager;
   EXPECT_TRUE(manager.Empty());
-  EXPECT_EQ(manager.Size(), 0);
+  EXPECT_EQ(manager.Size(), 0u);
 }
 
 TEST(TestConnectionManager, AddEmpty)
@@ -176,7 +176,7 @@
 
   EXPECT_EQ(handle, global_handle);
   EXPECT_TRUE(manager.Empty());
-  EXPECT_EQ(manager.Size(), 0);
+  EXPECT_EQ(manager.Size(), 0u);
 }
 
 TEST(TestConnectionManager, AddSignal)
@@ -192,7 +192,7 @@
   ++global_handle;
   EXPECT_EQ(handle, global_handle);
   EXPECT_FALSE(manager.Empty());
-  EXPECT_EQ(manager.Size(), 1);
+  EXPECT_EQ(manager.Size(), 1u);
 }
 
 TEST(TestConnectionManager, AddMultipleSignals)
@@ -200,7 +200,7 @@
   connection::Manager manager;
   SignalerObject signaler;
 
-  for (int i = 1; i <= 10; ++i)
+  for (unsigned i = 1; i <= 10u; ++i)
   {
     auto const& conn = signaler.awesome_signal.connect([] {/* Awesome callback! */});
     auto handle = manager.Add(conn);
@@ -237,7 +237,7 @@
   EXPECT_TRUE(manager.RemoveAndClear(&handle));
   EXPECT_FALSE(conn.connected());
   EXPECT_TRUE(manager.Empty());
-  EXPECT_EQ(handle, 0);
+  EXPECT_EQ(handle, 0u);
 }
 
 TEST(TestConnectionManager, RemoveUnavailable)
@@ -247,7 +247,7 @@
   connection::handle handle = 5;
   EXPECT_FALSE(manager.RemoveAndClear(&handle));
   EXPECT_TRUE(manager.Empty());
-  EXPECT_EQ(handle, 5);
+  EXPECT_EQ(handle, 5u);
 }
 
 TEST(TestConnectionManager, ReplaceOnEmpty)
@@ -256,7 +256,7 @@
   SignalerObject signaler;
 
   auto const& conn = signaler.awesome_signal.connect([] {/* Awesome callback! */});
-  EXPECT_GT(manager.Replace(0, conn), 0);
+  EXPECT_GT(manager.Replace(0, conn), 0u);
   EXPECT_FALSE(manager.Empty());
 }
 
@@ -269,8 +269,8 @@
   manager.Add(conn);
   ASSERT_FALSE(manager.Empty());
 
-  EXPECT_GT(manager.Replace(0, conn), 0);
-  EXPECT_EQ(manager.Size(), 2);
+  EXPECT_GT(manager.Replace(0, conn), 0u);
+  EXPECT_EQ(manager.Size(), 2u);
 }
 
 TEST(TestConnectionManager, ReplaceAvailable)
@@ -284,7 +284,7 @@
 
   sigc::connection second_conn = signaler.awesome_signal.connect([] {/* Awesome callback! */});
   auto second_handle = manager.Replace(first_handle, second_conn);
-  EXPECT_EQ(manager.Size(), 1);
+  EXPECT_EQ(manager.Size(), 1u);
   EXPECT_EQ(first_handle, second_handle);
 
   EXPECT_FALSE(first_conn.connected());

=== modified file 'tests/test_dashview.cpp'
--- tests/test_dashview.cpp	2014-03-21 04:40:12 +0000
+++ tests/test_dashview.cpp	2016-11-30 11:04:07 +0000
@@ -91,7 +91,7 @@
   Scopes::Ptr scopes(new MockGSettingsScopes(scopes_default));
   nux::ObjectPtr<MockDashView> view(new MockDashView(scopes, application_starter_));
 
-  EXPECT_EQ(view->scope_views_.size(), 5) << "Error: Incorrect number of scope views (" << view->scope_views_.size() << " != 5)";
+  EXPECT_EQ(view->scope_views_.size(), 5u) << "Error: Incorrect number of scope views (" << view->scope_views_.size() << " != 5)";
 }
 
 

=== modified file 'tests/test_dashview_impl.cpp'
--- tests/test_dashview_impl.cpp	2013-02-21 10:47:14 +0000
+++ tests/test_dashview_impl.cpp	2016-11-30 11:04:07 +0000
@@ -49,7 +49,7 @@
   ScopeFilter filter = parse_scope_uri("uri?filter_param=test");
 
   EXPECT_THAT(filter.id, Eq("uri"));
-  EXPECT_THAT(filter.filters.size(), Eq(1));
+  EXPECT_THAT(filter.filters.size(), Eq(1u));
   EXPECT_THAT(filter.filters["param"], Eq("test"));
 }
 
@@ -66,7 +66,7 @@
   ScopeFilter filter = parse_scope_uri("uri?filter_param=a=b");
 
   EXPECT_THAT(filter.id, Eq("uri"));
-  EXPECT_THAT(filter.filters.size(), Eq(1));
+  EXPECT_THAT(filter.filters.size(), Eq(1u));
   EXPECT_THAT(filter.filters["param"], Eq("a=b"));
 }
 
@@ -75,7 +75,7 @@
   ScopeFilter filter = parse_scope_uri("uri?filter_param1=first&filter_param2=second");
 
   EXPECT_THAT(filter.id, Eq("uri"));
-  EXPECT_THAT(filter.filters.size(), Eq(2));
+  EXPECT_THAT(filter.filters.size(), Eq(2u));
   EXPECT_THAT(filter.filters["param1"], Eq("first"));
   EXPECT_THAT(filter.filters["param2"], Eq("second"));
 }

=== modified file 'tests/test_dbus_indicators.cpp'
--- tests/test_dbus_indicators.cpp	2014-12-19 16:48:04 +0000
+++ tests/test_dbus_indicators.cpp	2016-11-30 11:04:07 +0000
@@ -76,8 +76,8 @@
   // wait until the dbus indicator gets any indicator from the panel service
   Utils::WaitUntil(sigc::mem_fun(*dbus_indicators, &DBusIndicatorsTest::HasIndicators), true, 5);
 
-  EXPECT_EQ(dbus_indicators->GetIndicators().size(), 1);
-  EXPECT_EQ(dbus_indicators->GetIndicators().front()->GetEntries().size(), 2);
+  EXPECT_EQ(dbus_indicators->GetIndicators().size(), 1u);
+  EXPECT_EQ(dbus_indicators->GetIndicators().front()->GetEntries().size(), 2u);
   EXPECT_EQ(dbus_indicators->GetIndicators().front()->GetEntries().front()->id(), "test_entry_id");
   EXPECT_EQ(dbus_indicators->GetIndicators().front()->GetEntries().back()->id(), "test_entry_id2");
 
@@ -89,8 +89,8 @@
   // so do one interation of the main loop more
   g_main_context_iteration(NULL, TRUE);
 
-  EXPECT_EQ(dbus_indicators->GetIndicators().size(), 1);
-  EXPECT_EQ(dbus_indicators->GetIndicators().front()->GetEntries().size(), 2);
+  EXPECT_EQ(dbus_indicators->GetIndicators().size(), 1u);
+  EXPECT_EQ(dbus_indicators->GetIndicators().front()->GetEntries().size(), 2u);
   EXPECT_EQ(dbus_indicators->GetIndicators().front()->GetEntries().front()->id(), "test_entry_id2");
   EXPECT_EQ(dbus_indicators->GetIndicators().front()->GetEntries().back()->id(), "test_entry_id");
 }

=== modified file 'tests/test_decorations_input_mixer.cpp'
--- tests/test_decorations_input_mixer.cpp	2014-02-11 17:40:09 +0000
+++ tests/test_decorations_input_mixer.cpp	2016-11-30 11:04:07 +0000
@@ -53,13 +53,13 @@
   mixer.PushToFront(item3);
 
   auto const& items = mixer.Items();
-  ASSERT_EQ(3, items.size());
+  ASSERT_EQ(3u, items.size());
   EXPECT_EQ(item3, *std::next(items.begin(), 0));
   EXPECT_EQ(item2, *std::next(items.begin(), 1));
   EXPECT_EQ(item1, *std::next(items.begin(), 2));
 
   mixer.PushToFront(item2);
-  ASSERT_EQ(3, mixer.Items().size());
+  ASSERT_EQ(3u, mixer.Items().size());
   EXPECT_EQ(item2, *std::next(items.begin(), 0));
   EXPECT_EQ(item3, *std::next(items.begin(), 1));
   EXPECT_EQ(item1, *std::next(items.begin(), 2));
@@ -77,13 +77,13 @@
   mixer.PushToBack(item3);
 
   auto const& items = mixer.Items();
-  ASSERT_EQ(3, items.size());
+  ASSERT_EQ(3u, items.size());
   EXPECT_EQ(item1, *std::next(items.begin(), 0));
   EXPECT_EQ(item2, *std::next(items.begin(), 1));
   EXPECT_EQ(item3, *std::next(items.begin(), 2));
 
   mixer.PushToBack(item2);
-  ASSERT_EQ(3, items.size());
+  ASSERT_EQ(3u, items.size());
   EXPECT_EQ(item1, *std::next(items.begin(), 0));
   EXPECT_EQ(item3, *std::next(items.begin(), 1));
   EXPECT_EQ(item2, *std::next(items.begin(), 2));
@@ -101,15 +101,15 @@
   mixer.PushToFront(item3);
 
   auto const& items = mixer.Items();
-  ASSERT_EQ(3, items.size());
+  ASSERT_EQ(3u, items.size());
 
   mixer.Remove(item2);
-  ASSERT_EQ(2, items.size());
+  ASSERT_EQ(2u, items.size());
   EXPECT_EQ(item3, *std::next(items.begin(), 0));
   EXPECT_EQ(item1, *std::next(items.begin(), 1));
 
   mixer.Remove(item1);
-  ASSERT_EQ(1, items.size());
+  ASSERT_EQ(1u, items.size());
   EXPECT_EQ(item3, *std::next(items.begin(), 0));
 
   mixer.EnterEvent(CompPoint(item3->Geometry().x2(), item3->Geometry().y1()));

=== modified file 'tests/test_decorations_widgets.cpp'
--- tests/test_decorations_widgets.cpp	2014-02-26 02:23:52 +0000
+++ tests/test_decorations_widgets.cpp	2016-11-30 11:04:07 +0000
@@ -321,7 +321,7 @@
     ASSERT_EQ(layout->Geometry().y() + (layout->Geometry().height() - item_geo.height()) / 2, item_geo.y());
   }
 
-  EXPECT_EQ(100, layout->Items().size());
+  EXPECT_EQ(100u, layout->Items().size());
 }
 
 TEST_F(TestDecorationLayout, AppendParentsItem)
@@ -365,7 +365,7 @@
     ASSERT_EQ(expected_geo, layout->Geometry());
   }
 
-  EXPECT_EQ(100, layout->Items().size());
+  EXPECT_EQ(100u, layout->Items().size());
   EXPECT_EQ(CompRect(), layout->Geometry());
 }
 
@@ -388,7 +388,7 @@
     ASSERT_EQ(layout->Geometry().y() + (layout->Geometry().height() - item_geo.height()) / 2, item_geo.y());
   }
 
-  EXPECT_EQ(100, layout->Items().size());
+  EXPECT_EQ(100u, layout->Items().size());
 }
 
 TEST_F(TestDecorationLayout, AppendWithMaxWidth)
@@ -398,7 +398,7 @@
   for (int i = 0; i < 100; ++i)
     layout->Append(RandomMockItem());
 
-  ASSERT_EQ(100, layout->Items().size());
+  ASSERT_EQ(100u, layout->Items().size());
 
   auto const& layout_geo = layout->Geometry();
   int new_width = layout_geo.width()/2;
@@ -430,7 +430,7 @@
   for (int i = 0; i < 100; ++i)
     layout->Append(RandomMockItem());
 
-  ASSERT_EQ(100, layout->Items().size());
+  ASSERT_EQ(100u, layout->Items().size());
 
   auto const& layout_geo = layout->Geometry();
   int full_width = layout_geo.width();

=== modified file 'tests/test_delta_tracker.cpp'
--- tests/test_delta_tracker.cpp	2013-09-19 00:05:23 +0000
+++ tests/test_delta_tracker.cpp	2016-11-30 11:04:07 +0000
@@ -38,7 +38,7 @@
 
 TEST_F(TestDeltaTracker, TestDirectionEmptyOnStart)
 {
-  ASSERT_EQ(delta_tracker_.AmountOfDirectionsChanged(), 0);
+  ASSERT_EQ(delta_tracker_.AmountOfDirectionsChanged(), 0u);
 }
 
 TEST_F(TestDeltaTracker, TestCorrectDirections)
@@ -46,7 +46,7 @@
   delta_tracker_.HandleNewMouseDelta(0, -1);
   delta_tracker_.HandleNewMouseDelta(1, 0);
 
-  ASSERT_EQ(delta_tracker_.AmountOfDirectionsChanged(), 2);
+  ASSERT_EQ(delta_tracker_.AmountOfDirectionsChanged(), 2u);
 }
 
 TEST_F(TestDeltaTracker, TestNoDuplicates)
@@ -54,7 +54,7 @@
   delta_tracker_.HandleNewMouseDelta(0, -1);
   delta_tracker_.HandleNewMouseDelta(0, -1);
 
-  ASSERT_EQ(delta_tracker_.AmountOfDirectionsChanged(), 1);
+  ASSERT_EQ(delta_tracker_.AmountOfDirectionsChanged(), 1u);
 }
 
 TEST_F(TestDeltaTracker, TestAllDirections)
@@ -64,7 +64,7 @@
   delta_tracker_.HandleNewMouseDelta(-1, 0);
   delta_tracker_.HandleNewMouseDelta(1, 0);
 
-  ASSERT_EQ(delta_tracker_.AmountOfDirectionsChanged(), 4);
+  ASSERT_EQ(delta_tracker_.AmountOfDirectionsChanged(), 4u);
 }
 
 TEST_F(TestDeltaTracker, TestResetStates)
@@ -74,10 +74,10 @@
   delta_tracker_.HandleNewMouseDelta(-1, 0);
   delta_tracker_.HandleNewMouseDelta(1, 0);
 
-  ASSERT_EQ(delta_tracker_.AmountOfDirectionsChanged(), 4);
+  ASSERT_EQ(delta_tracker_.AmountOfDirectionsChanged(), 4u);
 
   delta_tracker_.ResetState();
-  ASSERT_EQ(delta_tracker_.AmountOfDirectionsChanged(), 0);
+  ASSERT_EQ(delta_tracker_.AmountOfDirectionsChanged(), 0u);
 }
 
 }

=== modified file 'tests/test_desktop_launcher_icon.cpp'
--- tests/test_desktop_launcher_icon.cpp	2014-03-21 04:40:12 +0000
+++ tests/test_desktop_launcher_icon.cpp	2016-11-30 11:04:07 +0000
@@ -40,7 +40,7 @@
 
 TEST_F(TestDesktopLauncherIcon, Shortcut)
 {
-  EXPECT_EQ(icon.GetShortcut(), 'd');
+  EXPECT_EQ(icon.GetShortcut(), static_cast<guint64>('d'));
 }
 
 TEST_F(TestDesktopLauncherIcon, Position)

=== modified file 'tests/test_device_launcher_section.cpp'
--- tests/test_device_launcher_section.cpp	2014-03-21 04:40:12 +0000
+++ tests/test_device_launcher_section.cpp	2016-11-30 11:04:07 +0000
@@ -80,7 +80,7 @@
 
 TEST_F(TestDeviceLauncherSection, GetIcons)
 {
-  EXPECT_EQ(section_.GetIcons().size(), 2);
+  EXPECT_EQ(section_.GetIcons().size(), 2u);
 }
 
 }

=== modified file 'tests/test_favorite_store_gsettings.cpp'
--- tests/test_favorite_store_gsettings.cpp	2016-02-19 21:54:04 +0000
+++ tests/test_favorite_store_gsettings.cpp	2016-11-30 11:04:07 +0000
@@ -44,7 +44,7 @@
                                   "device://uuid",
                                   NULL
                                 };
-const int n_base_store_favs = G_N_ELEMENTS(base_store_favs) - 1; /* NULL */
+const unsigned n_base_store_favs = G_N_ELEMENTS(base_store_favs) - 1; /* NULL */
 
 const std::string other_desktop = "application://" BUILDDIR "/tests/data/applications/bzr-handle-patch.desktop";
 
@@ -322,7 +322,7 @@
   favorite_store->SaveFavorites(favs, false);
 
   ASSERT_TRUE(signal_received);
-  ASSERT_EQ(paths_removed.size(), 3);
+  ASSERT_EQ(paths_removed.size(), 3u);
   EXPECT_EQ(paths_removed[0], base_store_favs[4]);
   EXPECT_EQ(paths_removed[1], base_store_favs[1]);
   EXPECT_EQ(paths_removed[2], base_store_favs[3]);
@@ -457,7 +457,7 @@
 {
   EXPECT_TRUE(favorite_store->IsFavorite(FavoriteStore::URI_PREFIX_APP+base_store_favs[0]));
 
-  for (int i = 1; i < n_base_store_favs; i++)
+  for (unsigned i = 1; i < n_base_store_favs; i++)
   {
     ASSERT_TRUE(favorite_store->IsFavorite(base_store_favs[i]));
   }
@@ -469,9 +469,9 @@
 {
   EXPECT_EQ(favorite_store->FavoritePosition(FavoriteStore::URI_PREFIX_APP+base_store_favs[0]), 0);
 
-  for (int i = 1; i < n_base_store_favs; i++)
+  for (unsigned i = 1; i < n_base_store_favs; i++)
   {
-    ASSERT_EQ(favorite_store->FavoritePosition(base_store_favs[i]), i);
+    ASSERT_EQ(favorite_store->FavoritePosition(base_store_favs[i]), static_cast<int>(i));
   }
 
   EXPECT_EQ(favorite_store->FavoritePosition("unity://invalid-favorite"), -1);

=== modified file 'tests/test_favorite_store_private.cpp'
--- tests/test_favorite_store_private.cpp	2012-01-07 15:49:40 +0000
+++ tests/test_favorite_store_private.cpp	2016-11-30 11:04:07 +0000
@@ -80,7 +80,7 @@
   
   result = internal::impl::GetNewbies(old, fresh);
   
-  EXPECT_EQ(result.size(), 2);
+  EXPECT_EQ(result.size(), 2u);
   EXPECT_EQ(result[0], "e");
   EXPECT_EQ(result[1], "f");
   
@@ -95,7 +95,7 @@
   
   result = internal::impl::GetNewbies(old, fresh);
   
-  EXPECT_EQ(result.size(), 2);
+  EXPECT_EQ(result.size(), 2u);
   EXPECT_EQ(result[0], "e");
   EXPECT_EQ(result[1], "f");
 }
@@ -212,7 +212,7 @@
   
   result = internal::impl::GetRemoved(old, fresh);
   
-  EXPECT_EQ(result.size(), 2);
+  EXPECT_EQ(result.size(), 2u);
   EXPECT_EQ(result[0], "a");
   EXPECT_EQ(result[1], "d");
   
@@ -227,7 +227,7 @@
   
   result = internal::impl::GetRemoved(old, fresh);
   
-  EXPECT_EQ(result.size(), 2);
+  EXPECT_EQ(result.size(), 2u);
   EXPECT_EQ(result[0], "b");
   EXPECT_EQ(result[1], "c");
 }

=== modified file 'tests/test_file_manager_launcher_icon.cpp'
--- tests/test_file_manager_launcher_icon.cpp	2016-07-06 10:45:44 +0000
+++ tests/test_file_manager_launcher_icon.cpp	2016-11-30 11:04:07 +0000
@@ -92,7 +92,7 @@
 TEST_F(TestFileManagerLauncherIcon, NoManagedWindow_Device)
 {
   auto const& device_icons = dev_->GetIcons();
-  ASSERT_EQ(2, device_icons.size());
+  ASSERT_EQ(2u, device_icons.size());
 
   device_icons.at(0)->Activate(ActionArg());
 
@@ -164,7 +164,7 @@
 
   EXPECT_TRUE(icon_->IsVisible());
   EXPECT_TRUE(icon_->IsRunning());
-  EXPECT_EQ(2, icon_->WindowsVisibleOnMonitor(0));
+  EXPECT_EQ(2u, icon_->WindowsVisibleOnMonitor(0));
 }
 
 TEST_F(TestFileManagerLauncherIcon, ManagedWindows_CopyDialogAndNoManagedWindow)
@@ -196,7 +196,7 @@
 
   EXPECT_TRUE(icon_->IsVisible());
   EXPECT_TRUE(icon_->IsRunning());
-  EXPECT_EQ(1, icon_->WindowsVisibleOnMonitor(0));
+  EXPECT_EQ(1u, icon_->WindowsVisibleOnMonitor(0));
 }
 
 }

=== modified file 'tests/test_filter_widgets.cpp'
--- tests/test_filter_widgets.cpp	2014-03-21 04:40:12 +0000
+++ tests/test_filter_widgets.cpp	2016-11-30 11:04:07 +0000
@@ -123,7 +123,7 @@
   MultiRangeFilter::Ptr filter(new MultiRangeFilter(model_, AddMultiRangeFilterOptions(model_)));
   SetFilter(filter);
 
-  ASSERT_EQ(filter_widget_->buttons_.size(), 6);
+  ASSERT_EQ(filter_widget_->buttons_.size(), 6u);
 }
 
 TEST_F(TestFilterMultiRangeWidget, TestClick)

=== modified file 'tests/test_glib_dbus_object.cpp'
--- tests/test_glib_dbus_object.cpp	2013-02-28 18:01:22 +0000
+++ tests/test_glib_dbus_object.cpp	2016-11-30 11:04:07 +0000
@@ -112,14 +112,14 @@
 TEST(TestGLibDBusObjectBuilder, GetObjectsForIntrospectionWithOneObject)
 {
   auto const& objs = DBusObjectBuilder::GetObjectsForIntrospection(introspection::SINGLE_OJBECT);
-  ASSERT_EQ(objs.size(), 1);
+  ASSERT_EQ(objs.size(), 1u);
   EXPECT_EQ(objs.front()->InterfaceName(), "com.canonical.Unity.ObjectTest");
 }
 
 TEST(TestGLibDBusObjectBuilder, GetObjectsForIntrospectionWithMultipleObjects)
 {
   auto const& objs = DBusObjectBuilder::GetObjectsForIntrospection(introspection::MULTIPLE_OJBECTS);
-  ASSERT_EQ(objs.size(), 3);
+  ASSERT_EQ(objs.size(), 3u);
   EXPECT_EQ((*std::next(objs.begin(), 0))->InterfaceName(), "com.canonical.Unity.ObjectTest1");
   EXPECT_EQ((*std::next(objs.begin(), 1))->InterfaceName(), "com.canonical.Unity.ObjectTest2");
   EXPECT_EQ((*std::next(objs.begin(), 2))->InterfaceName(), "com.canonical.Unity.ObjectTest3");

=== modified file 'tests/test_glib_dbus_server.cpp'
--- tests/test_glib_dbus_server.cpp	2015-03-13 13:49:16 +0000
+++ tests/test_glib_dbus_server.cpp	2016-11-30 11:04:07 +0000
@@ -179,7 +179,7 @@
   unsigned objects_registered = 0;
 
   server.AddObjects(introspection::MULTIPLE_OJBECTS, TEST_OBJECT_PATH);
-  ASSERT_EQ(server.GetObjects().size(), 3);
+  ASSERT_EQ(server.GetObjects().size(), 3u);
 
   for (auto const& obj : server.GetObjects())
   {
@@ -193,7 +193,7 @@
 
   Utils::WaitUntilMSec([this] { return server.OwnsName(); });
 
-  EXPECT_EQ(objects_registered, 3);
+  EXPECT_EQ(objects_registered, 3u);
 }
 
 TEST_F(TestGLibDBusServer, RemovingObjectWontRegisterIt)
@@ -201,10 +201,10 @@
   unsigned objects_registered = 0;
 
   server.AddObjects(introspection::MULTIPLE_OJBECTS, TEST_OBJECT_PATH);
-  ASSERT_EQ(server.GetObjects().size(), 3);
+  ASSERT_EQ(server.GetObjects().size(), 3u);
 
   server.RemoveObject(server.GetObjects().front());
-  ASSERT_EQ(server.GetObjects().size(), 2);
+  ASSERT_EQ(server.GetObjects().size(), 2u);
 
   for (auto const& obj : server.GetObjects())
   {
@@ -216,13 +216,13 @@
 
   Utils::WaitUntilMSec([this] { return server.OwnsName(); });
 
-  EXPECT_EQ(objects_registered, 2);
+  EXPECT_EQ(objects_registered, 2u);
 }
 
 TEST_F(TestGLibDBusServer, RemovingObjectsUnregistersThem)
 {
   server.AddObjects(introspection::MULTIPLE_OJBECTS, TEST_OBJECT_PATH);
-  ASSERT_EQ(server.GetObjects().size(), 3);
+  ASSERT_EQ(server.GetObjects().size(), 3u);
 
   Utils::WaitUntilMSec([this] { return server.OwnsName(); });
 
@@ -236,16 +236,16 @@
   }
 
   server.RemoveObject(server.GetObjects().front());
-  ASSERT_EQ(server.GetObjects().size(), 2);
-  EXPECT_EQ(objects_unregistered, 1);
-
-  server.RemoveObject(server.GetObjects().front());
-  ASSERT_EQ(server.GetObjects().size(), 1);
-  EXPECT_EQ(objects_unregistered, 2);
-
-  server.RemoveObject(server.GetObjects().front());
-  ASSERT_EQ(server.GetObjects().size(), 0);
-  EXPECT_EQ(objects_unregistered, 3);
+  ASSERT_EQ(server.GetObjects().size(), 2u);
+  EXPECT_EQ(objects_unregistered, 1u);
+
+  server.RemoveObject(server.GetObjects().front());
+  ASSERT_EQ(server.GetObjects().size(), 1u);
+  EXPECT_EQ(objects_unregistered, 2u);
+
+  server.RemoveObject(server.GetObjects().front());
+  ASSERT_EQ(server.GetObjects().size(), 0u);
+  EXPECT_EQ(objects_unregistered, 3u);
 }
 
 ///
@@ -269,7 +269,7 @@
     ASSERT_TRUE(proxy->IsConnected());
 
     auto const& objects = server->GetObjects();
-    ASSERT_EQ(objects.size(), 1);
+    ASSERT_EQ(objects.size(), 1u);
     object = objects.front();
     ASSERT_NE(object, nullptr);
   }

=== modified file 'tests/test_glib_object.cpp'
--- tests/test_glib_object.cpp	2014-07-30 00:49:35 +0000
+++ tests/test_glib_object.cpp	2016-11-30 11:04:07 +0000
@@ -222,7 +222,7 @@
   EXPECT_EQ(cast_copy, gt_obj.RawPtr());
 
   Object<GObject> g_obj = glib::object_cast<GObject>(gt_obj);
-  EXPECT_EQ(g_obj->ref_count, 2);
+  EXPECT_EQ(G_OBJECT(g_obj.RawPtr())->ref_count, 2u);
 
   g_object_set_data(g_obj, "TestData", GINT_TO_POINTER(55));
   EXPECT_EQ(GPOINTER_TO_INT(g_object_get_data(g_obj, "TestData")), 55);
@@ -285,7 +285,7 @@
   // Release() doesn't unref the object.
   g_obj.Release();
   EXPECT_EQ(g_obj, 0);
-  EXPECT_EQ(RefCount(t_obj), 1);
+  EXPECT_EQ(RefCount(t_obj), 1u);
 
   g_object_unref(t_obj);
 }
@@ -315,8 +315,8 @@
     EXPECT_EQ(g_obj1, t_obj1);
     EXPECT_EQ(g_obj2, t_obj2);
 
-    EXPECT_EQ(RefCount(g_obj1), 1);
-    EXPECT_EQ(RefCount(g_obj2), 1);
+    EXPECT_EQ(RefCount(g_obj1), 1u);
+    EXPECT_EQ(RefCount(g_obj2), 1u);
   }
 
   EXPECT_TRUE(IsObjectDestroyed(t_obj1));
@@ -336,29 +336,29 @@
   TestObjectWrapper g_obj4;
   TestObjectWrapper g_obj5;
 
-  EXPECT_EQ(RefCount(g_obj1), 1);
+  EXPECT_EQ(RefCount(g_obj1), 1u);
 
   obj_list.push_back(g_obj1);
   obj_list.push_back(g_obj2);
   obj_list.push_back(g_obj3);
   obj_list.push_back(g_obj4);
   obj_list.push_back(g_obj5);
-  EXPECT_EQ(obj_list.size(), 5);
+  EXPECT_EQ(obj_list.size(), 5u);
 
-  EXPECT_EQ(RefCount(g_obj1), 2);
+  EXPECT_EQ(RefCount(g_obj1), 2u);
 
   obj_list.remove(g_obj2);
-  EXPECT_EQ(obj_list.size(), 4);
+  EXPECT_EQ(obj_list.size(), 4u);
 
   EXPECT_TRUE(std::find(obj_list.begin(), obj_list.end(), g_obj3) != obj_list.end());
   EXPECT_TRUE(std::find(obj_list.begin(), obj_list.end(), g_obj3.RawPtr()) != obj_list.end());
 
   obj_list.remove(TestObjectWrapper(t_obj1, AddRef()));
-  EXPECT_EQ(obj_list.size(), 3);
+  EXPECT_EQ(obj_list.size(), 3u);
 
   EXPECT_TRUE(std::find(obj_list.begin(), obj_list.end(), g_obj4) != obj_list.end());
   obj_list.remove(g_obj5);
-  EXPECT_EQ(obj_list.size(), 1);
+  EXPECT_EQ(obj_list.size(), 1u);
 }
 
 } // Namespace

=== modified file 'tests/test_glib_signals.cpp'
--- tests/test_glib_signals.cpp	2013-07-18 04:16:50 +0000
+++ tests/test_glib_signals.cpp	2016-11-30 11:04:07 +0000
@@ -289,7 +289,7 @@
   g_signal_emit_by_name(test_signals_, "signal0");
 
   EXPECT_FALSE(signal0_received_);
-  EXPECT_EQ(signal0_num_cb, 1);
+  EXPECT_EQ(signal0_num_cb, 1u);
 }
 
 TEST_F(TestGLibSignals, TestManagerConstruction)
@@ -324,7 +324,7 @@
               "signal6",
               sigc::mem_fun(this, &TestGLibSignals::Signal6Callback)));
 
-  EXPECT_EQ(manager.GetConnections().size(), 7);
+  EXPECT_EQ(manager.GetConnections().size(), 7u);
 }
 
 TEST_F(TestGLibSignals, TestManagerAdditionTemplate)
@@ -345,7 +345,7 @@
                                                                              sigc::mem_fun(this, &TestGLibSignals::Signal5Callback));
   manager.Add<gboolean, TestSignals*, const char*, int, float, double, gboolean, char>(test_signals_, "signal6", sigc::mem_fun(this, &TestGLibSignals::Signal6Callback));
 
-  EXPECT_EQ(manager.GetConnections().size(), 7);
+  EXPECT_EQ(manager.GetConnections().size(), 7u);
 }
 
 TEST_F(TestGLibSignals, TestManagerConnection)

=== modified file 'tests/test_glib_source.cpp'
--- tests/test_glib_source.cpp	2013-10-10 09:47:46 +0000
+++ tests/test_glib_source.cpp	2016-11-30 11:04:07 +0000
@@ -56,7 +56,7 @@
 TEST(TestGLibSource, ID)
 {
   Idle source;
-  EXPECT_EQ(source.Id(), 0);
+  EXPECT_EQ(source.Id(), 0u);
 }
 
 TEST(TestGLibSource, Running)
@@ -91,7 +91,7 @@
 TEST(TestGLibTimeout, Construction)
 {
   Timeout timeout(1000, &OnSourceCallbackContinue);
-  EXPECT_NE(timeout.Id(), 0);
+  EXPECT_NE(timeout.Id(), 0u);
   EXPECT_TRUE(timeout.IsRunning());
   EXPECT_EQ(timeout.GetPriority(), Source::Priority::DEFAULT);
 }
@@ -99,7 +99,7 @@
 TEST(TestGLibTimeout, ConstructionEmptyCallback)
 {
   Timeout timeout(1000, Source::Callback());
-  EXPECT_NE(timeout.Id(), 0);
+  EXPECT_NE(timeout.Id(), 0u);
   EXPECT_TRUE(timeout.IsRunning());
   EXPECT_EQ(timeout.GetPriority(), Source::Priority::DEFAULT);
 }
@@ -107,7 +107,7 @@
 TEST(TestGLibTimeout, DelayedRunConstruction)
 {
   Timeout timeout(1000);
-  EXPECT_EQ(timeout.Id(), 0);
+  EXPECT_EQ(timeout.Id(), 0u);
   EXPECT_FALSE(timeout.IsRunning());
   EXPECT_EQ(timeout.GetPriority(), Source::Priority::DEFAULT);
 }
@@ -124,7 +124,7 @@
   }
 
   EXPECT_TRUE(removed_called);
-  EXPECT_EQ(callback_call_count, 0);
+  EXPECT_EQ(callback_call_count, 0u);
 }
 
 TEST(TestGLibTimeout, OneShotRun)
@@ -138,7 +138,7 @@
 
   Utils::WaitUntilMSec([&timeout] {return timeout.IsRunning();}, false, 500);
   EXPECT_TRUE(callback_called);
-  EXPECT_EQ(callback_call_count, 1);
+  EXPECT_EQ(callback_call_count, 1u);
   EXPECT_TRUE(removed_called);
 }
 
@@ -157,7 +157,7 @@
   }
 
   EXPECT_TRUE(callback_called);
-  EXPECT_GT(callback_call_count, 1);
+  EXPECT_GT(callback_call_count, 1u);
   EXPECT_TRUE(removed_called);
 }
 
@@ -185,10 +185,10 @@
 
   Utils::WaitUntilMSec([&timeout] {return timeout.IsRunning();}, false, 300);
 
-  EXPECT_NE(timeout.Id(), 0);
+  EXPECT_NE(timeout.Id(), 0u);
   EXPECT_TRUE(removed_called);
   EXPECT_FALSE(callback_called);
-  EXPECT_EQ(callback_call_count, 0);
+  EXPECT_EQ(callback_call_count, 0u);
 }
 
 TEST(TestGLibTimeout, Running)
@@ -204,7 +204,7 @@
 
   Utils::WaitUntilMSec([&timeout] {return timeout.IsRunning();}, false, 500);
   EXPECT_TRUE(callback_called);
-  EXPECT_EQ(callback_call_count, 1);
+  EXPECT_EQ(callback_call_count, 1u);
 }
 
 TEST(TestGLibTimeout, RemoveOnCallback)
@@ -225,7 +225,7 @@
 
   ASSERT_EQ(timeout.IsRunning(), false);
   EXPECT_EQ(local_callback_called, true);
-  EXPECT_EQ(local_callback_call_count, 1);
+  EXPECT_EQ(local_callback_call_count, 1u);
 }
 
 TEST(TestGLibTimeout, RemovePtrOnCallback)
@@ -249,7 +249,7 @@
 
   ASSERT_EQ(timeout, nullptr);
   EXPECT_EQ(local_callback_called, true);
-  EXPECT_EQ(local_callback_call_count, 1);
+  EXPECT_EQ(local_callback_call_count, 1u);
 }
 
 TEST(TestGLibTimeout, AutoRemoveSourceOnCallback)
@@ -270,7 +270,7 @@
 
   timeout.reset();
   EXPECT_EQ(local_callback_called, true);
-  EXPECT_EQ(local_callback_call_count, 1);
+  EXPECT_EQ(local_callback_call_count, 1u);
 
   // source should be removed by now.
   EXPECT_TRUE(g_main_context_find_source_by_id(NULL, id) == nullptr);
@@ -282,7 +282,7 @@
 TEST(TestGLibTimeoutSeconds, Construction)
 {
   TimeoutSeconds timeout(1, &OnSourceCallbackContinue);
-  EXPECT_NE(timeout.Id(), 0);
+  EXPECT_NE(timeout.Id(), 0u);
   EXPECT_TRUE(timeout.IsRunning());
   EXPECT_EQ(timeout.GetPriority(), Source::Priority::DEFAULT);
 }
@@ -290,7 +290,7 @@
 TEST(TestGLibTimeoutSeconds, DelayedRunConstruction)
 {
   TimeoutSeconds timeout(1);
-  EXPECT_EQ(timeout.Id(), 0);
+  EXPECT_EQ(timeout.Id(), 0u);
   EXPECT_FALSE(timeout.IsRunning());
   EXPECT_EQ(timeout.GetPriority(), Source::Priority::DEFAULT);
 }
@@ -307,7 +307,7 @@
   }
 
   EXPECT_TRUE(removed_called);
-  EXPECT_EQ(callback_call_count, 0);
+  EXPECT_EQ(callback_call_count, 0u);
 }
 
 TEST(TestGLibTimeoutSeconds, OneShotRun)
@@ -321,7 +321,7 @@
 
   Utils::WaitUntil([&timeout] {return timeout.IsRunning();}, false, 2);
   EXPECT_TRUE(callback_called);
-  EXPECT_EQ(callback_call_count, 1);
+  EXPECT_EQ(callback_call_count, 1u);
   EXPECT_TRUE(removed_called);
 }
 
@@ -340,7 +340,7 @@
   }
 
   EXPECT_TRUE(callback_called);
-  EXPECT_GT(callback_call_count, 1);
+  EXPECT_GT(callback_call_count, 1u);
   EXPECT_TRUE(removed_called);
 }
 
@@ -349,7 +349,7 @@
 TEST(TestGLibIdle, Construction)
 {
   Idle idle(&OnSourceCallbackStop);
-  EXPECT_NE(idle.Id(), 0);
+  EXPECT_NE(idle.Id(), 0u);
   EXPECT_EQ(idle.GetPriority(), Source::Priority::DEFAULT_IDLE);
 }
 
@@ -365,7 +365,7 @@
   }
 
   EXPECT_TRUE(removed_called);
-  EXPECT_EQ(callback_call_count, 0);
+  EXPECT_EQ(callback_call_count, 0u);
 }
 
 TEST(TestGLibIdle, OneShotRun)
@@ -382,7 +382,7 @@
   Utils::WaitUntilMSec([&idle] {return idle.IsRunning();}, false, 100);
   EXPECT_FALSE(idle.IsRunning());
   EXPECT_TRUE(callback_called);
-  EXPECT_EQ(callback_call_count, 1);
+  EXPECT_EQ(callback_call_count, 1u);
   EXPECT_LE(pre, post);
 }
 
@@ -402,7 +402,7 @@
   }
 
   EXPECT_TRUE(callback_called);
-  EXPECT_GT(callback_call_count, 1);
+  EXPECT_GT(callback_call_count, 1u);
   DeltaTime time_delta = unity::TimeUtil::TimeDelta(&post, &pre);
   EXPECT_GE(time_delta, 100);
   EXPECT_LT(time_delta, 200);
@@ -420,10 +420,10 @@
 
   Utils::WaitUntilMSec([&idle] {return idle.IsRunning();}, false, 300);
 
-  EXPECT_NE(idle.Id(), 0);
+  EXPECT_NE(idle.Id(), 0u);
   EXPECT_TRUE(removed_called);
   EXPECT_FALSE(callback_called);
-  EXPECT_EQ(callback_call_count, 0);
+  EXPECT_EQ(callback_call_count, 0u);
 }
 
 TEST(TestGLibIdle, Running)
@@ -439,7 +439,7 @@
 
   Utils::WaitUntilMSec([&idle] {return idle.IsRunning();}, false, 20000);
   EXPECT_TRUE(callback_called);
-  EXPECT_EQ(callback_call_count, 1);
+  EXPECT_EQ(callback_call_count, 1u);
 }
 
 TEST(TestGLibIdle, RemoveOnCallback)
@@ -460,7 +460,7 @@
 
   ASSERT_EQ(idle.IsRunning(), false);
   EXPECT_EQ(local_callback_called, true);
-  EXPECT_EQ(local_callback_call_count, 1);
+  EXPECT_EQ(local_callback_call_count, 1u);
 }
 
 TEST(TestGLibIdle, RemovePtrOnCallback)
@@ -481,7 +481,7 @@
 
   ASSERT_EQ(idle, nullptr);
   EXPECT_EQ(local_callback_called, true);
-  EXPECT_EQ(local_callback_call_count, 1);
+  EXPECT_EQ(local_callback_call_count, 1u);
 }
 
 // Test GLibSource Manager
@@ -509,7 +509,7 @@
   manager.Add(new Idle());
   manager.Add(new Idle(&OnSourceCallbackContinue));
 
-  EXPECT_EQ(manager.GetSources().size(), 4);
+  EXPECT_EQ(manager.GetSources().size(), 4u);
 }
 
 TEST(TestGLibSourceManager, AddingNamedSources)
@@ -532,7 +532,7 @@
   manager.Add(idle_2, "idle-2");
   ASSERT_EQ(manager.GetSource("idle-2").get(), idle_2);
 
-  EXPECT_EQ(manager.GetSources().size(), 4);
+  EXPECT_EQ(manager.GetSources().size(), 4u);
 }
 
 TEST(TestGLibSourceManager, AddingDuplicatedSources)
@@ -550,7 +550,7 @@
   EXPECT_EQ(manager.GetSource(timeout->Id()), timeout);
   EXPECT_EQ(ret, false);
 
-  EXPECT_EQ(manager.GetSources().size(), 1);
+  EXPECT_EQ(manager.GetSources().size(), 1u);
 }
 
 TEST(TestGLibSourceManager, AddingDuplicatedNamedSources)
@@ -570,7 +570,7 @@
   EXPECT_EQ(ret, true);
 
   EXPECT_FALSE(timeout_1->IsRunning());
-  EXPECT_EQ(manager.GetSources().size(), 1);
+  EXPECT_EQ(manager.GetSources().size(), 1u);
 }
 
 TEST(TestGLibSourceManager, AddingTimeouts)
@@ -580,7 +580,7 @@
   auto timeout1 = manager.AddTimeout(1);
   auto timeout2 = manager.AddTimeout(1, &OnSourceCallbackContinue);
 
-  EXPECT_EQ(manager.GetSources().size(), 2);
+  EXPECT_EQ(manager.GetSources().size(), 2u);
   EXPECT_FALSE(timeout1->IsRunning());
   EXPECT_TRUE(timeout2->IsRunning());
 }
@@ -592,7 +592,7 @@
   auto idle1 = manager.AddIdle();
   auto idle2 = manager.AddIdle(&OnSourceCallbackContinue);
 
-  EXPECT_EQ(manager.GetSources().size(), 2);
+  EXPECT_EQ(manager.GetSources().size(), 2u);
   EXPECT_FALSE(idle1->IsRunning());
   EXPECT_TRUE(idle2->IsRunning());
 }
@@ -613,21 +613,21 @@
 
   manager.Remove(timeout1->Id());
   EXPECT_FALSE(timeout1->IsRunning());
-  EXPECT_EQ(manager.GetSources().size(), 3);
+  EXPECT_EQ(manager.GetSources().size(), 3u);
 
   manager.Remove(timeout2->Id());
   EXPECT_FALSE(timeout2->IsRunning());
   EXPECT_EQ(manager.GetSource(timeout2->Id()), nullptr);
-  EXPECT_EQ(manager.GetSources().size(), 2);
+  EXPECT_EQ(manager.GetSources().size(), 2u);
 
   manager.Remove(idle1->Id());
   EXPECT_FALSE(idle1->IsRunning());
-  EXPECT_EQ(manager.GetSources().size(), 1);
+  EXPECT_EQ(manager.GetSources().size(), 1u);
 
   manager.Remove(idle2->Id());
   EXPECT_FALSE(idle2->IsRunning());
   EXPECT_EQ(manager.GetSource(idle2->Id()), nullptr);
-  EXPECT_EQ(manager.GetSources().size(), 0);
+  EXPECT_EQ(manager.GetSources().size(), 0u);
 }
 
 TEST(TestGLibSourceManager, RemovingSourcesByNick)
@@ -647,22 +647,22 @@
   manager.Remove("timeout-1");
   EXPECT_FALSE(timeout1->IsRunning());
   EXPECT_EQ(manager.GetSource("timeout-1"), nullptr);
-  EXPECT_EQ(manager.GetSources().size(), 3);
+  EXPECT_EQ(manager.GetSources().size(), 3u);
 
   manager.Remove("timeout-2");
   EXPECT_FALSE(timeout2->IsRunning());
   EXPECT_EQ(manager.GetSource("timeout-2"), nullptr);
-  EXPECT_EQ(manager.GetSources().size(), 2);
+  EXPECT_EQ(manager.GetSources().size(), 2u);
 
   manager.Remove("idle-1");
   EXPECT_FALSE(idle1->IsRunning());
   EXPECT_EQ(manager.GetSource("idle-1"), nullptr);
-  EXPECT_EQ(manager.GetSources().size(), 1);
+  EXPECT_EQ(manager.GetSources().size(), 1u);
 
   manager.Remove("idle-2");
   EXPECT_FALSE(idle2->IsRunning());
   EXPECT_EQ(manager.GetSource("idle-2"), nullptr);
-  EXPECT_EQ(manager.GetSources().size(), 0);
+  EXPECT_EQ(manager.GetSources().size(), 0u);
 }
 
 TEST(TestGLibSourceManager, RemovesOnDisconnection)
@@ -675,16 +675,16 @@
   manager.Add(timeout);
   manager.Add(idle);
 
-  ASSERT_EQ(manager.GetSources().size(), 2);
+  ASSERT_EQ(manager.GetSources().size(), 2u);
   EXPECT_EQ(timeout, manager.GetSource(timeout->Id()));
   EXPECT_EQ(idle, manager.GetSource(idle->Id()));
 
   timeout->Remove();
-  EXPECT_EQ(manager.GetSources().size(), 1);
+  EXPECT_EQ(manager.GetSources().size(), 1u);
   EXPECT_EQ(manager.GetSource(timeout->Id()), nullptr);
 
   idle->Remove();
-  EXPECT_EQ(manager.GetSources().size(), 0);
+  EXPECT_EQ(manager.GetSources().size(), 0u);
   EXPECT_EQ(manager.GetSource(idle->Id()), nullptr);
 }
 
@@ -742,7 +742,7 @@
 
   ASSERT_FALSE(idle->IsRunning());
   EXPECT_TRUE(local_callback_called);
-  EXPECT_EQ(1, local_callback_call_count);
+  EXPECT_EQ(1u, local_callback_call_count);
 }
 
 }

=== modified file 'tests/test_glib_variant.cpp'
--- tests/test_glib_variant.cpp	2013-11-14 01:44:15 +0000
+++ tests/test_glib_variant.cpp	2016-11-30 11:04:07 +0000
@@ -241,9 +241,9 @@
   EXPECT_EQ("charstring-value", Variant(g_variant_lookup_value(v, "charstring-key", nullptr)).GetString());
   EXPECT_EQ("string-value", Variant(g_variant_lookup_value(v, "string-key", nullptr)).GetString());
   EXPECT_EQ(-1, Variant(g_variant_lookup_value(v, "gint32-key", nullptr)).GetInt32());
-  EXPECT_EQ(2, Variant(g_variant_lookup_value(v, "guint32-key", nullptr)).GetUInt32());
+  EXPECT_EQ(2u, Variant(g_variant_lookup_value(v, "guint32-key", nullptr)).GetUInt32());
   EXPECT_EQ(-3, Variant(g_variant_lookup_value(v, "gint64-key", nullptr)).GetInt64());
-  EXPECT_EQ(4, Variant(g_variant_lookup_value(v, "guint64-key", nullptr)).GetUInt64());
+  EXPECT_EQ(4u, Variant(g_variant_lookup_value(v, "guint64-key", nullptr)).GetUInt64());
   EXPECT_FLOAT_EQ(1.1, Variant(g_variant_lookup_value(v, "float-key", nullptr)).GetFloat());
   EXPECT_DOUBLE_EQ(2.2, Variant(g_variant_lookup_value(v, "double-key", nullptr)).GetDouble());
   EXPECT_EQ(true, Variant(g_variant_lookup_value(v, "bool-key", nullptr)).GetBool());
@@ -387,9 +387,9 @@
   EXPECT_EQ("charstring-value", Variant(g_variant_lookup_value(v, "charstring-key", nullptr)).GetString());
   EXPECT_EQ("string-value", Variant(g_variant_lookup_value(v, "string-key", nullptr)).GetString());
   EXPECT_EQ(-1, Variant(g_variant_lookup_value(v, "gint32-key", nullptr)).GetInt32());
-  EXPECT_EQ(2, Variant(g_variant_lookup_value(v, "guint32-key", nullptr)).GetUInt32());
+  EXPECT_EQ(2u, Variant(g_variant_lookup_value(v, "guint32-key", nullptr)).GetUInt32());
   EXPECT_EQ(-3, Variant(g_variant_lookup_value(v, "gint64-key", nullptr)).GetInt64());
-  EXPECT_EQ(4, Variant(g_variant_lookup_value(v, "guint64-key", nullptr)).GetUInt64());
+  EXPECT_EQ(4u, Variant(g_variant_lookup_value(v, "guint64-key", nullptr)).GetUInt64());
   EXPECT_FLOAT_EQ(1.1, Variant(g_variant_lookup_value(v, "float-key", nullptr)).GetFloat());
   EXPECT_DOUBLE_EQ(2.2, Variant(g_variant_lookup_value(v, "double-key", nullptr)).GetDouble());
   EXPECT_EQ(true, Variant(g_variant_lookup_value(v, "bool-key", nullptr)).GetBool());
@@ -590,10 +590,10 @@
   EXPECT_EQ(v2.GetUInt32(), value);
 
   Variant v3(g_variant_new("(ui)", value, G_MAXUINT32));
-  EXPECT_EQ(v3.GetUInt32(), 0);
+  EXPECT_EQ(v3.GetUInt32(), 0u);
 
   Variant v4;
-  EXPECT_EQ(v4.GetUInt32(), 0);
+  EXPECT_EQ(v4.GetUInt32(), 0u);
 
   value = g_random_int();
   Variant v5(g_variant_new_variant(g_variant_new_uint32(value)));
@@ -632,10 +632,10 @@
   EXPECT_EQ(v2.GetUInt64(), value);
 
   Variant v3(g_variant_new("(ti)", value, G_MAXINT64));
-  EXPECT_EQ(v3.GetUInt64(), 0);
+  EXPECT_EQ(v3.GetUInt64(), 0u);
 
   Variant v4;
-  EXPECT_EQ(v4.GetUInt64(), 0);
+  EXPECT_EQ(v4.GetUInt64(), 0u);
 
   value = g_random_int();
   Variant v5(g_variant_new_variant(g_variant_new_uint64(value)));
@@ -702,7 +702,7 @@
 
   auto const& variant = Variant::FromVector(empty);
   ASSERT_TRUE(g_variant_is_container(variant));
-  ASSERT_EQ(0, g_variant_n_children(variant));
+  ASSERT_EQ(0u, g_variant_n_children(variant));
   EXPECT_TRUE(g_variant_is_of_type(variant, G_VARIANT_TYPE_ARRAY));
 }
 

=== modified file 'tests/test_gnome_session_manager.cpp'
--- tests/test_gnome_session_manager.cpp	2016-11-02 16:38:47 +0000
+++ tests/test_gnome_session_manager.cpp	2016-11-30 11:04:07 +0000
@@ -510,7 +510,7 @@
     if (method == "Logout")
     {
       logout_called = true;
-      EXPECT_EQ(Variant(par).GetUInt32(), 1);
+      EXPECT_EQ(Variant(par).GetUInt32(), 1u);
     }
 
     return nullptr;

=== modified file 'tests/test_grabhandle.cpp'
--- tests/test_grabhandle.cpp	2013-07-18 04:16:50 +0000
+++ tests/test_grabhandle.cpp	2016-11-30 11:04:07 +0000
@@ -168,7 +168,7 @@
   EXPECT_EQ (handlesMask, MiddleHandle);
 
   handlesMask = unity::MT::getLayoutForMask (MaximizedHorzMask | MaximizedVertMask, ResizeMask);
-  EXPECT_EQ (handlesMask, 0);
+  EXPECT_EQ (handlesMask, 0u);
 
   handlesMask = unity::MT::getLayoutForMask (MaximizedHorzMask, ResizeMask);
   EXPECT_EQ (handlesMask, BottomHandle | TopHandle);
@@ -193,7 +193,7 @@
   EXPECT_EQ (handlesMask, MiddleHandle);
 
   handlesMask = unity::MT::getLayoutForMask (0, 0);
-  EXPECT_EQ (handlesMask, 0);
+  EXPECT_EQ (handlesMask, 0u);
 }
 
 TEST_F(UnityMTGrabHandleTest, TestLayouts)

=== modified file 'tests/test_gsettings_scopes.cpp'
--- tests/test_gsettings_scopes.cpp	2014-03-21 08:51:01 +0000
+++ tests/test_gsettings_scopes.cpp	2016-11-30 11:04:07 +0000
@@ -72,9 +72,9 @@
     });
   }
 
-  int scope_added;
-  int scope_removed;
-  int scopes_reordered;
+  unsigned scope_added;
+  unsigned scope_removed;
+  unsigned scopes_reordered;
 };
 
 TEST_F(TestGSettingsScopes, TestAdded)
@@ -83,13 +83,13 @@
   ConnectScope(&scopes);
 
   scopes.InsertScope("testscope1.scope", 0);
-  EXPECT_EQ(scopes.count, (unsigned int)1);
-  EXPECT_EQ(scopes_reordered, (unsigned int)0);
+  EXPECT_EQ(scopes.count, 1u);
+  EXPECT_EQ(scopes_reordered, 0u);
 
   // add another
   scopes.InsertScope("testscope2.scope", 1);
-  EXPECT_EQ(scopes.count, (unsigned int)2);
-  EXPECT_EQ(scopes_reordered, (unsigned int)0);
+  EXPECT_EQ(scopes.count, 2u);
+  EXPECT_EQ(scopes_reordered, 0u);
 
   int position = -1;
   EXPECT_TRUE(scopes.GetScope("testscope1.scope", &position) && position == 0);
@@ -105,12 +105,12 @@
   scopes.InsertScope("testscope2.scope", 1);
   scopes.InsertScope("testscope3.scope", 2);
   scopes.InsertScope("testscope4.scope", 3);
-  EXPECT_EQ(scopes.count, (unsigned int)4);
-  EXPECT_EQ(scopes_reordered, (unsigned int)0);
+  EXPECT_EQ(scopes.count, 4u);
+  EXPECT_EQ(scopes_reordered, 0u);
 
   // change position
   scopes.InsertScope("testscope3.scope", 0);
-  EXPECT_EQ(scopes_reordered, (unsigned int)1);
+  EXPECT_EQ(scopes_reordered, 1u);
 
   int position = -1;
   EXPECT_TRUE(scopes.GetScope("testscope3.scope", &position) && position == 0);
@@ -128,12 +128,12 @@
   scopes.InsertScope("testscope2.scope", 1);
   scopes.InsertScope("testscope3.scope", 2);
   scopes.InsertScope("testscope4.scope", 3);
-  EXPECT_EQ(scopes.count, (unsigned int)4);
-  EXPECT_EQ(scopes_reordered, (unsigned int)0);
+  EXPECT_EQ(scopes.count, 4u);
+  EXPECT_EQ(scopes_reordered, 0u);
 
   // change position
   scopes.InsertScope("testscope2.scope", 3);
-  EXPECT_EQ(scopes_reordered, (unsigned int)1);
+  EXPECT_EQ(scopes_reordered, 1u);
 
   int position = -1;
   EXPECT_TRUE(scopes.GetScope("testscope1.scope", &position) && position == 0);
@@ -149,8 +149,8 @@
   ConnectScope(&scopes);
 
   scopes.InsertScope("non-existing.scope", 0);
-  EXPECT_EQ(scope_added, (unsigned int)0);
-  EXPECT_EQ(scopes.count, (unsigned int)0);
+  EXPECT_EQ(scope_added, 0u);
+  EXPECT_EQ(scopes.count, 0u);
 }
 
 TEST_F(TestGSettingsScopes, TestAddSame)
@@ -159,15 +159,15 @@
   ConnectScope(&scopes);
 
   scopes.InsertScope("testscope1.scope", 0);
-  EXPECT_EQ(scope_added, (unsigned int)1);
-  EXPECT_EQ(scopes.count, (unsigned int)1);
+  EXPECT_EQ(scope_added, 1u);
+  EXPECT_EQ(scopes.count, 1u);
 
   // shouldnt add another
   scopes.InsertScope("testscope1.scope", 1);
 
-  EXPECT_EQ(scope_added, (unsigned int)1);
-  EXPECT_EQ(scopes.count, (unsigned int)1);
-  EXPECT_EQ(scopes_reordered, (unsigned int)0);
+  EXPECT_EQ(scope_added, 1u);
+  EXPECT_EQ(scopes.count, 1u);
+  EXPECT_EQ(scopes_reordered, 0u);
 }
 
 TEST_F(TestGSettingsScopes, TestAddRemove)
@@ -176,12 +176,12 @@
   ConnectScope(&scopes);
 
   scopes.InsertScope("testscope1.scope", 0);
-  EXPECT_EQ(scope_added, (unsigned int)1);
-  EXPECT_EQ(scopes.count, (unsigned int)1);
+  EXPECT_EQ(scope_added, 1u);
+  EXPECT_EQ(scopes.count, 1u);
 
   scopes.RemoveScope("testscope1.scope");
-  EXPECT_EQ(scope_removed, (unsigned int)1);
-  EXPECT_EQ(scopes.count, (unsigned int)0);
+  EXPECT_EQ(scope_removed, 1u);
+  EXPECT_EQ(scopes.count, 0u);
 }
 
 TEST_F(TestGSettingsScopes, TestRemoveNonExists)
@@ -190,8 +190,8 @@
   ConnectScope(&scopes);
 
   scopes.RemoveScope("non-existing.scope");
-  EXPECT_EQ(scope_removed, (unsigned int)0);
-  EXPECT_EQ(scopes.count, (unsigned int)0);
+  EXPECT_EQ(scope_removed, 0u);
+  EXPECT_EQ(scopes.count, 0u);
 }
 
 TEST_F(TestGSettingsScopes, TestLoad)
@@ -200,7 +200,7 @@
   ConnectScope(&scopes);
 
   scopes.LoadScopes();
-  EXPECT_EQ(scope_added, (unsigned int)4);
+  EXPECT_EQ(scope_added, 4u);
 
   int position = -1;
   EXPECT_TRUE(scopes.GetScope("testscope1.scope", &position) && position == 0);
@@ -215,15 +215,15 @@
   ConnectScope(&scopes);
   
   scopes.LoadScopes();
-  EXPECT_EQ(scope_added, (unsigned int)2);
-  EXPECT_EQ(scopes.count, (unsigned int)2);
+  EXPECT_EQ(scope_added, 2u);
+  EXPECT_EQ(scopes.count, 2u);
 
   scopes.UpdateScopes(scopes_updated);
   Utils::WaitUntilMSec([this] { return scope_removed > 0; }, true, 2000);
 
-  EXPECT_EQ(scope_added, (unsigned int)4);
-  EXPECT_EQ(scope_removed, (unsigned int)1);
-  EXPECT_EQ(scopes.count, (unsigned int)3);
+  EXPECT_EQ(scope_added, 4u);
+  EXPECT_EQ(scope_removed, 1u);
+  EXPECT_EQ(scopes.count, 3u);
 }
 
 

=== modified file 'tests/test_hud_button.cpp'
--- tests/test_hud_button.cpp	2014-03-21 04:40:12 +0000
+++ tests/test_hud_button.cpp	2016-11-30 11:04:07 +0000
@@ -41,13 +41,13 @@
   nux::Layout* layout = button->GetLayout();
 
   ASSERT_NE(layout, nullptr);
-  ASSERT_EQ(layout->GetChildren().size(), 0);
+  ASSERT_EQ(layout->GetChildren().size(), 0u);
 
   hud::Query::Ptr query(new hud::Query("<b>Op</b> Fi<b>le</b>", "","", "", "", NULL));
   button->SetQuery(query);
 
   auto children(layout->GetChildren());
-  ASSERT_EQ(children.size(), 3);
+  ASSERT_EQ(children.size(), 3u);
 
   auto it = children.begin();
   StaticCairoText* label = dynamic_cast<StaticCairoText*>(*it);

=== modified file 'tests/test_hud_private.cpp'
--- tests/test_hud_private.cpp	2012-05-30 14:33:07 +0000
+++ tests/test_hud_private.cpp	2016-11-30 11:04:07 +0000
@@ -32,20 +32,20 @@
   std::vector<std::pair<std::string, bool>> temp;
 
   temp = impl::RefactorText("");
-  ASSERT_EQ(temp.size(), 0);
+  ASSERT_EQ(temp.size(), 0u);
 
   temp = impl::RefactorText("Test");
-  ASSERT_EQ(temp.size(), 1);
+  ASSERT_EQ(temp.size(), 1u);
   EXPECT_EQ(temp[0].first, "Test");
   EXPECT_EQ(temp[0].second, false); // True means "Full opacity", false "Half opacity"
 
   temp = impl::RefactorText("<b>Test</b>");
-  ASSERT_EQ(temp.size(), 1);
+  ASSERT_EQ(temp.size(), 1u);
   EXPECT_EQ(temp[0].first, "Test");
   EXPECT_EQ(temp[0].second, true);
 
   temp = impl::RefactorText("Hello > <b>Test</b> World");
-  ASSERT_EQ(temp.size(), 3);
+  ASSERT_EQ(temp.size(), 3u);
   EXPECT_EQ(temp[0].first, "Hello > ");
   EXPECT_EQ(temp[0].second, false);
   EXPECT_EQ(temp[1].first, "Test");
@@ -54,7 +54,7 @@
   EXPECT_EQ(temp[2].second, false);
 
   temp = impl::RefactorText("Open <b>Fi</b>le <b>Wit</b>h");
-  ASSERT_EQ(temp.size(), 5);
+  ASSERT_EQ(temp.size(), 5u);
   EXPECT_EQ(temp[0].first, "Open ");
   EXPECT_EQ(temp[0].second, false);
   EXPECT_EQ(temp[1].first, "Fi");
@@ -67,7 +67,7 @@
   EXPECT_EQ(temp[4].second, false);
 
   temp = impl::RefactorText("Open <b>File With");
-  ASSERT_EQ(temp.size(), 2);
+  ASSERT_EQ(temp.size(), 2u);
   EXPECT_EQ(temp[0].first, "Open ");
   EXPECT_EQ(temp[0].second, false);
   EXPECT_EQ(temp[1].first, "File With");

=== modified file 'tests/test_hud_view.cpp'
--- tests/test_hud_view.cpp	2014-03-21 04:40:12 +0000
+++ tests/test_hud_view.cpp	2016-11-30 11:04:07 +0000
@@ -50,7 +50,7 @@
   queries.push_back(hud::Query::Ptr(new hud::Query("4", "","", "", "", NULL)));
   view->SetQueries(queries);
 
-  ASSERT_EQ(view->buttons().size(), 4);
+  ASSERT_EQ(view->buttons().size(), 4u);
 
   auto it = view->buttons().begin();
   EXPECT_EQ((*it)->label, "4");

=== modified file 'tests/test_indicator.cpp'
--- tests/test_indicator.cpp	2015-02-02 14:54:45 +0000
+++ tests/test_indicator.cpp	2016-11-30 11:04:07 +0000
@@ -94,19 +94,19 @@
   }
 
   indicator.Sync(sync_data);
-  EXPECT_EQ(indicator.GetEntries().size(), 3);
+  EXPECT_EQ(indicator.GetEntries().size(), 3u);
   EXPECT_EQ(indicator.GetEntry("test-entry-2"), entry2);
   // Mock::VerifyAndClearExpectations(&sig_receiver);
 
   // Sync the indicator removing an entry
   sync_data.erase(std::remove(sync_data.begin(), sync_data.end(), entry2), sync_data.end());
-  EXPECT_EQ(sync_data.size(), 2);
+  EXPECT_EQ(sync_data.size(), 2u);
   EXPECT_CALL(sig_receiver, Updated());
   EXPECT_CALL(sig_receiver, EntryAdded(_)).Times(0);
   EXPECT_CALL(sig_receiver, EntryRemoved(entry2));
 
   indicator.Sync(sync_data);
-  EXPECT_EQ(indicator.GetEntries().size(), 2);
+  EXPECT_EQ(indicator.GetEntries().size(), 2u);
   EXPECT_EQ(indicator.GetEntry("test-entry-2"), nullptr);
 
   // Sync the indicator removing an entry and adding a new one
@@ -115,13 +115,13 @@
   Entry::Ptr entry4(entry);
   sync_data.push_back(entry4);
   sync_data.erase(std::remove(sync_data.begin(), sync_data.end(), entry3), sync_data.end());
-  EXPECT_EQ(sync_data.size(), 2);
+  EXPECT_EQ(sync_data.size(), 2u);
 
   EXPECT_CALL(sig_receiver, EntryAdded(entry4));
   EXPECT_CALL(sig_receiver, EntryRemoved(entry3));
   EXPECT_CALL(sig_receiver, Updated());
   indicator.Sync(sync_data);
-  EXPECT_EQ(indicator.GetEntries().size(), 2);
+  EXPECT_EQ(indicator.GetEntries().size(), 2u);
 
   // Remove all the indicators
 
@@ -132,7 +132,7 @@
 
   sync_data.clear();
   indicator.Sync(sync_data);
-  EXPECT_EQ(indicator.GetEntries().size(), 0);
+  EXPECT_EQ(indicator.GetEntries().size(), 0u);
 }
 
 TEST(TestIndicator, Updated)

=== modified file 'tests/test_indicator_appmenu.cpp'
--- tests/test_indicator_appmenu.cpp	2015-02-09 18:55:18 +0000
+++ tests/test_indicator_appmenu.cpp	2016-11-30 11:04:07 +0000
@@ -108,7 +108,7 @@
 
   // Sync the indicator removing an entry
   sync_data.erase(std::remove(sync_data.begin(), sync_data.end(), entry2), sync_data.end());
-  ASSERT_EQ(sync_data.size(), 2);
+  ASSERT_EQ(sync_data.size(), 2u);
   EXPECT_CALL(sig_receiver, Updated());
   EXPECT_CALL(sig_receiver, UpdatedWin(parent_window1));
   EXPECT_CALL(sig_receiver, UpdatedWin(parent_window2)).Times(0);
@@ -116,7 +116,7 @@
   EXPECT_CALL(sig_receiver, EntryRemoved(entry2));
 
   indicator.Sync(sync_data);
-  EXPECT_EQ(indicator.GetEntries().size(), 2);
+  EXPECT_EQ(indicator.GetEntries().size(), 2u);
   EXPECT_EQ(indicator.GetEntry("test-entry-2"), nullptr);
   EXPECT_EQ(indicator.GetEntriesForWindow(parent_window1), Indicator::Entries({entry1}));
 
@@ -124,7 +124,7 @@
   auto entry4 = std::make_shared<Entry>("test-entry-4", "name-hint", parent_window2, "label", true, true, 0, "icon", true, true, -1);
   sync_data.push_back(entry4);
   sync_data.erase(std::remove(sync_data.begin(), sync_data.end(), entry3), sync_data.end());
-  EXPECT_EQ(sync_data.size(), 2);
+  EXPECT_EQ(sync_data.size(), 2u);
 
   EXPECT_CALL(sig_receiver, EntryAdded(entry4));
   EXPECT_CALL(sig_receiver, EntryRemoved(entry3));

=== modified file 'tests/test_indicator_entry.cpp'
--- tests/test_indicator_entry.cpp	2014-12-19 17:26:43 +0000
+++ tests/test_indicator_entry.cpp	2016-11-30 11:04:07 +0000
@@ -40,7 +40,7 @@
 
   EXPECT_EQ(entry.id(), "id");
   EXPECT_EQ(entry.name_hint(), "name_hint");
-  EXPECT_EQ(entry.parent_window(), 12345);
+  EXPECT_EQ(entry.parent_window(), 12345u);
   EXPECT_EQ(entry.label(), "label");
   EXPECT_TRUE(entry.label_sensitive());
   EXPECT_TRUE(entry.label_visible());
@@ -60,7 +60,7 @@
 
   EXPECT_EQ(entry.id(), "id");
   EXPECT_EQ(entry.name_hint(), "name_hint");
-  EXPECT_EQ(entry.parent_window(), 12345);
+  EXPECT_EQ(entry.parent_window(), 12345u);
   EXPECT_TRUE(entry.label().empty());
   EXPECT_FALSE(entry.label_sensitive());
   EXPECT_FALSE(entry.label_visible());
@@ -85,7 +85,7 @@
 
   EXPECT_EQ(entry.id(), "other_id");
   EXPECT_EQ(entry.name_hint(), "other_name_hint");
-  EXPECT_EQ(entry.parent_window(), 54321);
+  EXPECT_EQ(entry.parent_window(), 54321u);
   EXPECT_EQ(entry.label(), "other_label");
   EXPECT_FALSE(entry.label_sensitive());
   EXPECT_FALSE(entry.label_visible());

=== modified file 'tests/test_indicators.cpp'
--- tests/test_indicators.cpp	2015-06-05 14:27:09 +0000
+++ tests/test_indicators.cpp	2016-11-30 11:04:07 +0000
@@ -76,7 +76,7 @@
 
     // Sync the indicator, adding 3 entries
     test_indicator_1->Sync(sync_data);
-    EXPECT_EQ(test_indicator_1->GetEntries().size(), 3);
+    EXPECT_EQ(test_indicator_1->GetEntries().size(), 3u);
 
 
     // Adding another indicator filled with entries into the TestMockIndicators
@@ -93,9 +93,9 @@
 
     // Sync the indicator, adding 2 entries
     test_indicator_2->Sync(sync_data);
-    EXPECT_EQ(test_indicator_2->GetEntries().size(), 2);
+    EXPECT_EQ(test_indicator_2->GetEntries().size(), 2u);
 
-    ASSERT_THAT(indicators.GetIndicators().size(), 2);
+    ASSERT_THAT(indicators.GetIndicators().size(), 2u);
   }
 
   MockIndicators::Nice indicators;
@@ -135,7 +135,7 @@
   EXPECT_EQ(indicators.GetIndicator("indicator-test-1"), test_indicator_1);
 
   indicators_list = indicators.GetIndicators();
-  EXPECT_EQ(indicators_list.size(), 1);
+  EXPECT_EQ(indicators_list.size(), 1u);
   EXPECT_NE(std::find(indicators_list.begin(), indicators_list.end(), test_indicator_1), indicators_list.end());
 
   EXPECT_CALL(sig_receiver, OnObjectAdded(_));
@@ -145,7 +145,7 @@
   EXPECT_EQ(indicators.GetIndicator("indicator-test-2"), test_indicator_2);
 
   indicators_list = indicators.GetIndicators();
-  EXPECT_EQ(indicators_list.size(), 2);
+  EXPECT_EQ(indicators_list.size(), 2u);
   EXPECT_NE(std::find(indicators_list.begin(), indicators_list.end(), test_indicator_2), indicators_list.end());
 
   EXPECT_CALL(sig_receiver, OnObjectAdded(_));
@@ -155,14 +155,14 @@
   EXPECT_EQ(indicators.GetIndicator("indicator-test-3"), test_indicator_3);
 
   indicators_list = indicators.GetIndicators();
-  EXPECT_EQ(indicators_list.size(), 3);
+  EXPECT_EQ(indicators_list.size(), 3u);
   EXPECT_NE(std::find(indicators_list.begin(), indicators_list.end(), test_indicator_3), indicators_list.end());
 
   EXPECT_CALL(sig_receiver, OnObjectAdded(_)).Times(0);
   EXPECT_CALL(sig_receiver, OnObjectRemoved(_)).Times(0);
 
   ASSERT_THAT(indicators.GetIndicator("invalid-indicator-test-4"), IsNull());
-  EXPECT_EQ(indicators.GetIndicators().size(), 3);
+  EXPECT_EQ(indicators.GetIndicators().size(), 3u);
 
   // Readding an indicator already there should do nothing
   EXPECT_CALL(sig_receiver, OnObjectAdded(_)).Times(0);
@@ -170,7 +170,7 @@
 
   Indicator::Ptr test_indicator_3_duplicate(indicators.AddIndicator("indicator-test-3"));
   EXPECT_EQ(indicators.GetIndicator("indicator-test-3"), test_indicator_3);
-  EXPECT_EQ(indicators.GetIndicators().size(), 3);
+  EXPECT_EQ(indicators.GetIndicators().size(), 3u);
   EXPECT_EQ(test_indicator_3, test_indicator_3_duplicate);
 
   // Removing the indicators...
@@ -181,7 +181,7 @@
   ASSERT_THAT(indicators.GetIndicator("indicator-test-2"), IsNull());
 
   indicators_list = indicators.GetIndicators();
-  EXPECT_EQ(indicators_list.size(), 2);
+  EXPECT_EQ(indicators_list.size(), 2u);
   EXPECT_EQ(std::find(indicators_list.begin(), indicators_list.end(), test_indicator_2), indicators_list.end());
 
   EXPECT_CALL(sig_receiver, OnObjectAdded(_)).Times(0);
@@ -191,7 +191,7 @@
   ASSERT_THAT(indicators.GetIndicator("indicator-test-1"), IsNull());
 
   indicators_list = indicators.GetIndicators();
-  EXPECT_EQ(indicators_list.size(), 1);
+  EXPECT_EQ(indicators_list.size(), 1u);
   EXPECT_EQ(std::find(indicators_list.begin(), indicators_list.end(), test_indicator_1), indicators_list.end());
 
   EXPECT_CALL(sig_receiver, OnObjectAdded(_)).Times(0);
@@ -353,7 +353,7 @@
     ASSERT_TRUE(appmenu_indicator->IsAppmenu());
   }
 
-  ASSERT_EQ(indicators.GetIndicators().size(), 1);
+  ASSERT_EQ(indicators.GetIndicators().size(), 1u);
 
   {
     Indicator::Ptr indicator = indicators.GetIndicator("libappmenu.so");

=== modified file 'tests/test_introspection_data.cpp'
--- tests/test_introspection_data.cpp	2014-01-08 00:01:25 +0000
+++ tests/test_introspection_data.cpp	2016-11-30 11:04:07 +0000
@@ -54,9 +54,9 @@
   data.add("Bool", value);
   GVariant* variant = g_variant_lookup_value(data.Get(), "Bool", nullptr);
   ASSERT_THAT(variant, NotNull());
-  ASSERT_EQ(2, g_variant_n_children(variant));
+  ASSERT_EQ(2u, g_variant_n_children(variant));
 
-  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(0u, g_variant_get_uint32(get_variant_child(variant, 0)));
   EXPECT_EQ(value, g_variant_get_boolean(get_variant_child(variant, 1)));
 }
 
@@ -68,9 +68,9 @@
   auto tmp = data.Get();
   GVariant* variant = g_variant_lookup_value(tmp, "ConstChar", nullptr);
   ASSERT_THAT(variant, NotNull());
-  ASSERT_EQ(2, g_variant_n_children(variant));
+  ASSERT_EQ(2u, g_variant_n_children(variant));
 
-  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(0u, g_variant_get_uint32(get_variant_child(variant, 0)));
   EXPECT_STREQ(value, g_variant_get_string(get_variant_child(variant, 1), nullptr));
 }
 
@@ -81,9 +81,9 @@
   data.add("String", value);
   GVariant* variant = g_variant_lookup_value(data.Get(), "String", nullptr);
   ASSERT_THAT(variant, NotNull());
-  ASSERT_EQ(2, g_variant_n_children(variant));
+  ASSERT_EQ(2u, g_variant_n_children(variant));
 
-  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(0u, g_variant_get_uint32(get_variant_child(variant, 0)));
   EXPECT_EQ(value, g_variant_get_string(get_variant_child(variant, 1), nullptr));
 }
 
@@ -94,9 +94,9 @@
   data.add("Int16", value);
   GVariant* variant = g_variant_lookup_value(data.Get(), "Int16", nullptr);
   ASSERT_THAT(variant, NotNull());
-  ASSERT_EQ(2, g_variant_n_children(variant));
+  ASSERT_EQ(2u, g_variant_n_children(variant));
 
-  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(0u, g_variant_get_uint32(get_variant_child(variant, 0)));
   EXPECT_EQ(value, g_variant_get_int16(get_variant_child(variant, 1)));
 }
 
@@ -107,9 +107,9 @@
   data.add("Int32", value);
   GVariant* variant = g_variant_lookup_value(data.Get(), "Int32", nullptr);
   ASSERT_THAT(variant, NotNull());
-  ASSERT_EQ(2, g_variant_n_children(variant));
+  ASSERT_EQ(2u, g_variant_n_children(variant));
 
-  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(0u, g_variant_get_uint32(get_variant_child(variant, 0)));
   EXPECT_EQ(value, g_variant_get_int32(get_variant_child(variant, 1)));
 }
 
@@ -120,9 +120,9 @@
   data.add("Int64", value);
   GVariant* variant = g_variant_lookup_value(data.Get(), "Int64", nullptr);
   ASSERT_THAT(variant, NotNull());
-  ASSERT_EQ(2, g_variant_n_children(variant));
+  ASSERT_EQ(2u, g_variant_n_children(variant));
 
-  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(0u, g_variant_get_uint32(get_variant_child(variant, 0)));
   EXPECT_EQ(value, g_variant_get_int64(get_variant_child(variant, 1)));
 }
 
@@ -133,9 +133,9 @@
   data.add("Uint16", value);
   GVariant* variant = g_variant_lookup_value(data.Get(), "Uint16", nullptr);
   ASSERT_THAT(variant, NotNull());
-  ASSERT_EQ(2, g_variant_n_children(variant));
+  ASSERT_EQ(2u, g_variant_n_children(variant));
 
-  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(0u, g_variant_get_uint32(get_variant_child(variant, 0)));
   EXPECT_EQ(value, g_variant_get_uint16(get_variant_child(variant, 1)));
 }
 
@@ -146,9 +146,9 @@
   data.add("Uint32", value);
   GVariant* variant = g_variant_lookup_value(data.Get(), "Uint32", nullptr);
   ASSERT_THAT(variant, NotNull());
-  ASSERT_EQ(2, g_variant_n_children(variant));
+  ASSERT_EQ(2u, g_variant_n_children(variant));
 
-  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(0u, g_variant_get_uint32(get_variant_child(variant, 0)));
   EXPECT_EQ(value, g_variant_get_uint32(get_variant_child(variant, 1)));
 }
 
@@ -159,9 +159,9 @@
   data.add("Uint64", value);
   GVariant* variant = g_variant_lookup_value(data.Get(), "Uint64", nullptr);
   ASSERT_THAT(variant, NotNull());
-  ASSERT_EQ(2, g_variant_n_children(variant));
+  ASSERT_EQ(2u, g_variant_n_children(variant));
 
-  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(0u, g_variant_get_uint32(get_variant_child(variant, 0)));
   EXPECT_EQ(value, g_variant_get_uint64(get_variant_child(variant, 1)));
 }
 
@@ -172,9 +172,9 @@
   data.add("Float", value);
   GVariant* variant = g_variant_lookup_value(data.Get(), "Float", nullptr);
   ASSERT_THAT(variant, NotNull());
-  ASSERT_EQ(2, g_variant_n_children(variant));
+  ASSERT_EQ(2u, g_variant_n_children(variant));
 
-  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(0u, g_variant_get_uint32(get_variant_child(variant, 0)));
   EXPECT_FLOAT_EQ(value, g_variant_get_double(get_variant_child(variant, 1)));
 }
 
@@ -185,9 +185,9 @@
   data.add("Double", value);
   GVariant* variant = g_variant_lookup_value(data.Get(), "Double", nullptr);
   ASSERT_THAT(variant, NotNull());
-  ASSERT_EQ(2, g_variant_n_children(variant));
+  ASSERT_EQ(2u, g_variant_n_children(variant));
 
-  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(0u, g_variant_get_uint32(get_variant_child(variant, 0)));
   EXPECT_DOUBLE_EQ(value, g_variant_get_double(get_variant_child(variant, 1)));
 }
 
@@ -198,9 +198,9 @@
   data.add("Variant", value);
   GVariant* variant = g_variant_lookup_value(data.Get(), "Variant", nullptr);
   ASSERT_THAT(variant, NotNull());
-  ASSERT_EQ(2, g_variant_n_children(variant));
+  ASSERT_EQ(2u, g_variant_n_children(variant));
 
-  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(0u, g_variant_get_uint32(get_variant_child(variant, 0)));
   EXPECT_TRUE(g_variant_equal(value, get_variant_child(variant, 1)));
 }
 
@@ -211,9 +211,9 @@
   data.add("GLibVariant", value);
   GVariant* variant = g_variant_lookup_value(data.Get(), "GLibVariant", nullptr);
   ASSERT_THAT(variant, NotNull());
-  ASSERT_EQ(2, g_variant_n_children(variant));
+  ASSERT_EQ(2u, g_variant_n_children(variant));
 
-  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(0u, g_variant_get_uint32(get_variant_child(variant, 0)));
   EXPECT_TRUE(g_variant_equal(value, get_variant_child(variant, 1)));
 }
 
@@ -224,9 +224,9 @@
   data.add("Rect", value);
   GVariant* variant = g_variant_lookup_value(data.Get(), "Rect", nullptr);
   ASSERT_THAT(variant, NotNull());
-  ASSERT_EQ(5, g_variant_n_children(variant));
+  ASSERT_EQ(5u, g_variant_n_children(variant));
 
-  EXPECT_EQ(1, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(1u, g_variant_get_uint32(get_variant_child(variant, 0)));
   EXPECT_EQ(value.x, g_variant_get_int32(get_variant_child(variant, 1)));
   EXPECT_EQ(value.y, g_variant_get_int32(get_variant_child(variant, 2)));
   EXPECT_EQ(value.width, g_variant_get_int32(get_variant_child(variant, 3)));
@@ -241,9 +241,9 @@
   GVariant* data_variant = data.Get();
   GVariant* variant = g_variant_lookup_value(data_variant, "globalRect", nullptr);
   ASSERT_THAT(variant, NotNull());
-  ASSERT_EQ(5, g_variant_n_children(variant));
+  ASSERT_EQ(5u, g_variant_n_children(variant));
 
-  EXPECT_EQ(1, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(1u, g_variant_get_uint32(get_variant_child(variant, 0)));
   EXPECT_EQ(value.x, g_variant_get_int32(get_variant_child(variant, 1)));
   EXPECT_EQ(value.y, g_variant_get_int32(get_variant_child(variant, 2)));
   EXPECT_EQ(value.width, g_variant_get_int32(get_variant_child(variant, 3)));
@@ -251,22 +251,22 @@
 
   variant = g_variant_lookup_value(data_variant, "x", nullptr);
   ASSERT_THAT(variant, NotNull());
-  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(0u, g_variant_get_uint32(get_variant_child(variant, 0)));
   EXPECT_EQ(value.x, g_variant_get_int32(get_variant_child(variant, 1)));
 
   variant = g_variant_lookup_value(data_variant, "y", nullptr);
   ASSERT_THAT(variant, NotNull());
-  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(0u, g_variant_get_uint32(get_variant_child(variant, 0)));
   EXPECT_EQ(value.y, g_variant_get_int32(get_variant_child(variant, 1)));
 
   variant = g_variant_lookup_value(data_variant, "width", nullptr);
   ASSERT_THAT(variant, NotNull());
-  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(0u, g_variant_get_uint32(get_variant_child(variant, 0)));
   EXPECT_EQ(value.width, g_variant_get_int32(get_variant_child(variant, 1)));
 
   variant = g_variant_lookup_value(data_variant, "height", nullptr);
   ASSERT_THAT(variant, NotNull());
-  EXPECT_EQ(0, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(0u, g_variant_get_uint32(get_variant_child(variant, 0)));
   EXPECT_EQ(value.height, g_variant_get_int32(get_variant_child(variant, 1)));
 }
 
@@ -277,9 +277,9 @@
   data.add("Point", value);
   GVariant* variant = g_variant_lookup_value(data.Get(), "Point", nullptr);
   ASSERT_THAT(variant, NotNull());
-  ASSERT_EQ(3, g_variant_n_children(variant));
+  ASSERT_EQ(3u, g_variant_n_children(variant));
 
-  EXPECT_EQ(2, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(2u, g_variant_get_uint32(get_variant_child(variant, 0)));
   EXPECT_EQ(value.x, g_variant_get_int32(get_variant_child(variant, 1)));
   EXPECT_EQ(value.y, g_variant_get_int32(get_variant_child(variant, 2)));
 }
@@ -291,9 +291,9 @@
   data.add("Size", value);
   GVariant* variant = g_variant_lookup_value(data.Get(), "Size", nullptr);
   ASSERT_THAT(variant, NotNull());
-  ASSERT_EQ(3, g_variant_n_children(variant));
+  ASSERT_EQ(3u, g_variant_n_children(variant));
 
-  EXPECT_EQ(3, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(3u, g_variant_get_uint32(get_variant_child(variant, 0)));
   EXPECT_EQ(value.width, g_variant_get_int32(get_variant_child(variant, 1)));
   EXPECT_EQ(value.height, g_variant_get_int32(get_variant_child(variant, 2)));
 }
@@ -305,9 +305,9 @@
   data.add("Color", value);
   GVariant* variant = g_variant_lookup_value(data.Get(), "Color", nullptr);
   ASSERT_THAT(variant, NotNull());
-  ASSERT_EQ(5, g_variant_n_children(variant));
+  ASSERT_EQ(5u, g_variant_n_children(variant));
 
-  EXPECT_EQ(4, g_variant_get_uint32(get_variant_child(variant, 0)));
+  EXPECT_EQ(4u, g_variant_get_uint32(get_variant_child(variant, 0)));
   EXPECT_EQ(static_cast<int32_t>(value.red * 255.), g_variant_get_int32(get_variant_child(variant, 1)));
   EXPECT_EQ(static_cast<int32_t>(value.green * 255.), g_variant_get_int32(get_variant_child(variant, 2)));
   EXPECT_EQ(static_cast<int32_t>(value.blue * 255.), g_variant_get_int32(get_variant_child(variant, 3)));

=== modified file 'tests/test_keyboard_util.cpp'
--- tests/test_keyboard_util.cpp	2015-11-02 17:50:38 +0000
+++ tests/test_keyboard_util.cpp	2016-11-30 11:04:07 +0000
@@ -66,6 +66,8 @@
   ASSERT_NE(keyboard::get_key_above_key_symbol(x_display, XStringToKeysym("x")), NoSymbol);
   ASSERT_NE(keyboard::get_key_above_key_symbol(x_display, XStringToKeysym("y")), NoSymbol);
   ASSERT_NE(keyboard::get_key_above_key_symbol(x_display, XStringToKeysym("z")), NoSymbol);
+
+  XCloseDisplay(x_display);
 }
 
 TEST(TestKeyboardUtil, BelowKeySymbol)
@@ -97,6 +99,8 @@
   ASSERT_NE(keyboard::get_key_below_key_symbol(x_display, XStringToKeysym("w")), NoSymbol);
   ASSERT_NE(keyboard::get_key_below_key_symbol(x_display, XStringToKeysym("x")), NoSymbol);
   ASSERT_NE(keyboard::get_key_below_key_symbol(x_display, XStringToKeysym("y")), NoSymbol);
+
+  XCloseDisplay(x_display);
 }
 
 TEST(TestKeyboardUtil, RightToKeySymbol)
@@ -134,6 +138,8 @@
   ASSERT_NE(keyboard::get_key_right_to_key_symbol(x_display, XStringToKeysym("x")), NoSymbol);
   ASSERT_NE(keyboard::get_key_right_to_key_symbol(x_display, XStringToKeysym("y")), NoSymbol);
   ASSERT_NE(keyboard::get_key_right_to_key_symbol(x_display, XStringToKeysym("z")), NoSymbol);
+
+  XCloseDisplay(x_display);
 }
 
 TEST(TestKeyboardUtil, LeftToKeySymbol)
@@ -172,6 +178,8 @@
   ASSERT_NE(keyboard::get_key_left_to_key_symbol(x_display, XStringToKeysym("x")), NoSymbol);
   ASSERT_NE(keyboard::get_key_left_to_key_symbol(x_display, XStringToKeysym("y")), NoSymbol);
   ASSERT_NE(keyboard::get_key_left_to_key_symbol(x_display, XStringToKeysym("z")), NoSymbol);
+
+  XCloseDisplay(x_display);
 }
 
 TEST(TestKeyboardUtil, PrintableKeySymbols)

=== modified file 'tests/test_launcher_controller.cpp'
--- tests/test_launcher_controller.cpp	2016-08-22 12:08:46 +0000
+++ tests/test_launcher_controller.cpp	2016-11-30 11:04:07 +0000
@@ -271,6 +271,7 @@
       for (auto const& icon : icons)
         model->RemoveIcon(icon);
 
+
       ASSERT_EQ(model->Size(), 0);
     }
 
@@ -299,16 +300,16 @@
 {
   EXPECT_NE(lc.options(), nullptr);
   EXPECT_TRUE(lc.multiple_launchers());
-  ASSERT_EQ(lc.launchers().size(), 1);
+  ASSERT_EQ(lc.launchers().size(), 1u);
   EXPECT_EQ(lc.launcher().monitor(), 0);
   ASSERT_EQ(lc.Impl()->parent_, &lc);
   ASSERT_NE(lc.Impl()->model_, nullptr);
   EXPECT_EQ(lc.Impl()->expo_icon_->GetIconType(), AbstractLauncherIcon::IconType::EXPO);
   EXPECT_EQ(lc.Impl()->desktop_icon_->GetIconType(), AbstractLauncherIcon::IconType::DESKTOP);
   EXPECT_GE(lc.Impl()->sort_priority_, AbstractLauncherIcon::DefaultPriority(AbstractLauncherIcon::IconType::APPLICATION));
-  EXPECT_EQ(lc.Impl()->model_->GetSublist<BFBLauncherIcon>().size(), 1);
-  EXPECT_EQ(lc.Impl()->model_->GetSublist<HudLauncherIcon>().size(), 1);
-  EXPECT_EQ(lc.Impl()->model_->GetSublist<TrashLauncherIcon>().size(), 1);
+  EXPECT_EQ(lc.Impl()->model_->GetSublist<BFBLauncherIcon>().size(), 1u);
+  EXPECT_EQ(lc.Impl()->model_->GetSublist<HudLauncherIcon>().size(), 1u);
+  EXPECT_EQ(lc.Impl()->model_->GetSublist<TrashLauncherIcon>().size(), 1u);
   EXPECT_FALSE(lc.Impl()->launcher_open);
   EXPECT_FALSE(lc.Impl()->launcher_keynav);
   EXPECT_FALSE(lc.Impl()->launcher_grabbed);
@@ -355,7 +356,7 @@
   for (unsigned i = 0; i < monitors::MAX; ++i)
   {
     uscreen.SetPrimary(i);
-    ASSERT_EQ(lc.launchers().size(), 1);
+    ASSERT_EQ(lc.launchers().size(), 1u);
     EXPECT_EQ(lc.launcher().monitor(), i);
   }
 }
@@ -366,7 +367,7 @@
   lc.multiple_launchers = false;
   uscreen.SetPrimary(1);
 
-  ASSERT_EQ(lc.launchers().size(), 1);
+  ASSERT_EQ(lc.launchers().size(), 1u);
   ASSERT_EQ(lc.launcher().monitor(), 0);
 }
 
@@ -375,7 +376,7 @@
   lc.multiple_launchers = false;
   uscreen.SetupFakeMultiMonitor();
 
-  ASSERT_EQ(lc.launchers().size(), 1);
+  ASSERT_EQ(lc.launchers().size(), 1u);
 
   lc.multiple_launchers = true;
   EXPECT_EQ(lc.launchers().size(), monitors::MAX);
@@ -390,7 +391,7 @@
   ASSERT_EQ(lc.launchers().size(), monitors::MAX);
 
   lc.multiple_launchers = false;
-  EXPECT_EQ(lc.launchers().size(), 1);
+  EXPECT_EQ(lc.launchers().size(), 1u);
   EXPECT_EQ(lc.launcher().monitor(), primary);
 }
 
@@ -400,7 +401,7 @@
   ASSERT_EQ(lc.launchers().size(), monitors::MAX);
 
   uscreen.Reset();
-  EXPECT_EQ(lc.launchers().size(), 1);
+  EXPECT_EQ(lc.launchers().size(), 1u);
   EXPECT_EQ(lc.launcher().monitor(), 0);
 }
 
@@ -419,7 +420,7 @@
 
 TEST_F(TestLauncherController, SingleMonitorSwitchToMultimonitor)
 {
-  ASSERT_EQ(lc.launchers().size(), 1);
+  ASSERT_EQ(lc.launchers().size(), 1u);
 
   uscreen.SetupFakeMultiMonitor();
 

=== modified file 'tests/test_launcher_model.cpp'
--- tests/test_launcher_model.cpp	2012-10-11 01:44:15 +0000
+++ tests/test_launcher_model.cpp	2016-11-30 11:04:07 +0000
@@ -52,28 +52,28 @@
 
 TEST_F(TestLauncherModel, Constructor)
 {
-  EXPECT_EQ(model.Size(), 0);
+  EXPECT_EQ(model.Size(), 0u);
 }
 
 TEST_F(TestLauncherModel, Add)
 {
   model.AddIcon(icon1);
-  EXPECT_EQ(model.Size(), 1);
+  EXPECT_EQ(model.Size(), 1u);
 
   model.AddIcon(icon1);
-  EXPECT_EQ(model.Size(), 1);
+  EXPECT_EQ(model.Size(), 1u);
 
   model.AddIcon(AbstractLauncherIcon::Ptr());
-  EXPECT_EQ(model.Size(), 1);
+  EXPECT_EQ(model.Size(), 1u);
 }
 
 TEST_F(TestLauncherModel, Remove)
 {
   model.AddIcon(icon1);
-  EXPECT_EQ(model.Size(), 1);
+  EXPECT_EQ(model.Size(), 1u);
 
   model.RemoveIcon(icon1);
-  EXPECT_EQ(model.Size(), 0);
+  EXPECT_EQ(model.Size(), 0u);
 }
 
 TEST_F(TestLauncherModel, AddSignal)

=== modified file 'tests/test_layout_system.cpp'
--- tests/test_layout_system.cpp	2015-12-16 11:18:25 +0000
+++ tests/test_layout_system.cpp	2016-11-30 11:04:07 +0000
@@ -55,7 +55,7 @@
   LayoutWindow lwin(xid);
   EXPECT_EQ(lwin.xid, xid);
   EXPECT_EQ(lwin.geo, fake_window->geo);
-  EXPECT_EQ(lwin.decoration_height, 0);
+  EXPECT_EQ(lwin.decoration_height, 0u);
   EXPECT_EQ(lwin.selected, false);
   EXPECT_FLOAT_EQ(lwin.scale, 1.0f);
   EXPECT_EQ(lwin.aspect_ratio, fake_window->geo().width / static_cast<float>(fake_window->geo().height));
@@ -70,7 +70,7 @@
   LayoutWindow lwin(xid);
   EXPECT_EQ(lwin.xid, xid);
   EXPECT_EQ(lwin.geo, fake_window->geo);
-  EXPECT_EQ(lwin.decoration_height, 0);
+  EXPECT_EQ(lwin.decoration_height, 0u);
   EXPECT_EQ(lwin.selected, false);
   EXPECT_EQ(lwin.aspect_ratio, fake_window->geo().width / static_cast<float>(fake_window->geo().height));
 }
@@ -84,7 +84,7 @@
   LayoutWindow lwin(xid);
   EXPECT_EQ(lwin.xid, xid);
   EXPECT_EQ(lwin.geo, fake_window->geo);
-  EXPECT_EQ(lwin.decoration_height, 0);
+  EXPECT_EQ(lwin.decoration_height, 0u);
   EXPECT_EQ(lwin.selected, false);
   EXPECT_EQ(lwin.aspect_ratio, fake_window->geo().width / static_cast<float>(fake_window->geo().height));
 }
@@ -99,7 +99,7 @@
   LayoutWindow lwin(xid);
   EXPECT_EQ(lwin.xid, xid);
   EXPECT_EQ(lwin.geo, fake_window->geo);
-  EXPECT_EQ(lwin.decoration_height, 0);
+  EXPECT_EQ(lwin.decoration_height, 0u);
   EXPECT_EQ(lwin.selected, false);
   EXPECT_EQ(lwin.aspect_ratio, fake_window->geo().width / static_cast<float>(fake_window->geo().height));
 }
@@ -113,7 +113,7 @@
   lwin.ComputeDecorationHeight();
   EXPECT_EQ(lwin.xid, xid);
   EXPECT_EQ(lwin.geo, fake_window->geo);
-  EXPECT_EQ(lwin.decoration_height, 0);
+  EXPECT_EQ(lwin.decoration_height, 0u);
   EXPECT_EQ(lwin.selected, false);
   EXPECT_FLOAT_EQ(lwin.scale, 1.0f);
   EXPECT_EQ(lwin.aspect_ratio, fake_window->geo().width / static_cast<float>(fake_window->geo().height));
@@ -129,7 +129,7 @@
   lwin.ComputeDecorationHeight();
   EXPECT_EQ(lwin.xid, xid);
   EXPECT_EQ(lwin.geo, fake_window->geo);
-  EXPECT_EQ(lwin.decoration_height, 0);
+  EXPECT_EQ(lwin.decoration_height, 0u);
   EXPECT_EQ(lwin.selected, false);
   EXPECT_EQ(lwin.aspect_ratio, fake_window->geo().width / static_cast<float>(fake_window->geo().height));
 }
@@ -163,7 +163,7 @@
   LayoutWindow lwin(xid);
   EXPECT_EQ(lwin.xid, xid);
   EXPECT_EQ(lwin.geo, fake_window->geo);
-  EXPECT_EQ(lwin.decoration_height, 0);
+  EXPECT_EQ(lwin.decoration_height, 0u);
   EXPECT_EQ(lwin.selected, false);
   EXPECT_EQ(lwin.aspect_ratio, fake_window->geo().width / static_cast<float>(fake_window->geo().height));
 }
@@ -234,7 +234,7 @@
   ls.LayoutWindows(lwindows, max_bounds, final_bounds);
 
   std::vector<int> const& row_sizes = ls.GetRowSizes(lwindows, max_bounds);
-  EXPECT_EQ(row_sizes.size(), 2);
+  EXPECT_EQ(row_sizes.size(), 2u);
   EXPECT_EQ(row_sizes[0], 2);
   EXPECT_EQ(row_sizes[1], 2);
 }
@@ -259,7 +259,7 @@
   ls.LayoutWindows(lwindows, max_bounds, final_bounds);
 
   std::vector<int> const& row_sizes = ls.GetRowSizes(lwindows, max_bounds);
-  EXPECT_EQ(row_sizes.size(), 2);
+  EXPECT_EQ(row_sizes.size(), 2u);
   EXPECT_EQ(row_sizes[0], 2);
   EXPECT_EQ(row_sizes[1], 3);
 }

=== modified file 'tests/test_lockscreen_controller.cpp'
--- tests/test_lockscreen_controller.cpp	2016-11-11 15:55:39 +0000
+++ tests/test_lockscreen_controller.cpp	2016-11-30 11:04:07 +0000
@@ -186,7 +186,7 @@
   session_manager->lock_requested.emit();
 
   Utils::WaitUntilMSec([this]{ return controller.shields_.size() == 1; });
-  ASSERT_EQ(1, controller.shields_.size());
+  ASSERT_EQ(1u, controller.shields_.size());
 
   Utils::WaitUntilMSec([this]{ return uscreen.GetMonitors().at(0) == controller.shields_.at(0)->GetGeometry(); });
   EXPECT_EQ(uscreen.GetMonitors().at(0), controller.shields_.at(0)->GetGeometry());
@@ -216,7 +216,7 @@
 
   uscreen.Reset(/* emit_change */ true);
 
-  ASSERT_EQ(1, controller.shields_.size());
+  ASSERT_EQ(1u, controller.shields_.size());
   EXPECT_EQ(uscreen.GetMonitors().at(0), controller.shields_.at(0)->GetGeometry());
 }
 
@@ -225,7 +225,7 @@
   session_manager->lock_requested.emit();
 
   Utils::WaitUntilMSec([this]{ return controller.shields_.size() == 1; });
-  ASSERT_EQ(1, controller.shields_.size());
+  ASSERT_EQ(1u, controller.shields_.size());
 
   session_manager->unlock_requested.emit();
   tick_source.tick(ANIMATION_DURATION);
@@ -253,7 +253,7 @@
   // Lock...
   session_manager->lock_requested.emit();
   Utils::WaitUntilMSec([this]{ return controller.shields_.size() == 1; });
-  ASSERT_EQ(1, controller.shields_.size());
+  ASSERT_EQ(1u, controller.shields_.size());
 
   // ...and let the screen blank.
   session_manager->presence_status_changed.emit(true);

=== modified file 'tests/test_panel_controller.cpp'
--- tests/test_panel_controller.cpp	2016-09-01 23:56:54 +0000
+++ tests/test_panel_controller.cpp	2016-11-30 11:04:07 +0000
@@ -57,7 +57,7 @@
   {
     Controller pc(menus, edge_barriers);
 
-    ASSERT_EQ(pc.panels().size(), 1);
+    ASSERT_EQ(pc.panels().size(), 1u);
     EXPECT_EQ(pc.panels()[0]->GetMonitor(), 0);
     panel_ptr = pc.panels()[0];
   }
@@ -98,7 +98,7 @@
     ASSERT_EQ(pc.panels().size(), monitors::MAX);
 
     uscreen.Reset();
-    EXPECT_EQ(pc.panels().size(), 1);
+    EXPECT_EQ(pc.panels().size(), 1u);
     EXPECT_EQ(pc.panels()[0]->GetMonitor(), 0);
   }
 }
@@ -127,7 +127,7 @@
   {
     Controller pc(menus, edge_barriers);
 
-    ASSERT_EQ(pc.panels().size(), 1);
+    ASSERT_EQ(pc.panels().size(), 1u);
 
     uscreen.SetupFakeMultiMonitor();
     EXPECT_EQ(pc.panels().size(), monitors::MAX);

=== modified file 'tests/test_panel_indicator_entry_dropdown_view.cpp'
--- tests/test_panel_indicator_entry_dropdown_view.cpp	2014-03-21 04:40:12 +0000
+++ tests/test_panel_indicator_entry_dropdown_view.cpp	2016-11-30 11:04:07 +0000
@@ -97,12 +97,12 @@
 
   dropdown.Push(first_entry);
   EXPECT_FALSE(dropdown.Empty());
-  EXPECT_EQ(1, dropdown.Size());
+  EXPECT_EQ(1u, dropdown.Size());
   EXPECT_TRUE(dropdown.IsVisible());
   EXPECT_THAT(dropdown.Children(), Contains(first_entry));
   EXPECT_EQ(first_entry, dropdown.Top());
 
-  EXPECT_EQ(1, first_entry->GetEntry()->parents().size());
+  EXPECT_EQ(1u, first_entry->GetEntry()->parents().size());
   EXPECT_THAT(first_entry->GetEntry()->parents(), Contains(dropdown.GetEntry()));
 
   auto second_entry = BuildEntry("SecondEntry");
@@ -110,12 +110,12 @@
 
   dropdown.Push(second_entry);
   EXPECT_FALSE(dropdown.Empty());
-  EXPECT_EQ(2, dropdown.Size());
+  EXPECT_EQ(2u, dropdown.Size());
   EXPECT_TRUE(dropdown.IsVisible());
   EXPECT_THAT(dropdown.Children(), Contains(second_entry));
   EXPECT_EQ(first_entry, dropdown.Top());
 
-  EXPECT_EQ(1, second_entry->GetEntry()->parents().size());
+  EXPECT_EQ(1u, second_entry->GetEntry()->parents().size());
   EXPECT_THAT(second_entry->GetEntry()->parents(), Contains(dropdown.GetEntry()));
 }
 
@@ -127,12 +127,12 @@
 
   dropdown.Insert(first_entry);
   EXPECT_FALSE(dropdown.Empty());
-  EXPECT_EQ(1, dropdown.Size());
+  EXPECT_EQ(1u, dropdown.Size());
   EXPECT_TRUE(dropdown.IsVisible());
   EXPECT_THAT(dropdown.Children(), Contains(first_entry));
   EXPECT_EQ(first_entry, dropdown.Top());
 
-  EXPECT_EQ(1, first_entry->GetEntry()->parents().size());
+  EXPECT_EQ(1u, first_entry->GetEntry()->parents().size());
   EXPECT_THAT(first_entry->GetEntry()->parents(), Contains(dropdown.GetEntry()));
 
   auto second_entry = BuildEntry("SecondEntry");
@@ -141,12 +141,12 @@
 
   dropdown.Insert(second_entry);
   EXPECT_FALSE(dropdown.Empty());
-  EXPECT_EQ(2, dropdown.Size());
+  EXPECT_EQ(2u, dropdown.Size());
   EXPECT_TRUE(dropdown.IsVisible());
   EXPECT_THAT(dropdown.Children(), Contains(second_entry));
   EXPECT_EQ(second_entry, dropdown.Top());
 
-  EXPECT_EQ(1, second_entry->GetEntry()->parents().size());
+  EXPECT_EQ(1u, second_entry->GetEntry()->parents().size());
   EXPECT_THAT(second_entry->GetEntry()->parents(), Contains(dropdown.GetEntry()));
 }
 
@@ -161,7 +161,7 @@
   EXPECT_CALL(sig_receiver, Refreshed(&dropdown)).Times(0);
   dropdown.Remove(second_entry);
 
-  EXPECT_EQ(1, dropdown.Size());
+  EXPECT_EQ(1u, dropdown.Size());
   EXPECT_TRUE(dropdown.IsVisible());
   EXPECT_THAT(dropdown.Children(), Not(Contains(second_entry)));
   EXPECT_THAT(second_entry->GetEntry()->parents(), Not(Contains(dropdown.GetEntry())));
@@ -193,7 +193,7 @@
   EXPECT_CALL(sig_receiver, Refreshed(&dropdown)).Times(0);
   EXPECT_EQ(first_entry, dropdown.Pop());
 
-  EXPECT_EQ(1, dropdown.Size());
+  EXPECT_EQ(1u, dropdown.Size());
   EXPECT_TRUE(dropdown.IsVisible());
   EXPECT_THAT(dropdown.Children(), Not(Contains(first_entry)));
   EXPECT_THAT(first_entry->GetEntry()->parents(), Not(Contains(dropdown.GetEntry())));

=== modified file 'tests/test_pointer_barrier.cpp'
--- tests/test_pointer_barrier.cpp	2015-01-14 02:46:10 +0000
+++ tests/test_pointer_barrier.cpp	2016-11-30 11:04:07 +0000
@@ -94,7 +94,7 @@
       EXPECT_EQ(bev->x, ev.root_x);
       EXPECT_EQ(bev->y, ev.root_y);
       EXPECT_EQ(bev->velocity, 600 * pb->max_velocity_multiplier);
-      EXPECT_EQ(bev->event_id, ev.eventid);
+      EXPECT_EQ(bev->event_id, static_cast<int>(ev.eventid));
      }
   });
 
@@ -120,7 +120,7 @@
     EXPECT_EQ(bev->x, ev.root_x);
     EXPECT_EQ(bev->y, ev.root_y);
     EXPECT_GT(bev->velocity, 0);
-    EXPECT_EQ(bev->event_id, ev.eventid);
+    EXPECT_EQ(bev->event_id, static_cast<int>(ev.eventid));
   });
 
   pb->released = true;

=== modified file 'tests/test_previews.cpp'
--- tests/test_previews.cpp	2013-07-18 04:16:50 +0000
+++ tests/test_previews.cpp	2016-11-30 11:04:07 +0000
@@ -106,7 +106,7 @@
   auto actions = preview->GetActions();
   auto info_hints = preview->GetInfoHints();
 
-  EXPECT_EQ(actions.size(), 2);
+  EXPECT_EQ(actions.size(), 2u);
 
   auto action1 = actions[0];
   EXPECT_EQ(action1->id, "action1");
@@ -121,7 +121,7 @@
   EXPECT_EQ(action2->icon_hint, "");
   EXPECT_EQ(action2->extra_text, "Foo");
 
-  EXPECT_EQ(info_hints.size(), 2);
+  EXPECT_EQ(info_hints.size(), 2u);
   auto hint1 = info_hints[0];
   EXPECT_EQ(hint1->id, "hint1");
   EXPECT_EQ(hint1->display_name, "Hint 1");

=== modified file 'tests/test_previews_application.cpp'
--- tests/test_previews_application.cpp	2016-02-09 01:58:11 +0000
+++ tests/test_previews_application.cpp	2016-11-30 11:04:07 +0000
@@ -122,7 +122,7 @@
   EXPECT_EQ(preview_view->copywrite_->GetText(), "Copywrite &amp; special char");
 
   EXPECT_EQ(preview_view->app_rating_->GetRating(), 0.8f);
-  EXPECT_EQ(preview_view->action_buttons_.size(), 2);
+  EXPECT_EQ(preview_view->action_buttons_.size(), 2u);
 
   if (preview_view->action_buttons_.size() >= 2)
   {

=== modified file 'tests/test_previews_generic.cpp'
--- tests/test_previews_generic.cpp	2014-03-21 04:40:12 +0000
+++ tests/test_previews_generic.cpp	2016-11-30 11:04:07 +0000
@@ -105,7 +105,7 @@
   EXPECT_EQ(preview_view->subtitle_->GetText(), "Generic Subtitle &gt; special char");
   EXPECT_EQ(preview_view->description_->GetText(), "Generic Desctiption &lt; special char");
 
-  EXPECT_EQ(preview_view->action_buttons_.size(), 2);
+  EXPECT_EQ(preview_view->action_buttons_.size(), 2u);
 
   if (preview_view->action_buttons_.size() >= 2)
   {

=== modified file 'tests/test_previews_movie.cpp'
--- tests/test_previews_movie.cpp	2014-03-21 04:40:12 +0000
+++ tests/test_previews_movie.cpp	2016-11-30 11:04:07 +0000
@@ -116,7 +116,7 @@
   EXPECT_EQ(preview_view->description_->GetText(), "Movie Desctiption &lt; special char");
 
   EXPECT_EQ(preview_view->rating_->GetRating(), 0.8f);
-  EXPECT_EQ(preview_view->action_buttons_.size(), 2);
+  EXPECT_EQ(preview_view->action_buttons_.size(), 2u);
 
   if (preview_view->action_buttons_.size() >= 2)
   {

=== modified file 'tests/test_previews_music.cpp'
--- tests/test_previews_music.cpp	2014-03-21 04:40:12 +0000
+++ tests/test_previews_music.cpp	2016-11-30 11:04:07 +0000
@@ -107,7 +107,7 @@
   EXPECT_EQ(preview_view->title_->GetText(), "Music Title &amp; special char");
   EXPECT_EQ(preview_view->subtitle_->GetText(), "Music Subtitle &gt; special char");
 
-  EXPECT_EQ(preview_view->action_buttons_.size(), 4);
+  EXPECT_EQ(preview_view->action_buttons_.size(), 4u);
 
   if (preview_view->action_buttons_.size() >= 2)
   {

=== modified file 'tests/test_previews_social.cpp'
--- tests/test_previews_social.cpp	2014-03-21 04:40:12 +0000
+++ tests/test_previews_social.cpp	2016-11-30 11:04:07 +0000
@@ -101,7 +101,7 @@
 
   EXPECT_EQ(preview_view->title_->GetText(), "Social Title &amp; special char");
   EXPECT_EQ(preview_view->subtitle_->GetText(), "Social Subtitle &gt; special char");
-  EXPECT_EQ(preview_view->action_buttons_.size(), 2);
+  EXPECT_EQ(preview_view->action_buttons_.size(), 2u);
 }
 
 }

=== modified file 'tests/test_quicklist_view.cpp'
--- tests/test_quicklist_view.cpp	2014-03-21 04:40:12 +0000
+++ tests/test_quicklist_view.cpp	2016-11-30 11:04:07 +0000
@@ -110,7 +110,7 @@
 
   AddMenuItems(root);
 
-  ASSERT_EQ(quicklist->GetChildren().size(), 4);
+  ASSERT_EQ(quicklist->GetChildren().size(), 4u);
   ASSERT_EQ(quicklist->GetNumItems(), 4);
   EXPECT_EQ(quicklist->GetNthType(0), unity::QuicklistMenuItemType::LABEL);
   EXPECT_EQ(quicklist->GetNthType(1), unity::QuicklistMenuItemType::SEPARATOR);

=== modified file 'tests/test_results.cpp'
--- tests/test_results.cpp	2013-09-19 00:25:44 +0000
+++ tests/test_results.cpp	2016-11-30 11:04:07 +0000
@@ -41,7 +41,7 @@
   Result res(nullptr, nullptr, nullptr);
 
   bool added = false;
-  ASSERT_EQ(model.row_added.size(), 1);
+  ASSERT_EQ(model.row_added.size(), 1u);
   model.result_added.connect([&added] (Result const&) { added = true; });
   model.row_added.emit(res);
   EXPECT_TRUE(added);
@@ -52,7 +52,7 @@
   Result res(nullptr, nullptr, nullptr);
 
   bool changed = false;
-  ASSERT_EQ(model.row_changed.size(), 1);
+  ASSERT_EQ(model.row_changed.size(), 1u);
   model.result_changed.connect([&changed] (Result const&) { changed = true; });
   model.row_changed.emit(res);
   EXPECT_TRUE(changed);
@@ -63,7 +63,7 @@
   Result res(nullptr, nullptr, nullptr);
 
   bool removed = false;
-  ASSERT_EQ(model.row_removed.size(), 1);
+  ASSERT_EQ(model.row_removed.size(), 1u);
   model.result_removed.connect([&removed] (Result const&) { removed = true; });
   model.row_removed.emit(res);
   EXPECT_TRUE(removed);
@@ -83,15 +83,15 @@
 
   dee_filter_new_for_any_column(2, g_variant_new_uint32(1), &filter);
   glib::Object<DeeModel> filter_model(dee_filter_model_new(model.model(), &filter));
-  
+
   unsigned int i = 0;
   for (ResultIterator iter(filter_model);  !iter.IsLast(); ++iter)
   {
-    EXPECT_EQ((*iter).category_index(), 1);
+    EXPECT_EQ((*iter).category_index(), 1u);
     i++;
   }
 
-  EXPECT_EQ(i, 50);
+  EXPECT_EQ(i, 50u);
 }
 
 TEST_F(TestResults, TestRowsValid)
@@ -108,7 +108,7 @@
     EXPECT_EQ(result.uri(), value);
     EXPECT_EQ(result.icon_hint(), value);
     EXPECT_EQ(result.category_index(), (i / 50));
-    EXPECT_EQ(result.result_type(), 0);
+    EXPECT_EQ(result.result_type(), 0u);
     EXPECT_EQ(result.mimetype(), value);
     EXPECT_EQ(result.name(), value);
     EXPECT_EQ(result.comment(), value);
@@ -287,8 +287,8 @@
 
   EXPECT_EQ(local_result_2.uri, "uri");
   EXPECT_EQ(local_result_2.icon_hint, "icon_hint");
-  EXPECT_EQ(local_result_2.category_index, 1);
-  EXPECT_EQ(local_result_2.result_type, 2);
+  EXPECT_EQ(local_result_2.category_index, 1u);
+  EXPECT_EQ(local_result_2.result_type, 2u);
   EXPECT_EQ(local_result_2.mimetype, "mimetype");
   EXPECT_EQ(local_result_2.name, "name");
   EXPECT_EQ(local_result_2.comment, "comment");
@@ -315,7 +315,7 @@
 TEST_F(TestResults, LocalResult_Variants)
 {
   LocalResult local_result;
-  EXPECT_EQ(local_result.Variants().size(), 9);
+  EXPECT_EQ(local_result.Variants().size(), 9u);
 }
 
 }

=== modified file 'tests/test_scope.cpp'
--- tests/test_scope.cpp	2013-11-06 11:21:43 +0000
+++ tests/test_scope.cpp	2016-11-30 11:04:07 +0000
@@ -258,9 +258,9 @@
   ASSERT_THAT(category_model1, NotNull());
   ASSERT_THAT(category_model2, NotNull());
 
-  EXPECT_EQ(category_model0->count(), 5) << "Category 0 result count not as expected (" << category_model0->count() << " != 5)";
-  EXPECT_EQ(category_model1->count(), 4) << "Category 1 result count not as expected (" << category_model1->count() << " != 4)";
-  EXPECT_EQ(category_model2->count(), 4) << "Category 2 result count not as expected (" << category_model2->count() << " != 4)";
+  EXPECT_EQ(category_model0->count(), 5u) << "Category 0 result count not as expected (" << category_model0->count() << " != 5)";
+  EXPECT_EQ(category_model1->count(), 4u) << "Category 1 result count not as expected (" << category_model1->count() << " != 4)";
+  EXPECT_EQ(category_model2->count(), 4u) << "Category 2 result count not as expected (" << category_model2->count() << " != 4)";
 
   // 2. Update the filter.
   CheckOptionFilter::Ptr type_filter = std::static_pointer_cast<CheckOptionFilter>(WaitForFilter("categories"));
@@ -287,9 +287,9 @@
   category_model1 = scope_->GetResultsForCategory(1);
   category_model2 = scope_->GetResultsForCategory(2);
 
-  EXPECT_EQ(category_model0->count(), 0) << "Category 0 result count not as expected (" << category_model0->count() << " != 0)";
-  EXPECT_EQ(category_model1->count(), 4) << "Category 1 result count not as expected (" << category_model1->count() << " != 4)";
-  EXPECT_EQ(category_model2->count(), 0) << "Category 2 result count not as expected (" << category_model2->count() << " != 0)";
+  EXPECT_EQ(category_model0->count(), 0u) << "Category 0 result count not as expected (" << category_model0->count() << " != 0)";
+  EXPECT_EQ(category_model1->count(), 4u) << "Category 1 result count not as expected (" << category_model1->count() << " != 4)";
+  EXPECT_EQ(category_model2->count(), 0u) << "Category 2 result count not as expected (" << category_model2->count() << " != 0)";
 }
 
 } // namespace dash

=== modified file 'tests/test_scope_view.cpp'
--- tests/test_scope_view.cpp	2014-03-21 04:40:12 +0000
+++ tests/test_scope_view.cpp	2016-11-30 11:04:07 +0000
@@ -87,14 +87,14 @@
   MockCategories::Ptr categories = std::make_shared<MockCategories>(2);
   scope_->categories.changed.emit(categories);
   Utils::WaitUntilMSec([this] { return scope_view_->GetOrderedCategoryViews().size() == 2; });
-  ASSERT_EQ(scope_view_->GetOrderedCategoryViews().size(), 2);
+  ASSERT_EQ(scope_view_->GetOrderedCategoryViews().size(), 2u);
 }
 
 TEST_F(TestScopeView, TestFilterExpansion)
 {
   MockCategories::Ptr categories = std::make_shared<MockCategories>(4);
   scope_->categories.changed.emit(categories);
-  ASSERT_EQ(scope_view_->fake_groups_.size(), 4);
+  ASSERT_EQ(scope_view_->fake_groups_.size(), 4u);
 
   scope_view_->filters_expanded = true;
   for (unsigned i = 0; i < scope_view_->fake_groups_.size(); ++i)
@@ -107,7 +107,7 @@
   scope_view_->search_string_ = "";
 
   scope_->categories.changed.emit(categories);
-  ASSERT_EQ(scope_view_->fake_groups_.size(), 1);
+  ASSERT_EQ(scope_view_->fake_groups_.size(), 1u);
   Utils::WaitPendingEvents();
   Utils::WaitUntilMSec([this] () { return scope_view_->fake_groups_[0]->GetExpanded(); });
 }
@@ -118,7 +118,7 @@
   scope_view_->search_string_ = "Ubuntu";
 
   scope_->categories.changed.emit(categories);
-  ASSERT_EQ(scope_view_->fake_groups_.size(), 1);
+  ASSERT_EQ(scope_view_->fake_groups_.size(), 1u);
   Utils::WaitPendingEvents();
   Utils::WaitUntilMSec([this] () { return scope_view_->fake_groups_[0]->GetExpanded(); });
 }
@@ -129,7 +129,7 @@
   scope_view_->search_string_ = "";
 
   scope_->categories.changed.emit(categories);
-  ASSERT_EQ(scope_view_->fake_groups_.size(), 2);
+  ASSERT_EQ(scope_view_->fake_groups_.size(), 2u);
   Utils::WaitPendingEvents();
   Utils::WaitUntilMSec([this] () { return not scope_view_->fake_groups_[0]->GetExpanded(); });
   Utils::WaitUntilMSec([this] () { return scope_view_->fake_groups_[1]->GetExpanded(); });
@@ -141,7 +141,7 @@
   scope_view_->search_string_ = "Ubuntu";
 
   scope_->categories.changed.emit(categories);
-  ASSERT_EQ(scope_view_->fake_groups_.size(), 2);
+  ASSERT_EQ(scope_view_->fake_groups_.size(), 2u);
   Utils::WaitPendingEvents();
   Utils::WaitUntilMSec([this] () { return not scope_view_->fake_groups_[0]->GetExpanded(); });
   Utils::WaitUntilMSec([this] () { return scope_view_->fake_groups_[1]->GetExpanded(); });
@@ -153,7 +153,7 @@
   scope_view_->search_string_ = "";
 
   scope_->categories.changed.emit(categories);
-  ASSERT_EQ(scope_view_->fake_groups_.size(), 3);
+  ASSERT_EQ(scope_view_->fake_groups_.size(), 3u);
   Utils::WaitPendingEvents();
   Utils::WaitUntilMSec([this] () { return not scope_view_->fake_groups_[0]->GetExpanded(); });
   Utils::WaitUntilMSec([this] () { return not scope_view_->fake_groups_[1]->GetExpanded(); });
@@ -166,7 +166,7 @@
   scope_view_->search_string_ = "Ubuntu";
 
   scope_->categories.changed.emit(categories);
-  ASSERT_EQ(scope_view_->fake_groups_.size(), 3);
+  ASSERT_EQ(scope_view_->fake_groups_.size(), 3u);
   Utils::WaitPendingEvents();
   Utils::WaitUntilMSec([this] () { return not scope_view_->fake_groups_[0]->GetExpanded(); });
   Utils::WaitUntilMSec([this] () { return not scope_view_->fake_groups_[1]->GetExpanded(); });
@@ -178,7 +178,7 @@
   MockCategories::Ptr categories = std::make_shared<MockCategories>(2);
 
   scope_->categories.changed.emit(categories);
-  ASSERT_EQ(scope_view_->fake_groups_.size(), 2);
+  ASSERT_EQ(scope_view_->fake_groups_.size(), 2u);
   Utils::WaitPendingEvents();
   Utils::WaitUntilMSec([this] () { return not scope_view_->fake_groups_[0]->GetExpanded(); });
   Utils::WaitUntilMSec([this] () { return scope_view_->fake_groups_[1]->GetExpanded(); });
@@ -202,7 +202,7 @@
   scope_view_->search_string_ = "Ubuntu";
 
   scope_->categories.changed.emit(categories);
-  ASSERT_EQ(scope_view_->fake_groups_.size(), 2);
+  ASSERT_EQ(scope_view_->fake_groups_.size(), 2u);
   Utils::WaitPendingEvents();
   Utils::WaitUntilMSec([this] () { return not scope_view_->fake_groups_[0]->GetExpanded(); });
   Utils::WaitUntilMSec([this] () { return scope_view_->fake_groups_[1]->GetExpanded(); });
@@ -225,7 +225,7 @@
   MockCategories::Ptr categories = std::make_shared<MockCategories>(3);
 
   scope_->categories.changed.emit(categories);
-  ASSERT_EQ(scope_view_->fake_groups_.size(), 3);
+  ASSERT_EQ(scope_view_->fake_groups_.size(), 3u);
   Utils::WaitPendingEvents();
   Utils::WaitUntilMSec([this] () { return not scope_view_->fake_groups_[0]->GetExpanded(); });
   Utils::WaitUntilMSec([this] () { return not scope_view_->fake_groups_[1]->GetExpanded(); });
@@ -257,7 +257,7 @@
   scope_view_->search_string_ = "Ubuntu";
 
   scope_->categories.changed.emit(categories);
-  ASSERT_EQ(scope_view_->fake_groups_.size(), 3);
+  ASSERT_EQ(scope_view_->fake_groups_.size(), 3u);
   Utils::WaitPendingEvents();
   Utils::WaitUntilMSec([this] () { return not scope_view_->fake_groups_[0]->GetExpanded(); });
   Utils::WaitUntilMSec([this] () { return not scope_view_->fake_groups_[1]->GetExpanded(); });

=== modified file 'tests/test_session_view.cpp'
--- tests/test_session_view.cpp	2014-05-16 03:05:20 +0000
+++ tests/test_session_view.cpp	2016-11-30 11:04:07 +0000
@@ -179,7 +179,7 @@
   ON_CALL(*manager, CanShutdown()).WillByDefault(testing::Return(true));
   view.mode = View::Mode::SHUTDOWN;
 
-  EXPECT_EQ(view.GetButtons().size(), 2);
+  EXPECT_EQ(view.GetButtons().size(), 2u);
   EXPECT_EQ(view.GetButtonPosition(Button::Action::REBOOT), 0);
   EXPECT_EQ(view.GetButtonPosition(Button::Action::SHUTDOWN), 1);
   EXPECT_EQ(view.key_focus_area(), view.GetButtonByAction(Button::Action::SHUTDOWN));
@@ -190,7 +190,7 @@
   ON_CALL(*manager, CanLock()).WillByDefault(testing::Return(true));
   view.mode = View::Mode::LOGOUT;
 
-  EXPECT_EQ(view.GetButtons().size(), 2);
+  EXPECT_EQ(view.GetButtons().size(), 2u);
   EXPECT_EQ(view.GetButtonPosition(Button::Action::LOCK), 0);
   EXPECT_EQ(view.GetButtonPosition(Button::Action::LOGOUT), 1);
   EXPECT_EQ(view.key_focus_area(), view.GetButtonByAction(Button::Action::LOGOUT));
@@ -201,7 +201,7 @@
   ON_CALL(*manager, CanLock()).WillByDefault(testing::Return(false));
   view.mode = View::Mode::LOGOUT;
 
-  EXPECT_EQ(view.GetButtons().size(), 1);
+  EXPECT_EQ(view.GetButtons().size(), 1u);
   EXPECT_EQ(view.GetButtonPosition(Button::Action::LOGOUT), 0);
   EXPECT_EQ(view.key_focus_area(), view.GetButtonByAction(Button::Action::LOGOUT));
 }
@@ -314,4 +314,4 @@
 }
 
 } // session
-} // unity
\ No newline at end of file
+} // unity

=== modified file 'tests/test_shortcut_model.cpp'
--- tests/test_shortcut_model.cpp	2013-01-19 00:37:45 +0000
+++ tests/test_shortcut_model.cpp	2016-11-30 11:04:07 +0000
@@ -40,10 +40,10 @@
   Model model(hints);
 
   EXPECT_EQ(model.categories_per_column(), 3);
-  EXPECT_EQ(model.categories().size(), 3);
-  EXPECT_EQ(model.hints().at("Launcher").size(), 2);
-  EXPECT_EQ(model.hints().at("Dash").size(), 1);
-  EXPECT_EQ(model.hints().at("Menu Bar").size(), 1);
+  EXPECT_EQ(model.categories().size(), 3u);
+  EXPECT_EQ(model.hints().at("Launcher").size(), 2u);
+  EXPECT_EQ(model.hints().at("Dash").size(), 1u);
+  EXPECT_EQ(model.hints().at("Menu Bar").size(), 1u);
   EXPECT_EQ(model.hints().find("Unity"), model.hints().end());
 }
 

=== modified file 'tests/test_shortcut_view.cpp'
--- tests/test_shortcut_view.cpp	2014-03-21 04:40:12 +0000
+++ tests/test_shortcut_view.cpp	2016-11-30 11:04:07 +0000
@@ -85,7 +85,7 @@
   model->categories_per_column = 1;
   view.SetModel(model);
 
-  EXPECT_EQ(view.columns_layout_->GetChildren().size(), 2);
+  EXPECT_EQ(view.columns_layout_->GetChildren().size(), 2u);
 }
 
 TEST_F(TestShortcutView, SettingModelRebuildsColumns)
@@ -93,12 +93,12 @@
   auto model1 = GetMockModel({"Cat1", "Cat2"}, 1);
   model1->categories_per_column = 1;
   view.SetModel(model1);
-  ASSERT_EQ(view.columns_layout_->GetChildren().size(), 2);
+  ASSERT_EQ(view.columns_layout_->GetChildren().size(), 2u);
 
   auto model2 = GetMockModel({"Cat1"}, 1);
   model2->categories_per_column = 1;
   view.SetModel(model2);
-  EXPECT_EQ(view.columns_layout_->GetChildren().size(), 1);
+  EXPECT_EQ(view.columns_layout_->GetChildren().size(), 1u);
 }
 
 TEST_F(TestShortcutView, ChangingModelParametersRebuildsColumns)

=== modified file 'tests/test_switcher_controller_slow.cpp'
--- tests/test_switcher_controller_slow.cpp	2014-03-03 22:49:48 +0000
+++ tests/test_switcher_controller_slow.cpp	2016-11-30 11:04:07 +0000
@@ -39,7 +39,7 @@
   controller_->Show(ShowMode::ALL, SortMode::LAUNCHER_ORDER, icons_);
   Selection selection = controller_->GetCurrentSelection();
   EXPECT_EQ(selection.application_->tooltip_text(), "Second");
-  EXPECT_EQ(selection.window_, 0);
+  EXPECT_EQ(selection.window_, 0u);
 
   Utils::WaitForTimeoutMSec(initial_details_timeout * 1.1);
   selection = controller_->GetCurrentSelection();
@@ -65,22 +65,22 @@
   controller_->Show(ShowMode::ALL, SortMode::LAUNCHER_ORDER, icons_);
   Selection selection = controller_->GetCurrentSelection();
   EXPECT_EQ(selection.application_->tooltip_text(), "Second");
-  EXPECT_EQ(selection.window_, 0);
+  EXPECT_EQ(selection.window_, 0u);
 
   controller_->Next();
   selection = controller_->GetCurrentSelection();
   ASSERT_EQ(selection.application_->tooltip_text(), "Third");
-  EXPECT_EQ(selection.window_, 0);
+  EXPECT_EQ(selection.window_, 0u);
 
   controller_->Next();
   selection = controller_->GetCurrentSelection();
   ASSERT_EQ(selection.application_->tooltip_text(), "Show Desktop");
-  EXPECT_EQ(selection.window_, 0);
+  EXPECT_EQ(selection.window_, 0u);
 
   controller_->Next();
   selection = controller_->GetCurrentSelection();
   ASSERT_EQ(selection.application_->tooltip_text(), "First");
-  EXPECT_EQ(selection.window_, 0);
+  EXPECT_EQ(selection.window_, 0u);
 
   Utils::WaitForTimeoutMSec(details_timeout * 1.1);
   selection = controller_->GetCurrentSelection();

=== modified file 'tests/test_texture_cache.cpp'
--- tests/test_texture_cache.cpp	2014-01-14 17:08:11 +0000
+++ tests/test_texture_cache.cpp	2016-11-30 11:04:07 +0000
@@ -126,11 +126,11 @@
   TextureCache& cache = TextureCache::GetDefault();
   nux::ObjectPtr<nux::BaseTexture> t1 = cache.FindTexture("foo", 5, 7, callback);
   cache.Invalidate("foo", 5, 7);
-  ASSERT_EQ(0, cache.Size());
+  ASSERT_EQ(0u, cache.Size());
 
   nux::ObjectPtr<nux::BaseTexture> t2 = cache.FindTexture("foo", 5, 7, callback);
   EXPECT_NE(t1, t2);
-  EXPECT_EQ(1, cache.Size());
+  EXPECT_EQ(1u, cache.Size());
   EXPECT_EQ(2, counter.count);
 }
 

=== modified file 'tests/test_trash_launcher_icon.cpp'
--- tests/test_trash_launcher_icon.cpp	2015-11-26 03:12:38 +0000
+++ tests/test_trash_launcher_icon.cpp	2016-11-30 11:04:07 +0000
@@ -65,13 +65,13 @@
 TEST_F(TestTrashLauncherIcon, Quicklist)
 {
   auto const& menus = icon.Menus();
-  EXPECT_EQ(menus.size(), 1);
+  EXPECT_EQ(menus.size(), 1u);
 }
 
 TEST_F(TestTrashLauncherIcon, QuicklistEmptyTrash)
 {
   auto const& menus = icon.Menus();
-  ASSERT_EQ(menus.size(), 1);
+  ASSERT_EQ(menus.size(), 1u);
 
   auto const& empty_trash_menu = menus.front();
 
@@ -145,12 +145,12 @@
   ON_CALL(*fm_, WindowsForLocation(TRASH_URI)).WillByDefault(Return(WindowList({win})));
   fm_->locations_changed.emit();
 
-  EXPECT_EQ(icon.WindowsVisibleOnMonitor(0), 1);
-  EXPECT_EQ(icon.WindowsVisibleOnMonitor(1), 0);
+  EXPECT_EQ(icon.WindowsVisibleOnMonitor(0), 1u);
+  EXPECT_EQ(icon.WindowsVisibleOnMonitor(1), 0u);
 
   win->SetMonitor(1);
-  EXPECT_EQ(icon.WindowsVisibleOnMonitor(0), 0);
-  EXPECT_EQ(icon.WindowsVisibleOnMonitor(1), 1);
+  EXPECT_EQ(icon.WindowsVisibleOnMonitor(0), 0u);
+  EXPECT_EQ(icon.WindowsVisibleOnMonitor(1), 1u);
 }
 
 TEST_F(TestTrashLauncherIcon, FilemanagerSignalDisconnection)

=== modified file 'tests/test_ubus.cpp'
--- tests/test_ubus.cpp	2013-11-06 11:21:43 +0000
+++ tests/test_ubus.cpp	2016-11-30 11:04:07 +0000
@@ -114,7 +114,7 @@
   ProcessMessages();
 
   EXPECT_TRUE(callback_called);
-  EXPECT_EQ(callback_call_count, 1);
+  EXPECT_EQ(callback_call_count, 1u);
 }
 
 TEST_F(TestUBusServer, SingleDispatchWithData)
@@ -125,7 +125,7 @@
   ProcessMessages();
 
   EXPECT_TRUE(callback_called);
-  EXPECT_EQ(callback_call_count, 1);
+  EXPECT_EQ(callback_call_count, 1u);
   EXPECT_EQ(last_msg_variant.GetString(), "UserData");
 }
 
@@ -137,7 +137,7 @@
   ProcessMessages();
 
   EXPECT_TRUE(callback_called);
-  EXPECT_EQ(callback_call_count, 1);
+  EXPECT_EQ(callback_call_count, 1u);
 }
 
 TEST_F(TestUBusServer, SendUnregisteredMessage)
@@ -166,7 +166,7 @@
 
   ProcessMessages();
   EXPECT_TRUE(callback_called);
-  EXPECT_EQ(callback_call_count, 3);
+  EXPECT_EQ(callback_call_count, 3u);
 }
 
 TEST_F(TestUBusServer, MultipleDispatchesWithData)
@@ -253,7 +253,7 @@
 
   ProcessMessages();
   EXPECT_TRUE(callback_called);
-  EXPECT_EQ(callback_call_count, 1);
+  EXPECT_EQ(callback_call_count, 1u);
 }
 
 TEST_F(TestUBusManager, Unregister)
@@ -301,7 +301,7 @@
 
   ProcessMessages();
   EXPECT_TRUE(callback_called);
-  EXPECT_EQ(callback_call_count, 1);
+  EXPECT_EQ(callback_call_count, 1u);
 }
 
 TEST_F(TestUBusManager, DispatchWithPriority)

=== modified file 'tests/test_unity_window_style.cpp'
--- tests/test_unity_window_style.cpp	2013-12-16 16:21:54 +0000
+++ tests/test_unity_window_style.cpp	2016-11-30 11:04:07 +0000
@@ -34,10 +34,10 @@
   auto style_copy = UnityWindowStyle::Get();
   ASSERT_EQ(style, style_copy);
 
-  EXPECT_EQ(style.use_count(), 2);
+  EXPECT_EQ(style.use_count(), 2u);
   }
 
-  EXPECT_EQ(style.use_count(), 1);
+  EXPECT_EQ(style.use_count(), 1u);
 }
 
-}
\ No newline at end of file
+}

=== modified file 'tests/test_volume_launcher_icon.cpp'
--- tests/test_volume_launcher_icon.cpp	2016-07-21 12:37:19 +0000
+++ tests/test_volume_launcher_icon.cpp	2016-11-30 11:04:07 +0000
@@ -213,12 +213,12 @@
   ON_CALL(*file_manager_, WindowsForLocation(volume_->GetUri())).WillByDefault(Return(WindowList({win})));
   file_manager_->locations_changed.emit();
 
-  EXPECT_EQ(icon_->WindowsVisibleOnMonitor(0), 1);
-  EXPECT_EQ(icon_->WindowsVisibleOnMonitor(1), 0);
+  EXPECT_EQ(icon_->WindowsVisibleOnMonitor(0), 1u);
+  EXPECT_EQ(icon_->WindowsVisibleOnMonitor(1), 0u);
 
   win->SetMonitor(1);
-  EXPECT_EQ(icon_->WindowsVisibleOnMonitor(0), 0);
-  EXPECT_EQ(icon_->WindowsVisibleOnMonitor(1), 1);
+  EXPECT_EQ(icon_->WindowsVisibleOnMonitor(0), 0u);
+  EXPECT_EQ(icon_->WindowsVisibleOnMonitor(1), 1u);
 }
 
 TEST_F(TestVolumeLauncherIcon, TestPosition)