Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225100
Change subject: Fix editing tests.
......................................................................
Fix editing tests.
Change-Id: I73ca53eeab046e7ddda3d3032813c1e9a0d06f7b
---
M wikipedia/src/androidTest/java/org/wikipedia/test/DoEditTaskTests.java
1 file changed, 4 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/00/225100/1
diff --git
a/wikipedia/src/androidTest/java/org/wikipedia/test/DoEditTaskTests.java
b/wikipedia/src/androidTest/java/org/wikipedia/test/DoEditTaskTests.java
index 0686e91..d39787e 100644
--- a/wikipedia/src/androidTest/java/org/wikipedia/test/DoEditTaskTests.java
+++ b/wikipedia/src/androidTest/java/org/wikipedia/test/DoEditTaskTests.java
@@ -9,7 +9,6 @@
import org.wikipedia.WikipediaApp;
import org.wikipedia.editing.DoEditTask;
import org.wikipedia.editing.EditTokenStorage;
-import org.wikipedia.editing.EditingException;
import org.wikipedia.editing.EditingResult;
import org.wikipedia.editing.FetchSectionWikitextTask;
import org.wikipedia.login.LoginResult;
@@ -65,9 +64,9 @@
public void onCatch(Throwable caught) {
// borrowed mainly from EditSectionActivity:
final WikipediaApp app = WikipediaApp.getInstance();
- if (caught instanceof EditingException) {
- EditingException ee = (EditingException) caught;
- if (app.getUserInfoStorage().isLoggedIn() &&
ee.getCode().equals("badtoken")) {
+ if (caught instanceof ApiException) {
+ ApiException ee = (ApiException) caught;
+ if (app.getUserInfoStorage().isLoggedIn() &&
"badtoken".equals(ee.getCode())) {
// looks like our session expired.
app.getEditTokenStorage().clearAllTokens();
app.getCookieManager().clearAllCookies();
@@ -84,10 +83,8 @@
}
}
}.execute();
- return;
}
- }
- if (!(caught instanceof ApiException)) {
+ } else {
throw new RuntimeException(caught);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/225100
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I73ca53eeab046e7ddda3d3032813c1e9a0d06f7b
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
