From ce73514ea07ec932c1404fc362231611be7f1450 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 23 Sep 2022 12:20:15 +0300 Subject: [PATCH] kurifilter-plugins: remove test case that relies on QTDIR environment variable Signed-off-by: Ivailo Monev --- kurifilter-plugins/shorturi/kshorturifilter.cpp | 2 +- kurifilter-plugins/tests/kurifiltertest.cpp | 9 --------- kurifilter-plugins/tests/kurifiltertest.h | 1 - 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/kurifilter-plugins/shorturi/kshorturifilter.cpp b/kurifilter-plugins/shorturi/kshorturifilter.cpp index 3264b87e..9ea07e59 100644 --- a/kurifilter-plugins/shorturi/kshorturifilter.cpp +++ b/kurifilter-plugins/shorturi/kshorturifilter.cpp @@ -262,7 +262,7 @@ bool KShortUriFilter::filterUri( KUriFilterData& data ) const if ( expanded || cmd.startsWith( '/' ) ) { - // Look for #ref again, after $ and ~ expansion (testcase: $QTDIR/doc/html/functions.html#s) + // Look for #ref again, after $ and ~ expansion // Can't use KUrl here, setPath would escape it... const int pos = path.indexOf('#'); if ( pos > -1 ) diff --git a/kurifilter-plugins/tests/kurifiltertest.cpp b/kurifilter-plugins/tests/kurifiltertest.cpp index 4a92c731..e6bb0c64 100644 --- a/kurifilter-plugins/tests/kurifiltertest.cpp +++ b/kurifilter-plugins/tests/kurifiltertest.cpp @@ -154,7 +154,6 @@ static char s_delimiter = ':'; // the alternative is ' ' KUriFilterTest::KUriFilterTest() { minicliFilters << "kshorturifilter" << "kurisearchfilter" << "localdomainurifilter"; - qtdir = getenv("QTDIR"); home = getenv("HOME"); kdehome = getenv("KDEHOME"); } @@ -326,11 +325,6 @@ void KUriFilterTest::environmentVariables() filter( "$SOMEVAR/kdelibs/kio", 0, KUriFilterData::Error ); // note: this dir doesn't exist... filter( "$ETC/passwd", "/etc/passwd", KUriFilterData::LocalFile ); - QString qtdocPath(qtdir+"/doc/html/functions.html"); - if (QFile::exists(qtdocPath)) { - QString expectedUrl = KUrl(qtdocPath).url()+"#s"; - filter( "$QTDIR/doc/html/functions.html#s", expectedUrl.toUtf8(), KUriFilterData::LocalFile ); - } filter( "http://www.kde.org/$USER", "http://www.kde.org/$USER", KUriFilterData::NetProtocol ); // no expansion filter( "$KDEHOME/share", QByteArray(kdehome+"/share"), KUriFilterData::LocalDir ); @@ -358,9 +352,6 @@ void KUriFilterTest::environmentVariables() filter( "$1/$2/$3", "https://www.google.com/search?q=%241%2F%242%2F%243&ie=UTF-8", KUriFilterData::NetProtocol ); // can be used as bogus or valid test. Currently triggers default search, i.e. google filter( "$$$$", "https://www.google.com/search?q=%24%24%24%24&ie=UTF-8", KUriFilterData::NetProtocol ); // worst case scenarios. - if (!qtdir.isEmpty()) { - filter( "$QTDIR", qtdir, KUriFilterData::LocalDir, QStringList( "kshorturifilter" ) ); //use specific filter. - } filter( "$HOME", home, KUriFilterData::LocalDir, QStringList( "kshorturifilter" ) ); //use specific filter. } diff --git a/kurifilter-plugins/tests/kurifiltertest.h b/kurifilter-plugins/tests/kurifiltertest.h index 0afd5554..0241c985 100644 --- a/kurifilter-plugins/tests/kurifiltertest.h +++ b/kurifilter-plugins/tests/kurifiltertest.h @@ -42,7 +42,6 @@ private slots: private: QStringList minicliFilters; - QByteArray qtdir; QByteArray home; QByteArray kdehome;