From cddf79bc63fdb5213eed6a51e5fc6c7200539e0f Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Wed, 20 Mar 2019 11:28:51 +0100 Subject: Remove replicator plugin from logserver --- .../replicator/FormattedBufferCacheTestCase.java | 45 ------- .../replicator/ReplicatorPluginTestCase.java | 43 ------- .../handlers/replicator/ReplicatorTestCase.java | 132 --------------------- 3 files changed, 220 deletions(-) delete mode 100644 logserver/src/test/java/com/yahoo/logserver/handlers/replicator/FormattedBufferCacheTestCase.java delete mode 100644 logserver/src/test/java/com/yahoo/logserver/handlers/replicator/ReplicatorPluginTestCase.java delete mode 100644 logserver/src/test/java/com/yahoo/logserver/handlers/replicator/ReplicatorTestCase.java (limited to 'logserver/src/test/java') diff --git a/logserver/src/test/java/com/yahoo/logserver/handlers/replicator/FormattedBufferCacheTestCase.java b/logserver/src/test/java/com/yahoo/logserver/handlers/replicator/FormattedBufferCacheTestCase.java deleted file mode 100644 index 994eb96bac9..00000000000 --- a/logserver/src/test/java/com/yahoo/logserver/handlers/replicator/FormattedBufferCacheTestCase.java +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/* -*- c-basic-offset: 4 -*- - * - * $Id$ - * - */ -package com.yahoo.logserver.handlers.replicator; - -import java.nio.ByteBuffer; - -import com.yahoo.logserver.handlers.replicator.FormattedBufferCache; -import com.yahoo.log.LogMessage; -import com.yahoo.logserver.formatter.LogFormatter; -import com.yahoo.logserver.formatter.LogFormatterManager; -import com.yahoo.logserver.test.MockLogEntries; - -import org.junit.*; - -import static org.junit.Assert.*; - -/** - * Unit tests for thge LogMessage class. - * - * @author Bjorn Borud - */ -public class FormattedBufferCacheTestCase { - - @Test - public void testCache() { - LogMessage msgs[] = MockLogEntries.getMessages(); - FormattedBufferCache cache = new FormattedBufferCache(); - String n[] = LogFormatterManager.getFormatterNames(); - for (int i = 0; i < n.length; i++) { - LogFormatter f = LogFormatterManager.getLogFormatter(n[i]); - for (int j = 0; j < msgs.length; j++) { - ByteBuffer bb = cache.getFormatted(msgs[j], f); - assertNotNull(bb); - } - } - - assertTrue(cache.getUnderlyingMapOnlyForTesting().size() > 0); - cache.reset(); - assertTrue(cache.getUnderlyingMapOnlyForTesting().size() == 0); - } -} diff --git a/logserver/src/test/java/com/yahoo/logserver/handlers/replicator/ReplicatorPluginTestCase.java b/logserver/src/test/java/com/yahoo/logserver/handlers/replicator/ReplicatorPluginTestCase.java deleted file mode 100644 index 7b9f410d7ed..00000000000 --- a/logserver/src/test/java/com/yahoo/logserver/handlers/replicator/ReplicatorPluginTestCase.java +++ /dev/null @@ -1,43 +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.handlers.replicator; - -import static org.junit.Assert.*; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.yahoo.plugin.SystemPropertyConfig; - -public class ReplicatorPluginTestCase { - - ReplicatorPlugin rp; - - @Before - public void setUp() { - rp = new ReplicatorPlugin(); - } - - @After - public void tearDown() { - if (rp != null) { - rp.shutdownPlugin(); - } - } - - @Test - public void testReplicatorPlugin() { - System.setProperty("replicatorplugin.test.port", "18325"); - try { - rp.shutdownPlugin(); - fail("Shutdown before init didn't throw."); - } catch (Exception e) { - } - rp.initPlugin(new SystemPropertyConfig("replicatorplugin.test.")); - try { - rp.initPlugin(new SystemPropertyConfig("test")); - fail("Multiple init didn't throw."); - } catch (Exception e) { - } - } -} diff --git a/logserver/src/test/java/com/yahoo/logserver/handlers/replicator/ReplicatorTestCase.java b/logserver/src/test/java/com/yahoo/logserver/handlers/replicator/ReplicatorTestCase.java deleted file mode 100644 index b26c6236dbb..00000000000 --- a/logserver/src/test/java/com/yahoo/logserver/handlers/replicator/ReplicatorTestCase.java +++ /dev/null @@ -1,132 +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.handlers.replicator; - -import com.yahoo.io.Listener; -import com.yahoo.log.InvalidLogFormatException; -import com.yahoo.log.LogLevel; -import com.yahoo.log.LogMessage; -import com.yahoo.logserver.Server; -import com.yahoo.logserver.filter.LogFilter; -import com.yahoo.logserver.filter.LogFilterManager; -import com.yahoo.logserver.formatter.LogFormatterManager; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import java.io.IOException; -import java.net.InetSocketAddress; -import java.nio.ByteBuffer; -import java.nio.channels.SocketChannel; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -public class ReplicatorTestCase { - Server server; - Thread serverThread; - Replicator replicator; - private SocketChannel socket; - private Listener listener; - private ReplicatorConnection conn; - - @Before - public void setUp() throws InterruptedException, IOException { - server = Server.getInstance(); - server.initialize(18321); - serverThread = new Thread(server); - serverThread.start(); - long start = System.currentTimeMillis(); - long timeout = 60000; - while (System.currentTimeMillis() < (start + timeout)) { - try { - socket = SocketChannel.open(new InetSocketAddress("localhost", 18321)); - break; - } catch (Exception e) { - Thread.sleep(100); - } - } - listener = new Listener("test"); - replicator = new Replicator(18323); - conn = (ReplicatorConnection) replicator.newConnection(socket, listener); - } - - @After - public void tearDown() throws InterruptedException { - if (serverThread != null) { - serverThread.interrupt(); - serverThread.join(); - } - if (replicator != null) replicator.close(); - } - - @Test - public void testReplicator() throws IOException, InvalidLogFormatException { - LogMessage msg = LogMessage. - parseNativeFormat("1343996283.239582\texample.yahoo.com\t27301/7637\tconfig-sentinel\trunserver\tevent\tfoo"); - assertFalse(conn.isLoggable(msg)); // Default all muted - conn.onUse("system.all"); - assertTrue(conn.isLoggable(msg)); - assertTrue(conn.getTotalBytesWritten() > 50); // Should be in this ballpark - conn.onCommand("use system.mute"); - assertFalse(conn.isLoggable(msg)); - assertEquals("system.mute", conn.getLogFilterName()); - replicator.doHandle(msg); - conn.onFormatter("system.textformatter"); - assertEquals(conn.formatter, LogFormatterManager.getLogFormatter("system.textformatter")); - conn.onCommand("formatter system.nullformatter"); - assertEquals(conn.formatter, LogFormatterManager.getLogFormatter("system.nullformatter")); - assertEquals(4, conn.getNumHandled()); - conn.onList(); - assertEquals(11, conn.getNumHandled()); // 6 filters + start/stop msg - conn.onCommand("list"); - assertEquals(18, conn.getNumHandled()); // 6 filters + start/stop msg - conn.onListFormatters(); - assertEquals(22, conn.getNumHandled()); // 4 formatters - conn.onCommand("listformatters"); - assertEquals(26, conn.getNumHandled()); // 4 formatters - - conn.onStats(); - assertEquals(27, conn.getNumHandled()); // 1 line - conn.onCommand("stats"); - assertEquals(28, conn.getNumHandled()); // 1 line - conn.enqueue(ByteBuffer.wrap("baz".getBytes())); - assertEquals(29, conn.getNumHandled()); // 1 line - conn.onCommand("ping"); - assertEquals(30, conn.getNumHandled()); // 1 line - conn.onCommand("quit"); - assertEquals(31, conn.getNumHandled()); // 1 line - assertEquals(0, conn.getNumDropped()); - assertEquals(0, conn.getNumQueued()); - LogFilterManager.addLogFilter("test.onlyerror", new LogFilter() { - @Override - public boolean isLoggable(LogMessage msg) { - return msg.getLevel().equals(LogLevel.ERROR); - } - - @Override - public String description() { - return "Only error"; - } - }); - conn.onUse("test.onlyerror"); - assertFalse(conn.isLoggable(LogMessage. - parseNativeFormat("1343996283.239582\texample.yahoo.com\t27301/7637\tconfig-sentinel\trunserver\tdebug\tfoo"))); - assertTrue(conn.isLoggable(LogMessage. - parseNativeFormat("1343996283.239582\texample.yahoo.com\t27301/7637\tconfig-sentinel\trunserver\terror\tbar"))); - assertEquals(conn.selectOps(), 1); - assertEquals(conn.description(), "Only error"); - conn.setFilter(null); - assertTrue(conn.isLoggable(LogMessage. - parseNativeFormat("1343996283.239582\texample.yahoo.com\t27301/7637\tconfig-sentinel\trunserver\terror\tbar"))); - assertEquals(conn.description(), "No filter defined"); - assertEquals(conn.getRemoteHost(), "localhost"); - conn.onFormatter("nonexistant"); - assertEquals(conn.formatter, LogFormatterManager.getLogFormatter("system.nullformatter")); // unchanged - conn.onUse("nonexistant"); - assertTrue(conn.isLoggable(LogMessage. - parseNativeFormat("1343996283.239582\texample.yahoo.com\t27301/7637\tconfig-sentinel\trunserver\terror\tbar"))); - conn.close(); - } - -} -- cgit v1.2.3