From 8dfa4c941a742d8fc3e30f6453635c6852c8d17d Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Tue, 10 Sep 2019 03:40:30 -0500
Subject: [PATCH] Server.stop() is now optional because of assumption on start

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 .../test/java/org/eclipse/jetty/embedded/LikeJettyXmlTest.java | 3 ++-
 .../test/java/org/eclipse/jetty/embedded/OneWebAppTest.java    | 3 ++-
 .../java/org/eclipse/jetty/embedded/OneWebAppWithJspTest.java  | 3 ++-
 .../org/eclipse/jetty/embedded/ServerWithAnnotationsTest.java  | 3 ++-
 .../java/org/eclipse/jetty/embedded/ServerWithJNDITest.java    | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/LikeJettyXmlTest.java b/examples/embedded/src/test/java/org/eclipse/jetty/embedded/LikeJettyXmlTest.java
index 3cd3cf1a479..445ebe9d4db 100644
--- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/LikeJettyXmlTest.java
+++ b/examples/embedded/src/test/java/org/eclipse/jetty/embedded/LikeJettyXmlTest.java
@@ -25,6 +25,7 @@ import org.eclipse.jetty.client.api.ContentResponse;
 import org.eclipse.jetty.http.HttpMethod;
 import org.eclipse.jetty.http.HttpStatus;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.util.component.LifeCycle;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -59,7 +60,7 @@ public class LikeJettyXmlTest extends AbstractEmbeddedTest
     @AfterEach
     public void stopServer() throws Exception
     {
-        server.stop();
+        LifeCycle.stop(server);
     }
 
     @Test
diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneWebAppTest.java b/examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneWebAppTest.java
index 4801f8c1e15..7f9eae15003 100644
--- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneWebAppTest.java
+++ b/examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneWebAppTest.java
@@ -24,6 +24,7 @@ import org.eclipse.jetty.client.api.ContentResponse;
 import org.eclipse.jetty.http.HttpMethod;
 import org.eclipse.jetty.http.HttpStatus;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.util.component.LifeCycle;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -49,7 +50,7 @@ public class OneWebAppTest extends AbstractEmbeddedTest
     @AfterEach
     public void stopServer() throws Exception
     {
-        server.stop();
+        LifeCycle.stop(server);
     }
 
     @Test
diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneWebAppWithJspTest.java b/examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneWebAppWithJspTest.java
index 53569bc7e32..9f858925596 100644
--- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneWebAppWithJspTest.java
+++ b/examples/embedded/src/test/java/org/eclipse/jetty/embedded/OneWebAppWithJspTest.java
@@ -24,6 +24,7 @@ import org.eclipse.jetty.client.api.ContentResponse;
 import org.eclipse.jetty.http.HttpMethod;
 import org.eclipse.jetty.http.HttpStatus;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.util.component.LifeCycle;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -53,7 +54,7 @@ public class OneWebAppWithJspTest extends AbstractEmbeddedTest
     @AfterEach
     public void stopServer() throws Exception
     {
-        server.stop();
+        LifeCycle.stop(server);
     }
 
     @Test
diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ServerWithAnnotationsTest.java b/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ServerWithAnnotationsTest.java
index 5abee62e47d..3662334ea26 100644
--- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ServerWithAnnotationsTest.java
+++ b/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ServerWithAnnotationsTest.java
@@ -23,6 +23,7 @@ import java.net.URI;
 import org.eclipse.jetty.client.api.ContentResponse;
 import org.eclipse.jetty.http.HttpStatus;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.util.component.LifeCycle;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -49,7 +50,7 @@ public class ServerWithAnnotationsTest extends AbstractEmbeddedTest
     @AfterEach
     public void stopServer() throws Exception
     {
-        server.stop();
+        LifeCycle.stop(server);
     }
 
     @Test
diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ServerWithJNDITest.java b/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ServerWithJNDITest.java
index 2065a2f0e09..603b4ae8023 100644
--- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ServerWithJNDITest.java
+++ b/examples/embedded/src/test/java/org/eclipse/jetty/embedded/ServerWithJNDITest.java
@@ -23,6 +23,7 @@ import java.net.URI;
 import org.eclipse.jetty.client.api.ContentResponse;
 import org.eclipse.jetty.http.HttpStatus;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.util.component.LifeCycle;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -50,7 +51,7 @@ public class ServerWithJNDITest extends AbstractEmbeddedTest
     @AfterEach
     public void stopServer() throws Exception
     {
-        server.stop();
+        LifeCycle.stop(server);
     }
 
     @Test