BearND has uploaded a new change for review.
https://gerrit.wikimedia.org/r/155074
Change subject: Correct order of arguments in assertEquals
......................................................................
Correct order of arguments in assertEquals
Expected should come before actual, so that test failure output
is more sensible.
Change-Id: I0d0503fb7a4ac85048b59f0f9b535807a5224074
---
M src/test/java/org/mediawiki/api/json/ApiConstructionTest.java
M src/test/java/org/mediawiki/api/json/ApiTest.java
M src/test/java/org/mediawiki/api/json/RequestBuilderTest.java
3 files changed, 31 insertions(+), 29 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/java-mwapi
refs/changes/74/155074/1
diff --git a/src/test/java/org/mediawiki/api/json/ApiConstructionTest.java
b/src/test/java/org/mediawiki/api/json/ApiConstructionTest.java
index 82d6351..3f5c442 100644
--- a/src/test/java/org/mediawiki/api/json/ApiConstructionTest.java
+++ b/src/test/java/org/mediawiki/api/json/ApiConstructionTest.java
@@ -13,45 +13,45 @@
@Test
public void testSecure() throws Exception {
assertEquals(
- new Api("test.wikipedia.org", true).getApiUrl().toString(),
- "https://test.wikipedia.org/w/api.php";
+ "https://test.wikipedia.org/w/api.php";,
+ new Api("test.wikipedia.org", true).getApiUrl().toString()
);
assertEquals(
- new Api("test.wikipedia.org", false).getApiUrl().toString(),
- "http://test.wikipedia.org/w/api.php";
+ "http://test.wikipedia.org/w/api.php";,
+ new Api("test.wikipedia.org", false).getApiUrl().toString()
);
}
@Test
public void testFull() throws Exception {
assertEquals(
- new Api("test.wikipedia.org", true,
"/api.php").getApiUrl().toString(),
- "https://test.wikipedia.org/api.php";
+ "https://test.wikipedia.org/api.php";,
+ new Api("test.wikipedia.org", true,
"/api.php").getApiUrl().toString()
);
assertEquals(
- new Api("test.wikipedia.org",
"java-mwapi-UA").getApiUrl().toString(),
- "https://test.wikipedia.org/w/api.php";
+ "https://test.wikipedia.org/w/api.php";,
+ new Api("test.wikipedia.org",
"java-mwapi-UA").getApiUrl().toString()
);
HashMap<String,String> additionalHeaders = new
java.util.HashMap<String,String>();
additionalHeaders.put("X-Java-Mwapi-UnitTest", "java-mwapi-UA");
assertEquals(
- new Api("test.wikipedia.org",
additionalHeaders).getApiUrl().toString(),
- "https://test.wikipedia.org/w/api.php";
+ "https://test.wikipedia.org/w/api.php";,
+ new Api("test.wikipedia.org",
additionalHeaders).getApiUrl().toString()
);
assertEquals(
- new Api("test.wikipedia.org", "java-mwapi-UA",
additionalHeaders).getApiUrl().toString(),
- "https://test.wikipedia.org/w/api.php";
+ "https://test.wikipedia.org/w/api.php";,
+ new Api("test.wikipedia.org", "java-mwapi-UA",
additionalHeaders).getApiUrl().toString()
);
assertEquals(
- new Api("test.wikipedia.org", false,
"/api.php").getApiUrl().toString(),
- "http://test.wikipedia.org/api.php";
+ "http://test.wikipedia.org/api.php";,
+ new Api("test.wikipedia.org", false,
"/api.php").getApiUrl().toString()
);
}
@Test
public void testBasic() throws Exception {
assertEquals(
- new Api("test.wikipedia.org").getApiUrl().toString(),
- "https://test.wikipedia.org/w/api.php";
- );
+ "https://test.wikipedia.org/w/api.php";,
+ new Api("test.wikipedia.org").getApiUrl().toString()
+ );
}
}
diff --git a/src/test/java/org/mediawiki/api/json/ApiTest.java
b/src/test/java/org/mediawiki/api/json/ApiTest.java
index 527f0a5..e25d881 100644
--- a/src/test/java/org/mediawiki/api/json/ApiTest.java
+++ b/src/test/java/org/mediawiki/api/json/ApiTest.java
@@ -28,7 +28,7 @@
.param("lgname", testUsername)
.param("lgpassword", testPassword)
.post().asObject();
- assertEquals(resp.optJSONObject("login").optString("result"),
"NeedToken");
+ assertEquals("NeedToken",
resp.optJSONObject("login").optString("result"));
assertNull(resp.optJSONObject("error"));
}
@@ -38,7 +38,7 @@
JSONObject resp = api.action("login")
.get().asObject();
- assertEquals(resp.optJSONObject("error").optString("code"),
"mustbeposted");
+ assertEquals("mustbeposted",
resp.optJSONObject("error").optString("code"));
}
@Test
@@ -51,7 +51,7 @@
.param("text", inputText)
.param("prop", "wikitext")
.get().asObject();
-
assertEquals(resp.optJSONObject("parse").optJSONObject("wikitext").optString("*"),
inputText);
+ assertEquals(inputText,
resp.optJSONObject("parse").optJSONObject("wikitext").optString("*"));
}
/**
@@ -69,8 +69,10 @@
.param("sectionprop", "toclevel|line|anchor")
.param("noheadings", "true")
.get().asObject();
-
assertEquals(resp.optJSONObject("mobileview").optJSONArray("sections").getJSONObject(0).optString("text"),
- "<p>Testing a page with & in the title</p>");
+ assertEquals(
+ "<p>Testing a page with & in the title</p>",
+
resp.optJSONObject("mobileview").optJSONArray("sections").getJSONObject(0).optString("text")
+ );
}
@Test(expected = IllegalArgumentException.class)
@@ -91,12 +93,12 @@
public void testJSONException() {
Api api = getApi();
try {
- api.action("somethingdoesnmtatter").param("format",
"xml").get().asObject();
+ api.action("somethingdoesntmatter").param("format",
"xml").get().asObject();
} catch (ApiException e) {
assertTrue(e.getCause() instanceof JSONException);
return;
}
- assertTrue("This means no exception was thrown, and hence test fails",
false);
+ fail("This means no exception was thrown, and hence test fails");
}
/**
@@ -110,12 +112,12 @@
public void testNetworkException() {
Api api = new Api("blashblahblahdoesnotexist", "java-mwapi-UA");
try {
- api.action("somethingdoesnmtatter").param("format",
"xml").get().asObject();
+ api.action("somethingdoesntmatter").param("format",
"xml").get().asObject();
} catch (ApiException e) {
assertTrue(e.getCause() instanceof IOException);
return;
}
- assertTrue("This means no exception was thrown, and hence test fails",
false);
+ fail("This means no exception was thrown, and hence test fails");
}
/**
@@ -159,7 +161,7 @@
}
/**
- *
+ *
* @return API with test-friendly construction
*/
public Api getApi() {
diff --git a/src/test/java/org/mediawiki/api/json/RequestBuilderTest.java
b/src/test/java/org/mediawiki/api/json/RequestBuilderTest.java
index 5cc84f2..2828509 100644
--- a/src/test/java/org/mediawiki/api/json/RequestBuilderTest.java
+++ b/src/test/java/org/mediawiki/api/json/RequestBuilderTest.java
@@ -17,7 +17,7 @@
public void testActionIsFirstParam() throws Exception {
RequestBuilder requestBuilder = new RequestBuilder(new
Api("test.wikipedia.org"), "foo");
final Iterator<Map.Entry<String, String>> entryIterator =
requestBuilder.getParams().entrySet().iterator();
- assertEquals(entryIterator.next().getKey(), "action");
- assertEquals(entryIterator.next().getKey(), "format");
+ assertEquals("action", entryIterator.next().getKey());
+ assertEquals("format", entryIterator.next().getKey());
}
}
--
To view, visit https://gerrit.wikimedia.org/r/155074
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d0503fb7a4ac85048b59f0f9b535807a5224074
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/java-mwapi
Gerrit-Branch: master
Gerrit-Owner: BearND <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
