From 18a38ce4b89403b1d339eea5e90f2ec329a92937 Mon Sep 17 00:00:00 2001
From: Lasse Westh-Nielsen <lassewesth@gmail.com>
Date: Thu, 13 Sep 2012 16:20:41 +0100
Subject: [PATCH] a movie can apparently have more then one director, as this
 was failing when the mapping was a single

---
 spring-data-neo4j-examples/cineasts/pom.xml   | 67 +++++++++++++++----
 .../java/org/neo4j/cineasts/domain/Movie.java |  3 +
 .../webapp/WEB-INF/applicationContext.xml     |  2 +-
 .../DatabasePopulationIT.java                 | 33 +++++++++
 .../movieimport/MovieDbImportServiceTest.java | 14 ++++
 5 files changed, 106 insertions(+), 13 deletions(-)
 create mode 100644 spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/integrationtests/DatabasePopulationIT.java

diff --git a/spring-data-neo4j-examples/cineasts/pom.xml b/spring-data-neo4j-examples/cineasts/pom.xml
index 2719b4536..414bd68a7 100644
--- a/spring-data-neo4j-examples/cineasts/pom.xml
+++ b/spring-data-neo4j-examples/cineasts/pom.xml
@@ -253,20 +253,62 @@
 			<version>4.8.1</version>
 			<scope>test</scope>
 		</dependency>
-	</dependencies>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+            <version>1.3</version>
+        </dependency>
+    </dependencies>
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>jetty-maven-plugin</artifactId>
-				<version>7.1.2.v20100523</version>
-				<configuration>
-					<webAppConfig>
-						<contextPath>/</contextPath>
-					</webAppConfig>
-					<!--scanIntervalSeconds>1</scanIntervalSeconds -->
-				</configuration>
-			</plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>2.12</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
+                <version>7.6.5.v20120716</version>
+                <configuration>
+                    <scanIntervalSeconds>10</scanIntervalSeconds>
+                    <stopKey>foo</stopKey>
+                    <stopPort>9999</stopPort>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>start-jetty</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <scanIntervalSeconds>0</scanIntervalSeconds>
+                            <daemon>true</daemon>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>stop-jetty</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
 
 			<plugin>
 				<!-- Must use java 1.5 or higher for annotations -->
@@ -281,6 +323,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
+                <version>2.12.1</version>
 				<configuration>
 					<useFile>true</useFile>
 					<includes>
diff --git a/spring-data-neo4j-examples/cineasts/src/main/java/org/neo4j/cineasts/domain/Movie.java b/spring-data-neo4j-examples/cineasts/src/main/java/org/neo4j/cineasts/domain/Movie.java
index 7e524bb98..cf2509103 100644
--- a/spring-data-neo4j-examples/cineasts/src/main/java/org/neo4j/cineasts/domain/Movie.java
+++ b/spring-data-neo4j-examples/cineasts/src/main/java/org/neo4j/cineasts/domain/Movie.java
@@ -234,5 +234,8 @@ public class Movie {
         return nodeId != null ? nodeId.hashCode() : super.hashCode();
     }
 
+    public Set<Director> getDirectors() {
+        return directors;
+    }
 }
 
diff --git a/spring-data-neo4j-examples/cineasts/src/main/webapp/WEB-INF/applicationContext.xml b/spring-data-neo4j-examples/cineasts/src/main/webapp/WEB-INF/applicationContext.xml
index c53ae4bd8..e1433c14d 100644
--- a/spring-data-neo4j-examples/cineasts/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/spring-data-neo4j-examples/cineasts/src/main/webapp/WEB-INF/applicationContext.xml
@@ -15,7 +15,7 @@
 
     <context:spring-configured/>
 
-    <neo4j:config storeDirectory="data/graph.db"/>
+    <neo4j:config storeDirectory="target/data/graph.db"/>
     <neo4j:repositories base-package="org.neo4j.cineasts.repository"/>
 
     <!--neo4j:config graphDatabaseService="graphDatabaseService"/>
diff --git a/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/integrationtests/DatabasePopulationIT.java b/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/integrationtests/DatabasePopulationIT.java
new file mode 100644
index 000000000..cbdab37ac
--- /dev/null
+++ b/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/integrationtests/DatabasePopulationIT.java
@@ -0,0 +1,33 @@
+package org.neo4j.cineasts.integrationtests;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.hamcrest.Matchers;
+import org.junit.Test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+public class DatabasePopulationIT {
+    @Test
+    public void shouldPopulateDatabase() throws Exception {
+        HttpClient httpclient = new DefaultHttpClient();
+        HttpGet httpget = new HttpGet("http://localhost:8080/populate");
+
+        HttpResponse response = httpclient.execute(httpget);
+
+        assertThat(response.getStatusLine().getStatusCode(), is(200));
+        assertThat(getContent(response), Matchers.containsString("Neo"));
+    }
+
+    private String getContent(HttpResponse response) throws IOException {
+        ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+        response.getEntity().writeTo(buffer);
+        return buffer.toString();
+    }
+}
diff --git a/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/movieimport/MovieDbImportServiceTest.java b/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/movieimport/MovieDbImportServiceTest.java
index 940782ee8..568250107 100644
--- a/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/movieimport/MovieDbImportServiceTest.java
+++ b/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/movieimport/MovieDbImportServiceTest.java
@@ -3,6 +3,7 @@ package org.neo4j.cineasts.movieimport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.neo4j.cineasts.domain.Actor;
+import org.neo4j.cineasts.domain.Director;
 import org.neo4j.cineasts.domain.Movie;
 import org.neo4j.cineasts.domain.Person;
 import org.neo4j.cineasts.repository.MovieRepository;
@@ -11,7 +12,11 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Set;
+
+import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
 
 /**
  * @author mh
@@ -49,4 +54,13 @@ public class MovieDbImportServiceTest {
         assertEquals("movie-id","105955", actor.getId());
         assertEquals("movie-title","George M. Williamson", actor.getName());
     }
+
+    @Test
+    public void shouldImportMovieWithTwoDirectors() throws Exception {
+        Movie movie = importService.importMovie("603");
+
+        movie = movieRepository.findById(movie.getId());
+
+        assertThat(movie.getDirectors().size(), is(2));
+    }
 }