[MediaWiki-commits] [Gerrit] Allow caller to specify maxResults in FullSearchTask - change (apps...wikipedia)

2014-11-19 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Allow caller to specify maxResults in FullSearchTask
..


Allow caller to specify maxResults in FullSearchTask

Also fix the related tests.

Change-Id: Ic887b9acd041284c80c279f5cb5c7a05f11f3024
---
M wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
3 files changed, 19 insertions(+), 18 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 5b7e999..f3322d1 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
@@ -14,7 +14,7 @@
  */
 public class FullSearchTaskTests extends 
ActivityUnitTestCase {
 private static final int TASK_COMPLETION_TIMEOUT = 2;
-private static final int NUM_RESULTS_REQUESTED = 12;
+private static final int BATCH_SIZE = 12;
 private static final Site SITE = new Site("test.wikipedia.org");
 
 public FullSearchTaskTests() {
@@ -28,13 +28,13 @@
 @Override
 public void run() {
 final WikipediaApp app = (WikipediaApp) 
getInstrumentation().getTargetContext().getApplicationContext();
-new FullSearchArticlesTask(app.getAPIForSite(SITE), SITE, 
"test", 0) {
+new FullSearchArticlesTask(app.getAPIForSite(SITE), SITE, 
"test", BATCH_SIZE, null) {
 @Override
 public void onFinish(FullSearchResults results) {
 assertNotNull(results);
-assertEquals(results.getResults().size(), 
NUM_RESULTS_REQUESTED);
+assertEquals(results.getResults().size(), BATCH_SIZE);
 assertEquals(results.getSuggestion(), "");
-assertEquals(results.getContinueOffset(), 
NUM_RESULTS_REQUESTED);
+assertNotNull(results.getContinueOffset());
 
 for (FullSearchResult result : results.getResults()) {
 if 
(result.getTitle().getPrefixedText().equals("Test")) {
@@ -56,7 +56,7 @@
 @Override
 public void run() {
 final WikipediaApp app = (WikipediaApp) 
getInstrumentation().getTargetContext().getApplicationContext();
-new FullSearchArticlesTask(app.getAPIForSite(SITE), SITE, 
"teest", 0) { // small typo should produce a suggestion
+new FullSearchArticlesTask(app.getAPIForSite(SITE), SITE, 
"teest", BATCH_SIZE, null) { // small typo should produce a suggestion
 @Override
 public void onFinish(FullSearchResults results) {
 assertNotNull(results);
@@ -76,13 +76,13 @@
 @Override
 public void run() {
 final WikipediaApp app = (WikipediaApp) 
getInstrumentation().getTargetContext().getApplicationContext();
-new FullSearchArticlesTask(app.getAPIForSite(SITE), SITE, 
"jkfsdfpefdsfwoirpoik", 0) { // toal gibberish, should not exist on testwiki
+new FullSearchArticlesTask(app.getAPIForSite(SITE), SITE, 
"jkfsdfpefdsfwoirpoik", BATCH_SIZE, null) { // total gibberish, should not 
exist on testwiki
 @Override
 public void onFinish(FullSearchResults results) {
 assertNotNull(results);
 assertEquals(results.getResults().size(), 0);
 assertEquals(results.getSuggestion(), "");
-assertEquals(results.getContinueOffset(), 0);
+assertNull(results.getContinueOffset());
 completionLatch.countDown();
 }
 }.execute();
diff --git 
a/wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java 
b/wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
index 6fc3395..afc9afa 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
@@ -19,22 +19,22 @@
 import java.util.Map;
 
 public class FullSearchArticlesTask extends 
ApiTask {
-private static final int MAX_RESULTS = 12;
-private static final String NUM_RESULTS_PER_QUERY = 
Integer.toString(MAX_RESULTS);
-
 private final Site site;
 private final String searchTerm;
+private final int maxResults;
 private final ContinueOffset continueOffset;
 
-public FullSearchArticlesTask(Api api, Site site, String

[MediaWiki-commits] [Gerrit] Allow caller to specify maxResults in FullSearchTask - change (apps...wikipedia)

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

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

Change subject: Allow caller to specify maxResults in FullSearchTask
..

Allow caller to specify maxResults in FullSearchTask

Also fix the related tests.

Change-Id: Ic887b9acd041284c80c279f5cb5c7a05f11f3024
---
M wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
3 files changed, 20 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/93/174293/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 5b7e999..f3322d1 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
@@ -14,7 +14,7 @@
  */
 public class FullSearchTaskTests extends 
ActivityUnitTestCase {
 private static final int TASK_COMPLETION_TIMEOUT = 2;
-private static final int NUM_RESULTS_REQUESTED = 12;
+private static final int BATCH_SIZE = 12;
 private static final Site SITE = new Site("test.wikipedia.org");
 
 public FullSearchTaskTests() {
@@ -28,13 +28,13 @@
 @Override
 public void run() {
 final WikipediaApp app = (WikipediaApp) 
getInstrumentation().getTargetContext().getApplicationContext();
-new FullSearchArticlesTask(app.getAPIForSite(SITE), SITE, 
"test", 0) {
+new FullSearchArticlesTask(app.getAPIForSite(SITE), SITE, 
"test", BATCH_SIZE, null) {
 @Override
 public void onFinish(FullSearchResults results) {
 assertNotNull(results);
-assertEquals(results.getResults().size(), 
NUM_RESULTS_REQUESTED);
+assertEquals(results.getResults().size(), BATCH_SIZE);
 assertEquals(results.getSuggestion(), "");
-assertEquals(results.getContinueOffset(), 
NUM_RESULTS_REQUESTED);
+assertNotNull(results.getContinueOffset());
 
 for (FullSearchResult result : results.getResults()) {
 if 
(result.getTitle().getPrefixedText().equals("Test")) {
@@ -56,7 +56,7 @@
 @Override
 public void run() {
 final WikipediaApp app = (WikipediaApp) 
getInstrumentation().getTargetContext().getApplicationContext();
-new FullSearchArticlesTask(app.getAPIForSite(SITE), SITE, 
"teest", 0) { // small typo should produce a suggestion
+new FullSearchArticlesTask(app.getAPIForSite(SITE), SITE, 
"teest", BATCH_SIZE, null) { // small typo should produce a suggestion
 @Override
 public void onFinish(FullSearchResults results) {
 assertNotNull(results);
@@ -76,13 +76,13 @@
 @Override
 public void run() {
 final WikipediaApp app = (WikipediaApp) 
getInstrumentation().getTargetContext().getApplicationContext();
-new FullSearchArticlesTask(app.getAPIForSite(SITE), SITE, 
"jkfsdfpefdsfwoirpoik", 0) { // toal gibberish, should not exist on testwiki
+new FullSearchArticlesTask(app.getAPIForSite(SITE), SITE, 
"jkfsdfpefdsfwoirpoik", BATCH_SIZE, null) { // total gibberish, should not 
exist on testwiki
 @Override
 public void onFinish(FullSearchResults results) {
 assertNotNull(results);
 assertEquals(results.getResults().size(), 0);
 assertEquals(results.getSuggestion(), "");
-assertEquals(results.getContinueOffset(), 0);
+assertNull(results.getContinueOffset());
 completionLatch.countDown();
 }
 }.execute();
diff --git 
a/wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java 
b/wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
index 08d5bda..17c4d4c 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
@@ -19,22 +19,22 @@
 import java.util.Map;
 
 public class FullSearchArticlesTask extends 
ApiTask {
-private static final int MAX_RESULTS = 12;
-private static final String NUM_RESULTS_PER_QUERY = 
Integer.toString(MAX_RESULTS);
-
 private final Site site;
 private final String searchTerm;
+private final int maxResults;
 private final ContinueOffset continueOffset;
 
-public Fu