diff options
Diffstat (limited to 'jdisc_http_service/src/test/java/com/yahoo/container')
2 files changed, 36 insertions, 32 deletions
diff --git a/jdisc_http_service/src/test/java/com/yahoo/container/logging/ConnectionLogEntryTest.java b/jdisc_http_service/src/test/java/com/yahoo/container/logging/ConnectionLogEntryTest.java deleted file mode 100644 index fbf9bd1dc23..00000000000 --- a/jdisc_http_service/src/test/java/com/yahoo/container/logging/ConnectionLogEntryTest.java +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -package com.yahoo.container.logging; - -import org.junit.Assert; -import org.junit.Test; - -import java.io.IOException; -import java.time.Instant; -import java.util.UUID; - -/** - * @author mortent - */ -public class ConnectionLogEntryTest { - - @Test - public void test_serialization () throws IOException { - var id = UUID.randomUUID(); - var instant = Instant.parse("2021-01-13T12:12:12Z"); - ConnectionLogEntry entry = ConnectionLogEntry.builder(id, instant) - .withPeerPort(1234) - .build(); - - String expected = "{" + - "\"id\":\""+id.toString()+"\"," + - "\"timestamp\":\"2021-01-13T12:12:12Z\"," + - "\"peerPort\":1234" + - "}"; - Assert.assertEquals(expected, entry.toJson()); - } -} diff --git a/jdisc_http_service/src/test/java/com/yahoo/container/logging/JsonConnectionLogWriterTest.java b/jdisc_http_service/src/test/java/com/yahoo/container/logging/JsonConnectionLogWriterTest.java new file mode 100644 index 00000000000..b8978fe489c --- /dev/null +++ b/jdisc_http_service/src/test/java/com/yahoo/container/logging/JsonConnectionLogWriterTest.java @@ -0,0 +1,36 @@ +package com.yahoo.container.logging;// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + +import com.yahoo.test.json.JsonTestHelper; +import org.junit.jupiter.api.Test; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.time.Instant; +import java.util.UUID; + +/** + * @author bjorncs + */ +class JsonConnectionLogWriterTest { + + @Test + void test_serialization() throws IOException { + var id = UUID.randomUUID(); + var instant = Instant.parse("2021-01-13T12:12:12Z"); + ConnectionLogEntry entry = ConnectionLogEntry.builder(id, instant) + .withPeerPort(1234) + .build(); + String expectedJson = "{" + + "\"id\":\""+id.toString()+"\"," + + "\"timestamp\":\"2021-01-13T12:12:12Z\"," + + "\"peerPort\":1234" + + "}"; + + JsonConnectionLogWriter writer = new JsonConnectionLogWriter(); + ByteArrayOutputStream out = new ByteArrayOutputStream(); + writer.write(entry, out); + String actualJson = out.toString(StandardCharsets.UTF_8); + JsonTestHelper.assertJsonEquals(actualJson, expectedJson); + } +}
\ No newline at end of file |