Skip to content
This repository was archived by the owner on Jun 21, 2019. It is now read-only.

Rename test names and methods #15

Merged
merged 2 commits into from
Dec 5, 2017
Merged

Rename test names and methods #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6263509
Rename test names and methods
Nov 28, 2017
440fb2b
Fix test names
Dec 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/test/java/io/kamax/matrix/AMatrixHttpUserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,20 @@ public void getName() throws URISyntaxException {
}

@Test
public void getName404() throws URISyntaxException {
public void getNameNotFound() throws URISyntaxException {
assertThat(createUserObject().getName(), is(equalTo(Optional.empty())));
}

@Test
public void getNameError403() throws URISyntaxException {
public void getNameAccessDenied() throws URISyntaxException {
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class, createUserObject()::getName);
checkErrorInfo403(e);
checkErrorInfoAccessDenied(e);
}

@Test
public void getNameError429() throws URISyntaxException {
public void getNameRateLimited() throws URISyntaxException {
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class, createUserObject()::getName);
checkErrorInfo429(e);
checkErrorInfoRateLimited(e);
}

@Test
Expand All @@ -70,22 +70,22 @@ public void getAvatar() throws URISyntaxException {
}

@Test
public void getAvatar404() throws URISyntaxException {
public void getAvatarNotFound() throws URISyntaxException {
assertThat(createUserObject().getAvatar(), is(equalTo(Optional.empty())));
}

@Test
public void getAvatarError403() throws URISyntaxException {
public void getAvatarAccessDenied() throws URISyntaxException {
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class,
createUserObject()::getAvatar);
checkErrorInfo403(e);
checkErrorInfoAccessDenied(e);
}

@Test
public void getAvatarError429() throws URISyntaxException {
public void getAvatarRateLimited() throws URISyntaxException {
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class,
createUserObject()::getAvatar);
checkErrorInfo429(e);
checkErrorInfoRateLimited(e);
}

private MatrixHttpUser createUserObject() throws URISyntaxException {
Expand Down
36 changes: 18 additions & 18 deletions src/test/java/io/kamax/matrix/MatrixHttpUserWiremockTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,21 @@ public void getName() throws URISyntaxException {
}

@Test
public void getName404() throws URISyntaxException {
stubFor(get(urlEqualTo(nameUrl)).willReturn(aResponse().withStatus(404).withBody(error404Response)));
super.getName404();
public void getNameNotFound() throws URISyntaxException {
stubFor(get(urlEqualTo(nameUrl)).willReturn(aResponse().withStatus(404).withBody(errorNotFoundResponse)));
super.getNameNotFound();
}

@Test
public void getNameError403() throws URISyntaxException {
stubFor(get(urlEqualTo(nameUrl)).willReturn(aResponse().withStatus(403).withBody(error403Response)));
super.getNameError403();
public void getNameAccessDenied() throws URISyntaxException {
stubFor(get(urlEqualTo(nameUrl)).willReturn(aResponse().withStatus(403).withBody(errorAccessDeniedResponse)));
super.getNameAccessDenied();
}

@Test
public void getNameError429() throws URISyntaxException {
stubFor(get(urlEqualTo(nameUrl)).willReturn(aResponse().withStatus(429).withBody(error429Response)));
super.getNameError429();
public void getNameRateLimited() throws URISyntaxException {
stubFor(get(urlEqualTo(nameUrl)).willReturn(aResponse().withStatus(429).withBody(errorRateLimitedResponse)));
super.getNameRateLimited();
}

@Test
Expand All @@ -72,21 +72,21 @@ public void getAvatar() throws URISyntaxException {
}

@Test
public void getAvatar404() throws URISyntaxException {
stubFor(get(urlEqualTo(avatarUrl)).willReturn(aResponse().withStatus(404).withBody(error404Response)));
super.getAvatar404();
public void getAvatarNotFound() throws URISyntaxException {
stubFor(get(urlEqualTo(avatarUrl)).willReturn(aResponse().withStatus(404).withBody(errorNotFoundResponse)));
super.getAvatarNotFound();
}

@Test
public void getAvatarError403() throws URISyntaxException {
stubFor(get(urlEqualTo(avatarUrl)).willReturn(aResponse().withStatus(403).withBody(error403Response)));
super.getAvatarError403();
public void getAvatarAccessDenied() throws URISyntaxException {
stubFor(get(urlEqualTo(avatarUrl)).willReturn(aResponse().withStatus(403).withBody(errorAccessDeniedResponse)));
super.getAvatarAccessDenied();
}

@Test
public void getAvatarError429() throws URISyntaxException {
stubFor(get(urlEqualTo(avatarUrl)).willReturn(aResponse().withStatus(429).withBody(error429Response)));
super.getAvatarError429();
public void getAvatarRateLimited() throws URISyntaxException {
stubFor(get(urlEqualTo(avatarUrl)).willReturn(aResponse().withStatus(429).withBody(errorRateLimitedResponse)));
super.getAvatarRateLimited();
}

}
28 changes: 14 additions & 14 deletions src/test/java/io/kamax/matrix/client/AMatrixHttpRoomTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ public void getEmptyName() throws URISyntaxException {
@Test
public void getNameAccessDenied() throws URISyntaxException {
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class, createRoomObject()::getName);
checkErrorInfo403(e);
checkErrorInfoAccessDenied(e);
}

@Test
public void getNameRateLimited() throws URISyntaxException {
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class, createRoomObject()::getName);
checkErrorInfo429(e);
checkErrorInfoRateLimited(e);
}

@Test
Expand All @@ -79,13 +79,13 @@ public void getEmptyTopic() throws URISyntaxException {
@Test
public void getTopicAccessDenied() throws URISyntaxException {
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class, createRoomObject()::getTopic);
checkErrorInfo403(e);
checkErrorInfoAccessDenied(e);
}

@Test
public void getTopicRateLimited() throws URISyntaxException {
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class, createRoomObject()::getTopic);
checkErrorInfo429(e);
checkErrorInfoRateLimited(e);
}

@Test
Expand All @@ -96,19 +96,19 @@ public void join() throws URISyntaxException {
@Test
public void joinRoomNotFound() throws URISyntaxException {
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class, createRoomObject()::join);
checkErrorInfo404(e);
checkErrorInfoNotFound(e);
}

@Test
public void joinAccessDenied() throws URISyntaxException {
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class, createRoomObject()::join);
checkErrorInfo403(e);
checkErrorInfoAccessDenied(e);
}

@Test
public void joinRateLimited() throws URISyntaxException {
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class, createRoomObject()::join);
checkErrorInfo429(e);
checkErrorInfoRateLimited(e);
}

@Test
Expand All @@ -119,7 +119,7 @@ public void leave() throws URISyntaxException {
@Test
public void leaveAccessDenied() throws URISyntaxException {
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class, createRoomObject()::leave);
checkErrorInfo403(e);
checkErrorInfoAccessDenied(e);
}

@Test
Expand All @@ -130,7 +130,7 @@ public void leaveRoomNotFound() throws URISyntaxException {
@Test
public void leaveRateLimited() throws URISyntaxException {
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class, createRoomObject()::leave);
checkErrorInfo429(e);
checkErrorInfoRateLimited(e);
}

@Test
Expand All @@ -142,21 +142,21 @@ public void sendText() throws URISyntaxException {
public void sendTextAccessDenied() throws URISyntaxException {
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class,
() -> createRoomObject().sendText(testText));
checkErrorInfo403(e);
checkErrorInfoAccessDenied(e);
}

@Test
public void sendTextRoomNotFound() throws URISyntaxException {
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class,
() -> createRoomObject().sendText(testText));
checkErrorInfo404(e);
checkErrorInfoNotFound(e);
}

@Test
public void sendTextRateLimited() throws URISyntaxException {
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class,
() -> createRoomObject().sendText(testText));
checkErrorInfo429(e);
checkErrorInfoRateLimited(e);
}

@Test
Expand All @@ -172,14 +172,14 @@ public void getJoinedUsers() throws URISyntaxException {
public void getJoinedUsersRoomNotFound() throws URISyntaxException {
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class,
createRoomObject()::getJoinedUsers);
checkErrorInfo404(e);
checkErrorInfoNotFound(e);
}

@Test
public void getJoinedUsersRateLimited() throws URISyntaxException {
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class,
createRoomObject()::getJoinedUsers);
checkErrorInfo429(e);
checkErrorInfoRateLimited(e);
}

private MatrixHttpRoom createRoomObject() throws URISyntaxException {
Expand Down
20 changes: 12 additions & 8 deletions src/test/java/io/kamax/matrix/client/MatrixHttpContentWiremockTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,14 @@ public void isValidMissingContentType() throws URISyntaxException {

@Test
public void isValidContentNotFound() throws URISyntaxException {
stubFor(get(urlEqualTo(downloadUrl)).willReturn(aResponse().withStatus(404).withBody(error404Response)));
stubFor(get(urlEqualTo(downloadUrl)).willReturn(aResponse().withStatus(404).withBody(errorNotFoundResponse)));
super.isValidContentNotFound();
}

@Test
public void isValidErrorAccessDenied() throws URISyntaxException {
stubFor(get(urlEqualTo(downloadUrl)).willReturn(aResponse().withStatus(403).withBody(error403Response)));
stubFor(get(urlEqualTo(downloadUrl))
.willReturn(aResponse().withStatus(403).withBody(errorAccessDeniedResponse)));
super.isValidErrorAccessDenied();
}

Expand All @@ -81,13 +82,14 @@ public void getTypeMissingContentType() throws URISyntaxException {

@Test
public void getTypeErrorContentNotFound() throws URISyntaxException, IOException {
stubFor(get(urlEqualTo(downloadUrl)).willReturn(aResponse().withStatus(404).withBody(error404Response)));
stubFor(get(urlEqualTo(downloadUrl)).willReturn(aResponse().withStatus(404).withBody(errorNotFoundResponse)));
super.getTypeErrorContentNotFound();
}

@Test
public void getTypeErrorAccessDenied() throws URISyntaxException, IOException {
stubFor(get(urlEqualTo(downloadUrl)).willReturn(aResponse().withStatus(403).withBody(error403Response)));
stubFor(get(urlEqualTo(downloadUrl))
.willReturn(aResponse().withStatus(403).withBody(errorAccessDeniedResponse)));
super.getTypeErrorAccessDenied();
}

Expand All @@ -106,13 +108,14 @@ public void getDataMissingContentType() throws URISyntaxException, IOException {

@Test
public void getDataErrorContentNotFound() throws URISyntaxException, IOException {
stubFor(get(urlEqualTo(downloadUrl)).willReturn(aResponse().withStatus(404).withBody(error404Response)));
stubFor(get(urlEqualTo(downloadUrl)).willReturn(aResponse().withStatus(404).withBody(errorNotFoundResponse)));
super.getDataErrorContentNotFound();
}

@Test
public void getDataErrorAccessDenied() throws URISyntaxException, IOException {
stubFor(get(urlEqualTo(downloadUrl)).willReturn(aResponse().withStatus(403).withBody(error403Response)));
stubFor(get(urlEqualTo(downloadUrl))
.willReturn(aResponse().withStatus(403).withBody(errorAccessDeniedResponse)));
super.getDataErrorAccessDenied();
}

Expand Down Expand Up @@ -158,13 +161,14 @@ public void getFilenameMissingContentType() throws URISyntaxException {

@Test
public void getFilenameErrorContentNotFound() throws URISyntaxException, IOException {
stubFor(get(urlEqualTo(downloadUrl)).willReturn(aResponse().withStatus(404).withBody(error404Response)));
stubFor(get(urlEqualTo(downloadUrl)).willReturn(aResponse().withStatus(404).withBody(errorNotFoundResponse)));
super.getFilenameErrorContentNotFound();
}

@Test
public void getFilenameErrorAccessDenied() throws URISyntaxException, IOException {
stubFor(get(urlEqualTo(downloadUrl)).willReturn(aResponse().withStatus(403).withBody(error403Response)));
stubFor(get(urlEqualTo(downloadUrl))
.willReturn(aResponse().withStatus(403).withBody(errorAccessDeniedResponse)));
super.getFilenameErrorAccessDenied();
}

Expand Down
Loading