This is an automated email from the ASF dual-hosted git repository. ppkarwasz pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-flume-legacy.git
commit 6ae45fe2ae31f79fb3adb2849197808c6daffa8f Author: Mike Percy <[email protected]> AuthorDate: Wed Jun 29 21:18:20 2016 -0700 FLUME-2941. Integrate checkstyle for test classes Also make test code conform to style guidelines. Additionally, this patch makes style violations fatal to the build. This patch is whitespace-only from a code perspective. After stripping line numbers, the generated test bytecode before and after these changes is identical. Code review: https://reviews.apache.org/r/49830/ Reviewed by Hari. --- .../TestLoadBalancingLog4jAppender.java | 51 +++++++++++----------- .../clients/log4jappender/TestLog4jAppender.java | 32 +++++++------- .../log4jappender/TestLog4jAppenderWithAvro.java | 5 +-- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/flume-ng-log4jappender/src/test/java/org/apache/flume/clients/log4jappender/TestLoadBalancingLog4jAppender.java b/flume-ng-log4jappender/src/test/java/org/apache/flume/clients/log4jappender/TestLoadBalancingLog4jAppender.java index 267ac1d..53795fb 100644 --- a/flume-ng-log4jappender/src/test/java/org/apache/flume/clients/log4jappender/TestLoadBalancingLog4jAppender.java +++ b/flume-ng-log4jappender/src/test/java/org/apache/flume/clients/log4jappender/TestLoadBalancingLog4jAppender.java @@ -65,7 +65,7 @@ public class TestLoadBalancingLog4jAppender { private boolean slowDown = false; @Before - public void initiate() throws InterruptedException{ + public void initiate() throws InterruptedException { ch = new MemoryChannel(); configureChannel(); @@ -164,9 +164,9 @@ public class TestLoadBalancingLog4jAppender { @Test public void testRandomBackoffUnsafeMode() throws Exception { File TESTFILE = new File(TestLoadBalancingLog4jAppender.class - .getClassLoader() - .getResource("flume-loadbalancing-backoff-log4jtest.properties") - .getFile()); + .getClassLoader() + .getResource("flume-loadbalancing-backoff-log4jtest.properties") + .getFile()); startSources(TESTFILE, true, new int[]{25430, 25431, 25432}); sources.get(0).setFail(); @@ -179,9 +179,9 @@ public class TestLoadBalancingLog4jAppender { @Test (expected = EventDeliveryException.class) public void testTimeout() throws Throwable { File TESTFILE = new File(TestLoadBalancingLog4jAppender.class - .getClassLoader() - .getResource("flume-loadbalancinglog4jtest.properties") - .getFile()); + .getClassLoader() + .getResource("flume-loadbalancinglog4jtest.properties") + .getFile()); ch = new TestLog4jAppender.SlowMemoryChannel(2000); configureChannel(); @@ -200,9 +200,9 @@ public class TestLoadBalancingLog4jAppender { @Test(expected = EventDeliveryException.class) public void testRandomBackoffNotUnsafeMode() throws Throwable { File TESTFILE = new File(TestLoadBalancingLog4jAppender.class - .getClassLoader() - .getResource("flume-loadbalancing-backoff-log4jtest.properties") - .getFile()); + .getClassLoader() + .getResource("flume-loadbalancing-backoff-log4jtest.properties") + .getFile()); startSources(TESTFILE, false, new int[]{25430, 25431, 25432}); sources.get(0).setFail(); @@ -224,17 +224,17 @@ public class TestLoadBalancingLog4jAppender { } private void sendAndAssertFail() throws IOException { - int level = 20000; - String msg = "This is log message number" + String.valueOf(level); - fixture.log(Level.toLevel(level), msg); + int level = 20000; + String msg = "This is log message number" + String.valueOf(level); + fixture.log(Level.toLevel(level), msg); - Transaction transaction = ch.getTransaction(); - transaction.begin(); - Event event = ch.take(); - Assert.assertNull(event); + Transaction transaction = ch.getTransaction(); + transaction.begin(); + Event event = ch.take(); + Assert.assertNull(event); - transaction.commit(); - transaction.close(); + transaction.commit(); + transaction.close(); } @@ -271,8 +271,7 @@ public class TestLoadBalancingLog4jAppender { } private void startSources(File log4jProps, boolean unsafeMode, int... ports) - throws - IOException { + throws IOException { for (int port : ports) { CountingAvroSource source = new CountingAvroSource(port); Context context = new Context(); @@ -297,8 +296,8 @@ public class TestLoadBalancingLog4jAppender { Properties props = new Properties(); props.load(reader); props.setProperty("log4j.appender.out2.UnsafeMode", - String.valueOf(unsafeMode)); - if(slowDown) { + String.valueOf(unsafeMode)); + if (slowDown) { props.setProperty("log4j.appender.out2.Timeout", String.valueOf(1000)); } PropertyConfigurator.configure(props); @@ -308,13 +307,13 @@ public class TestLoadBalancingLog4jAppender { static class CountingAvroSource extends AvroSource { AtomicInteger appendCount = new AtomicInteger(); volatile boolean isFail = false; - private final int port2; + private final int port2; public CountingAvroSource(int port) { - port2 = port; + port2 = port; } - public void setOk() { + public void setOk() { this.isFail = false; } diff --git a/flume-ng-log4jappender/src/test/java/org/apache/flume/clients/log4jappender/TestLog4jAppender.java b/flume-ng-log4jappender/src/test/java/org/apache/flume/clients/log4jappender/TestLog4jAppender.java index 1b840f3..c087b67 100644 --- a/flume-ng-log4jappender/src/test/java/org/apache/flume/clients/log4jappender/TestLog4jAppender.java +++ b/flume-ng-log4jappender/src/test/java/org/apache/flume/clients/log4jappender/TestLog4jAppender.java @@ -21,7 +21,10 @@ package org.apache.flume.clients.log4jappender; import java.io.File; import java.io.FileReader; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Properties; import java.util.concurrent.TimeUnit; import junit.framework.Assert; @@ -46,13 +49,13 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -public class TestLog4jAppender{ +public class TestLog4jAppender { private AvroSource source; private Channel ch; private Properties props; @Before - public void initiate() throws Exception{ + public void initiate() throws Exception { int port = 25430; source = new AvroSource(); ch = new MemoryChannel(); @@ -88,13 +91,13 @@ public class TestLog4jAppender{ configureSource(); PropertyConfigurator.configure(props); Logger logger = LogManager.getLogger(TestLog4jAppender.class); - for(int count = 0; count <= 1000; count++){ + for (int count = 0; count <= 1000; count++) { /* * Log4j internally defines levels as multiples of 10000. So if we * create levels directly using count, the level will be set as the * default. */ - int level = ((count % 5)+1)*10000; + int level = ((count % 5) + 1) * 10000; String msg = "This is log message number" + String.valueOf(count); logger.log(Level.toLevel(level), msg); @@ -146,11 +149,11 @@ public class TestLog4jAppender{ } private void sendAndAssertFail(Logger logger) throws Throwable { - /* - * Log4j internally defines levels as multiples of 10000. So if we - * create levels directly using count, the level will be set as the - * default. - */ + /* + * Log4j internally defines levels as multiples of 10000. So if we + * create levels directly using count, the level will be set as the + * default. + */ int level = 20000; try { logger.log(Level.toLevel(level), "Test Msg"); @@ -177,13 +180,13 @@ public class TestLog4jAppender{ PropertyConfigurator.configure(props); Logger logger = LogManager.getLogger(TestLog4jAppender.class); Thread.currentThread().setName("Log4jAppenderTest"); - for(int count = 0; count <= 100; count++){ + for (int count = 0; count <= 100; count++) { /* * Log4j internally defines levels as multiples of 10000. So if we * create levels directly using count, the level will be set as the * default. */ - int level = ((count % 5)+1)*10000; + int level = ((count % 5) + 1) * 10000; String msg = "This is log message number" + String.valueOf(count); logger.log(Level.toLevel(level), msg); @@ -230,7 +233,7 @@ public class TestLog4jAppender{ props.put("log4j.appender.out2.Timeout", "1000"); props.put("log4j.appender.out2.layout", "org.apache.log4j.PatternLayout"); props.put("log4j.appender.out2.layout.ConversionPattern", - "%-5p [%t]: %m%n"); + "%-5p [%t]: %m%n"); PropertyConfigurator.configure(props); Logger logger = LogManager.getLogger(TestLog4jAppender.class); Thread.currentThread().setName("Log4jAppenderTest"); @@ -251,13 +254,12 @@ public class TestLog4jAppender{ @After - public void cleanUp(){ + public void cleanUp() { source.stop(); ch.stop(); props.clear(); } - static class SlowMemoryChannel extends MemoryChannel { private final int slowTime; diff --git a/flume-ng-log4jappender/src/test/java/org/apache/flume/clients/log4jappender/TestLog4jAppenderWithAvro.java b/flume-ng-log4jappender/src/test/java/org/apache/flume/clients/log4jappender/TestLog4jAppenderWithAvro.java index 5899c62..0607e3a 100644 --- a/flume-ng-log4jappender/src/test/java/org/apache/flume/clients/log4jappender/TestLog4jAppenderWithAvro.java +++ b/flume-ng-log4jappender/src/test/java/org/apache/flume/clients/log4jappender/TestLog4jAppenderWithAvro.java @@ -125,8 +125,7 @@ public class TestLog4jAppenderWithAvro { Assert.assertNull(hdrs.get(Log4jAvroHeaders.MESSAGE_ENCODING.toString())); Assert.assertEquals("Schema URL should be set", - "file:///tmp/myrecord.avsc", hdrs.get(Log4jAvroHeaders.AVRO_SCHEMA_URL.toString - ())); + "file:///tmp/myrecord.avsc", hdrs.get(Log4jAvroHeaders.AVRO_SCHEMA_URL.toString())); Assert.assertNull("Schema string should not be set", hdrs.get(Log4jAvroHeaders.AVRO_SCHEMA_LITERAL.toString())); @@ -174,7 +173,7 @@ public class TestLog4jAppenderWithAvro { } @After - public void cleanUp(){ + public void cleanUp() { source.stop(); ch.stop(); props.clear();
