Repository: tomee Updated Branches: refs/heads/master ea13f63f2 -> f11150f99
Fixed test. Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f11150f9 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f11150f9 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f11150f9 Branch: refs/heads/master Commit: f11150f998172ed294fa35572aa87884d8fd6625 Parents: ea13f63 Author: Roberto Cortez <[email protected]> Authored: Mon Oct 8 00:08:23 2018 +0100 Committer: Roberto Cortez <[email protected]> Committed: Mon Oct 8 00:08:23 2018 +0100 ---------------------------------------------------------------------- .../tomee/embedded/ServletContextInjectionTest.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/f11150f9/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/ServletContextInjectionTest.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/ServletContextInjectionTest.java b/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/ServletContextInjectionTest.java index a60c7f1..0b7f124 100644 --- a/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/ServletContextInjectionTest.java +++ b/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/ServletContextInjectionTest.java @@ -89,8 +89,9 @@ public class ServletContextInjectionTest { @Test public void testWebApp() { + Container container = null; try { - final Container container = new Container( + container = new Container( new Configuration() .http(NetworkUtil.getNextAvailablePort()) .property("openejb.container.additional.exclude", "org.apache.tomee.embedded.") @@ -100,6 +101,9 @@ public class ServletContextInjectionTest { assertEquals("ok", IO.slurp( new URL("http://localhost:"; + container.getConfiguration().getHttpPort() + "/api/path"))); } catch (final Exception e) { + if (container != null) { + container.close(); + } Assert.fail(); } } @@ -125,8 +129,9 @@ public class ServletContextInjectionTest { contents.put("webapp.war", webapp); final File file = jarArchive(ear, contents); + Container container = null; try { - final Container container = new Container( + container = new Container( new Configuration() .http(NetworkUtil.getNextAvailablePort()) .property("openejb.container.additional.exclude", "org.apache.tomee.embedded.") @@ -139,8 +144,11 @@ public class ServletContextInjectionTest { assertEquals("ok", IO.slurp( new URL("http://localhost:"; + container.getConfiguration().getHttpPort() + "/webapp/path"))); } catch (final Exception e) { - e.printStackTrace(); Assert.fail(); + } finally { + if (container != null) { + container.close(); + } } }
