Webaccess fixes cant be merged since in 1.7 we still rely on jettison normally and in polling sample we cant require java 7 build ;) ---------- Message transféré ---------- De : <[email protected]> Date : 17 juil. 2014 21:39 Objet : svn commit: r1611467 - in /tomee/tomee/branches/tomee-1.7.x: ./ arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/ examples/deltaspike-fullstack/ examples/moviefun-rest/ examples/moviefun/ examples/polling-parent... À : <[email protected]>
Author: andygumbrecht Date: Thu Jul 17 20:39:01 2014 New Revision: 1611467 URL: http://svn.apache.org/r1611467 Log: Test on available ports. Merged some test fixes from Romain Modified: tomee/tomee/branches/tomee-1.7.x/ (props changed) tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java tomee/tomee/branches/tomee-1.7.x/examples/deltaspike-fullstack/pom.xml tomee/tomee/branches/tomee-1.7.x/examples/moviefun-rest/pom.xml tomee/tomee/branches/tomee-1.7.x/examples/moviefun/pom.xml tomee/tomee/branches/tomee-1.7.x/examples/polling-parent/polling-domain/pom.xml tomee/tomee/branches/tomee-1.7.x/examples/polling-parent/polling-web/pom.xml tomee/tomee/branches/tomee-1.7.x/examples/polling-parent/polling-web/src/main/resources/META-INF/jug.polling/service-jar.xml tomee/tomee/branches/tomee-1.7.x/examples/polling-parent/polling-web/src/test/java/jug/rest/arquillian/SubjectServiceTomEETest.java tomee/tomee/branches/tomee-1.7.x/examples/rest-cdi/src/main/java/org/superbiz/rest/GreetingService.java tomee/tomee/branches/tomee-1.7.x/examples/rest-cdi/src/test/java/org/superbiz/rest/GreetingServiceTest.java tomee/tomee/branches/tomee-1.7.x/examples/rest-xml-json/src/test/java/org/superbiz/rest/GreetingServiceTest.java tomee/tomee/branches/tomee-1.7.x/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/ServletContextListenerRegistrationTest.java tomee/tomee/branches/tomee-1.7.x/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MulticastPulseAgentTest.java tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerDefaultsTest.java tomee/tomee/branches/tomee-1.7.x/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/LogTest.groovy tomee/tomee/branches/tomee-1.7.x/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/ScriptingTest.groovy Propchange: tomee/tomee/branches/tomee-1.7.x/ ------------------------------------------------------------------------------ Merged /tomee/tomee/trunk:r1611418-1611440 Modified: tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java?rev=1611467&r1=1611466&r2=1611467&view=diff ============================================================================== --- tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java (original) +++ tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java Thu Jul 17 20:39:01 2014 @@ -38,6 +38,7 @@ import static org.junit.Assert.assertNot @RunWith(Arquillian.class) // @RunAsClient public class EmbeddedTomEEContainerTest { + @Deployment public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class, "test.war") Modified: tomee/tomee/branches/tomee-1.7.x/examples/deltaspike-fullstack/pom.xml URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/examples/deltaspike-fullstack/pom.xml?rev=1611467&r1=1611466&r2=1611467&view=diff ============================================================================== --- tomee/tomee/branches/tomee-1.7.x/examples/deltaspike-fullstack/pom.xml (original) +++ tomee/tomee/branches/tomee-1.7.x/examples/deltaspike-fullstack/pom.xml Thu Jul 17 20:39:01 2014 @@ -21,7 +21,7 @@ <properties> <version.myfaces2>2.2.3</version.myfaces2> - <version.deltaspike>1.0.0</version.deltaspike> + <version.deltaspike>1.0.1</version.deltaspike> <version.extval>2.0.8</version.extval> <version.openejb>4.7.0-SNAPSHOT</version.openejb> <version.tomee>1.7.0-SNAPSHOT</version.tomee> @@ -48,6 +48,17 @@ <simpleLog>true</simpleLog> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.17</version> + <configuration> <!-- optional --> + <systemPropertyVariables> + <openejb.jul.forceReload>true</openejb.jul.forceReload> + </systemPropertyVariables> + <reuseForks>false</reuseForks> + </configuration> + </plugin> </plugins> </build> Modified: tomee/tomee/branches/tomee-1.7.x/examples/moviefun-rest/pom.xml URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/examples/moviefun-rest/pom.xml?rev=1611467&r1=1611466&r2=1611467&view=diff ============================================================================== --- tomee/tomee/branches/tomee-1.7.x/examples/moviefun-rest/pom.xml (original) +++ tomee/tomee/branches/tomee-1.7.x/examples/moviefun-rest/pom.xml Thu Jul 17 20:39:01 2014 @@ -105,7 +105,7 @@ <artifactId>maven-surefire-plugin</artifactId> <version>2.17</version> <configuration> - <forkMode>always</forkMode> + <reuseForks>false</reuseForks> </configuration> </plugin> <plugin> Modified: tomee/tomee/branches/tomee-1.7.x/examples/moviefun/pom.xml URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/examples/moviefun/pom.xml?rev=1611467&r1=1611466&r2=1611467&view=diff ============================================================================== --- tomee/tomee/branches/tomee-1.7.x/examples/moviefun/pom.xml (original) +++ tomee/tomee/branches/tomee-1.7.x/examples/moviefun/pom.xml Thu Jul 17 20:39:01 2014 @@ -73,7 +73,7 @@ <artifactId>maven-surefire-plugin</artifactId> <version>2.17</version> <configuration> - <forkMode>always</forkMode> + <reuseForks>false</reuseForks> <!-- otherwise openejb embedded and tomee embedded shares the same context and EJBContainer is broken --> </configuration> </plugin> <plugin> Modified: tomee/tomee/branches/tomee-1.7.x/examples/polling-parent/polling-domain/pom.xml URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/examples/polling-parent/polling-domain/pom.xml?rev=1611467&r1=1611466&r2=1611467&view=diff ============================================================================== --- tomee/tomee/branches/tomee-1.7.x/examples/polling-parent/polling-domain/pom.xml (original) +++ tomee/tomee/branches/tomee-1.7.x/examples/polling-parent/polling-domain/pom.xml Thu Jul 17 20:39:01 2014 @@ -58,9 +58,9 @@ </executions> <dependencies> <dependency> - <groupId>org.apache.openjpa</groupId> + <groupId>org.apache.openejb.patch</groupId> <artifactId>openjpa</artifactId> - <version>2.3.0</version> + <version>2.4.0-nonfinal-1598334</version> </dependency> </dependencies> </plugin> Modified: tomee/tomee/branches/tomee-1.7.x/examples/polling-parent/polling-web/pom.xml URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/examples/polling-parent/polling-web/pom.xml?rev=1611467&r1=1611466&r2=1611467&view=diff ============================================================================== --- tomee/tomee/branches/tomee-1.7.x/examples/polling-parent/polling-web/pom.xml (original) +++ tomee/tomee/branches/tomee-1.7.x/examples/polling-parent/polling-web/pom.xml Thu Jul 17 20:39:01 2014 @@ -84,6 +84,15 @@ <tomeeClassifier>jaxrs</tomeeClassifier> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.1</version> + <configuration> + <source>1.7</source> + <target>1.7</target> + </configuration> + </plugin> </plugins> </build> </project> Modified: tomee/tomee/branches/tomee-1.7.x/examples/polling-parent/polling-web/src/main/resources/META-INF/jug.polling/service-jar.xml URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/examples/polling-parent/polling-web/src/main/resources/META-INF/jug.polling/service-jar.xml?rev=1611467&r1=1611466&r2=1611467&view=diff ============================================================================== --- tomee/tomee/branches/tomee-1.7.x/examples/polling-parent/polling-web/src/main/resources/META-INF/jug.polling/service-jar.xml (original) +++ tomee/tomee/branches/tomee-1.7.x/examples/polling-parent/polling-web/src/main/resources/META-INF/jug.polling/service-jar.xml Thu Jul 17 20:39:01 2014 @@ -16,6 +16,7 @@ limitations under the License. --> <ServiceJar> + <!-- can also be done in tomee.xml with <Resource id="PollingRouter" class-name="jug.routing.PollingRouter" /> --> <ServiceProvider id="PollingRouter" service="Resource" type="org.apache.openejb.resource.jdbc.Router" class-name="jug.routing.PollingRouter"/> Modified: tomee/tomee/branches/tomee-1.7.x/examples/polling-parent/polling-web/src/test/java/jug/rest/arquillian/SubjectServiceTomEETest.java URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/examples/polling-parent/polling-web/src/test/java/jug/rest/arquillian/SubjectServiceTomEETest.java?rev=1611467&r1=1611466&r2=1611467&view=diff ============================================================================== --- tomee/tomee/branches/tomee-1.7.x/examples/polling-parent/polling-web/src/test/java/jug/rest/arquillian/SubjectServiceTomEETest.java (original) +++ tomee/tomee/branches/tomee-1.7.x/examples/polling-parent/polling-web/src/test/java/jug/rest/arquillian/SubjectServiceTomEETest.java Thu Jul 17 20:39:01 2014 @@ -22,6 +22,7 @@ import jug.monitoring.VoteCounter; import jug.rest.SubjectService; import jug.routing.PollingRouter; import org.apache.commons.io.IOUtils; +import org.apache.cxf.jaxrs.client.WebClient; import org.apache.ziplock.JarLocation; import org.apache.ziplock.WebModule; import org.jboss.arquillian.container.test.api.Deployment; @@ -38,6 +39,7 @@ import java.io.BufferedInputStream; import java.net.URL; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; @RunAsClient @RunWith(Arquillian.class) @@ -49,7 +51,7 @@ public class SubjectServiceTomEETest { @Deployment public static WebArchive archive() { return new WebModule(SubjectServiceTomEETest.class).getArchive() - .addClass(VoteCounter.class) + .addClass(VoteCounter.class) .addPackage(Subject.class.getPackage()) // domain .addAsWebInfResource(new ClassLoaderAsset("META-INF/persistence.xml"), "persistence.xml") .addAsWebInfResource(new ClassLoaderAsset("META-INF/env-entries.properties"), "env-entries.properties") @@ -65,8 +67,18 @@ public class SubjectServiceTomEETest { @Test public void checkThereIsSomeOutput() throws Exception { final String base = url.toExternalForm(); - final URL url = new URL(base + "api/subject/list"); - final String output = IOUtils.toString(new BufferedInputStream(url.openStream())); - assertTrue(output.contains("subject")); + WebClient.create(base) + .path("api/subject/create") + .accept("application/json") + .query("name", "SubjectServiceTomEETest") + .post("SubjectServiceTomEETest"); + for (int i = 0; i < 2; i++) { // we have a dynamic datasource so let it round + final URL url = new URL(base + "api/subject/list"); + final String output = IOUtils.toString(new BufferedInputStream(url.openStream())); + if (output.contains("SubjectServiceTomEETest")) { + return; + } + } + fail("created entry not found"); } } Modified: tomee/tomee/branches/tomee-1.7.x/examples/rest-cdi/src/main/java/org/superbiz/rest/GreetingService.java URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/examples/rest-cdi/src/main/java/org/superbiz/rest/GreetingService.java?rev=1611467&r1=1611466&r2=1611467&view=diff ============================================================================== --- tomee/tomee/branches/tomee-1.7.x/examples/rest-cdi/src/main/java/org/superbiz/rest/GreetingService.java (original) +++ tomee/tomee/branches/tomee-1.7.x/examples/rest-cdi/src/main/java/org/superbiz/rest/GreetingService.java Thu Jul 17 20:39:01 2014 @@ -23,6 +23,7 @@ import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import javax.xml.bind.annotation.XmlRootElement; @Path("/greeting") @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) @@ -33,12 +34,33 @@ public class GreetingService { Greeting greeting; @GET - public Response message() { - return new Response("Hi REST!"); + public Greet message() { + return new Greet("Hi REST!"); } @POST - public Response lowerCase(final Request message) { - return new Response(greeting.doSomething(message.getValue())); + public Greet lowerCase(final Request message) { + return new Greet(greeting.doSomething(message.getValue())); + } + + @XmlRootElement // for xml only, useless for json (fleece is the default) + public static class Greet { + private String message; + + public Greet(final String message) { + this.message = message; + } + + public Greet() { + this(null); + } + + public String getMessage() { + return message; + } + + public void setMessage(final String message) { + this.message = message; + } } } Modified: tomee/tomee/branches/tomee-1.7.x/examples/rest-cdi/src/test/java/org/superbiz/rest/GreetingServiceTest.java URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/examples/rest-cdi/src/test/java/org/superbiz/rest/GreetingServiceTest.java?rev=1611467&r1=1611466&r2=1611467&view=diff ============================================================================== --- tomee/tomee/branches/tomee-1.7.x/examples/rest-cdi/src/test/java/org/superbiz/rest/GreetingServiceTest.java (original) +++ tomee/tomee/branches/tomee-1.7.x/examples/rest-cdi/src/test/java/org/superbiz/rest/GreetingServiceTest.java Thu Jul 17 20:39:01 2014 @@ -17,6 +17,7 @@ package org.superbiz.rest; import org.apache.cxf.jaxrs.client.WebClient; +import org.apache.fleece.jaxrs.FleeceProvider; import org.apache.openejb.jee.WebApp; import org.apache.openejb.junit.ApplicationComposer; import org.apache.openejb.testing.Classes; @@ -28,6 +29,7 @@ import org.junit.runner.RunWith; import javax.ws.rs.core.MediaType; import java.io.IOException; +import static java.util.Arrays.asList; import static org.junit.Assert.assertEquals; @EnableServices(value = "jaxrs", httpDebug = true) @@ -35,7 +37,7 @@ import static org.junit.Assert.assertEqu public class GreetingServiceTest { @Module - @Classes(value = {GreetingService.class, Greeting.class}, cdi = true) //This enables the CDI magic + @Classes(value = {GreetingService.class, Greeting.class}, cdi = true) // This enables the CDI magic public WebApp app() { return new WebApp().contextRoot("test"); } @@ -44,7 +46,7 @@ public class GreetingServiceTest { public void getXml() throws IOException { final String message = WebClient.create("http://localhost:4204 ").path("/test/greeting/") .accept(MediaType.APPLICATION_XML_TYPE) - .get(Response.class).getValue(); + .get(GreetingService.Greet.class).getMessage(); assertEquals("Hi REST!", message); } @@ -52,23 +54,23 @@ public class GreetingServiceTest { public void postXml() throws IOException { final String message = WebClient.create("http://localhost:4204 ").path("/test/greeting/") .accept(MediaType.APPLICATION_XML_TYPE) - .post(new Request("Hi REST!"), Response.class).getValue(); + .post(new Request("Hi REST!"), GreetingService.Greet.class).getMessage(); assertEquals("hi rest!", message); } @Test public void getJson() throws IOException { - final String message = WebClient.create("http://localhost:4204 ").path("/test/greeting/") + final String message = WebClient.create("http://localhost:4204", asList(new FleeceProvider<GreetingService.Greet>())).path("/test/greeting/") .accept(MediaType.APPLICATION_JSON_TYPE) - .get(Response.class).getValue(); + .get(GreetingService.Greet.class).getMessage(); assertEquals("Hi REST!", message); } @Test public void postJson() throws IOException { - final String message = WebClient.create("http://localhost:4204 ").path("/test/greeting/") + final String message = WebClient.create("http://localhost:4204", asList(new FleeceProvider<GreetingService.Greet>())).path("/test/greeting/") .accept(MediaType.APPLICATION_JSON_TYPE) - .post(new Request("Hi REST!"), Response.class).getValue(); + .post(new Request("Hi REST!"), GreetingService.Greet.class).getMessage(); assertEquals("hi rest!", message); } } Modified: tomee/tomee/branches/tomee-1.7.x/examples/rest-xml-json/src/test/java/org/superbiz/rest/GreetingServiceTest.java URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/examples/rest-xml-json/src/test/java/org/superbiz/rest/GreetingServiceTest.java?rev=1611467&r1=1611466&r2=1611467&view=diff ============================================================================== --- tomee/tomee/branches/tomee-1.7.x/examples/rest-xml-json/src/test/java/org/superbiz/rest/GreetingServiceTest.java (original) +++ tomee/tomee/branches/tomee-1.7.x/examples/rest-xml-json/src/test/java/org/superbiz/rest/GreetingServiceTest.java Thu Jul 17 20:39:01 2014 @@ -43,32 +43,35 @@ public class GreetingServiceTest { @Test public void getXml() throws IOException { final String message = WebClient.create("http://localhost:4204 ").path("/test/greeting/") - .accept(MediaType.APPLICATION_XML_TYPE) - .get(Response.class).getValue(); - assertEquals("Hi REST!", message); + .accept(MediaType.APPLICATION_XML_TYPE) + .get(String.class); + assertEquals("<response><value>Hi REST!</value></response>", message); } @Test public void postXml() throws IOException { - final String message = WebClient.create("http://localhost:4204 ").path("/test/greeting/") - .accept(MediaType.APPLICATION_XML_TYPE) - .post(new Request("Hi REST!"), Response.class).getValue(); - assertEquals("hi rest!", message); + final String message = WebClient.create("http://localhost:4204") + .path("/test/greeting/") + .accept(MediaType.APPLICATION_XML_TYPE) + .post("<request><value>Hi REST!</value></request>", String.class); + assertEquals("<response><value>hi rest!</value></response>", message); } @Test public void getJson() throws IOException { - final String message = WebClient.create("http://localhost:4204 ").path("/test/greeting/") - .accept(MediaType.APPLICATION_JSON_TYPE) - .get(Response.class).getValue(); - assertEquals("Hi REST!", message); + final String message = WebClient.create("http://localhost:4204") + .path("/test/greeting/") + .accept(MediaType.APPLICATION_JSON_TYPE) + .get(String.class); + assertEquals("{\"value\":\"Hi REST!\"}", message); } @Test public void postJson() throws IOException { - final String message = WebClient.create("http://localhost:4204 ").path("/test/greeting/") - .accept(MediaType.APPLICATION_JSON_TYPE) - .post(new Request("Hi REST!"), Response.class).getValue(); - assertEquals("hi rest!", message); + final String message = WebClient.create("http://localhost:4204") + .path("/test/greeting/") + .accept(MediaType.APPLICATION_JSON_TYPE) + .post(new Request("Hi REST!"), String.class); + assertEquals("{\"value\":\"hi rest!\"}", message); } } Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/ServletContextListenerRegistrationTest.java URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/ServletContextListenerRegistrationTest.java?rev=1611467&r1=1611466&r2=1611467&view=diff ============================================================================== --- tomee/tomee/branches/tomee-1.7.x/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/ServletContextListenerRegistrationTest.java (original) +++ tomee/tomee/branches/tomee-1.7.x/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/ServletContextListenerRegistrationTest.java Thu Jul 17 20:39:01 2014 @@ -18,20 +18,38 @@ package org.apache.openejb.server.httpd; import org.apache.openejb.jee.WebApp; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.junit.EnableServices; -import org.apache.openejb.junit.Module; +import org.apache.openejb.testing.Configuration; +import org.apache.openejb.testing.EnableServices; +import org.apache.openejb.testing.Module; +import org.apache.openejb.testng.PropertiesBuilder; +import org.apache.openejb.util.NetworkUtil; +import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; import java.io.IOException; +import java.util.Properties; import static org.junit.Assert.assertTrue; @EnableServices({"httpejbd"}) @RunWith(ApplicationComposer.class) public class ServletContextListenerRegistrationTest { + + private static int port = -1; + + @BeforeClass + public static void beforeClass() { + port = NetworkUtil.getNextAvailablePort(); + } + + @Configuration + public Properties props() { + return new PropertiesBuilder().p("httpejbd.port", Integer.toString(port)).build(); + } + @Module public WebApp app() { return new WebApp() Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MulticastPulseAgentTest.java URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MulticastPulseAgentTest.java?rev=1611467&r1=1611466&r2=1611467&view=diff ============================================================================== --- tomee/tomee/branches/tomee-1.7.x/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MulticastPulseAgentTest.java (original) +++ tomee/tomee/branches/tomee-1.7.x/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MulticastPulseAgentTest.java Thu Jul 17 20:39:01 2014 @@ -17,6 +17,7 @@ package org.apache.openejb.server.discovery; import org.apache.openejb.server.DiscoveryListener; +import org.apache.openejb.util.NetworkUtil; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -56,7 +57,7 @@ public class MulticastPulseAgentTest { private static final Charset utf8 = Charset.forName("UTF-8"); private static final String forGroup = "*"; private static final String host = "239.255.3.2"; - private static final int port = 6142; + private static final int port = NetworkUtil.getNextAvailablePort(); private static MulticastPulseAgent agent; @BeforeClass Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerDefaultsTest.java URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerDefaultsTest.java?rev=1611467&r1=1611466&r2=1611467&view=diff ============================================================================== --- tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerDefaultsTest.java (original) +++ tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerDefaultsTest.java Thu Jul 17 20:39:01 2014 @@ -18,11 +18,17 @@ package org.apache.openejb.server; import org.apache.openejb.jee.EjbJar; import org.apache.openejb.junit.ApplicationComposer; +import org.apache.openejb.testing.Configuration; import org.apache.openejb.testing.EnableServices; import org.apache.openejb.testing.Module; +import org.apache.openejb.testng.PropertiesBuilder; +import org.apache.openejb.util.NetworkUtil; +import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import java.util.Properties; + import static org.junit.Assert.assertEquals; /** @@ -34,6 +40,18 @@ import static org.junit.Assert.assertEqu @RunWith(ApplicationComposer.class) public class FilteredServiceManagerDefaultsTest { + private static int port = -1; + + @BeforeClass + public static void beforeClass() { + port = NetworkUtil.getNextAvailablePort(); + } + + @Configuration + public Properties props() { + return new PropertiesBuilder().p("httpejbd.port", Integer.toString(port)).build(); + } + @Module public EjbJar jar() { return new EjbJar(); Modified: tomee/tomee/branches/tomee-1.7.x/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/LogTest.groovy URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/LogTest.groovy?rev=1611467&r1=1611466&r2=1611467&view=diff ============================================================================== --- tomee/tomee/branches/tomee-1.7.x/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/LogTest.groovy (original) +++ tomee/tomee/branches/tomee-1.7.x/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/LogTest.groovy Thu Jul 17 20:39:01 2014 @@ -59,7 +59,7 @@ class LogTest { @Test void test() throws Exception { Utilities.withClient(deploymentURL, { CloseableHttpClient client -> - Assert.assertEquals('{"listFilesResultDto":{"files":["catalina.2014-02-07.log","localhost_access_log.2014-02-07.txt"]}}', + Assert.assertEquals('{"files":["catalina.2014-02-07.log","localhost_access_log.2014-02-07.txt"]}', Utilities.getBody(client.execute(new HttpGet("${deploymentURL.toURI()}rest/log/list-files"))) ) Utilities.getBody(client.execute(new HttpGet("${deploymentURL.toURI()}rest/keep-alive"))) Modified: tomee/tomee/branches/tomee-1.7.x/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/ScriptingTest.groovy URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/ScriptingTest.groovy?rev=1611467&r1=1611466&r2=1611467&view=diff ============================================================================== --- tomee/tomee/branches/tomee-1.7.x/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/ScriptingTest.groovy (original) +++ tomee/tomee/branches/tomee-1.7.x/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/ScriptingTest.groovy Thu Jul 17 20:39:01 2014 @@ -57,7 +57,7 @@ class ScriptingTest { void test() throws Exception { Utilities.withClient(deploymentURL, { CloseableHttpClient client -> Assert.assertEquals( - '{"scriptingResultDto":{"output":"Hi there!"}}', + '{"output":"Hi there!"}', Utilities.post(deploymentURL, client, 'rest/scripting', new BasicNameValuePair('engine', 'js'), new BasicNameValuePair('script', 'print("Hi there!");')
