jenkins-bot has submitted this change and it was merged.
Change subject: Fix search result tests
......................................................................
Fix search result tests
Update a couple of the search tests for the recent changes in
SearchResult.
Change-Id: If61ee49a5cc82c3200ffcde421a9c54374293062
---
M app/src/androidTest/java/org/wikipedia/test/FullSearchTaskTests.java
M app/src/androidTest/java/org/wikipedia/test/SuggestionsTaskTests.java
2 files changed, 27 insertions(+), 25 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/app/src/androidTest/java/org/wikipedia/test/FullSearchTaskTests.java
b/app/src/androidTest/java/org/wikipedia/test/FullSearchTaskTests.java
index da0f8c3..65f2f86 100644
--- a/app/src/androidTest/java/org/wikipedia/test/FullSearchTaskTests.java
+++ b/app/src/androidTest/java/org/wikipedia/test/FullSearchTaskTests.java
@@ -1,12 +1,13 @@
package org.wikipedia.test;
-import org.wikipedia.page.PageTitle;
+import android.test.ActivityUnitTestCase;
+
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
import org.wikipedia.search.FullSearchArticlesTask;
+import org.wikipedia.search.SearchResult;
import org.wikipedia.search.SearchResults;
-import android.test.ActivityUnitTestCase;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -33,13 +34,13 @@
@Override
public void onFinish(SearchResults results) {
assertNotNull(results);
- assertEquals(results.getPageTitles().size(),
BATCH_SIZE);
+ assertEquals(results.getResults().size(), BATCH_SIZE);
assertNull(results.getSuggestion());
assertNotNull(results.getContinueOffset());
- for (PageTitle result : results.getPageTitles()) {
- if (result.getPrefixedText().equals("Test")) {
- assertEquals(result.getDescription(),
"Wikipedia disambiguation page");
+ for (SearchResult result : results.getResults()) {
+ if
(result.getTitle().getPrefixedText().equals("Test")) {
+
assertEquals(result.getTitle().getDescription(), "Wikipedia disambiguation
page");
}
}
completionLatch.countDown();
@@ -82,7 +83,7 @@
@Override
public void onFinish(SearchResults results) {
assertNotNull(results);
- assertEquals(results.getPageTitles().size(), 0);
+ assertEquals(results.getResults().size(), 0);
assertEquals(results.getSuggestion(), "");
assertNull(results.getContinueOffset());
completionLatch.countDown();
diff --git
a/app/src/androidTest/java/org/wikipedia/test/SuggestionsTaskTests.java
b/app/src/androidTest/java/org/wikipedia/test/SuggestionsTaskTests.java
index ef28132..22e706b 100644
--- a/app/src/androidTest/java/org/wikipedia/test/SuggestionsTaskTests.java
+++ b/app/src/androidTest/java/org/wikipedia/test/SuggestionsTaskTests.java
@@ -1,12 +1,13 @@
package org.wikipedia.test;
-import org.wikipedia.page.PageTitle;
+import android.test.ActivityUnitTestCase;
+
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
+import org.wikipedia.page.PageTitle;
import org.wikipedia.page.SuggestionsTask;
+import org.wikipedia.search.SearchResult;
import org.wikipedia.search.SearchResults;
-
-import android.test.ActivityUnitTestCase;
import java.util.ArrayList;
import java.util.List;
@@ -37,10 +38,10 @@
@Override
public void onFinish(SearchResults results) {
assertNotNull(results);
- assertEquals(results.getPageTitles().size(),
BATCH_SIZE);
+ assertEquals(results.getResults().size(), BATCH_SIZE);
- for (PageTitle result : results.getPageTitles()) {
-
assertFalse(result.getPrefixedText().equals("Test"));
+ for (SearchResult result : results.getResults()) {
+
assertFalse(result.getTitle().getPrefixedText().equals("Test"));
}
completionLatch.countDown();
}
@@ -55,36 +56,36 @@
//
public void testFilterNoResults() throws Throwable {
- List<PageTitle> originalResults = new ArrayList<>();
+ List<SearchResult> originalResults = new ArrayList<>();
checkFilter(0, originalResults);
}
public void testFilter1ResultSameAsTitleIgnoreCase() throws Throwable {
- List<PageTitle> originalResults = new ArrayList<>();
- originalResults.add(new PageTitle("Test", SITE, null, null));
+ List<SearchResult> originalResults = new ArrayList<>();
+ originalResults.add(new SearchResult(new PageTitle("Test", SITE, null,
null)));
checkFilter(0, originalResults);
}
public void testFilter1ResultDifferentFromTitle() throws Throwable {
- List<PageTitle> originalResults = new ArrayList<>();
- originalResults.add(new PageTitle("something else", SITE, null, null));
+ List<SearchResult> originalResults = new ArrayList<>();
+ originalResults.add(new SearchResult(new PageTitle("something else",
SITE, null, null)));
checkFilter(1, originalResults);
}
public void testFilter4ResultsDifferentFromTitle() throws Throwable {
- List<PageTitle> originalResults = new ArrayList<>();
- originalResults.add(new PageTitle("something else", SITE, null, null));
- originalResults.add(new PageTitle("something else", SITE, null, null));
- originalResults.add(new PageTitle("something else", SITE, null, null));
- originalResults.add(new PageTitle("something else", SITE, null, null));
+ List<SearchResult> originalResults = new ArrayList<>();
+ originalResults.add(new SearchResult(new PageTitle("something else",
SITE, null, null)));
+ originalResults.add(new SearchResult(new PageTitle("something else",
SITE, null, null)));
+ originalResults.add(new SearchResult(new PageTitle("something else",
SITE, null, null)));
+ originalResults.add(new SearchResult(new PageTitle("something else",
SITE, null, null)));
checkFilter(BATCH_SIZE, originalResults);
}
- private void checkFilter(int expected, List<PageTitle> originalResults) {
+ private void checkFilter(int expected, List<SearchResult> originalResults)
{
SuggestionsTask task = new SuggestionsTask(app.getAPIForSite(SITE),
SITE, "test",
BATCH_SIZE + 1, BATCH_SIZE, false);
SearchResults searchResults = new SearchResults(originalResults, null,
null);
- List<PageTitle> filteredList =
task.filterResults(searchResults).getPageTitles();
+ List<SearchResult> filteredList =
task.filterResults(searchResults).getResults();
assertEquals(expected, filteredList.size());
}
}
--
To view, visit https://gerrit.wikimedia.org/r/285515
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If61ee49a5cc82c3200ffcde421a9c54374293062
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
