diff options
author | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-06-12 11:36:18 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-06-12 11:42:38 +0200 |
commit | 6d9089f9788e9dd3e975dee2bd02580f7ed4c88e (patch) | |
tree | e9e0c8809095c54c7257e4d9c6d988258b84b7a4 /jdisc_core/src/test/java/com/yahoo/jdisc/core/ActiveContainerFinalizerTest.java | |
parent | 3c4d24437dbbc120d9ee9c9642600024125a649e (diff) |
Remove finalizer in ActiveContainer
No instances of the log message has been detected the last month, which
indicates that the finalizer is not necessary.
Diffstat (limited to 'jdisc_core/src/test/java/com/yahoo/jdisc/core/ActiveContainerFinalizerTest.java')
-rw-r--r-- | jdisc_core/src/test/java/com/yahoo/jdisc/core/ActiveContainerFinalizerTest.java | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/core/ActiveContainerFinalizerTest.java b/jdisc_core/src/test/java/com/yahoo/jdisc/core/ActiveContainerFinalizerTest.java deleted file mode 100644 index b2fd357b30c..00000000000 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/core/ActiveContainerFinalizerTest.java +++ /dev/null @@ -1,75 +0,0 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.jdisc.core; - -import com.yahoo.jdisc.Container; -import com.yahoo.jdisc.Request; -import com.yahoo.jdisc.test.TestDriver; - -import java.net.URI; -import java.util.concurrent.TimeUnit; - -import org.junit.Test; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; - -/** - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a> - */ -@SuppressWarnings("UnusedAssignment") -public class ActiveContainerFinalizerTest { - - @Test - public void requireThatMissingContainerReleaseDoesNotPreventShutdown() throws InterruptedException { - final TestDriver driver = TestDriver.newSimpleApplicationInstanceWithoutOsgi(); - driver.activateContainer(driver.newContainerBuilder()); - Container container = driver.newReference(URI.create("scheme://host")); - assertNotNull(container); - - final Termination termination = new Termination(); - driver.activateContainer(null).notifyTermination(termination); - assertFalse(termination.await(100, TimeUnit.MILLISECONDS)); - - container = null; // intentionally doing this instead of container.release() - assertTrue(termination.await(600, TimeUnit.SECONDS)); - assertTrue(driver.close()); - } - - @Test - public void requireThatMissingRequestReleaseDoesNotPreventShutdown() throws InterruptedException { - final TestDriver driver = TestDriver.newSimpleApplicationInstanceWithoutOsgi(); - driver.activateContainer(driver.newContainerBuilder()); - Request request = new Request(driver, URI.create("scheme://host")); - assertNotNull(request); - - final Termination termination = new Termination(); - driver.activateContainer(null).notifyTermination(termination); - assertFalse(termination.await(100, TimeUnit.MILLISECONDS)); - - request = null; // intentionally doing this instead of request.release() - assertTrue(termination.await(600, TimeUnit.SECONDS)); - assertTrue(driver.close()); - } - - private static class Termination implements Runnable { - - volatile boolean done; - - @Override - public void run() { - done = true; - } - - boolean await(final int timeout, final TimeUnit unit) throws InterruptedException { - final long timeoutAt = System.currentTimeMillis() + unit.toMillis(timeout); - while (!done) { - if (System.currentTimeMillis() > timeoutAt) { - return false; - } - Thread.sleep(10); - System.gc(); - } - return true; - } - } -} |