[MediaWiki-commits] [Gerrit] Title search gets descriptions, too - change (apps...wikipedia)
Dbrant has submitted this change and it was merged.
Change subject: Title search gets descriptions, too
..
Title search gets descriptions, too
Now that we can easily get descriptions from our own API,
why not have them for both search types.
Using common data type for both full text and title search: PageTitle
Also using same layout for both fragments.
This will enable us to refactor things even more.
The two tasks and the two fragments have a lot of common code.
Change-Id: Ied3ca27a36e0ff26f7c8f5404289e8ecee062336
---
M wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
M wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java
M
wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionFeederTests.java
D wikipedia/res/layout/item_full_search_result.xml
M wikipedia/res/layout/item_search_result.xml
M wikipedia/src/main/java/org/wikipedia/PageTitle.java
M wikipedia/src/main/java/org/wikipedia/Utils.java
M wikipedia/src/main/java/org/wikipedia/page/SuggestionsTask.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
D wikipedia/src/main/java/org/wikipedia/search/FullSearchResult.java
M wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
M wikipedia/src/main/java/org/wikipedia/search/TitleSearchTask.java
M wikipedia/src/main/java/org/wikipedia/wikidata/GetDescriptionsTask.java
M wikipedia/src/main/java/org/wikipedia/wikidata/WikidataDescriptionFeeder.java
15 files changed, 142 insertions(+), 149 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
diff --git
a/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
b/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
index ad7b104..8fc2854 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
@@ -1,9 +1,10 @@
package org.wikipedia.test;
+import org.wikipedia.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
import org.wikipedia.search.FullSearchArticlesTask;
-import org.wikipedia.search.FullSearchResult;
+
import android.content.Intent;
import android.test.ActivityUnitTestCase;
import java.util.concurrent.CountDownLatch;
@@ -38,8 +39,8 @@
assertEquals(results.getSuggestion(), );
assertNotNull(results.getContinueOffset());
-for (FullSearchResult result : results.getResults()) {
-if
(result.getTitle().getPrefixedText().equals(Test)) {
+for (PageTitle result : results.getResults()) {
+if (result.getPrefixedText().equals(Test)) {
assertEquals(result.getDescription(),
Wikipedia disambiguation page);
}
}
diff --git
a/wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java
b/wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java
index d4ac13b..b143bfd 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java
@@ -1,9 +1,10 @@
package org.wikipedia.test;
+import org.wikipedia.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
import org.wikipedia.page.SuggestionsTask;
-import org.wikipedia.search.FullSearchResult;
+
import android.content.Intent;
import android.test.ActivityUnitTestCase;
import java.util.concurrent.CountDownLatch;
@@ -39,8 +40,8 @@
assertNotNull(results);
assertEquals(results.getResults().size(), BATCH_SIZE);
-for (FullSearchResult result : results.getResults()) {
-
assertFalse(result.getTitle().getPrefixedText().equals(Test));
+for (PageTitle result : results.getResults()) {
+
assertFalse(result.getPrefixedText().equals(Test));
}
completionLatch.countDown();
}
diff --git
a/wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionFeederTests.java
b/wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionFeederTests.java
index c557c4a..4acc2b2 100644
---
a/wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionFeederTests.java
+++
b/wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionFeederTests.java
@@ -3,11 +3,11 @@
import org.wikipedia.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
-import org.wikipedia.search.FullSearchResult;
import org.wikipedia.wikidata.WikidataCache;
import org.wikipedia.wikidata.WikidataDescriptionFeeder;
[MediaWiki-commits] [Gerrit] Title search gets descriptions, too - change (apps...wikipedia)
BearND has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177752
Change subject: Title search gets descriptions, too
..
Title search gets descriptions, too
Now that we can easily get descriptions from our own API,
why not have them for both search types.
Using common data type for both full text and title search: PageTitle
Also using same layout for both fragments.
This will enable us to refactor things even more.
The two tasks and the two fragments have a lot of common code.
Change-Id: Ied3ca27a36e0ff26f7c8f5404289e8ecee062336
---
M wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
M wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java
M
wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionFeederTests.java
D wikipedia/res/layout/item_full_search_result.xml
M wikipedia/res/layout/item_search_result.xml
M wikipedia/src/main/java/org/wikipedia/PageTitle.java
M wikipedia/src/main/java/org/wikipedia/Utils.java
M wikipedia/src/main/java/org/wikipedia/page/SuggestionsTask.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
D wikipedia/src/main/java/org/wikipedia/search/FullSearchResult.java
M wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
M wikipedia/src/main/java/org/wikipedia/search/TitleSearchTask.java
M wikipedia/src/main/java/org/wikipedia/wikidata/GetDescriptionsTask.java
M wikipedia/src/main/java/org/wikipedia/wikidata/WikidataDescriptionFeeder.java
15 files changed, 141 insertions(+), 149 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/52/177752/1
diff --git
a/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
b/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
index ad7b104..8fc2854 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
@@ -1,9 +1,10 @@
package org.wikipedia.test;
+import org.wikipedia.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
import org.wikipedia.search.FullSearchArticlesTask;
-import org.wikipedia.search.FullSearchResult;
+
import android.content.Intent;
import android.test.ActivityUnitTestCase;
import java.util.concurrent.CountDownLatch;
@@ -38,8 +39,8 @@
assertEquals(results.getSuggestion(), );
assertNotNull(results.getContinueOffset());
-for (FullSearchResult result : results.getResults()) {
-if
(result.getTitle().getPrefixedText().equals(Test)) {
+for (PageTitle result : results.getResults()) {
+if (result.getPrefixedText().equals(Test)) {
assertEquals(result.getDescription(),
Wikipedia disambiguation page);
}
}
diff --git
a/wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java
b/wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java
index d4ac13b..b143bfd 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java
@@ -1,9 +1,10 @@
package org.wikipedia.test;
+import org.wikipedia.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
import org.wikipedia.page.SuggestionsTask;
-import org.wikipedia.search.FullSearchResult;
+
import android.content.Intent;
import android.test.ActivityUnitTestCase;
import java.util.concurrent.CountDownLatch;
@@ -39,8 +40,8 @@
assertNotNull(results);
assertEquals(results.getResults().size(), BATCH_SIZE);
-for (FullSearchResult result : results.getResults()) {
-
assertFalse(result.getTitle().getPrefixedText().equals(Test));
+for (PageTitle result : results.getResults()) {
+
assertFalse(result.getPrefixedText().equals(Test));
}
completionLatch.countDown();
}
diff --git
a/wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionFeederTests.java
b/wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionFeederTests.java
index c557c4a..4acc2b2 100644
---
a/wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionFeederTests.java
+++
b/wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionFeederTests.java
@@ -3,11 +3,11 @@
import org.wikipedia.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
-import org.wikipedia.search.FullSearchResult;
import
