Merge lp:~brandontschaefer/mir/xcursor-test-cleanup into lp:mir

[Brandon Schaefer]

Make a testing class + move to use a temp env variable vs manually doing it.

Make a testing class + move to use a temp env variable vs manually doing it.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2964
http://jenkins.qa.ubuntu.com/job/mir-ci/5037/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4147
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3054
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4089
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/47/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1188
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1188/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/47/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4090
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4090/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6772
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23692
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/48/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5037/rebuild

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

=== modified file 'tests/unit-tests/input/test_xcursor_loader.cpp'
--- tests/unit-tests/input/test_xcursor_loader.cpp	2015-04-28 07:54:10 +0000
+++ tests/unit-tests/input/test_xcursor_loader.cpp	2015-09-26 05:41:49 +0000
@@ -20,6 +20,7 @@
 
 #include "mir/graphics/cursor_image.h"
 #include "mir_test_framework/executable_path.h"
+#include "mir_test_framework/temporary_environment_value.h"
 
 #include <mir_toolkit/common.h>
 #include <mir_toolkit/cursors.h>
@@ -34,6 +35,25 @@
 
 namespace mi = mir::input;
 namespace mg = mir::graphics;
+namespace mtf = mir_test_framework;
+
+namespace
+{
+std::string const test_cursor_path{mir_test_framework::executable_path() + std::string("/testing-cursor-theme")};
+}
+
+// Warning, XCURSOR_PATH will only be checked ONCE by libxcursor due to static var
+class XCursorLoaderTest : public ::testing::Test
+{
+public:
+    XCursorLoaderTest()
+        : xcursor_path("XCURSOR_PATH", test_cursor_path.c_str())
+    {
+    }
+
+    mtf::TemporaryEnvironmentValue xcursor_path;
+    mi::XCursorLoader loader;
+};
 
 namespace
 {
@@ -82,34 +102,10 @@
 {
     return cursor_image_is_solid_color(arg, 0xff000000);
 }
-
-char *old_xcursor_path = nullptr;
-void set_xcursor_path()
-{
-    char const* old = getenv("XCURSOR_PATH");
-    if (old)
-        old_xcursor_path = strdup(old);
-    auto test_cursor_path =mir_test_framework::executable_path() + std::string("/testing-cursor-theme");
-    setenv("XCURSOR_PATH", test_cursor_path.c_str(), 1);
-}
-
-void restore_xcursor_path()
-{
-    if (old_xcursor_path)
-    {
-        setenv("XCURSOR_PATH", old_xcursor_path, 1);
-        free(old_xcursor_path);
-    }
-}
-
-}
-
-TEST(XCursorLoader, loads_cursors_from_testing_theme)
-{
-    set_xcursor_path();
-
-    mi::XCursorLoader loader;
-    
+}
+
+TEST_F(XCursorLoaderTest, loads_cursors_from_testing_theme)
+{
     auto size = mi::default_cursor_size;
     auto red_image = loader.image("red", size);
     auto blue_image = loader.image("blue", size);
@@ -121,25 +117,17 @@
     EXPECT_THAT(red_image, IsSolidRed());
     EXPECT_THAT(green_image, IsSolidGreen());
     EXPECT_THAT(blue_image, IsSolidBlue());
-    
-    restore_xcursor_path();
 }
 
-TEST(XCursorLoader, only_supports_the_default_size)
+TEST_F(XCursorLoaderTest, only_supports_the_default_size)
 {
-    mi::XCursorLoader loader;
-    
     EXPECT_THROW({
             loader.image("red", {100, 100});
     }, std::logic_error);
 }
 
-TEST(XCursorLoader, default_image_is_arrow_from_xcursor_theme)
+TEST_F(XCursorLoaderTest, default_image_is_arrow_from_xcursor_theme)
 {
-    set_xcursor_path();
-
-    mi::XCursorLoader loader;
-    
     auto size = mi::default_cursor_size;
     auto arrow_image = loader.image(mir_default_cursor_name, size);
 
@@ -147,21 +135,13 @@
     // name.
     ASSERT_THAT(arrow_image, HasLoaded());
     EXPECT_THAT(arrow_image, IsSolidBlack());
-    
-    restore_xcursor_path();
 }
 
-TEST(XCursorLoader, symbolic_names_which_are_not_present_resolve_to_default)
+TEST_F(XCursorLoaderTest, symbolic_names_which_are_not_present_resolve_to_default)
 {
-    set_xcursor_path();
-
-    mi::XCursorLoader loader;
-    
     auto size = mi::default_cursor_size;
     auto default_image = loader.image(mir_default_cursor_name, size);
     auto image_with_made_up_name = loader.image("Artickrumbulis", size);
 
     EXPECT_EQ(default_image, image_with_made_up_name);
-    
-    restore_xcursor_path();
 }