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

Issue #6327 Re-enable and rename ContainerLifeCycleListenerTest (#7147)

This commit is contained in:
Jan Bartel 2021-12-06 10:39:29 +11:00 committed by GitHub
parent bc9406f38c
commit 2165b74b91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jetty-util/src/test/java/org/eclipse/jetty/util/component/LifeCycleListenerNestedTest.java → jetty-util/src/test/java/org/eclipse/jetty/util/component/ContainerLifeCycleListenerTest.java
View File

@ -17,7 +17,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.hamcrest.Matcher; import org.hamcrest.Matcher;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
@ -25,14 +24,11 @@ import static org.hamcrest.Matchers.hasItem;
import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.is;
/** /**
* Testing for LifeCycleListener events on nested components * Testing for LifeCycleListener events on ContainerLifeCycle components
* during runtime. * during runtime.
*/ */
@Disabled public class ContainerLifeCycleListenerTest
public class LifeCycleListenerNestedTest
{ {
// Set this true to use test-specific workaround.
private final boolean workaround = false;
public static class Foo extends ContainerLifeCycle public static class Foo extends ContainerLifeCycle
{ {
@ -181,8 +177,6 @@ public class LifeCycleListenerNestedTest
CapturingListener listener = new CapturingListener(); CapturingListener listener = new CapturingListener();
foo.addEventListener(listener); foo.addEventListener(listener);
if (workaround)
foo.addEventListener(listener);
try try
{ {
@ -212,8 +206,6 @@ public class LifeCycleListenerNestedTest
CapturingListener listener = new CapturingListener(); CapturingListener listener = new CapturingListener();
foo.addEventListener(listener); foo.addEventListener(listener);
if (workaround)
foo.addEventListener(listener);
Bar bara = new Bar("a"); Bar bara = new Bar("a");
Bar barb = new Bar("b"); Bar barb = new Bar("b");
@ -250,8 +242,6 @@ public class LifeCycleListenerNestedTest
CapturingListener listener = new CapturingListener(); CapturingListener listener = new CapturingListener();
foo.addEventListener(listener); foo.addEventListener(listener);
if (workaround)
foo.addEventListener(listener);
try try
{ {

2
jetty-util/src/test/java/org/eclipse/jetty/util/component/LifeCycleListenerTest.java
View File

@ -102,7 +102,7 @@ public class LifeCycleListenerTest
// System.out.println("STOPING TIME : " + listener.stoppingTime + " : " + listener.stoppedTime); // System.out.println("STOPING TIME : " + listener.stoppingTime + " : " + listener.stoppedTime);
// check that the lifecycle's state is stopped // check that the lifecycle's state is stopped
assertTrue(lifecycle.isStopped(), "The lifecycle state is not stooped"); assertTrue(lifecycle.isStopped(), "The lifecycle state is not stopped");
} }
@Test @Test