summaryrefslogtreecommitdiffstats
path: root/vespajlib/src/test/java
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2021-12-09 11:12:22 +0100
committerJon Bratseth <bratseth@gmail.com>2021-12-09 11:12:22 +0100
commitab7844c88fa058bc1db12837cbcaff3ecf4448ca (patch)
treeecf599581e09be83d99e3874aeba7a428225665c /vespajlib/src/test/java
parent608ea1f94f5e5b5dbbbafc388b6a24cfc26de586 (diff)
No functional changes
Diffstat (limited to 'vespajlib/src/test/java')
-rw-r--r--vespajlib/src/test/java/com/yahoo/slime/SlimeUtilsTest.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/vespajlib/src/test/java/com/yahoo/slime/SlimeUtilsTest.java b/vespajlib/src/test/java/com/yahoo/slime/SlimeUtilsTest.java
index 67311d75029..28930b67264 100644
--- a/vespajlib/src/test/java/com/yahoo/slime/SlimeUtilsTest.java
+++ b/vespajlib/src/test/java/com/yahoo/slime/SlimeUtilsTest.java
@@ -8,9 +8,7 @@ import java.io.IOException;
import java.util.List;
import java.util.stream.Collectors;
-import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -37,7 +35,8 @@ public class SlimeUtilsTest {
SlimeUtils.copyObject(slime2.get(), subobj);
- assertThat(root.toString(), is("{\"foo\":\"foobie\",\"bar\":{\"a\":\"a\",\"b\":2,\"c\":true,\"d\":3.14,\"e\":\"0x64\",\"f\":null}}"));
+ assertEquals("{\"foo\":\"foobie\",\"bar\":{\"a\":\"a\",\"b\":2,\"c\":true,\"d\":3.14,\"e\":\"0x64\",\"f\":null}}",
+ root.toString());
}
@Test
@@ -61,7 +60,8 @@ public class SlimeUtilsTest {
SlimeUtils.copyObject(slime2.get(), subobj);
- assertThat(root.toString(), is("{\"foo\":\"foobie\",\"bar\":{\"a\":[\"foo\",4,true,3.14,null,\"0x64\",{\"inner\":\"binner\"}]}}"));
+ assertEquals("{\"foo\":\"foobie\",\"bar\":{\"a\":[\"foo\",4,true,3.14,null,\"0x64\",{\"inner\":\"binner\"}]}}",
+ root.toString());
}
@Test
@@ -71,21 +71,21 @@ public class SlimeUtilsTest {
root.setString("foo", "foobie");
root.setObject("bar");
String json = Utf8.toString(SlimeUtils.toJsonBytes(slime));
- assertThat(json, is("{\"foo\":\"foobie\",\"bar\":{}}"));
+ assertEquals("{\"foo\":\"foobie\",\"bar\":{}}", json);
}
@Test
public void test_json_to_slime() {
byte[] json = Utf8.toBytes("{\"foo\":\"foobie\",\"bar\":{}}");
Slime slime = SlimeUtils.jsonToSlime(json);
- assertThat(slime.get().field("foo").asString(), is("foobie"));
+ assertEquals("foobie", slime.get().field("foo").asString());
assertTrue(slime.get().field("bar").valid());
}
@Test
public void test_json_to_slime_or_throw() {
Slime slime = SlimeUtils.jsonToSlimeOrThrow("{\"foo\":\"foobie\",\"bar\":{}}");
- assertThat(slime.get().field("foo").asString(), is("foobie"));
+ assertEquals("foobie", slime.get().field("foo").asString());
assertTrue(slime.get().field("bar").valid());
}
@@ -107,7 +107,7 @@ public class SlimeUtilsTest {
assertEquals(0, SlimeUtils.entriesStream(inspector.field("object")).count());
assertEquals(List.of(1L, 2L, 4L, 3L, 0L),
- SlimeUtils.entriesStream(inspector.field("list")).map(Inspector::asLong).collect(Collectors.toList()));
+ SlimeUtils.entriesStream(inspector.field("list")).map(Inspector::asLong).collect(Collectors.toList()));
}
}