diff options
Diffstat (limited to 'org.eclipse.ua.tests')
3 files changed, 10 insertions, 91 deletions
diff --git a/org.eclipse.ua.tests/data/help/search/test1.xhtml b/org.eclipse.ua.tests/data/help/search/test1.xhtml index d52fe3277..62f5145a2 100644 --- a/org.eclipse.ua.tests/data/help/search/test1.xhtml +++ b/org.eclipse.ua.tests/data/help/search/test1.xhtml @@ -13,7 +13,7 @@ to search for as part of this test: jehcyqpfjs vkrhjewiwh </p> <p filter="os=invalid"> -This paragraph is always filtered out, and is used to ensure that searching does not +This paragraph is always filtered out, and is used to test whether search will flag this document as a hit. Here is a unique word to search for: gsdduvfqnh vkrhjewiwh riehguanil </p> diff --git a/org.eclipse.ua.tests/data/help/search/test7.html b/org.eclipse.ua.tests/data/help/search/test7.html index b634fb857..f63e756b4 100644 --- a/org.eclipse.ua.tests/data/help/search/test7.html +++ b/org.eclipse.ua.tests/data/help/search/test7.html @@ -14,8 +14,8 @@ kejehrgaqm </p> <p filter="os=invalid"> -This paragraph is always filtered out, and is used to ensure that searching does not -flag this document as a hit. Here is a unique word to search for: hugftnhdtg +This paragraph is always filtered out, but search should still find it. Here is +a unique word to search for: hugftnhdtg </p> <p filter="plugin!=my.invalid.plugin.id.012345"> This paragraph, which has filter attribute "plugin!=my.invalid.plugin.id.012345" should never be filtered out. diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/BasicTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/BasicTest.java index aa9f140ca..eed5845c0 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/BasicTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/BasicTest.java @@ -23,22 +23,14 @@ import junit.framework.TestSuite; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Preferences; import org.eclipse.help.internal.base.BaseHelpSystem; -import org.eclipse.help.internal.base.HelpBasePlugin; -import org.eclipse.help.internal.base.IHelpBaseConstants; import org.eclipse.help.internal.search.ISearchQuery; import org.eclipse.help.internal.search.SearchHit; import org.eclipse.help.internal.search.SearchQuery; import org.eclipse.help.internal.search.SearchResults; -import org.eclipse.help.ui.internal.HelpUIPlugin; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.activities.IWorkbenchActivitySupport; public class BasicTest extends TestCase { - private boolean oldPreference; - /* * The test data for testXHTMLSearch(). The first string in each array * is the word to search for. The rest are the expected hits' hrefs. @@ -56,14 +48,14 @@ public class BasicTest extends TestCase { // try OR'ing with a string from another doc.. should find both { "vkrhjewiwh OR rugnwjfyqj", "/org.eclipse.ua.tests/data/help/search/test1.xhtml", "/org.eclipse.ua.tests/data/help/search/test2.xhtml" }, - // these two words only appear next to each other in a paragraph that's always filtered out - { "\"vkrhjewiwh riehguanil\"", /* no hits */ }, + // these two words only appear next to each other in a paragraph that's filtered out - search should still find it + { "\"vkrhjewiwh riehguanil\"", "/org.eclipse.ua.tests/data/help/search/test1.xhtml" }, - // first one should be found, but second one only exists in a paragraph that's always filtered out - { "vkrhjewiwh AND riehguanil", /* no hits */ }, + // first one should be found, but second one only exists in a paragraph that's filtered out - search should still find + { "vkrhjewiwh AND riehguanil", "/org.eclipse.ua.tests/data/help/search/test1.xhtml" }, - // only exists in paragraph that's always filtered out - { "gsdduvfqnh", /* no hits */ }, + // only exists in paragraph that's filtered out - search should find + { "gsdduvfqnh", "/org.eclipse.ua.tests/data/help/search/test1.xhtml" }, // word is in test3.xhtml and also included by test4.xhtml, contributed // into test5.xhtml as an extension, and replaces a paragraph in test6.xhtml. @@ -80,7 +72,7 @@ public class BasicTest extends TestCase { // only exists in a paragraph in test7.html that should be filtered out // make sure this works for XHTML content inside .html file - { "hugftnhdtg", /* no hits */ }, + { "hugftnhdtg", "/org.eclipse.ua.tests/data/help/search/test7.html" }, // this doc is listed in TOC several times, using slightly different paths { "rqfedajhtg", "/org.eclipse.ua.tests/data/help/search/test9.htm" }, @@ -93,30 +85,6 @@ public class BasicTest extends TestCase { return new TestSuite(BasicTest.class); } - /* - * Ensure that org.eclipse.help.ui is started. It contributes extra content - * filtering that is used by this test. See UIContentFilterProcessor. - * - * Also, turn off potential hits searching for this test. - */ - protected void setUp() throws Exception { - HelpUIPlugin.getDefault(); - - Preferences pref = HelpBasePlugin.getDefault().getPluginPreferences(); - oldPreference = pref.getBoolean(IHelpBaseConstants.P_KEY_SHOW_POTENTIAL_HITS); - pref.setValue(IHelpBaseConstants.P_KEY_SHOW_POTENTIAL_HITS, false); - HelpBasePlugin.getDefault().savePluginPreferences(); - } - - /* - * Set the preference value back to whatever it was before. - */ - protected void tearDown() throws Exception { - Preferences pref = HelpBasePlugin.getDefault().getPluginPreferences(); - pref.setValue(IHelpBaseConstants.P_KEY_SHOW_POTENTIAL_HITS, oldPreference); - HelpBasePlugin.getDefault().savePluginPreferences(); - } - public void testSearch() throws Exception { for (int i=0;i<EXPECTED_RESULTS.length;++i) { String searchWord = EXPECTED_RESULTS[i][0]; @@ -172,53 +140,4 @@ public class BasicTest extends TestCase { } } } - - /** - * Tests searching with changing filtering conditions. Activities, for - * example, can change during a session, and the search should only - * find content that is *currently* not filtered out. - */ - public void testXHTMLActivityFilteringSearch() throws Exception { - String searchWord = "qjfuhemaok"; - String href = "/org.eclipse.ua.tests/data/help/search/test2.xhtml"; - String testActivity = "org.eclipse.ua.tests.activity"; - ISearchQuery query = new SearchQuery(searchWord, false, new ArrayList(), Platform.getNL()); - IWorkbenchActivitySupport activitySupport = PlatformUI.getWorkbench().getActivitySupport(); - Set withoutTestActivity = activitySupport.getActivityManager().getEnabledActivityIds(); - Set withTestActivity = new HashSet(withoutTestActivity); - withTestActivity.add(testActivity); - - // first try with activity turned off - should not find it - activitySupport.setEnabledActivityIds(withoutTestActivity); - SearchResults collector = new SearchResults(null, 500, Platform.getNL()); - BaseHelpSystem.getSearchManager().search(query, collector, new NullProgressMonitor()); - Assert.assertTrue("Found an unexpected search result. Was searching for string in a paragraph filtered by activity, and the activity was turned off, but the search came back positive", !containsHref(href, collector.getSearchHits())); - - // now try with it turned on - should find it - activitySupport.setEnabledActivityIds(withTestActivity); - collector = new SearchResults(null, 500, Platform.getNL()); - BaseHelpSystem.getSearchManager().search(query, collector, new NullProgressMonitor()); - Assert.assertTrue("Did not find an expected search result. Was searching for string in a paragraph filtered by activity, and the activity was turned on, but the search came back negative", containsHref(href, collector.getSearchHits())); - - // finally try again with it turned off - should not find it - activitySupport.setEnabledActivityIds(withoutTestActivity); - collector = new SearchResults(null, 500, Platform.getNL()); - BaseHelpSystem.getSearchManager().search(query, collector, new NullProgressMonitor()); - Assert.assertTrue("Found an unexpected search result. Was searching for string in a paragraph filtered by activity, and the activity was turned off, but the search came back positive (second attempt)", !containsHref(href, collector.getSearchHits())); - } - - private static boolean containsHref(String href, SearchHit[] hits) { - for (int i=0;i<hits.length;++i) { - String hitHref = hits[i].getHref(); - // ignore query params - int index = hitHref.indexOf('?'); - if (index != -1) { - hitHref = hitHref.substring(0, index); - } - if (href.equals(hitHref)) { - return true; - } - } - return false; - } } |