Author: tchemit Date: 2008-08-14 12:17:51 +0000 (Thu, 14 Aug 2008) New Revision: 106 Removed: trunk/hessian-test/hessian-test-client/src/test/filters/ Modified: trunk/hessian-test/hessian-test-api/src/main/java/org/codelutin/hessian/entity/Person.java trunk/hessian-test/hessian-test-api/src/main/java/org/codelutin/hessian/service/GenericListDao.java trunk/hessian-test/hessian-test-client/README.txt trunk/hessian-test/hessian-test-client/pom.xml trunk/hessian-test/hessian-test-client/src/test/java/org/codelutin/hessian/PersonDaoTest.java trunk/hessian-test/hessian-test-client/src/test/resources/server.properties Log: ajout test update, suppression du filter Modified: trunk/hessian-test/hessian-test-api/src/main/java/org/codelutin/hessian/entity/Person.java =================================================================== --- trunk/hessian-test/hessian-test-api/src/main/java/org/codelutin/hessian/entity/Person.java 2008-08-14 11:56:00 UTC (rev 105) +++ trunk/hessian-test/hessian-test-api/src/main/java/org/codelutin/hessian/entity/Person.java 2008-08-14 12:17:51 UTC (rev 106) @@ -22,7 +22,7 @@ public class Person extends Pao implements Serializable { - enum Gender { + public static enum Gender { MALE, FEMALE } @@ -78,6 +78,13 @@ this.mails = mails; } + public void addMail(Mail mail) { + if (mails == null) { + mails = new java.util.ArrayList<Mail>(); + } + mails.add(mail); + } + @Override public String toString() { return super.toString() + "<name:" + name + ", age:" + age + ", gender:" + gender + ", address:" + address + ", mails:" + mails + ">"; Modified: trunk/hessian-test/hessian-test-api/src/main/java/org/codelutin/hessian/service/GenericListDao.java =================================================================== --- trunk/hessian-test/hessian-test-api/src/main/java/org/codelutin/hessian/service/GenericListDao.java 2008-08-14 11:56:00 UTC (rev 105) +++ trunk/hessian-test/hessian-test-api/src/main/java/org/codelutin/hessian/service/GenericListDao.java 2008-08-14 12:17:51 UTC (rev 106) @@ -41,7 +41,7 @@ @Override public void insert(T t) { - System.out.println("server :" + t); + System.out.println("server insert :" + t); data.add(t); } @@ -52,7 +52,13 @@ @Override public void update(T t) { - data.set(data.indexOf(t), t); + System.out.println("server update :" + t); + int index = data.indexOf(t); + if (index == -1) { + data.add(t); + } else { + data.set(index, t); + } } } Modified: trunk/hessian-test/hessian-test-client/README.txt =================================================================== --- trunk/hessian-test/hessian-test-client/README.txt 2008-08-14 11:56:00 UTC (rev 105) +++ trunk/hessian-test/hessian-test-client/README.txt 2008-08-14 12:17:51 UTC (rev 106) @@ -4,4 +4,4 @@ lancer la partie serveur puis un 'mvn test -Ptests' (par défaut on recherche le service hessian sur localhost:8080/PersonDao) -Pour changer l'adresse de bind hessian vous pouvez la modifier dans le fichier src/test/filters/filter.properties +Pour changer l'adresse de bind hessian vous pouvez la modifier dans le fichier src/test/resources/server.properties Modified: trunk/hessian-test/hessian-test-client/pom.xml =================================================================== --- trunk/hessian-test/hessian-test-client/pom.xml 2008-08-14 11:56:00 UTC (rev 105) +++ trunk/hessian-test/hessian-test-client/pom.xml 2008-08-14 12:17:51 UTC (rev 106) @@ -46,17 +46,6 @@ <build> - <filters> - <filter>src/test/filters/filter.properties</filter> - </filters> - - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>true</filtering> - </testResource> - </testResources> - </build> </project> Modified: trunk/hessian-test/hessian-test-client/src/test/java/org/codelutin/hessian/PersonDaoTest.java =================================================================== --- trunk/hessian-test/hessian-test-client/src/test/java/org/codelutin/hessian/PersonDaoTest.java 2008-08-14 11:56:00 UTC (rev 105) +++ trunk/hessian-test/hessian-test-client/src/test/java/org/codelutin/hessian/PersonDaoTest.java 2008-08-14 12:17:51 UTC (rev 106) @@ -17,6 +17,7 @@ import com.caucho.hessian.client.HessianProxyFactory; import junit.framework.TestCase; import org.codelutin.hessian.entity.Address; +import org.codelutin.hessian.entity.Mail; import org.codelutin.hessian.entity.Person; import org.codelutin.hessian.service.GenericDao; @@ -98,6 +99,33 @@ } + public void testUpdate() { + + Person person; + + person = personDao.findById((long) 0); + + assertEquals(null, person.getMails()); + assertEquals(Person.Gender.MALE, person.getGender()); + + Mail mail = new Mail(); + mail.setId((long) 0); + mail.setAddress("test@cdelutin.com"); + person.addMail(mail); + person.setGender(Person.Gender.FEMALE); + + personDao.update(person); + + Person person1 = personDao.findById((long) 0); + + assertNotNull(person1.getMails()); + assertEquals(1, person1.getMails().size()); + assertEquals(mail, person1.getMails().get(0)); + + assertEquals(Person.Gender.FEMALE, person.getGender()); + + } + public void testRemove() { Person person; @@ -122,6 +150,7 @@ person.setId((long) i); person.setName("someone_" + i); person.setAge(25); + person.setGender(Person.Gender.MALE); Address address = new Address(); address.setStreet("Some Street"); address.setNumber(17); Modified: trunk/hessian-test/hessian-test-client/src/test/resources/server.properties =================================================================== --- trunk/hessian-test/hessian-test-client/src/test/resources/server.properties 2008-08-14 11:56:00 UTC (rev 105) +++ trunk/hessian-test/hessian-test-client/src/test/resources/server.properties 2008-08-14 12:17:51 UTC (rev 106) @@ -1 +1 @@ -hessian.url=${hessian.bind.url} +hessian.url=http://localhost:8080/PersonDao