jetty-9: replaced usage of deprecated JUnit class.
This commit is contained in:
parent
20317fffeb
commit
0ee83d334d
|
@ -34,10 +34,10 @@ import org.eclipse.jetty.spdy.client.SPDYClient;
|
|||
import org.eclipse.jetty.util.thread.QueuedThreadPool;
|
||||
import org.junit.After;
|
||||
import org.junit.Rule;
|
||||
import org.junit.rules.TestWatchman;
|
||||
import org.junit.rules.TestWatcher;
|
||||
import org.junit.runner.Description;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.junit.runners.Parameterized;
|
||||
import org.junit.runners.model.FrameworkMethod;
|
||||
|
||||
@RunWith(Parameterized.class)
|
||||
public abstract class AbstractHTTPSPDYTest
|
||||
|
@ -49,15 +49,16 @@ public abstract class AbstractHTTPSPDYTest
|
|||
}
|
||||
|
||||
@Rule
|
||||
public final TestWatchman testName = new TestWatchman()
|
||||
public final TestWatcher testName = new TestWatcher()
|
||||
{
|
||||
|
||||
@Override
|
||||
public void starting(FrameworkMethod method)
|
||||
public void starting(Description description)
|
||||
{
|
||||
super.starting(method);
|
||||
super.starting(description);
|
||||
System.err.printf("Running %s.%s()%n",
|
||||
method.getMethod().getDeclaringClass().getName(),
|
||||
method.getName());
|
||||
description.getClassName(),
|
||||
description.getMethodName());
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
@ -36,21 +36,22 @@ import org.eclipse.jetty.util.ssl.SslContextFactory;
|
|||
import org.junit.Assert;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.rules.TestWatchman;
|
||||
import org.junit.runners.model.FrameworkMethod;
|
||||
import org.junit.rules.TestWatcher;
|
||||
import org.junit.runner.Description;
|
||||
|
||||
public class ProtocolNegotiationTest
|
||||
{
|
||||
@Rule
|
||||
public final TestWatchman testName = new TestWatchman()
|
||||
public final TestWatcher testName = new TestWatcher()
|
||||
{
|
||||
|
||||
@Override
|
||||
public void starting(FrameworkMethod method)
|
||||
public void starting(Description description)
|
||||
{
|
||||
super.starting(method);
|
||||
super.starting(description);
|
||||
System.err.printf("Running %s.%s()%n",
|
||||
method.getMethod().getDeclaringClass().getName(),
|
||||
method.getName());
|
||||
description.getClassName(),
|
||||
description.getMethodName());
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
@ -57,25 +57,26 @@ import org.junit.Before;
|
|||
import org.junit.Ignore;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.rules.TestWatchman;
|
||||
import org.junit.rules.TestWatcher;
|
||||
import org.junit.runner.Description;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.junit.runners.Parameterized;
|
||||
import org.junit.runners.model.FrameworkMethod;
|
||||
|
||||
@Ignore // TODO: make these tests pass
|
||||
@RunWith(value = Parameterized.class)
|
||||
public class ProxyHTTPSPDYTest
|
||||
{
|
||||
@Rule
|
||||
public final TestWatchman testName = new TestWatchman()
|
||||
public final TestWatcher testName = new TestWatcher()
|
||||
{
|
||||
|
||||
@Override
|
||||
public void starting(FrameworkMethod method)
|
||||
public void starting(Description description)
|
||||
{
|
||||
super.starting(method);
|
||||
super.starting(description);
|
||||
System.err.printf("Running %s.%s()%n",
|
||||
method.getMethod().getDeclaringClass().getName(),
|
||||
method.getName());
|
||||
description.getClassName(),
|
||||
description.getMethodName());
|
||||
}
|
||||
};
|
||||
private final short version;
|
||||
|
|
Loading…
Reference in New Issue