From 128dd665dc9cbadbd371be0008a87f608bce3bfd Mon Sep 17 00:00:00 2001 From: jackygurui Date: Sun, 15 May 2016 00:00:13 +0100 Subject: [PATCH] Tidy up 1. Rename TestNameToConsoleRunListener to RedissonTestRunListener 2. Moved Test stats processing code to RedissonTestRunListener from RedissonRuntimeEnvironment. --- pom.xml | 2 +- .../redisson/RedissonRuntimeEnvironment.java | 25 ----- .../org/redisson/RedissonTestRunListener.java | 100 ++++++++++++++++++ .../TestNameToConsoleRunListener.java | 58 ---------- 4 files changed, 101 insertions(+), 84 deletions(-) create mode 100644 src/test/java/org/redisson/RedissonTestRunListener.java delete mode 100644 src/test/java/org/redisson/TestNameToConsoleRunListener.java diff --git a/pom.xml b/pom.xml index e49a2c9b5..eb52323e7 100644 --- a/pom.xml +++ b/pom.xml @@ -356,7 +356,7 @@ listener - org.redisson.TestNameToConsoleRunListener + org.redisson.RedissonTestRunListener diff --git a/src/test/java/org/redisson/RedissonRuntimeEnvironment.java b/src/test/java/org/redisson/RedissonRuntimeEnvironment.java index 465d84dbf..a214f975c 100644 --- a/src/test/java/org/redisson/RedissonRuntimeEnvironment.java +++ b/src/test/java/org/redisson/RedissonRuntimeEnvironment.java @@ -19,30 +19,5 @@ public class RedissonRuntimeEnvironment { static { OS = System.getProperty("os.name", "generic"); isWindows = OS.toLowerCase(Locale.ENGLISH).contains("win"); - if (RedissonRuntimeEnvironment.isTravis) { - final AtomicBoolean running = new AtomicBoolean(Boolean.TRUE); - Runtime.getRuntime().addShutdownHook(new Thread(() -> { - running.set(Boolean.FALSE); - })); - new Thread(() -> { - final RuntimeMXBean runtimeBean = ManagementFactory.getRuntimeMXBean(); - final AtomicLong u = new AtomicLong(runtimeBean.getUptime()); - while (running.get()) { - try { - long upTime = runtimeBean.getUptime(); - if (upTime >= u.get() + 10000) { - u.set(upTime); - System.out.printf("Test Up Time = %.3f (s)%n", upTime / 1000d); - System.out.printf("Heap Usage = %.3f (MB)%n", ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getUsed() / 1024d / 1024d); - System.out.printf("None Heap Usage = %.3f (MB)%n", ManagementFactory.getMemoryMXBean().getNonHeapMemoryUsage().getUsed() / 1024d / 1024d); - System.out.println("============================="); - } - Thread.currentThread().sleep(10000l); - } catch (InterruptedException ex) { - Logger.getLogger(RedissonRuntimeEnvironment.class.getName()).log(Level.SEVERE, null, ex); - } - } - }).start(); - } } } diff --git a/src/test/java/org/redisson/RedissonTestRunListener.java b/src/test/java/org/redisson/RedissonTestRunListener.java new file mode 100644 index 000000000..5a8a5160d --- /dev/null +++ b/src/test/java/org/redisson/RedissonTestRunListener.java @@ -0,0 +1,100 @@ +package org.redisson; + +import java.lang.management.ManagementFactory; +import java.lang.management.RuntimeMXBean; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicLong; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.stream.IntStream; +import org.junit.runner.Description; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; +import org.junit.runner.notification.RunListener; + +public class RedissonTestRunListener extends RunListener { + + private final AtomicBoolean running = new AtomicBoolean(Boolean.TRUE); + + @Override + public void testRunStarted(Description description) throws Exception { + super.testRunStarted(description); + Runtime.getRuntime().addShutdownHook(new Thread(() -> { + running.set(Boolean.FALSE); + })); + new Thread(() -> { + final RuntimeMXBean runtimeBean = ManagementFactory.getRuntimeMXBean(); + final AtomicLong u = new AtomicLong(runtimeBean.getUptime()); + while (running.get()) { + try { + long upTime = runtimeBean.getUptime(); + if (upTime >= u.get() + 10000) { + u.set(upTime); + System.out.printf("Test Up Time = %.3f (s)%n", upTime / 1000d); + System.out.printf("Heap Usage = %.3f (MB)%n", ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getUsed() / 1024d / 1024d); + System.out.printf("None Heap Usage = %.3f (MB)%n", ManagementFactory.getMemoryMXBean().getNonHeapMemoryUsage().getUsed() / 1024d / 1024d); + System.out.println("============================="); + } + Thread.currentThread().sleep(10000l); + } catch (InterruptedException ex) { + Logger.getLogger(RedissonTestRunListener.class.getName()).log(Level.SEVERE, null, ex); + } + } + }).start(); + } + + @Override + public void testRunFinished(Result result) throws Exception { + super.testRunFinished(result); + running.set(Boolean.FALSE); + } + + @Override + public void testStarted(Description d) throws Exception { + super.testStarted(d); + printTestName("Started", d.getDisplayName(), '*'); + } + + @Override + public void testFinished(Description d) throws Exception { + super.testFinished(d); + printTestName("Finished", d.getDisplayName()); + } + + @Override + public void testIgnored(Description d) throws Exception { + super.testIgnored(d); + printTestName("Ignored", d.getDisplayName()); + } + + @Override + public void testFailure(Failure f) throws Exception { + super.testFailure(f); + printTestName("Failed", f.getTestHeader()); + } + + @Override + public void testAssumptionFailure(Failure f) { + super.testAssumptionFailure(f); + printTestName("Assumption Failed", f.getTestHeader()); + } + + private static void printTestName(String action, String test) { + printTestName(action, test, '='); + } + + private static void printTestName(String action, String test, char c) { + int dividers = 16 + action.length() + test.length(); + aBeautifulDivider(dividers, c); + System.out.println(" " + action + " Test: " + test); + aBeautifulDivider(dividers, c); + } + + private static void aBeautifulDivider(int times, char c) { + System.out.println(""); + IntStream.iterate(0, n -> n++) + .limit(times) + .forEach((i) -> System.out.print(c)); + System.out.println("\n"); + } +} diff --git a/src/test/java/org/redisson/TestNameToConsoleRunListener.java b/src/test/java/org/redisson/TestNameToConsoleRunListener.java deleted file mode 100644 index 4f9fa1d05..000000000 --- a/src/test/java/org/redisson/TestNameToConsoleRunListener.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.redisson; - -import java.util.stream.IntStream; -import org.junit.runner.Description; -import org.junit.runner.notification.Failure; -import org.junit.runner.notification.RunListener; - -public class TestNameToConsoleRunListener extends RunListener { - - @Override - public void testStarted(Description d) throws Exception { - super.testStarted(d); - printTestName("Started", d.getDisplayName(), '*'); - } - - @Override - public void testFinished(Description d) throws Exception { - super.testFinished(d); - printTestName("Finished", d.getDisplayName()); - } - - @Override - public void testIgnored(Description d) throws Exception { - super.testIgnored(d); - printTestName("Ignored", d.getDisplayName()); - } - - @Override - public void testFailure(Failure f) throws Exception { - super.testFailure(f); - printTestName("Failed", f.getTestHeader()); - } - - @Override - public void testAssumptionFailure(Failure f) { - super.testAssumptionFailure(f); - printTestName("Assumption Failed", f.getTestHeader()); - } - - private static void printTestName(String action, String test) { - printTestName(action, test, '='); - } - - private static void printTestName(String action, String test, char c) { - int dividers = 16 + action.length() + test.length(); - aBeautifulDivider(dividers, c); - System.out.println(" " + action + " Test: " + test); - aBeautifulDivider(dividers, c); - } - - private static void aBeautifulDivider(int times, char c) { - System.out.println(""); - IntStream.iterate(0, n -> n++) - .limit(times) - .forEach((i) -> System.out.print(c)); - System.out.println("\n"); - } -}