Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jetty-9.3.x' into jetty-9.4.x

This commit is contained in:
Joakim Erdfelt 2016-08-18 14:30:48 -07:00
parent c80fe2b0b9 24b4aeb147
commit 196f5eeb96
1 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
jetty-util/src/test/java/org/eclipse/jetty/util/component/ContainerLifeCycleTest.java
View File

@ -18,6 +18,8 @@
package org.eclipse.jetty.util.component; package org.eclipse.jetty.util.component;
import static org.hamcrest.CoreMatchers.containsString;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.StringReader; import java.io.StringReader;
@ -27,10 +29,15 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.eclipse.jetty.util.TypeUtil; import org.eclipse.jetty.util.TypeUtil;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.ExpectedException;
public class ContainerLifeCycleTest public class ContainerLifeCycleTest
{ {
@Rule
public ExpectedException expectedException = ExpectedException.none();
@Test @Test
public void testStartStopDestroy() throws Exception public void testStartStopDestroy() throws Exception
{ {
@ -97,7 +104,14 @@ public class ContainerLifeCycleTest
Assert.assertEquals(2,stopped.get()); Assert.assertEquals(2,stopped.get());
Assert.assertEquals(1,destroyed.get()); Assert.assertEquals(1,destroyed.get());
a0.start(); try
{
a0.start();
expectedException.reportMissingExceptionWithMessage("Expected IllegalStateException");
} catch(IllegalStateException ignore) {
// ignored
}
Assert.assertEquals(2,started.get()); Assert.assertEquals(2,started.get());
Assert.assertEquals(2,stopped.get()); Assert.assertEquals(2,stopped.get());
Assert.assertEquals(1,destroyed.get()); Assert.assertEquals(1,destroyed.get());
@ -107,11 +121,27 @@ public class ContainerLifeCycleTest
Assert.assertEquals(2,stopped.get()); Assert.assertEquals(2,stopped.get());
Assert.assertEquals(1,destroyed.get()); Assert.assertEquals(1,destroyed.get());
Assert.assertFalse(a0.isManaged(a1)); Assert.assertFalse(a0.isManaged(a1));
a0.start();
try
{
a0.start();
expectedException.reportMissingExceptionWithMessage("Expected IllegalStateException");
} catch(IllegalStateException ignore) {
// ignored
}
Assert.assertEquals(2,started.get()); Assert.assertEquals(2,started.get());
Assert.assertEquals(2,stopped.get()); Assert.assertEquals(2,stopped.get());
Assert.assertEquals(1,destroyed.get()); Assert.assertEquals(1,destroyed.get());
a1.start();
try
{
a1.start();
expectedException.reportMissingExceptionWithMessage("Expected IllegalStateException");
} catch(IllegalStateException ignore) {
// ignored
}
a0.manage(a1); a0.manage(a1);
Assert.assertEquals(3,started.get()); Assert.assertEquals(3,started.get());
Assert.assertEquals(2,stopped.get()); Assert.assertEquals(2,stopped.get());
@ -139,7 +169,7 @@ public class ContainerLifeCycleTest
Assert.assertEquals(2,destroyed.get()); Assert.assertEquals(2,destroyed.get());
} }
@Test(expected = IllegalStateException.class) @Test
public void testIllegalToStartAfterDestroy() throws Exception public void testIllegalToStartAfterDestroy() throws Exception
{ {
ContainerLifeCycle container = new ContainerLifeCycle(); ContainerLifeCycle container = new ContainerLifeCycle();
@ -148,6 +178,8 @@ public class ContainerLifeCycleTest
container.destroy(); container.destroy();
// Should throw IllegalStateException. // Should throw IllegalStateException.
expectedException.expect(IllegalStateException.class);
expectedException.expectMessage(containsString("Destroyed"));
container.start(); container.start();
} }