From fdf1f838bdaf9b34603169e8fb840199a8d0d89b Mon Sep 17 00:00:00 2001 From: Andres Taylor Date: Fri, 14 Oct 2011 17:18:03 +0200 Subject: [PATCH] Made the cineasts-rest use RestTestBase --- .../cineasts-rest/pom.xml | 736 ++++++++++-------- .../org/neo4j/cineasts/domain/DomainTest.java | 8 +- .../movieimport/MovieDbImportServiceTest.java | 3 +- .../test/resources/movies-test-context.xml | 2 +- .../src/test/resources/test-db.properties | 1 + spring-data-neo4j-rest/pom.xml | 151 ++-- 6 files changed, 492 insertions(+), 409 deletions(-) create mode 100644 spring-data-neo4j-examples/cineasts-rest/src/test/resources/test-db.properties diff --git a/spring-data-neo4j-examples/cineasts-rest/pom.xml b/spring-data-neo4j-examples/cineasts-rest/pom.xml index c67e100f8..a6a11a18f 100644 --- a/spring-data-neo4j-examples/cineasts-rest/pom.xml +++ b/spring-data-neo4j-examples/cineasts-rest/pom.xml @@ -1,331 +1,405 @@ - - 4.0.0 - - org.neo4j - movies-rest - 2.0-SNAPSHOT - war - - Movies over REST - - - UTF-8 - 3.0.6.RELEASE - 1.6.1 - UTF-8 - 1.5-SNAPSHOT - 2.0.0.BUILD-SNAPSHOT - 1.6.12.M1 - 1.6.1 - - - - - spring-maven-release - Spring Maven Release Repository - http://maven.springframework.org/release - - - spring-maven-snapshot - Spring Maven Snapshot Repository - - true - - http://maven.springframework.org/snapshot - - - spring-maven-milestone - Spring Maven Milestone Repository - http://maven.springframework.org/milestone - - - neo4j-public-repository - http://m2.neo4j.org/ - Publicly available Maven 2 repository for Neo4j - - - jboss-public-repo - http://repository.jboss.org/maven2/ - JBoss public available repo - - - - - - spring-maven-release - Spring Maven Release Repository - http://maven.springframework.org/release - - - spring-maven-milestone - Spring Maven Milestone Repository - http://maven.springframework.org/milestone - - - - - - - org.springframework - spring-core - ${spring.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-test - ${spring.version} - test - - - commons-logging - commons-logging - - - - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-aop - ${spring.version} - - - org.springframework - spring-aspects - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - - - - org.springframework - spring-webmvc - ${spring.version} - - - commons-logging - commons-logging - - - - - - org.springframework.security - spring-security-web - ${spring.version} - - - org.springframework.security - spring-security-config - ${spring.version} - - - - org.slf4j - slf4j-api - ${org.slf4j-version} - - - org.slf4j - jcl-over-slf4j - ${org.slf4j-version} - - - org.slf4j - slf4j-log4j12 - ${org.slf4j-version} - runtime - - - log4j - log4j - 1.2.16 - runtime - - - - org.springframework.data - spring-data-neo4j-aspects - ${spring-data-graph.version} - - - org.hibernate.javax.persistence - hibernate-jpa-2.0-api - - - - - - org.springframework.data - spring-data-neo4j-rest - ${spring-data-graph.version} - - - - opensymphony - sitemesh - 2.4.2 - - - - org.hibernate - hibernate-validator - 4.0.2.GA - - - - javax.servlet - servlet-api - 2.5 - provided - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - javax.servlet - jstl - 1.2 - - - - org.codehaus.jackson - jackson-mapper-asl - 1.7.2 - - - - org.aspectj - aspectjrt - ${aspectj.version} - - - - cglib - cglib-nodep - 2.2 - - - - org.hibernate.javax.persistence - hibernate-jpa-2.0-api - 1.0.0.Final - - - - - - org.neo4j - neo4j-kernel - ${neo4j.version} - test-jar - test - - - - junit - junit - 4.8.1 - test - - - - - - org.mortbay.jetty - jetty-maven-plugin - 7.1.2.v20100523 - - - / - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.1 - - 1.6 - 1.6 - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - **/*Tests.java - **/*Test.java - - - **/Abstract*.java - - junit:junit - - - - org.codehaus.mojo - aspectj-maven-plugin - 1.2 - - - org.aspectj - aspectjrt - ${aspectj.version} - - - org.aspectj - aspectjtools - ${aspectj.version} - - - - - - compile - test-compile - - - - - true - - - org.springframework - spring-aspects - - - org.springframework.data - spring-data-neo4j-aspects - - - 1.6 - 1.6 - - - - - - + + 4.0.0 + + org.neo4j + movies-rest + 2.0-SNAPSHOT + war + + Movies over REST + + + UTF-8 + 3.0.6.RELEASE + 1.6.1 + UTF-8 + 1.5-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT + 1.6.12.M1 + 1.6.1 + + + + + spring-maven-release + Spring Maven Release Repository + http://maven.springframework.org/release + + + spring-maven-snapshot + Spring Maven Snapshot Repository + + true + + http://maven.springframework.org/snapshot + + + spring-maven-milestone + Spring Maven Milestone Repository + http://maven.springframework.org/milestone + + + neo4j-public-repository + http://m2.neo4j.org/ + Publicly available Maven 2 repository for Neo4j + + + jboss-public-repo + http://repository.jboss.org/maven2/ + JBoss public available repo + + + + + + spring-maven-release + Spring Maven Release Repository + http://maven.springframework.org/release + + + spring-maven-milestone + Spring Maven Milestone Repository + http://maven.springframework.org/milestone + + + + + + org.springframework.data + spring-data-neo4j-rest + 2.0.0.BUILD-SNAPSHOT + test-jar + test + + + + + org.springframework + spring-core + ${spring.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-test + ${spring.version} + test + + + commons-logging + commons-logging + + + + + + org.springframework + spring-context + ${spring.version} + + + org.springframework + spring-aop + ${spring.version} + + + org.springframework + spring-aspects + ${spring.version} + + + org.springframework + spring-tx + ${spring.version} + + + + org.springframework + spring-webmvc + ${spring.version} + + + commons-logging + commons-logging + + + + + + org.springframework.security + spring-security-web + ${spring.version} + + + org.springframework.security + spring-security-config + ${spring.version} + + + + org.slf4j + slf4j-api + ${org.slf4j-version} + + + org.slf4j + jcl-over-slf4j + ${org.slf4j-version} + + + org.slf4j + slf4j-log4j12 + ${org.slf4j-version} + runtime + + + log4j + log4j + 1.2.16 + runtime + + + + org.springframework.data + spring-data-neo4j-aspects + ${spring-data-graph.version} + + + org.hibernate.javax.persistence + hibernate-jpa-2.0-api + + + + + + org.springframework.data + spring-data-neo4j-rest + ${spring-data-graph.version} + + + + opensymphony + sitemesh + 2.4.2 + + + + org.hibernate + hibernate-validator + 4.0.2.GA + + + + javax.servlet + servlet-api + 2.5 + provided + + + javax.servlet.jsp + jsp-api + 2.1 + provided + + + javax.servlet + jstl + 1.2 + + + + org.codehaus.jackson + jackson-mapper-asl + 1.7.2 + + + + org.aspectj + aspectjrt + ${aspectj.version} + + + + cglib + cglib-nodep + 2.2 + + + + org.hibernate.javax.persistence + hibernate-jpa-2.0-api + 1.0.0.Final + + + + + + org.neo4j + neo4j-kernel + ${neo4j.version} + test-jar + test + + + + org.neo4j.app + neo4j-server + ${neo4j.version} + test + + + org.slf4j + log4j-over-slf4j + + + + org.neo4j + neo4j + + + org.mortbay.jetty + jetty + + + com.sun.jersey + jersey-server + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-mapper-asl + + + de.huxhorn.lilith + de.huxhorn.lilith.3rdparty.rrd4j + + + com.sun.jersey.contribs + jersey-multipart + + + org.apache.felix + org.apache.felix.main + + + org.apache.felix + org.apache.felix.fileinstall + + + org.neo4j + neo4j-shell + + + org.slf4j + slf4j-jdk14 + + + + + + junit + junit + 4.8.1 + test + + + + org.mortbay.jetty + jetty + 6.1.25 + test + + + + + + + org.mortbay.jetty + jetty-maven-plugin + 7.1.2.v20100523 + + + / + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.1 + + 1.6 + 1.6 + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + **/*Tests.java + **/*Test.java + + + **/Abstract*.java + + junit:junit + + + + org.codehaus.mojo + aspectj-maven-plugin + 1.2 + + + org.aspectj + aspectjrt + ${aspectj.version} + + + org.aspectj + aspectjtools + ${aspectj.version} + + + + + + compile + test-compile + + + + + true + + + org.springframework + spring-aspects + + + org.springframework.data + spring-data-neo4j-aspects + + + 1.6 + 1.6 + + + + + + diff --git a/spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/domain/DomainTest.java b/spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/domain/DomainTest.java index f3328805d..23d9cf26f 100644 --- a/spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/domain/DomainTest.java +++ b/spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/domain/DomainTest.java @@ -7,6 +7,7 @@ import org.junit.runner.RunWith; import org.neo4j.cineasts.repository.MovieRepository; import org.neo4j.cineasts.repository.UserRepository; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.neo4j.rest.support.RestTestBase; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.transaction.annotation.Transactional; @@ -15,14 +16,10 @@ import java.util.Iterator; import static org.junit.Assert.*; -/** - * @author mh - * @since 04.03.11 - */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration({"/movies-test-context.xml"}) @Transactional -public class DomainTest { +public class DomainTest extends RestTestBase { @Autowired protected MovieRepository movieRepository; @@ -34,7 +31,6 @@ public class DomainTest { } @Test - @Ignore("Fails over REST") public void actorCanPlayARoleInAMovie() { Person tomHanks = new Person("1","Tom Hanks").persist(); Movie forestGump = new Movie("1", "Forrest Gump").persist(); diff --git a/spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/movieimport/MovieDbImportServiceTest.java b/spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/movieimport/MovieDbImportServiceTest.java index 4b590ec05..52d28a1f6 100644 --- a/spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/movieimport/MovieDbImportServiceTest.java +++ b/spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/movieimport/MovieDbImportServiceTest.java @@ -6,6 +6,7 @@ import org.neo4j.cineasts.domain.Movie; import org.neo4j.cineasts.domain.Person; import org.neo4j.cineasts.service.CineastsRepository; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.neo4j.rest.support.RestTestBase; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.transaction.annotation.Transactional; @@ -19,7 +20,7 @@ import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration({"/movies-test-context.xml"}) @Transactional -public class MovieDbImportServiceTest { +public class MovieDbImportServiceTest extends RestTestBase { @Autowired MovieDbImportService importService; diff --git a/spring-data-neo4j-examples/cineasts-rest/src/test/resources/movies-test-context.xml b/spring-data-neo4j-examples/cineasts-rest/src/test/resources/movies-test-context.xml index 0d4d42cdc..5bf2d9dd5 100644 --- a/spring-data-neo4j-examples/cineasts-rest/src/test/resources/movies-test-context.xml +++ b/spring-data-neo4j-examples/cineasts-rest/src/test/resources/movies-test-context.xml @@ -17,7 +17,7 @@ - + diff --git a/spring-data-neo4j-examples/cineasts-rest/src/test/resources/test-db.properties b/spring-data-neo4j-examples/cineasts-rest/src/test/resources/test-db.properties new file mode 100644 index 000000000..64291a371 --- /dev/null +++ b/spring-data-neo4j-examples/cineasts-rest/src/test/resources/test-db.properties @@ -0,0 +1 @@ +org.neo4j.server.database.location=target/test-db diff --git a/spring-data-neo4j-rest/pom.xml b/spring-data-neo4j-rest/pom.xml index 14a8b7d96..57ecb519d 100644 --- a/spring-data-neo4j-rest/pom.xml +++ b/spring-data-neo4j-rest/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - - org.springframework.data - spring-data-neo4j-parent - 2.0.0.BUILD-SNAPSHOT - ../spring-data-neo4j-parent/pom.xml - + + org.springframework.data + spring-data-neo4j-parent + 2.0.0.BUILD-SNAPSHOT + ../spring-data-neo4j-parent/pom.xml + spring-data-neo4j-rest jar 2.0.0.BUILD-SNAPSHOT @@ -37,7 +37,7 @@ test test-jar - + org.neo4j neo4j-rest-graphdb 1.5-SNAPSHOT @@ -82,74 +82,74 @@ neo4j-server ${neo4j.version} test - - - org.slf4j - log4j-over-slf4j - + + + org.slf4j + log4j-over-slf4j + - - org.neo4j - neo4j - - - org.mortbay.jetty - jetty - - - com.sun.jersey - jersey-server - - - org.codehaus.jackson - jackson-jaxrs - - - org.codehaus.jackson - jackson-mapper-asl - - - de.huxhorn.lilith - de.huxhorn.lilith.3rdparty.rrd4j - - - com.sun.jersey.contribs - jersey-multipart - - - org.apache.felix - org.apache.felix.main - - - org.apache.felix - org.apache.felix.fileinstall - - - org.neo4j - neo4j-shell - - - org.slf4j - slf4j-jdk14 - - + + org.neo4j + neo4j + + + org.mortbay.jetty + jetty + + + com.sun.jersey + jersey-server + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-mapper-asl + + + de.huxhorn.lilith + de.huxhorn.lilith.3rdparty.rrd4j + + + com.sun.jersey.contribs + jersey-multipart + + + org.apache.felix + org.apache.felix.main + + + org.apache.felix + org.apache.felix.fileinstall + + + org.neo4j + neo4j-shell + + + org.slf4j + slf4j-jdk14 + + - com.tinkerpop.blueprints - blueprints-core - true + com.tinkerpop.blueprints + blueprints-core + true - com.tinkerpop.blueprints - blueprints-neo4j-graph - true + com.tinkerpop.blueprints + blueprints-neo4j-graph + true - com.tinkerpop - gremlin - true + com.tinkerpop + gremlin + true @@ -186,10 +186,10 @@ ${jersey.version} - org.neo4j - neo4j-kernel - test-jar - test + org.neo4j + neo4j-kernel + test-jar + test @@ -234,6 +234,17 @@ + + maven-jar-plugin + + + attach-test-jar + + test-jar + + + + maven-compiler-plugin