[MediaWiki-commits] [Gerrit] Wikidata descriptions retrieved via new PageTerms API - change (apps...wikipedia)

2014-12-05 Thread Dbrant (Code Review) 
Dbrant has submitted this change and it was merged.

Change subject: Wikidata descriptions retrieved via new PageTerms API
..


Wikidata descriptions retrieved via new PageTerms API

This patch affects retrieving descriptions for
- Full text search items
- Lead image
- Disambig items

Had to change the WikidataCache to use PageTitles instead of
Wikidata IDs as keys.

Always add the description of the clicked on item in full text search
to the cache so we don't even try to get it again when the page is opened.

Change-Id: I6b308f57de805b6d1193cf6b55e5d74307f1aaa0
---
M wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
A wikipedia-it/src/main/java/org/wikipedia/test/GetDescriptionsTaskTests.java
M wikipedia-it/src/main/java/org/wikipedia/test/PageTests.java
M wikipedia-it/src/main/java/org/wikipedia/test/ParcelableTest.java
M 
wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionFeederTests.java
D 
wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionsTaskTests.java
M wikipedia/src/main/java/org/wikipedia/page/DisambigListAdapter.java
M wikipedia/src/main/java/org/wikipedia/page/PageProperties.java
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
M wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
M 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
A wikipedia/src/main/java/org/wikipedia/wikidata/GetDescriptionsTask.java
M wikipedia/src/main/java/org/wikipedia/wikidata/WikidataCache.java
M wikipedia/src/main/java/org/wikipedia/wikidata/WikidataDescriptionFeeder.java
D wikipedia/src/main/java/org/wikipedia/wikidata/WikidataDescriptionsTask.java
D wikipedia/src/main/java/org/wikipedia/wikidata/WikidataIdsTask.java
D wikipedia/src/main/java/org/wikipedia/wikidata/WikidataSite.java
21 files changed, 226 insertions(+), 363 deletions(-)

Approvals:
  Dbrant: Looks good to me, approved
  jenkins-bot: Verified



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 f3322d1..ad7b104 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
@@ -16,11 +16,13 @@
 private static final int TASK_COMPLETION_TIMEOUT = 2;
 private static final int BATCH_SIZE = 12;
 private static final Site SITE = new Site(test.wikipedia.org);
+private static final Site EN_SITE = new Site(en.wikipedia.org);
 
 public FullSearchTaskTests() {
 super(TestDummyActivity.class);
 }
 
