Updated Branches: refs/heads/trunk 07a399546 -> 312076c98
Change to JUnit 4.11 in order to get more readable reports for benchmarks Project: http://git-wip-us.apache.org/repos/asf/mina/repo Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/312076c9 Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/312076c9 Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/312076c9 Branch: refs/heads/trunk Commit: 312076c98e0af0a62d0858df38218ea6660acb76 Parents: 07a3995 Author: Jeff MAURY <[email protected]> Authored: Thu Jan 24 20:02:22 2013 +0100 Committer: Jeff MAURY <[email protected]> Committed: Thu Jan 24 20:02:22 2013 +0100 ---------------------------------------------------------------------- .../org/apache/mina/core/BenchmarkBinaryTest.java | 2 +- ...ina3ClientVsMina3ServerBenchmarkBinaryTest.java | 2 +- ...MinaClientVsNettyServerBenchmarkBinaryTest.java | 2 +- ...NettyClientVsMinaServerBenchmarkBinaryTest.java | 2 +- ...ettyClientVsNettyServerBenchmarkBinaryTest.java | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina/blob/312076c9/benchmarks/src/test/java/org/apache/mina/core/BenchmarkBinaryTest.java ---------------------------------------------------------------------- diff --git a/benchmarks/src/test/java/org/apache/mina/core/BenchmarkBinaryTest.java b/benchmarks/src/test/java/org/apache/mina/core/BenchmarkBinaryTest.java index bd46382..ab0225c 100755 --- a/benchmarks/src/test/java/org/apache/mina/core/BenchmarkBinaryTest.java +++ b/benchmarks/src/test/java/org/apache/mina/core/BenchmarkBinaryTest.java @@ -66,7 +66,7 @@ public abstract class BenchmarkBinaryTest { public abstract Type getServerType(); - @Parameters + @Parameters(name="{0} messages of size {1}") public static Collection<Object[]> getParameters() { Object[][] parameters = new Object[][] { { 100000, 10, 2 * 60 }, { 100000, 1 * 1024, 2 * 60 }, { 100000, 10 * 1024, 2 * 60 }, { 100, 64 * 1024 * 1024, 10 * 60 } }; http://git-wip-us.apache.org/repos/asf/mina/blob/312076c9/benchmarks/src/test/java/org/apache/mina/core/Mina3ClientVsMina3ServerBenchmarkBinaryTest.java ---------------------------------------------------------------------- diff --git a/benchmarks/src/test/java/org/apache/mina/core/Mina3ClientVsMina3ServerBenchmarkBinaryTest.java b/benchmarks/src/test/java/org/apache/mina/core/Mina3ClientVsMina3ServerBenchmarkBinaryTest.java index 05c9587..19eba35 100755 --- a/benchmarks/src/test/java/org/apache/mina/core/Mina3ClientVsMina3ServerBenchmarkBinaryTest.java +++ b/benchmarks/src/test/java/org/apache/mina/core/Mina3ClientVsMina3ServerBenchmarkBinaryTest.java @@ -54,7 +54,7 @@ public class Mina3ClientVsMina3ServerBenchmarkBinaryTest extends BenchmarkBinary return Type.Mina; } - @Parameters + @Parameters(name="{0} messages of size {1}") public static Collection<Object[]> getParameters() { Object[][] parameters = new Object[][] { { 1000000, 10, 2 * 60 }, http://git-wip-us.apache.org/repos/asf/mina/blob/312076c9/benchmarks/src/test/java/org/apache/mina/core/MinaClientVsNettyServerBenchmarkBinaryTest.java ---------------------------------------------------------------------- diff --git a/benchmarks/src/test/java/org/apache/mina/core/MinaClientVsNettyServerBenchmarkBinaryTest.java b/benchmarks/src/test/java/org/apache/mina/core/MinaClientVsNettyServerBenchmarkBinaryTest.java index f1ceb83..bee238e 100644 --- a/benchmarks/src/test/java/org/apache/mina/core/MinaClientVsNettyServerBenchmarkBinaryTest.java +++ b/benchmarks/src/test/java/org/apache/mina/core/MinaClientVsNettyServerBenchmarkBinaryTest.java @@ -54,7 +54,7 @@ public class MinaClientVsNettyServerBenchmarkBinaryTest extends BenchmarkBinaryT return Type.Netty; } - @Parameters + @Parameters(name="{0} messages of size {1}") public static Collection<Object[]> getParameters() { Object[][] parameters = new Object[][] { { 1000000, 10, 2 * 60 }, http://git-wip-us.apache.org/repos/asf/mina/blob/312076c9/benchmarks/src/test/java/org/apache/mina/core/NettyClientVsMinaServerBenchmarkBinaryTest.java ---------------------------------------------------------------------- diff --git a/benchmarks/src/test/java/org/apache/mina/core/NettyClientVsMinaServerBenchmarkBinaryTest.java b/benchmarks/src/test/java/org/apache/mina/core/NettyClientVsMinaServerBenchmarkBinaryTest.java index bdd2b92..d559702 100644 --- a/benchmarks/src/test/java/org/apache/mina/core/NettyClientVsMinaServerBenchmarkBinaryTest.java +++ b/benchmarks/src/test/java/org/apache/mina/core/NettyClientVsMinaServerBenchmarkBinaryTest.java @@ -54,7 +54,7 @@ public class NettyClientVsMinaServerBenchmarkBinaryTest } //TODO: analyze with Netty is so slow on large message: last test lower to 100 messages - @Parameters + @Parameters(name="{0} messages of size {1}") public static Collection<Object[]> getParameters() { Object[][] parameters = new Object[][] { { 200000, 10, 2 * 60 } //, http://git-wip-us.apache.org/repos/asf/mina/blob/312076c9/benchmarks/src/test/java/org/apache/mina/core/NettyClientVsNettyServerBenchmarkBinaryTest.java ---------------------------------------------------------------------- diff --git a/benchmarks/src/test/java/org/apache/mina/core/NettyClientVsNettyServerBenchmarkBinaryTest.java b/benchmarks/src/test/java/org/apache/mina/core/NettyClientVsNettyServerBenchmarkBinaryTest.java index 4832f24..ba57b40 100644 --- a/benchmarks/src/test/java/org/apache/mina/core/NettyClientVsNettyServerBenchmarkBinaryTest.java +++ b/benchmarks/src/test/java/org/apache/mina/core/NettyClientVsNettyServerBenchmarkBinaryTest.java @@ -54,7 +54,7 @@ public class NettyClientVsNettyServerBenchmarkBinaryTest } //TODO: analyze with Netty is so slow on large message: last test lower to 100 messages - @Parameters + @Parameters(name="{0} messages of size {1}") public static Collection<Object[]> getParameters() { Object[][] parameters = new Object[][] { { 1000000, 10, 2 * 60 }, http://git-wip-us.apache.org/repos/asf/mina/blob/312076c9/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6aab59b..55c3518 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ <properties> <!-- Dependencies versions ========================================== --> <version.guava>10.0.1</version.guava> - <version.junit>4.10</version.junit> + <version.junit>4.11</version.junit> <version.log4j>2.0-beta2</version.log4j> <version.mockito-all>1.9.0-rc1</version.mockito-all> <version.slf4j.api>1.6.4</version.slf4j.api>
