From 2339da7cc0bc583a7143110d5066a292567543e2 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Tue, 28 Aug 2012 13:01:14 +0200 Subject: [PATCH] Jetty9 - Marked tests as @Slow. --- .../java/org/eclipse/jetty/io/ByteArrayEndPointTest.java | 3 +++ jetty-spdy/spdy-core/pom.xml | 5 +++++ .../test/java/org/eclipse/jetty/spdy/AsyncTimeoutTest.java | 6 ++++++ 3 files changed, 14 insertions(+) diff --git a/jetty-io/src/test/java/org/eclipse/jetty/io/ByteArrayEndPointTest.java b/jetty-io/src/test/java/org/eclipse/jetty/io/ByteArrayEndPointTest.java index a241ddf7579..30243eee426 100644 --- a/jetty-io/src/test/java/org/eclipse/jetty/io/ByteArrayEndPointTest.java +++ b/jetty-io/src/test/java/org/eclipse/jetty/io/ByteArrayEndPointTest.java @@ -25,12 +25,14 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeoutException; +import org.eclipse.jetty.toolchain.test.AdvancedRunner; import org.eclipse.jetty.toolchain.test.annotation.Slow; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.FutureCallback; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; import static junit.framework.Assert.assertEquals; import static org.hamcrest.Matchers.containsString; @@ -41,6 +43,7 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +@RunWith(AdvancedRunner.class) public class ByteArrayEndPointTest { private ScheduledExecutorService _scheduler; diff --git a/jetty-spdy/spdy-core/pom.xml b/jetty-spdy/spdy-core/pom.xml index 0354f8261df..d24533be8c1 100644 --- a/jetty-spdy/spdy-core/pom.xml +++ b/jetty-spdy/spdy-core/pom.xml @@ -26,6 +26,11 @@ junit test + + org.eclipse.jetty.toolchain + jetty-test-helper + test + org.hamcrest hamcrest-all diff --git a/jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/AsyncTimeoutTest.java b/jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/AsyncTimeoutTest.java index dbe012da31e..324a5074480 100644 --- a/jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/AsyncTimeoutTest.java +++ b/jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/AsyncTimeoutTest.java @@ -34,12 +34,17 @@ import org.eclipse.jetty.spdy.api.Stream; import org.eclipse.jetty.spdy.api.StringDataInfo; import org.eclipse.jetty.spdy.api.SynInfo; import org.eclipse.jetty.spdy.generator.Generator; +import org.eclipse.jetty.toolchain.test.AdvancedRunner; +import org.eclipse.jetty.toolchain.test.annotation.Slow; import org.eclipse.jetty.util.Callback; import org.junit.Assert; import org.junit.Test; +import org.junit.runner.RunWith; +@RunWith(AdvancedRunner.class) public class AsyncTimeoutTest { + @Slow @Test public void testAsyncTimeoutInControlFrames() throws Exception { @@ -85,6 +90,7 @@ public class AsyncTimeoutTest Assert.assertTrue(failedLatch.await(2 * timeout, unit)); } + @Slow @Test public void testAsyncTimeoutInDataFrames() throws Exception {