diff options
author | gjoranv <gv@yahoo-inc.com> | 2017-08-15 15:24:56 +0200 |
---|---|---|
committer | gjoranv <gv@yahoo-inc.com> | 2017-08-15 15:24:56 +0200 |
commit | 6d163b43a6ed915036f302943a184e9b3050dd67 (patch) | |
tree | 7cf8eb120f30063b957e9a88dbe859c3cc2fe49d /container-core/src/test/java | |
parent | 102b364dca6625a7e738d5b6d2fe89ea1901dc92 (diff) |
Use @Before instead of ctor.
- It's less obscure. Also, if an exception is thrown in the ctor
@After is not run.
Diffstat (limited to 'container-core/src/test/java')
-rw-r--r-- | container-core/src/test/java/com/yahoo/container/jdisc/state/StateHandlerTest.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/state/StateHandlerTest.java b/container-core/src/test/java/com/yahoo/container/jdisc/state/StateHandlerTest.java index 17de692a878..100650d43bd 100644 --- a/container-core/src/test/java/com/yahoo/container/jdisc/state/StateHandlerTest.java +++ b/container-core/src/test/java/com/yahoo/container/jdisc/state/StateHandlerTest.java @@ -19,6 +19,7 @@ import com.yahoo.jdisc.test.TestDriver; import com.yahoo.metrics.MetricsPresentationConfig; import com.yahoo.vespa.defaults.Defaults; import org.junit.After; +import org.junit.Before; import org.junit.Test; import java.io.InputStreamReader; @@ -42,12 +43,13 @@ public class StateHandlerTest { private final static long SNAPSHOT_INTERVAL = TimeUnit.SECONDS.toMillis(300); private final static long META_GENERATION = 69; - private final TestDriver driver; - private final StateMonitor monitor; - private final Metric metric; + private TestDriver driver; + private StateMonitor monitor; + private Metric metric; private volatile long currentTimeMillis = 0; - public StateHandlerTest() { + @Before + public void startTestDriver() { driver = TestDriver.newSimpleApplicationInstanceWithoutOsgi(new AbstractModule() { @Override @@ -90,7 +92,7 @@ public class StateHandlerTest { } @After - public void closeTestDriver() { + public void stopTestDriver() { assertTrue(driver.close()); } |