+/** Have to use enwiki since I don't think there are any Wikidata 
descriptions for testwiki. */
 public void testFullTextSearchWithResults() throws Throwable {
 startActivity(new Intent(), null, null);
 final CountDownLatch completionLatch = new CountDownLatch(1);
@@ -28,7 +30,7 @@
 @Override
 public void run() {
 final WikipediaApp app = (WikipediaApp) 
getInstrumentation().getTargetContext().getApplicationContext();
-new FullSearchArticlesTask(app.getAPIForSite(SITE), SITE, 
test, BATCH_SIZE, null) {
+new FullSearchArticlesTask(app.getAPIForSite(EN_SITE), 
EN_SITE, test, BATCH_SIZE, null) {
 @Override
 public void onFinish(FullSearchResults results) {
 assertNotNull(results);
@@ -38,7 +40,7 @@
 
 for (FullSearchResult result : results.getResults()) {
 if 
(result.getTitle().getPrefixedText().equals(Test)) {
-assertEquals(result.getWikiBaseId(), Q377);
+assertEquals(result.getDescription(), 
Wikipedia disambiguation page);
 }
 }
 completionLatch.countDown();
@@ -49,25 +51,27 @@
 assertTrue(completionLatch.await(TASK_COMPLETION_TIMEOUT, 
TimeUnit.MILLISECONDS));
 }
 
-public void testFullTextSearchWithSuggestion() throws Throwable {
-startActivity(new Intent(), null, null);
-final CountDownLatch completionLatch = new CountDownLatch(1);
-runTestOnUiThread(new Runnable() {
-@Override
-public void run() {
-final WikipediaApp app = (WikipediaApp) 
getInstrumentation().getTargetContext().getApplicationContext();
-new FullSearchArticlesTask(app.getAPIForSite(SITE), SITE, 
teest, BATCH_SIZE, null) { // small typo should produce

[MediaWiki-commits] [Gerrit] Wikidata descriptions retrieved via new PageTerms API - change (apps...wikipedia)

2014-12-04 Thread BearND (Code Review) 
BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/177740

Change subject: Wikidata descriptions retrieved via new PageTerms API
..

Wikidata descriptions retrieved via new PageTerms API

This patch affects retrieving descriptions for
- Full text search items
- Lead image
- Disambig items

Change-Id: I6b308f57de805b6d1193cf6b55e5d74307f1aaa0
---
M wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
A wikipedia-it/src/main/java/org/wikipedia/test/GetDescriptionsTaskTests.java
M wikipedia-it/src/main/java/org/wikipedia/test/PageTests.java
M wikipedia-it/src/main/java/org/wikipedia/test/ParcelableTest.java
M 
wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionFeederTests.java
D 
wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionsTaskTests.java
M wikipedia/src/main/java/org/wikipedia/page/DisambigListAdapter.java
M wikipedia/src/main/java/org/wikipedia/page/PageProperties.java
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
M wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
M 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
A wikipedia/src/main/java/org/wikipedia/wikidata/GetDescriptionsTask.java
M wikipedia/src/main/java/org/wikipedia/wikidata/WikidataCache.java
M wikipedia/src/main/java/org/wikipedia/wikidata/WikidataDescriptionFeeder.java
D wikipedia/src/main/java/org/wikipedia/wikidata/WikidataDescriptionsTask.java
D wikipedia/src/main/java/org/wikipedia/wikidata/WikidataIdsTask.java
D wikipedia/src/main/java/org/wikipedia/wikidata/WikidataSite.java
21 files changed, 215 insertions(+), 360 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/40/177740/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 f3322d1..ad7b104 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
@@ -16,11 +16,13 @@
 private static final int TASK_COMPLETION_TIMEOUT = 2;
 private static final int BATCH_SIZE = 12;
 private static final Site SITE = new Site(test.wikipedia.org);
+private static final Site EN_SITE = new Site(en.wikipedia.org);
 
 public FullSearchTaskTests() {
 super(TestDummyActivity.class);
 }
 
+/** Have to use enwiki since I don't think there are any Wikidata 
descriptions for testwiki. */
 public void testFullTextSearchWithResults() throws Throwable {
 startActivity(new Intent(), null, null);
 final CountDownLatch completionLatch = new CountDownLatch(1);
@@ -28,7 +30,7 @@
 @Override
 public void run() {
 final WikipediaApp app = (WikipediaApp) 
getInstrumentation().getTargetContext().getApplicationContext();
-new FullSearchArticlesTask(app.getAPIForSite(SITE), SITE, 
test, BATCH_SIZE, null) {
+new FullSearchArticlesTask(app.getAPIForSite(EN_SITE), 
EN_SITE, test, BATCH_SIZE, null) {
 @Override
 public void onFinish(FullSearchResults results) {
 assertNotNull(results);
@@ -38,7 +40,7 @@
 
 for (FullSearchResult result : results.getResults()) {
 if 
(result.getTitle().getPrefixedText().equals(Test)) {
-assertEquals(result.getWikiBaseId(), Q377);
+assertEquals(result.getDescription(), 
Wikipedia disambiguation page);
 }
 }
 completionLatch.countDown();
@@ -49,25 +51,27 @@
 assertTrue(completionLatch.await(TASK_COMPLETION_TIMEOUT, 
TimeUnit.MILLISECONDS));
 }
 
-public void testFullTextSearchWithSuggestion() throws Throwable {
-startActivity(new Intent(), null, null);
-final CountDownLatch completionLatch = new CountDownLatch(1);
-runTestOnUiThread(new Runnable() {
-@Override
-public void run() {
-final WikipediaApp app = (WikipediaApp) 
getInstrumentation().getTargetContext().getApplicationContext();
-new FullSearchArticlesTask(app.getAPIForSite(SITE), SITE, 
teest, BATCH_SIZE, null) { // small typo should produce a suggestion
-@Override
-public void onFinish(FullSearchResults results) {
-assertNotNull(results);
-