This is an automated email from the git hooks/post-receive script. tjaalton pushed a commit to branch master in repository jackson-jaxrs-providers.
commit 5a297edde62deae8f43639b802c1bac5d6da3ff6 Author: Tatu Saloranta <[email protected]> Date: Sun Apr 7 17:54:44 2013 -0700 refactoring tests to try real integration testing... --- json/pom.xml | 9 +--- .../jackson/jaxrs/json/JaxrsTestBase.java | 33 +++++++++++++ .../jackson/jaxrs/json/dw/TestService.java | 56 ---------------------- .../jackson/jaxrs/json/dw/TestServiceConfig.java | 10 ---- .../jackson/jaxrs/json/dw/TestSimpleEndpoint.java | 2 + pom.xml | 25 +++++++++- 6 files changed, 59 insertions(+), 76 deletions(-) diff --git a/json/pom.xml b/json/pom.xml index b5d9d0e..8769112 100644 --- a/json/pom.xml +++ b/json/pom.xml @@ -76,14 +76,7 @@ <version>${version.jackson.jaxb}</version> </dependency> - <!-- test deps should come from parent. Except for DW --> - <dependency> - <groupId>com.yammer.dropwizard</groupId> - <artifactId>dropwizard-core</artifactId> - <version>0.6.2</version> - <scope>test</scope> - </dependency> - + <!-- test deps should come from parent, including jersey --> </dependencies> <build> <plugins> diff --git a/json/src/test/java/com/fasterxml/jackson/jaxrs/json/JaxrsTestBase.java b/json/src/test/java/com/fasterxml/jackson/jaxrs/json/JaxrsTestBase.java index 34d56ab..1e9eb92 100644 --- a/json/src/test/java/com/fasterxml/jackson/jaxrs/json/JaxrsTestBase.java +++ b/json/src/test/java/com/fasterxml/jackson/jaxrs/json/JaxrsTestBase.java @@ -5,12 +5,45 @@ import java.util.Arrays; import org.junit.Assert; +// JAX-RS (jersey), Jetty stuff: +import javax.ws.rs.core.Application; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.handler.ContextHandlerCollection; +import org.eclipse.jetty.servlet.ServletContextHandler; +import org.eclipse.jetty.servlet.ServletHolder; +import com.sun.jersey.spi.container.servlet.ServletContainer; + import com.fasterxml.jackson.core.*; public abstract class JaxrsTestBase extends junit.framework.TestCase { + /* + /********************************************************** + /* Starting actual JAX-RS container + /********************************************************** + */ + protected Server startServer(int port, Class<? extends Application> appClass) + { + Server server = new Server(port); + final ContextHandlerCollection contexts = new ContextHandlerCollection(); + server.setHandler(contexts); + ServletHolder jaxrs = new ServletHolder(ServletContainer.class); + jaxrs.setInitParameter("javax.ws.rs.Application", appClass.getName()); + final ServletContextHandler mainHandler = new ServletContextHandler(contexts, "/", true, false); + mainHandler.addServlet(jaxrs, "/*"); + server.setHandler(mainHandler); + try { + server.start(); + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { + throw new RuntimeException(e); + } + return server; + } + /* /********************************************************** /* Additional assertion methods diff --git a/json/src/test/java/com/fasterxml/jackson/jaxrs/json/dw/TestService.java b/json/src/test/java/com/fasterxml/jackson/jaxrs/json/dw/TestService.java deleted file mode 100644 index e52c383..0000000 --- a/json/src/test/java/com/fasterxml/jackson/jaxrs/json/dw/TestService.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.fasterxml.jackson.jaxrs.json.dw; - -import org.eclipse.jetty.server.Server; - -import com.yammer.dropwizard.Service; -import com.yammer.dropwizard.config.Bootstrap; -import com.yammer.dropwizard.config.Environment; -import com.yammer.dropwizard.config.ServerFactory; -import com.yammer.dropwizard.json.ObjectMapperFactory; -import com.yammer.dropwizard.validation.Validator; - -public class TestService extends Service<TestServiceConfig> -{ - protected final static ObjectMapperFactory MAPPER_FACTORY = new ObjectMapperFactory(); - - protected Server _jettyServer; - - protected TestService() { } - - public static TestService create(TestServiceConfig config, - Object... resources) - throws Exception - { - TestService service = new TestService(); - Bootstrap<TestServiceConfig> bootstrap = new Bootstrap<TestServiceConfig>(service); - final Environment environment = new Environment("TestService", config, - MAPPER_FACTORY, new Validator()); - for (Object resource : resources) { - environment.addResource(resource); - } - bootstrap.runWithBundles(config, environment); - service.run(config, environment); - final Server server = new ServerFactory(config.getHttpConfiguration(), - "StoreForTests").buildServer(environment); - service._jettyServer = server; - return service; - } - - public void start() throws Exception { - _jettyServer.start(); - } - - public void stop() throws Exception { - _jettyServer.stop(); - } - - @Override - public void initialize(Bootstrap<TestServiceConfig> bootstrap) { - } - - @Override - public void run(TestServiceConfig configuration, Environment environment) - throws Exception - { - } -} diff --git a/json/src/test/java/com/fasterxml/jackson/jaxrs/json/dw/TestServiceConfig.java b/json/src/test/java/com/fasterxml/jackson/jaxrs/json/dw/TestServiceConfig.java deleted file mode 100644 index 8fe5e5e..0000000 --- a/json/src/test/java/com/fasterxml/jackson/jaxrs/json/dw/TestServiceConfig.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.fasterxml.jackson.jaxrs.json.dw; - -import com.yammer.dropwizard.config.Configuration; - -public class TestServiceConfig extends Configuration -{ - public TestServiceConfig(int port) { - this.getHttpConfiguration().setPort(port); - } -} diff --git a/json/src/test/java/com/fasterxml/jackson/jaxrs/json/dw/TestSimpleEndpoint.java b/json/src/test/java/com/fasterxml/jackson/jaxrs/json/dw/TestSimpleEndpoint.java index ce8bc2f..607ec32 100644 --- a/json/src/test/java/com/fasterxml/jackson/jaxrs/json/dw/TestSimpleEndpoint.java +++ b/json/src/test/java/com/fasterxml/jackson/jaxrs/json/dw/TestSimpleEndpoint.java @@ -30,10 +30,12 @@ public class TestSimpleEndpoint extends JaxrsTestBase public void testStandardJson() throws Exception { + /* TestServiceConfig config = new TestServiceConfig(9090); TestService svc = TestService.create(config, new SimpleResource()); svc.start(); svc.stop(); + */ } } diff --git a/pom.xml b/pom.xml index e122ebb..605dff0 100644 --- a/pom.xml +++ b/pom.xml @@ -51,6 +51,10 @@ <version.jackson.xml>${version.jackson.core}</version.jackson.xml> <version.jackson.jaxb>${version.jackson.core}</version.jackson.jaxb> + + <!-- Need Jersey+Jetty for testing --> + <version.jersey>1.17.1</version.jersey> + <version.jetty>8.1.10.v20130312</version.jetty> </properties> <dependencies> @@ -78,15 +82,32 @@ NOTE: use 1.2 as that's JDK 1.5; later (1.8) versions need JDK 1.6 --> <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>${version.jetty}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>${version.jetty}</version> + </dependency> + + <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-core</artifactId> - <version>1.2</version> + <version>${version.jersey}</version> <scope>test</scope> </dependency> <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-server</artifactId> - <version>1.2</version> + <version>${version.jersey}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-servlet</artifactId> + <version>${version.jersey}</version> <scope>test</scope> </dependency> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-jaxrs-providers.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
