Author: bpoussin Date: 2010-12-11 01:56:27 +0100 (Sat, 11 Dec 2010) New Revision: 599 Url: http://nuiton.org/repositories/revision/wikitty/599 Log: test is back :) Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/Element.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/Element.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/Element.java 2010-12-10 22:26:28 UTC (rev 598) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/Element.java 2010-12-11 00:56:27 UTC (rev 599) @@ -40,7 +40,7 @@ public static String ELT_ID = "elt_id"; /** Represent type to search an element */ - public static enum ElementType {NUMERIC, STRING, WIKITTY, BOOLEAN, DATE}; + public static enum ElementType {BINARY, NUMERIC, STRING, WIKITTY, BOOLEAN, DATE}; // serialVersionUID is used for serialization. private static final long serialVersionUID = 1L; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java 2010-12-10 22:26:28 UTC (rev 598) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java 2010-12-11 00:56:27 UTC (rev 599) @@ -765,9 +765,13 @@ /** check if a given user belong to the group of app-admins. */ protected boolean isAppAdmin(String securityToken, String userId) { + // si le group n'existe pas alors tout le monde est admin + boolean result = true; Wikitty group = getAppAdminGroup(securityToken); - Set<String> ids = WikittyGroupHelper.getMembers(group); - boolean result = isMember(securityToken, userId, ids); + if (group != null) { + Set<String> ids = WikittyGroupHelper.getMembers(group); + result = isMember(securityToken, userId, ids); + } return result; } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java 2010-12-10 22:26:28 UTC (rev 598) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java 2010-12-11 00:56:27 UTC (rev 599) @@ -34,6 +34,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.entities.FieldType.TYPE; @@ -41,6 +42,7 @@ import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.entities.WikittyImpl; import org.nuiton.wikitty.WikittyService; +import org.nuiton.wikitty.WikittyServiceFactory; import org.nuiton.wikitty.WikittyUtil; public abstract class AbstractTestConformance { @@ -64,18 +66,22 @@ createType(TYPE.DATE, 1, 1) ); - /** must be static child set ws in @BeforeClass method */ - static protected WikittyService ws ; + private WikittyService ws; protected WikittyProxy proxy = null; + abstract public ApplicationConfig getConfig(); + public WikittyProxy getProxy() { if (proxy == null) { - proxy = new WikittyProxy(ws); + proxy = new WikittyProxy(getWikittyService()); } return proxy; } public WikittyService getWikittyService() { + if (ws == null) { + ws = WikittyServiceFactory.buildWikittyService(getConfig()); + } return ws; } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java 2010-12-10 22:26:28 UTC (rev 598) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java 2010-12-11 00:56:27 UTC (rev 599) @@ -41,12 +41,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.WikittyConfig; -import org.nuiton.wikitty.WikittyServiceFactory; import org.nuiton.wikitty.addons.WikittyImportExportService; import org.nuiton.wikitty.search.operators.Element; import org.nuiton.wikitty.search.Search; @@ -61,30 +60,34 @@ protected WikittyImportExportService ieService; - @BeforeClass - static public void loadWikittyService() throws Exception { - WikittyConfig config = new WikittyConfig(); // default config for in memory - String msg = "Try to passe test with "+ config.getPrintableConfig("wikitty.*", 50); - log.info(msg); - ws = WikittyServiceFactory.buildWikittyService(config); + private ApplicationConfig config = null; + + @Override + public ApplicationConfig getConfig() { + if (config == null) { + config = new WikittyConfig(); // default config for in memory + String msg = "Try to passe test with " + config.getPrintableConfig("wikitty.*", 50); + log.info(msg); + } + return config; } @Before public void clearStorage() throws Exception { - ws.clear(null); + getProxy().clear(); } protected WikittyImportExportService getImportExportService() { if (ieService == null) { WikittyConfig config = new WikittyConfig(); - ieService = new WikittyImportExportService(config, null, ws); + ieService = new WikittyImportExportService(config, null, getWikittyService()); } return ieService; } @Test public void testExport() throws Exception { - final List<Wikitty> wikitties = createSampleWikitty(ws); + final List<Wikitty> wikitties = createSampleWikitty(getWikittyService()); Criteria criteria = Search.query().eq(Element.ELT_EXTENSION, AbstractTestConformance.EXTNAME).criteria(); String result = getImportExportService().syncExportAllByCriteria( @@ -180,7 +183,7 @@ "7ca86742-5957-4659-b12f-4915cbef9193", "77d7640c-573d-421c-a7e9-9b70bd025983" }; - List<Wikitty> wikitties = ws.restore(null, Arrays.asList(ids)); + List<Wikitty> wikitties = getProxy().restore(Arrays.asList(ids)); assertEquals(3, wikitties.size()); } } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java 2010-12-10 22:26:28 UTC (rev 598) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java 2010-12-11 00:56:27 UTC (rev 599) @@ -31,11 +31,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; -import org.nuiton.wikitty.WikittyServiceFactory; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.entities.ExtensionFactory; import org.nuiton.wikitty.entities.FieldType.TYPE; @@ -43,24 +42,27 @@ import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.entities.WikittyImpl; -import org.nuiton.wikitty.services.WikittyServiceEnhanced; import org.nuiton.wikitty.search.Search; public class SearchTest extends AbstractTestConformance { private final static Log log = LogFactory.getLog(AbstractTestConformance.class); - @BeforeClass - static public void loadWikittyService() throws Exception { - WikittyConfig config = new WikittyConfig(); // default config for in memory - String msg = "Try to passe test with "+ config.getPrintableConfig("wikitty.*", 50); - log.info(msg); - ws = WikittyServiceFactory.buildWikittyService(config); + private ApplicationConfig config = null; + + @Override + public ApplicationConfig getConfig() { + if (config == null) { + config = new WikittyConfig(); // default config for in memory + String msg = "Try to passe test with " + config.getPrintableConfig("wikitty.*", 50); + log.info(msg); + } + return config; } @Before public void clearStorage() throws Exception { - ws.clear(null); + getProxy().clear(); } /* @@ -105,72 +107,72 @@ w.setField(ext.getName(), "birth", "19/04/1968 15:12"); wikitties.add( w ); - ws.store(null, wikitties, false); + wikitties = getProxy().storeWikitty(wikitties); // Testing search on a date criteria Criteria criteria = Search.query() .gt("testExt.birth", "19/04/1968 15:00") .criteria(); - PagedResult<String> result = ws.findAllByCriteria(null, criteria); + PagedResult<String> result = getProxy().findAllIdByCriteria(criteria); List<String> found = result.getAll(); assertEquals(1, found.size()); - Wikitty wikittyFound = WikittyServiceEnhanced.restore(ws, null, found.get(0)); + Wikitty wikittyFound = getProxy().restore(found.get(0)); log.info( wikittyFound.getFieldAsString(ext.getName(), "birth") ); // Testing search on a date criteria criteria = Search.query() .ge("testExt.birth", "19/04/1968") .criteria(); - result = ws.findAllByCriteria(null, criteria); + result = getProxy().findAllIdByCriteria(criteria); found = result.getAll(); assertEquals(2, found.size()); - wikittyFound = WikittyServiceEnhanced.restore(ws, null, found.get(0)); + wikittyFound = getProxy().restore(found.get(0)); log.info( wikittyFound.getFieldAsString(ext.getName(), "birth") ); criteria = Search.query() .eq("testExt.name", "Guillaume") .criteria(); - result = ws.findAllByCriteria(null, criteria); + result = getProxy().findAllIdByCriteria(criteria); found = result.getAll(); assertEquals(1, found.size()); - wikittyFound = WikittyServiceEnhanced.restore(ws, null, found.get(0)); + wikittyFound = getProxy().restore(found.get(0)); log.info( wikittyFound.getFieldAsString(ext.getName(), "name") ); criteria = Search.query() .eq("testExt.age", "125") .criteria(); - result = ws.findAllByCriteria(null, criteria); + result = getProxy().findAllIdByCriteria(criteria); found = result.getAll(); assertEquals(1, found.size()); - wikittyFound = WikittyServiceEnhanced.restore(ws, null, found.get(0)); + wikittyFound = getProxy().restore(found.get(0)); log.info( wikittyFound.getFieldAsString(ext.getName(), "name") ); criteria = Search.query() .gt("testExt.age", "10") .criteria(); - result = ws.findAllByCriteria(null, criteria); + result = getProxy().findAllIdByCriteria(criteria); found = result.getAll(); assertEquals(2, found.size()); - wikittyFound = WikittyServiceEnhanced.restore(ws, null, found.get(0)); + wikittyFound = getProxy().restore(found.get(0)); log.info( wikittyFound.getFieldAsString(ext.getName(), "name") ); - wikittyFound = WikittyServiceEnhanced.restore(ws, null, found.get(1)); + wikittyFound = getProxy().restore(found.get(1)); log.info( wikittyFound.getFieldAsString(ext.getName(), "name") ); Wikitty exemple = new WikittyImpl(); exemple.addExtension(ext); exemple.setField(ext.getName(), "name", "Guillaume"); exemple.setField(ext.getName(), "age", "27"); - result = ws.findAllByCriteria(null, Search.query(exemple).criteria() ); + result = getProxy().findAllIdByCriteria(Search.query(exemple).criteria() ); found = result.getAll(); assertEquals(1, found.size()); - wikittyFound = WikittyServiceEnhanced.restore(ws, null, found.get(0)); + wikittyFound = getProxy().restore(found.get(0)); log.info( wikittyFound.getFieldAsString(ext.getName(), "name") ); exemple = new WikittyImpl(); exemple.addExtension(ext); exemple.setField(ext.getName(), "name", "Guillaume"); exemple.setField(ext.getName(), "age", "125"); - result = ws.findAllByCriteria(null, Search.query(exemple).criteria() ); + result = getProxy().findAllIdByCriteria(Search.query(exemple).criteria() ); found = result.getAll(); assertEquals(0, found.size()); // log.info( found.get(0).getFieldAsString(ext.getName(), "name") ); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-12-10 22:26:28 UTC (rev 598) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-12-11 00:56:27 UTC (rev 599) @@ -74,7 +74,7 @@ Wikitty w = createBasicWikitty(); String id = w.getId(); w = getProxy().store(w); - w = WikittyServiceEnhanced.restore(ws, null, id); + w = getProxy().restore(id); assertTrue(w.hasExtension(EXTNAME)); for ( int i = 0; i < 3; i++ ) { assertTrue( w.hasField(EXTNAME, "fieldName" + i)); @@ -85,7 +85,7 @@ public void testExtensionMethod() throws Exception { { getProxy().storeExtension(EXT_TEST); - List<String> extIds = ws.getAllExtensionIds(null); + List<String> extIds = getProxy().getAllExtensionIds(); log.debug("extIds: " + extIds); assertEquals(1, extIds.size()); WikittyExtension ext = getProxy().restoreExtension(extIds.get(0)); @@ -96,7 +96,7 @@ { // test de la suppression de l'extension getProxy().deleteExtension(EXT_TEST.getName()); - List<String> extIds = ws.getAllExtensionIds(null); + List<String> extIds = getProxy().getAllExtensionIds(); assertEquals(0, extIds.size()); } { @@ -113,7 +113,7 @@ } catch (WikittyException eee) { assertTrue(true); } - List<String> extIds = ws.getAllExtensionIds(null); + List<String> extIds = getProxy().getAllExtensionIds(); assertEquals(1, extIds.size()); } } @@ -353,10 +353,10 @@ // essai de facettiser sur les extensions criteria = Search.query().keyword("*").criteria() .setFirstIndex(0).setEndIndex(0) - .addFacetField("extensions"); + .addFacetField(Element.ELT_EXTENSION); resultFind = getProxy().findAllIdByCriteria(criteria); assertEquals(1, resultFind.getFacetNames().size()); - assertNotNull(resultFind.getFacets().get("extensions")); + assertNotNull(resultFind.getFacets().get(Element.ELT_EXTENSION)); } @Test @@ -388,7 +388,7 @@ for( Wikitty w : wikitties ) { oldIdVersion.put(w.getId(), w.getVersion()); } - WikittyEvent response = ws.store(null, wikitties, false); + WikittyEvent response = getWikittyService().store(null, wikitties, false); for (Wikitty w : wikitties) { response.update(w); String v1 = w.getVersion(); @@ -447,7 +447,7 @@ public void testStoreAndLabel() throws Exception { // create some wikitty to permit search test - List<Wikitty> wikitties = createSampleWikitty(ws); + List<Wikitty> wikitties = createSampleWikitty(getWikittyService()); long ts = new Date().getTime(); // labelisation test @@ -475,7 +475,7 @@ @Test public void testStoreAndClassification() throws Exception { // create some wikitty to permit search test - List<Wikitty> wikitties = createSampleWikitty(ws); + List<Wikitty> wikitties = createSampleWikitty(getWikittyService()); List<Wikitty> wikittyNodes = new ArrayList<Wikitty>(); WikittyTreeNodeImpl root = new WikittyTreeNodeImpl(); @@ -548,7 +548,8 @@ Wikitty w = new WikittyImpl(); w.addExtension(WikittyTreeNodeImpl.extensions); - WikittyTreeNode treeNode = WikittyUtil.newInstance(null, ws, WikittyTreeNode.class, w); + WikittyTreeNode treeNode = WikittyUtil.newInstance( + null, getWikittyService(), WikittyTreeNode.class, w); Assert.assertNotNull(treeNode); } @@ -602,9 +603,9 @@ // store 4 : new wikitty with same wikitty id (obsolete) Wikitty myNewWikitty = new WikittyImpl(myWikitty.getId()); myNewWikitty.addExtension(WikittyTreeNodeImpl.extensions); - WikittyTreeNodeHelper.setName(myWikitty, "new wikitty"); + WikittyTreeNodeHelper.setName(myNewWikitty, "new wikitty"); try { - myWikitty = getProxy().store(myWikitty); + myWikitty = getProxy().store(myNewWikitty); Assert.fail("Test must throw WikittyObsoleteException"); } catch (WikittyObsoleteException ex) { @@ -614,12 +615,12 @@ } // store 4 : same but with force (increased by force) - ws.store(null, Collections.singletonList(myNewWikitty), true); + getWikittyService().store(null, Collections.singletonList(myNewWikitty), true); Assert.assertEquals("3.0", myNewWikitty.getVersion()); // store 5 : fix version (not increased by force) myNewWikitty.setVersion("11.0"); - ws.store(null, Collections.singletonList(myNewWikitty), true); + getWikittyService().store(null, Collections.singletonList(myNewWikitty), true); Assert.assertEquals("11.0", myNewWikitty.getVersion()); } Modified: trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java =================================================================== --- trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java 2010-12-10 22:26:28 UTC (rev 598) +++ trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java 2010-12-11 00:56:27 UTC (rev 599) @@ -28,11 +28,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Before; -import org.junit.BeforeClass; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.conform.StorageTest; -import org.nuiton.wikitty.WikittyServiceFactory; /** * @@ -46,17 +45,23 @@ protected final static Log log = LogFactory.getLog(StorageJDBCTest.class); - @BeforeClass - static public void loadWikittyService() throws Exception { - WikittyConfig config = new WikittyConfig("wikitty-config-sample-standalone"); - String msg = "Try to passe test with "+ config.getPrintableConfig("wikitty.*", 50); - log.info(msg); - ws = WikittyServiceFactory.buildWikittyService(config); + private ApplicationConfig config = null; + + @Override + public ApplicationConfig getConfig() { + if (config == null) { + config = new WikittyConfig("wikitty-config-sample-standalone.properties"); + config.setOption(WikittyConfig.WikittyOption.WIKITTY_DATA_DIR.getKey(), + "./target/data"); + String msg = "Try to passe test with " + config.getPrintableConfig("wikitty.*", 50); + log.info(msg); + } + return config; } @Before public void clearStorage() throws Exception { - ws.clear(null); + getProxy().clear(); } }