aboutsummaryrefslogtreecommitdiff
path: root/src/test/java/com
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/java/com')
-rw-r--r--src/test/java/com/juick/FormatterTest.java8
-rw-r--r--src/test/java/com/juick/MessageTest.java8
-rw-r--r--src/test/java/com/juick/server/tests/ServerTests.java27
3 files changed, 22 insertions, 21 deletions
diff --git a/src/test/java/com/juick/FormatterTest.java b/src/test/java/com/juick/FormatterTest.java
index da9f5d26..8a6bf83f 100644
--- a/src/test/java/com/juick/FormatterTest.java
+++ b/src/test/java/com/juick/FormatterTest.java
@@ -39,13 +39,13 @@ public class FormatterTest {
public void forAnyDateFormatterShouldReturnNotEmptyString() throws Exception {
Instant ts = Instant.now();
- assertThat(DateFormattersHolder.getMessageFormatterInstance().format(ts), not(isEmptyOrNullString()));
- assertThat(DateFormattersHolder.getRssFormatterInstance().format(ts), not(isEmptyOrNullString()));
+ assertThat(DateFormattersHolder.getMessageFormatterInstance().format(ts), not(emptyOrNullString()));
+ assertThat(DateFormattersHolder.getRssFormatterInstance().format(ts), not(emptyOrNullString()));
ts = Instant.ofEpochMilli(RandomUtils.nextLong(1, Long.MAX_VALUE / 10000));
- assertThat(DateFormattersHolder.getMessageFormatterInstance().format(ts), not(isEmptyOrNullString()));
- assertThat(DateFormattersHolder.getRssFormatterInstance().format(ts), not(isEmptyOrNullString()));
+ assertThat(DateFormattersHolder.getMessageFormatterInstance().format(ts), not(emptyOrNullString()));
+ assertThat(DateFormattersHolder.getRssFormatterInstance().format(ts), not(emptyOrNullString()));
}
@Test
diff --git a/src/test/java/com/juick/MessageTest.java b/src/test/java/com/juick/MessageTest.java
index b4c5f4ab..64d19e13 100644
--- a/src/test/java/com/juick/MessageTest.java
+++ b/src/test/java/com/juick/MessageTest.java
@@ -129,20 +129,20 @@ public class MessageTest {
public void tagsStringShouldBeEmptyIfNoTags() {
Message message = new Message();
- assertThat(MessageUtils.getTagsString(message), isEmptyString());
+ assertThat(MessageUtils.getTagsString(message), is(emptyString()));
message.FriendsOnly = true;
- assertThat(MessageUtils.getTagsString(message), isEmptyString());
+ assertThat(MessageUtils.getTagsString(message), is(emptyString()));
message.Hidden = true;
message.ReadOnly = true;
- assertThat(MessageUtils.getTagsString(message), isEmptyString());
+ assertThat(MessageUtils.getTagsString(message), is(emptyString()));
message.setTags(MessageUtils.parseTags(" "));
- assertThat(MessageUtils.getTagsString(message), isEmptyString());
+ assertThat(MessageUtils.getTagsString(message), is(emptyString()));
}
@Test
diff --git a/src/test/java/com/juick/server/tests/ServerTests.java b/src/test/java/com/juick/server/tests/ServerTests.java
index 644ff096..f89eca81 100644
--- a/src/test/java/com/juick/server/tests/ServerTests.java
+++ b/src/test/java/com/juick/server/tests/ServerTests.java
@@ -504,7 +504,7 @@ public class ServerTests {
get("/api/home")
.with(httpBasic(ugnichName, ugnichPassword)))
.andExpect(status().isOk())
- .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
+ .andExpect(content().contentType(MediaType.APPLICATION_JSON))
.andExpect(jsonPath("$[0].mid", is(msg.getMid())))
.andExpect(jsonPath("$[0].timestamp",
is(DateFormattersHolder.getMessageFormatterInstance().format(msg.getCreated()))))
@@ -574,7 +574,7 @@ public class ServerTests {
.param("uname", "ugnich")
.param("uname", "freefd"))
.andExpect(status().isOk())
- .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
+ .andExpect(content().contentType(MediaType.APPLICATION_JSON))
.andExpect(jsonPath("$", hasSize(2)));
}
@@ -593,7 +593,7 @@ public class ServerTests {
mockMvc.perform(get("/api/messages?"+ "hash=" + userIdHash))
.andDo(print())
.andExpect(status().isOk())
- .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
+ .andExpect(content().contentType(MediaType.APPLICATION_JSON))
.andExpect((jsonPath("$[0].reactions[?(@.id == 3)].count",
is(Collections.singletonList(1)))))
.andExpect((jsonPath("$[0].reactions[?(@.id == 2)].count",
@@ -601,7 +601,7 @@ public class ServerTests {
mockMvc.perform(get("/api/reactions?hash=" + userIdHash))
.andExpect(status().isOk())
- .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
+ .andExpect(content().contentType(MediaType.APPLICATION_JSON))
.andExpect(jsonPath("$.length()", is(7)));
}
@@ -660,7 +660,7 @@ public class ServerTests {
String token = "123456";
ExternalToken registration = new ExternalToken(null, "apns", token, null);
mockMvc.perform(put("/api/notifications").with(httpBasic(ugnichName, ugnichPassword))
- .contentType(MediaType.APPLICATION_JSON_UTF8)
+ .contentType(MediaType.APPLICATION_JSON)
.content(jsonMapper.writeValueAsBytes(Collections.singletonList(registration))))
.andExpect(status().isOk());
MvcResult result = mockMvc.perform(get("/api/notifications")
@@ -685,10 +685,10 @@ public class ServerTests {
public void notificationsTokensTest() throws Exception {
List<ExternalToken> tokens = Collections.singletonList(new ExternalToken(null, "gcm", "123456", null));
mockMvc.perform(delete("/api/notifications").with(httpBasic(ugnichName, ugnichPassword))
- .contentType(MediaType.APPLICATION_JSON_UTF8)
+ .contentType(MediaType.APPLICATION_JSON)
.content(jsonMapper.writeValueAsBytes(tokens))).andExpect(status().isForbidden());
mockMvc.perform(delete("/api/notifications").with(httpBasic(juickName, juickPassword))
- .contentType(MediaType.APPLICATION_JSON_UTF8)
+ .contentType(MediaType.APPLICATION_JSON)
.content(jsonMapper.writeValueAsBytes(tokens))).andExpect(status().isOk());
}
@Test
@@ -1134,8 +1134,9 @@ public class ServerTests {
MvcResult apiResult = mockMvc.perform(get("/api/thread?mid=" + msg.getMid()))
.andExpect(status().isOk())
.andReturn();
- List<Message> fromApi = jsonMapper.readValue(apiResult.getResponse().getContentAsString(),
- new TypeReference<List<Message>>() {});
+ List<Message> fromApi = jsonMapper.readValue(apiResult.getResponse().getContentAsString(StandardCharsets.UTF_8),
+ new TypeReference<>() {
+ });
assertThat(fromApi.get(0).getTags(), is(tags));
}
@Test
@@ -1671,7 +1672,7 @@ public class ServerTests {
public void appAssociationsTest() throws Exception {
mockMvc.perform((get("/.well-known/apple-app-site-association")))
.andExpect(status().isOk())
- .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
+ .andExpect(content().contentType(MediaType.APPLICATION_JSON))
.andExpect(jsonPath("$.webcredentials.apps[0]", is(appId)));
}
@Test
@@ -1705,7 +1706,7 @@ public class ServerTests {
@Test
public void swaggerOutput() throws Exception {
MvcResult result = mockMvc.perform(get("/v2/api-docs")
- .accept(MediaType.APPLICATION_JSON_UTF8))
+ .accept(MediaType.APPLICATION_JSON))
.andExpect(status().isOk())
.andReturn();
String outputDir = System.getProperty("io.springfox.staticdocs.outputDir");
@@ -1834,9 +1835,9 @@ public class ServerTests {
URI testuserkeyUri = URI.create("https://example.com/u/testuser#main-key");
MockRestServiceServer restServiceServer = MockRestServiceServer.createServer(apClient);
restServiceServer.expect(times(3), requestTo(testuserUri))
- .andRespond(withSuccess(testuserResponseString, MediaType.APPLICATION_JSON_UTF8));
+ .andRespond(withSuccess(testuserResponseString, MediaType.APPLICATION_JSON));
restServiceServer.expect(times(3), requestTo(testuserkeyUri))
- .andRespond(withSuccess(testuserResponseString, MediaType.APPLICATION_JSON_UTF8));
+ .andRespond(withSuccess(testuserResponseString, MediaType.APPLICATION_JSON));
Person testuser = (Person)signatureManager.getContext(testuserUri).get();
Assert.assertThat(testuser.getPublicKey().getPublicKeyPem(), is(testKeystoreManager.getPublicKeyPem()));
Instant now2 = Instant.now();
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-30 14:56:09 +0000