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

Commit 4bca6dd

Browse files
MrCustomizerMax Dor
MrCustomizer
authored and
Max Dor
committed
Rename test names and methods (#15)
1 parent eacd67a commit 4bca6dd

11 files changed

+100
-88
lines changed

‎src/test/java/io/kamax/matrix/AMatrixHttpUserTest.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,20 @@ public void getName() throws URISyntaxException {
4646
}
4747

4848
@Test
49-
public void getName404() throws URISyntaxException {
49+
public void getNameNotFound() throws URISyntaxException {
5050
assertThat(createUserObject().getName(), is(equalTo(Optional.empty())));
5151
}
5252

5353
@Test
54-
public void getNameError403() throws URISyntaxException {
54+
public void getNameAccessDenied() throws URISyntaxException {
5555
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class, createUserObject()::getName);
56-
checkErrorInfo403(e);
56+
checkErrorInfoAccessDenied(e);
5757
}
5858

5959
@Test
60-
public void getNameError429() throws URISyntaxException {
60+
public void getNameRateLimited() throws URISyntaxException {
6161
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class, createUserObject()::getName);
62-
checkErrorInfo429(e);
62+
checkErrorInfoRateLimited(e);
6363
}
6464

6565
@Test
@@ -70,22 +70,22 @@ public void getAvatar() throws URISyntaxException {
7070
}
7171

7272
@Test
73-
public void getAvatar404() throws URISyntaxException {
73+
public void getAvatarNotFound() throws URISyntaxException {
7474
assertThat(createUserObject().getAvatar(), is(equalTo(Optional.empty())));
7575
}
7676

7777
@Test
78-
public void getAvatarError403() throws URISyntaxException {
78+
public void getAvatarAccessDenied() throws URISyntaxException {
7979
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class,
8080
createUserObject()::getAvatar);
81-
checkErrorInfo403(e);
81+
checkErrorInfoAccessDenied(e);
8282
}
8383

8484
@Test
85-
public void getAvatarError429() throws URISyntaxException {
85+
public void getAvatarRateLimited() throws URISyntaxException {
8686
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class,
8787
createUserObject()::getAvatar);
88-
checkErrorInfo429(e);
88+
checkErrorInfoRateLimited(e);
8989
}
9090

9191
private MatrixHttpUser createUserObject() throws URISyntaxException {

‎src/test/java/io/kamax/matrix/MatrixHttpUserWiremockTest.java

+18-18
Original file line numberDiff line numberDiff line change
@@ -48,21 +48,21 @@ public void getName() throws URISyntaxException {
4848
}
4949

5050
@Test
51-
public void getName404() throws URISyntaxException {
52-
stubFor(get(urlEqualTo(nameUrl)).willReturn(aResponse().withStatus(404).withBody(error404Response)));
53-
super.getName404();
51+
public void getNameNotFound() throws URISyntaxException {
52+
stubFor(get(urlEqualTo(nameUrl)).willReturn(aResponse().withStatus(404).withBody(errorNotFoundResponse)));
53+
super.getNameNotFound();
5454
}
5555

5656
@Test
57-
public void getNameError403() throws URISyntaxException {
58-
stubFor(get(urlEqualTo(nameUrl)).willReturn(aResponse().withStatus(403).withBody(error403Response)));
59-
super.getNameError403();
57+
public void getNameAccessDenied() throws URISyntaxException {
58+
stubFor(get(urlEqualTo(nameUrl)).willReturn(aResponse().withStatus(403).withBody(errorAccessDeniedResponse)));
59+
super.getNameAccessDenied();
6060
}
6161

6262
@Test
63-
public void getNameError429() throws URISyntaxException {
64-
stubFor(get(urlEqualTo(nameUrl)).willReturn(aResponse().withStatus(429).withBody(error429Response)));
65-
super.getNameError429();
63+
public void getNameRateLimited() throws URISyntaxException {
64+
stubFor(get(urlEqualTo(nameUrl)).willReturn(aResponse().withStatus(429).withBody(errorRateLimitedResponse)));
65+
super.getNameRateLimited();
6666
}
6767

6868
@Test
@@ -72,21 +72,21 @@ public void getAvatar() throws URISyntaxException {
7272
}
7373

7474
@Test
75-
public void getAvatar404() throws URISyntaxException {
76-
stubFor(get(urlEqualTo(avatarUrl)).willReturn(aResponse().withStatus(404).withBody(error404Response)));
77-
super.getAvatar404();
75+
public void getAvatarNotFound() throws URISyntaxException {
76+
stubFor(get(urlEqualTo(avatarUrl)).willReturn(aResponse().withStatus(404).withBody(errorNotFoundResponse)));
77+
super.getAvatarNotFound();
7878
}
7979

8080
@Test
81-
public void getAvatarError403() throws URISyntaxException {
82-
stubFor(get(urlEqualTo(avatarUrl)).willReturn(aResponse().withStatus(403).withBody(error403Response)));
83-
super.getAvatarError403();
81+
public void getAvatarAccessDenied() throws URISyntaxException {
82+
stubFor(get(urlEqualTo(avatarUrl)).willReturn(aResponse().withStatus(403).withBody(errorAccessDeniedResponse)));
83+
super.getAvatarAccessDenied();
8484
}
8585

8686
@Test
87-
public void getAvatarError429() throws URISyntaxException {
88-
stubFor(get(urlEqualTo(avatarUrl)).willReturn(aResponse().withStatus(429).withBody(error429Response)));
89-
super.getAvatarError429();
87+
public void getAvatarRateLimited() throws URISyntaxException {
88+
stubFor(get(urlEqualTo(avatarUrl)).willReturn(aResponse().withStatus(429).withBody(errorRateLimitedResponse)));
89+
super.getAvatarRateLimited();
9090
}
9191

9292
}

‎src/test/java/io/kamax/matrix/client/AMatrixHttpRoomTest.java

+14-14
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ public void getEmptyName() throws URISyntaxException {
5757
@Test
5858
public void getNameAccessDenied() throws URISyntaxException {
5959
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class, createRoomObject()::getName);
60-
checkErrorInfo403(e);
60+
checkErrorInfoAccessDenied(e);
6161
}
6262

6363
@Test
6464
public void getNameRateLimited() throws URISyntaxException {
6565
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class, createRoomObject()::getName);
66-
checkErrorInfo429(e);
66+
checkErrorInfoRateLimited(e);
6767
}
6868

6969
@Test
@@ -79,13 +79,13 @@ public void getEmptyTopic() throws URISyntaxException {
7979
@Test
8080
public void getTopicAccessDenied() throws URISyntaxException {
8181
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class, createRoomObject()::getTopic);
82-
checkErrorInfo403(e);
82+
checkErrorInfoAccessDenied(e);
8383
}
8484

8585
@Test
8686
public void getTopicRateLimited() throws URISyntaxException {
8787
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class, createRoomObject()::getTopic);
88-
checkErrorInfo429(e);
88+
checkErrorInfoRateLimited(e);
8989
}
9090

9191
@Test
@@ -96,19 +96,19 @@ public void join() throws URISyntaxException {
9696
@Test
9797
public void joinRoomNotFound() throws URISyntaxException {
9898
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class, createRoomObject()::join);
99-
checkErrorInfo404(e);
99+
checkErrorInfoNotFound(e);
100100
}
101101

102102
@Test
103103
public void joinAccessDenied() throws URISyntaxException {
104104
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class, createRoomObject()::join);
105-
checkErrorInfo403(e);
105+
checkErrorInfoAccessDenied(e);
106106
}
107107

108108
@Test
109109
public void joinRateLimited() throws URISyntaxException {
110110
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class, createRoomObject()::join);
111-
checkErrorInfo429(e);
111+
checkErrorInfoRateLimited(e);
112112
}
113113

114114
@Test
@@ -119,7 +119,7 @@ public void leave() throws URISyntaxException {
119119
@Test
120120
public void leaveAccessDenied() throws URISyntaxException {
121121
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class, createRoomObject()::leave);
122-
checkErrorInfo403(e);
122+
checkErrorInfoAccessDenied(e);
123123
}
124124

125125
@Test
@@ -130,7 +130,7 @@ public void leaveRoomNotFound() throws URISyntaxException {
130130
@Test
131131
public void leaveRateLimited() throws URISyntaxException {
132132
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class, createRoomObject()::leave);
133-
checkErrorInfo429(e);
133+
checkErrorInfoRateLimited(e);
134134
}
135135

136136
@Test
@@ -142,21 +142,21 @@ public void sendText() throws URISyntaxException {
142142
public void sendTextAccessDenied() throws URISyntaxException {
143143
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class,
144144
() -> createRoomObject().sendText(testText));
145-
checkErrorInfo403(e);
145+
checkErrorInfoAccessDenied(e);
146146
}
147147

148148
@Test
149149
public void sendTextRoomNotFound() throws URISyntaxException {
150150
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class,
151151
() -> createRoomObject().sendText(testText));
152-
checkErrorInfo404(e);
152+
checkErrorInfoNotFound(e);
153153
}
154154

155155
@Test
156156
public void sendTextRateLimited() throws URISyntaxException {
157157
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class,
158158
() -> createRoomObject().sendText(testText));
159-
checkErrorInfo429(e);
159+
checkErrorInfoRateLimited(e);
160160
}
161161

162162
@Test
@@ -172,14 +172,14 @@ public void getJoinedUsers() throws URISyntaxException {
172172
public void getJoinedUsersRoomNotFound() throws URISyntaxException {
173173
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class,
174174
createRoomObject()::getJoinedUsers);
175-
checkErrorInfo404(e);
175+
checkErrorInfoNotFound(e);
176176
}
177177

178178
@Test
179179
public void getJoinedUsersRateLimited() throws URISyntaxException {
180180
MatrixClientRequestException e = assertThrows(MatrixClientRequestException.class,
181181
createRoomObject()::getJoinedUsers);
182-
checkErrorInfo429(e);
182+
checkErrorInfoRateLimited(e);
183183
}
184184

185185
private MatrixHttpRoom createRoomObject() throws URISyntaxException {

‎src/test/java/io/kamax/matrix/client/MatrixHttpContentWiremockTest.java

+12-8
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,14 @@ public void isValidMissingContentType() throws URISyntaxException {
5656

5757
@Test
5858
public void isValidContentNotFound() throws URISyntaxException {
59-
stubFor(get(urlEqualTo(downloadUrl)).willReturn(aResponse().withStatus(404).withBody(error404Response)));
59+
stubFor(get(urlEqualTo(downloadUrl)).willReturn(aResponse().withStatus(404).withBody(errorNotFoundResponse)));
6060
super.isValidContentNotFound();
6161
}
6262

6363
@Test
6464
public void isValidErrorAccessDenied() throws URISyntaxException {
65-
stubFor(get(urlEqualTo(downloadUrl)).willReturn(aResponse().withStatus(403).withBody(error403Response)));
65+
stubFor(get(urlEqualTo(downloadUrl))
66+
.willReturn(aResponse().withStatus(403).withBody(errorAccessDeniedResponse)));
6667
super.isValidErrorAccessDenied();
6768
}
6869

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

8283
@Test
8384
public void getTypeErrorContentNotFound() throws URISyntaxException, IOException {
84-
stubFor(get(urlEqualTo(downloadUrl)).willReturn(aResponse().withStatus(404).withBody(error404Response)));
85+
stubFor(get(urlEqualTo(downloadUrl)).willReturn(aResponse().withStatus(404).withBody(errorNotFoundResponse)));
8586
super.getTypeErrorContentNotFound();
8687
}
8788

8889
@Test
8990
public void getTypeErrorAccessDenied() throws URISyntaxException, IOException {
90-
stubFor(get(urlEqualTo(downloadUrl)).willReturn(aResponse().withStatus(403).withBody(error403Response)));
91+
stubFor(get(urlEqualTo(downloadUrl))
92+
.willReturn(aResponse().withStatus(403).withBody(errorAccessDeniedResponse)));
9193
super.getTypeErrorAccessDenied();
9294
}
9395

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

107109
@Test
108110
public void getDataErrorContentNotFound() throws URISyntaxException, IOException {
109-
stubFor(get(urlEqualTo(downloadUrl)).willReturn(aResponse().withStatus(404).withBody(error404Response)));
111+
stubFor(get(urlEqualTo(downloadUrl)).willReturn(aResponse().withStatus(404).withBody(errorNotFoundResponse)));
110112
super.getDataErrorContentNotFound();
111113
}
112114

113115
@Test
114116
public void getDataErrorAccessDenied() throws URISyntaxException, IOException {
115-
stubFor(get(urlEqualTo(downloadUrl)).willReturn(aResponse().withStatus(403).withBody(error403Response)));
117+
stubFor(get(urlEqualTo(downloadUrl))
118+
.willReturn(aResponse().withStatus(403).withBody(errorAccessDeniedResponse)));
116119
super.getDataErrorAccessDenied();
117120
}
118121

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

159162
@Test
160163
public void getFilenameErrorContentNotFound() throws URISyntaxException, IOException {
161-
stubFor(get(urlEqualTo(downloadUrl)).willReturn(aResponse().withStatus(404).withBody(error404Response)));
164+
stubFor(get(urlEqualTo(downloadUrl)).willReturn(aResponse().withStatus(404).withBody(errorNotFoundResponse)));
162165
super.getFilenameErrorContentNotFound();
163166
}
164167

165168
@Test
166169
public void getFilenameErrorAccessDenied() throws URISyntaxException, IOException {
167-
stubFor(get(urlEqualTo(downloadUrl)).willReturn(aResponse().withStatus(403).withBody(error403Response)));
170+
stubFor(get(urlEqualTo(downloadUrl))
171+
.willReturn(aResponse().withStatus(403).withBody(errorAccessDeniedResponse)));
168172
super.getFilenameErrorAccessDenied();
169173
}
170174

0 commit comments

Comments
 (0)