← Back to branch summary

~muktupavels/compiz/add-gwd-application

« back to all changes in this revision

Viewing changes to gtk/window-decorator/tests/test_gwd_settings.cpp

  • Committer: Alberts Muktupāvels
  • Date: 2016-05-20 20:23:01 UTC
  • Revision ID: alberts.muktupavels@gmail.com-20160520202301-la11x2capltoluv9
Update metacity theme loading.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtk/window-decorator/tests/test_gwd_settings.cpp
196
196
    const gint BLUR_TYPE_NONE_INT_VALUE = BLUR_TYPE_NONE;
197
197
    const gboolean USE_METACITY_THEME_VALUE  = TRUE;
198
198
    const std::string METACITY_THEME_VALUE ("metacity_theme");
199
 
    const gboolean NO_USE_METACITY_THEME_VALUE  = FALSE;
200
 
    const std::string NO_METACITY_THEME_VALUE ("");
201
199
    const gdouble ACTIVE_OPACITY_VALUE = 0.9;
202
200
    const gdouble INACTIVE_OPACITY_VALUE = 0.8;
203
201
    const gboolean ACTIVE_SHADE_OPACITY_VALUE = !METACITY_ACTIVE_SHADE_OPACITY_DEFAULT;
315
313
        }
316
314
 
317
315
        static void updateMetacityThemeCb (GWDSettings                  *settings,
 
316
                                           const gchar                  *metacity_theme,
318
317
                                           GWDMockSettingsNotifiedGMock *gmock)
319
318
        {
320
319
            gmock->updateMetacityTheme ();
593
592
{
594
593
    EXPECT_CALL (*mGMockNotified, updateMetacityTheme ());
595
594
    EXPECT_CALL (*mGMockNotified, updateDecorations ());
596
 
    EXPECT_THAT (gwd_settings_metacity_theme_changed (mSettings.get (),
597
 
                                                      testing_values::NO_USE_METACITY_THEME_VALUE,
598
 
                                                      testing_values::METACITY_THEME_VALUE.c_str ()), IsTrue ());
 
595
    EXPECT_THAT (gwd_settings_metacity_theme_changed (mSettings.get (), FALSE, NULL), IsTrue ());
599
596
 
600
597
    AutoUnsetGValue metacityThemeValue (G_TYPE_STRING);
601
598
    GValue &metacityThemeGValue = metacityThemeValue;
604
601
                           "metacity-theme",
605
602
                           &metacityThemeGValue);
606
603
 
607
 
    EXPECT_THAT (&metacityThemeGValue, GValueMatch <std::string> (testing_values::NO_METACITY_THEME_VALUE,
608
 
                                                                  g_value_get_string));
 
604
    EXPECT_THAT (&metacityThemeGValue, GValueMatch <const gchar *> (NULL, g_value_get_string));
609
605
}
610
606
 
611
607
TEST_F(GWDSettingsTest, TestMetacityThemeChangedIsDefault)