summaryrefslogtreecommitdiffstats
path: root/logserver
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@broadpark.no>2019-03-29 16:05:49 +0100
committerGitHub <noreply@github.com>2019-03-29 16:05:49 +0100
commit02eee71b18fbdb223c4a5d7215aa0facf059ce1f (patch)
treef54f3a84ca198ce00718b4cf85b6c3e40ea0b31a /logserver
parent7ef26aab4837ec6ab76370a17b7fa236591cbc5d (diff)
parente67fe860e5cfe6b76c8df84c06d7a25483abfd93 (diff)
Merge pull request #8965 from vespa-engine/bjorncs/vespalog-timestamp-parsing
Bjorncs/vespalog timestamp parsing
Diffstat (limited to 'logserver')
-rw-r--r--logserver/src/test/files/event.txt.gzbin11272 -> 0 bytes
-rw-r--r--logserver/src/test/java/com/yahoo/logserver/test/LogMessageTestCase.java64
2 files changed, 0 insertions, 64 deletions
diff --git a/logserver/src/test/files/event.txt.gz b/logserver/src/test/files/event.txt.gz
deleted file mode 100644
index 9422ca5fc90..00000000000
--- a/logserver/src/test/files/event.txt.gz
+++ /dev/null
Binary files differ
diff --git a/logserver/src/test/java/com/yahoo/logserver/test/LogMessageTestCase.java b/logserver/src/test/java/com/yahoo/logserver/test/LogMessageTestCase.java
deleted file mode 100644
index c2cf7518eb9..00000000000
--- a/logserver/src/test/java/com/yahoo/logserver/test/LogMessageTestCase.java
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.logserver.test;
-
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.zip.GZIPInputStream;
-
-import com.yahoo.log.event.Event;
-import com.yahoo.log.event.MalformedEventException;
-import com.yahoo.log.InvalidLogFormatException;
-import com.yahoo.log.LogMessage;
-
-import org.junit.*;
-import static org.junit.Assert.*;
-
-/**
- * Unit tests for the LogMessage class.
- *
- * @author Bjorn Borud
- */
-public class LogMessageTestCase {
-
- /**
- * The original test was rubbish. We just test that parsing
- * is okay here. The way we do it is to check that we have
- * some log messages available from the MockLogEntries class.
- * If there are none the parsing failed.
- */
- @Test
- public void testLogParsing ()
- {
- assertTrue(MockLogEntries.getMessages().length > 0);
- }
-
- /**
- * Read in some events and make sure we are able to identify
- * them as such.
- */
- @Test
- public void testEvents () throws IOException {
- String eventfile = "src/test/files/event.txt.gz";
- BufferedReader br = new BufferedReader(
- new InputStreamReader(
- new GZIPInputStream(
- new FileInputStream(eventfile))));
-
- for (String line = br.readLine(); line != null; line = br.readLine()) {
- try {
- LogMessage m = LogMessage.parseNativeFormat(line);
- try {
- Event event = m.getEvent();
- assertNotNull(event);
- } catch (MalformedEventException evx) {
- fail();
- }
- } catch (InvalidLogFormatException e) {
- fail();
- }
- }
- }
-}
-