Wikitty-commits

Download

wikitty-commits@list.nuiton.org

May 2010

4 participants
32 discussions

r36 - trunk/wikitty-api/src/main/java/org/sharengo/wikitty
by echatellier＠users.nuiton.org May 6, 2010

May 6, 2010

Author: echatellier Date: 2010-05-06 11:48:36 +0200 (Thu, 06 May 2010) New Revision: 36 Url: http://nuiton.org/repositories/revision/wikitty/36 Log: Add doc about #restore method Modified: trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyProxy.java Modified: trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyProxy.java 2010-05-03 17:19:57 UTC (rev 35) +++ trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyProxy.java 2010-05-06 09:48:36 UTC (rev 36) @@ -81,12 +81,13 @@ } /** - * - * @param clazz - * @param id + * Restore wikitty entity with specified id or {@code null} if entity can't be found. + * + * @param clazz entity class + * @param id entity id * @param checkExtension if true check that Wikitty result has all extension * declared in clazz - * @return + * @return wikitty entity with specified id or {@code null} if entity can't be found */ public <E extends BusinessEntity> E restore(Class<E> clazz, String id, boolean checkExtension) { E result = null; @@ -120,11 +121,13 @@ } return result; } + /** - * - * @param clazz - * @param id - * @return + * Restore wikitty entity with specified id or {@code null} if entity can't be found. + * + * @param clazz entity class + * @param id entity id + * @return wikitty entity with specified id or {@code null} if entity can't be found */ public <E extends BusinessEntity> E restore(Class<E> clazz, String id) { E result = restore(clazz, id, false);

1 0

r35 - trunk/wikitty-api/src/test/java/org/sharengo/wikitty/test/conform
by echatellier＠users.nuiton.org May 3, 2010

May 3, 2010

Author: echatellier Date: 2010-05-03 19:19:57 +0200 (Mon, 03 May 2010) New Revision: 35 Url: http://nuiton.org/repositories/revision/wikitty/35 Log: Add search test to test for deletion in solr index too. Modified: trunk/wikitty-api/src/test/java/org/sharengo/wikitty/test/conform/StorageTest.java Modified: trunk/wikitty-api/src/test/java/org/sharengo/wikitty/test/conform/StorageTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/sharengo/wikitty/test/conform/StorageTest.java 2010-04-30 15:17:13 UTC (rev 34) +++ trunk/wikitty-api/src/test/java/org/sharengo/wikitty/test/conform/StorageTest.java 2010-05-03 17:19:57 UTC (rev 35) @@ -20,6 +20,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.Assert; import org.junit.Test; import org.sharengo.wikitty.TreeNodeImpl; import org.sharengo.wikitty.Criteria; @@ -353,9 +354,21 @@ resultFind.getFieldAsString(EXT_TEST.getName(), "fieldName2")); + // test to find deleted wikitty + // test if solr index is coherent with database + Criteria criteria1 = Search.query().eq("id", wikittySource.getId()).criteria(); + Wikitty searchedWikitty1 = ws.findByCriteria(criteria1); + Assert.assertNotNull(searchedWikitty1); + ws.delete(wikittySource.getId()); Wikitty deletedObject = ws.restore(wikittySource.getId()); assertNull(deletedObject); + + // test to find deleted wikitty + // test if solr index is coherent with database + Criteria criteria2 = Search.query().eq("id", wikittySource.getId()).criteria(); + Wikitty searchedWikitty2 = ws.findByCriteria(criteria2); + Assert.assertNull(searchedWikitty2); } @Test

1 0