diff options
author | heiko tietze <tietze.heiko@gmail.com> | 2018-05-25 11:45:29 +0200 |
---|---|---|
committer | Heiko Tietze <tietze.heiko@gmail.com> | 2018-06-04 22:24:57 +0200 |
commit | 0550189c28cd759c41b8a048a3f667ae12560c5e (patch) | |
tree | ec63f131364bb6f5e1a27b12f4f2bcd563a3706f /vcl/qa | |
parent | 513204bcf7b9a43535ed585251e73a6d77805148 (diff) |
tdf#116916 - Icon themes missing on LibreOffice Vanilla from macOS appstore
Update of blacklist for $WITH_THEMES
Fallback to Tango for ancient/unknown DE, Colibre only on Windows
MPL vs. non-MPL on macOS
tdf#117615 reverting elementary on gnome
Change-Id: Ibea9e9429a79911d632b54fa4aa9649003830aa3
Reviewed-on: https://gerrit.libreoffice.org/55295
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
Diffstat (limited to 'vcl/qa')
-rw-r--r-- | vcl/qa/cppunit/app/test_IconThemeSelector.cxx | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx index 3b6c53d3278f..45359af06535 100644 --- a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx +++ b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx @@ -19,11 +19,12 @@ class IconThemeSelectorTest : public CppUnit::TestFixture { +#ifndef _WIN32 //default theme on Windows is Colibre independently from any desktop environment void BreezeIsReturnedForKde5Desktop(); void - ElementaryIsReturnedForGnomeDesktop(); + TangoIsReturnedForGnomeDesktop(); void ThemeIsOverriddenByPreferredTheme(); @@ -51,12 +52,15 @@ class IconThemeSelectorTest : public CppUnit::TestFixture static std::vector<vcl::IconThemeInfo> GetFakeInstalledThemes(); +#endif // Adds code needed to register the test suite + CPPUNIT_TEST_SUITE(IconThemeSelectorTest); +#ifndef _WIN32 CPPUNIT_TEST(BreezeIsReturnedForKde5Desktop); - CPPUNIT_TEST(ElementaryIsReturnedForGnomeDesktop); + CPPUNIT_TEST(TangoIsReturnedForGnomeDesktop); CPPUNIT_TEST(ThemeIsOverriddenByPreferredTheme); CPPUNIT_TEST(ThemeIsOverriddenByHighContrastMode); CPPUNIT_TEST(NotInstalledThemeDoesNotOverride); @@ -65,22 +69,25 @@ class IconThemeSelectorTest : public CppUnit::TestFixture CPPUNIT_TEST(FallbackThemeIsReturnedForEmptyInput); CPPUNIT_TEST(DifferentPreferredThemesAreInequal); CPPUNIT_TEST(DifferentHighContrastModesAreInequal); +#endif // End of test suite definition CPPUNIT_TEST_SUITE_END(); }; +#ifndef _WIN32 + /*static*/ std::vector<vcl::IconThemeInfo> IconThemeSelectorTest::GetFakeInstalledThemes() { std::vector<vcl::IconThemeInfo> r; vcl::IconThemeInfo a; - a.mThemeId = "colibre"; - r.push_back(a); a.mThemeId = "breeze"; r.push_back(a); - a.mThemeId = "elementary"; + a.mThemeId = "tango"; + r.push_back(a); + a.mThemeId = "colibre"; r.push_back(a); a.mThemeId = "sifr"; r.push_back(a); @@ -97,12 +104,12 @@ IconThemeSelectorTest::BreezeIsReturnedForKde5Desktop() } void -IconThemeSelectorTest::ElementaryIsReturnedForGnomeDesktop() +IconThemeSelectorTest::TangoIsReturnedForGnomeDesktop() { std::vector<vcl::IconThemeInfo> themes = GetFakeInstalledThemes(); vcl::IconThemeSelector s; OUString r = s.SelectIconThemeForDesktopEnvironment(themes, "gnome"); - CPPUNIT_ASSERT_EQUAL_MESSAGE("'elementary' theme is returned for gnome desktop", OUString("elementary"), r); + CPPUNIT_ASSERT_EQUAL_MESSAGE("'tango' theme is returned for gnome desktop", OUString("tango"), r); } void @@ -113,7 +120,7 @@ IconThemeSelectorTest::ThemeIsOverriddenByPreferredTheme() s.SetPreferredIconTheme(preferred, false); std::vector<vcl::IconThemeInfo> themes = GetFakeInstalledThemes(); OUString selected = s.SelectIconThemeForDesktopEnvironment(themes, "gnome"); - CPPUNIT_ASSERT_EQUAL_MESSAGE("'elementary' theme is overridden by breeze", preferred, selected); + CPPUNIT_ASSERT_EQUAL_MESSAGE("'tango' theme is overridden by breeze", preferred, selected); } void @@ -190,6 +197,8 @@ IconThemeSelectorTest::DifferentPreferredThemesAreInequal() CPPUNIT_ASSERT_EQUAL_MESSAGE("Different preferred themes are detected as inequal", false, equal); } +#endif + // Put the test suite in the registry CPPUNIT_TEST_SUITE_REGISTRATION(IconThemeSelectorTest); |