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-07 07:51:52 +0200 |
| commit | 90088d43a20cff2623c2f01949955099f9b92845 (patch) | |
| tree | 3d7f3fd0984cf2394eced521ef7c42150dc9c948 /vcl/qa/cppunit | |
| parent | 251cb2a7b8b6c1f3fa6335911f0df38b23765da2 (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
Change-Id: Ibea9e9429a79911d632b54fa4aa9649003830aa3
Reviewed-on: https://gerrit.libreoffice.org/55295
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/54794
Diffstat (limited to 'vcl/qa/cppunit')
| -rw-r--r-- | vcl/qa/cppunit/app/test_IconThemeSelector.cxx | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx index 3b6c53d3278f..06cfe9466f63 100644 --- a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx +++ b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx @@ -19,6 +19,7 @@ class IconThemeSelectorTest : public CppUnit::TestFixture { +#ifndef _WIN32 //default theme on Windows is Colibre independently from any desktop environment void BreezeIsReturnedForKde5Desktop(); @@ -51,10 +52,13 @@ 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(ThemeIsOverriddenByPreferredTheme); @@ -65,23 +69,26 @@ 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"; r.push_back(a); + a.mThemeId = "colibre"; + r.push_back(a); a.mThemeId = "sifr"; r.push_back(a); return r; @@ -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); |