diff --git a/pom.xml b/pom.xml index f0fbd3e..9f8db63 100755 --- a/pom.xml +++ b/pom.xml @@ -1,107 +1,119 @@ - 4.0.0 - com.example - spring-hibernate-template - war - 0.0.1-SNAPSHOT + 4.0.0 + com.example + spring-hibernate-template + war + 0.0.1-SNAPSHOT - - 3.1.1.RELEASE - UTF-8 - + + 3.1.1.RELEASE + UTF-8 + - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - org.springframework - spring-webmvc - ${org.springframework.version} - - - org.springframework - spring-orm - ${org.springframework.version} - - - taglibs - standard - 1.1.2 - - - javax.servlet - jstl - 1.2 - - - org.hsqldb - hsqldb - 2.2.8 - - - postgresql - postgresql - 9.1-901-1.jdbc4 - - - commons-dbcp - commons-dbcp - 1.4 - - - org.hibernate - hibernate-entitymanager - 3.6.10.Final - - - com.github.jsimone - webapp-runner - 7.0.22.3 - provided - - + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + org.springframework + spring-webmvc + ${org.springframework.version} + + + org.springframework + spring-orm + ${org.springframework.version} + + + org.springframework + spring-test + ${org.springframework.version} + + + taglibs + standard + 1.1.2 + + + javax.servlet + jstl + 1.2 + + + org.hsqldb + hsqldb + 2.2.8 + + + postgresql + postgresql + 9.1-901-1.jdbc4 + + + commons-dbcp + commons-dbcp + 1.4 + + + org.hibernate + hibernate-entitymanager + 3.6.10.Final + + + com.github.jsimone + webapp-runner + 7.0.22.3 + provided + + + + junit + junit + 4.10 + test + + - - - - maven-compiler-plugin - - 1.6 - 1.6 - - - - maven-war-plugin - 2.2 - - - org.apache.maven.plugins - maven-dependency-plugin - 2.4 - - - package - - copy - - - - - com.github.jsimone - webapp-runner - 7.0.22.3 - webapp-runner.jar - - - - - - - - + + + + maven-compiler-plugin + + 1.6 + 1.6 + + + + maven-war-plugin + 2.2 + + + org.apache.maven.plugins + maven-dependency-plugin + 2.4 + + + package + + copy + + + + + com.github.jsimone + webapp-runner + 7.0.22.3 + webapp-runner.jar + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/example/controller/PersonController.java b/src/main/java/com/example/controller/PersonController.java index 82ee420..091f930 100755 --- a/src/main/java/com/example/controller/PersonController.java +++ b/src/main/java/com/example/controller/PersonController.java @@ -11,6 +11,7 @@ import com.example.model.Person; import com.example.service.PersonService; +import java.util.List; import java.util.Map; @Controller @@ -24,7 +25,6 @@ public String listPeople(Map map) { map.put("person", new Person()); map.put("peopleList", personService.listPeople()); - return "people"; } diff --git a/src/test/java/com/example/tests/PersonControllerTest.java b/src/test/java/com/example/tests/PersonControllerTest.java new file mode 100644 index 0000000..0d2f6c0 --- /dev/null +++ b/src/test/java/com/example/tests/PersonControllerTest.java @@ -0,0 +1,45 @@ +package com.example.tests; + +import junit.framework.TestCase; + +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.web.servlet.ModelAndView; + +import com.example.controller.PersonController; +import com.example.model.Person; +import com.example.service.PersonService; + + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.TimeZone; + +import static org.junit.Assert.assertEquals; + + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(locations = { "/applicationContext.xml" }) + +public class PersonControllerTest extends TestCase { + + @Autowired + PersonService personService; + + @Test + public void testListPersons() throws Exception { + Person p = new Person(); + p.setFirstName("Test"); + p.setLastName("Person"); + personService.addPerson(p); + + List persons = personService.listPeople(); + Assert.assertEquals(1, persons.size()); + } + +} \ No newline at end of file