Author: echatellier Date: 2012-01-20 11:36:08 +0100 (Fri, 20 Jan 2012) New Revision: 1346 Url: http://nuiton.org/repositories/revision/wikitty/1346 Log: Move label test to wikitty client test. Removed: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyLabelUtilTest.java Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2012-01-20 10:25:17 UTC (rev 1345) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2012-01-20 10:36:08 UTC (rev 1346) @@ -25,6 +25,8 @@ package org.nuiton.wikitty; +import static org.junit.Assert.assertEquals; + import java.io.IOException; import org.junit.Assert; @@ -34,18 +36,23 @@ import org.nuiton.wikitty.addons.WikittyI18nTestUtil; import org.nuiton.wikitty.addons.WikittyI18nUtil; import org.nuiton.wikitty.addons.WikittyImportExportService; +import org.nuiton.wikitty.addons.WikittyLabelUtil; import org.nuiton.wikitty.addons.WikittyImportExportService.FORMAT; import org.nuiton.wikitty.entities.Element; +import org.nuiton.wikitty.entities.ExtensionFactory; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.entities.WikittyI18n; +import org.nuiton.wikitty.entities.WikittyImpl; import org.nuiton.wikitty.entities.WikittyLabel; import org.nuiton.wikitty.entities.WikittyLabelImpl; import org.nuiton.wikitty.entities.WikittyTreeNode; +import org.nuiton.wikitty.entities.WikittyTypes; import org.nuiton.wikitty.query.WikittyQuery; import org.nuiton.wikitty.query.WikittyQueryMaker; import org.nuiton.wikitty.query.WikittyQueryParser; import org.nuiton.wikitty.query.WikittyQueryResult; +import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.services.WikittyServiceInMemory; import org.nuiton.wikitty.test.Category; import org.nuiton.wikitty.test.Product; @@ -289,4 +296,21 @@ trad = i18n.getTranslation("fr", WikittyLabel.FIELD_WIKITTYLABEL_LABELS); Assert.assertEquals("étiquette", trad); } + + /** + * Test d'ajout de labels sur un wikitty et de recherche par label. + */ + @Test + public void testFindAllByLabel() { + WikittyExtension ext = ExtensionFactory.create("test", "1") + .addField("toto", WikittyTypes.NUMERIC).extension(); + Wikitty w = new WikittyImpl(); + String id = w.getId(); + w.addExtension(ext); + w.setField(ext.getName(), "toto", 42); + wikittyClient.store(w); + WikittyLabelUtil.addLabel(wikittyClient, id, "hello"); + WikittyQueryResult<Wikitty> wikitties = WikittyLabelUtil.findAllByLabel(wikittyClient, "hello", 0, 1); + assertEquals(wikitties.get(0), w); + } } Deleted: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyLabelUtilTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyLabelUtilTest.java 2012-01-20 10:25:17 UTC (rev 1345) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyLabelUtilTest.java 2012-01-20 10:36:08 UTC (rev 1346) @@ -1,60 +0,0 @@ -/* - * #%L - * Wikitty :: api - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -package org.nuiton.wikitty.addons; - -import org.junit.Test; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.wikitty.WikittyConfig; -import org.nuiton.wikitty.WikittyProxy; -import org.nuiton.wikitty.WikittyService; -import org.nuiton.wikitty.WikittyServiceFactory; -import org.nuiton.wikitty.entities.ExtensionFactory; -import org.nuiton.wikitty.entities.WikittyTypes; -import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.entities.WikittyExtension; -import org.nuiton.wikitty.entities.WikittyImpl; -import org.nuiton.wikitty.search.PagedResult; - -import static org.junit.Assert.assertEquals; - -public class WikittyLabelUtilTest { - - @Test - public void testFindAllByLabel() { - ApplicationConfig config = WikittyConfig.getConfig(); - WikittyService ws = WikittyServiceFactory.buildWikittyService( - config); - WikittyProxy proxy = new WikittyProxy(ws); - WikittyExtension ext = ExtensionFactory.create("test", "1").addField("toto", WikittyTypes.NUMERIC).extension(); - Wikitty w = new WikittyImpl(); - String id = w.getId(); - w.addExtension(ext); - w.setField(ext.getName(), "toto", 42); - proxy.store(w); - WikittyLabelUtil.addLabel(proxy, id, "hello"); - PagedResult<Wikitty> wikitties = WikittyLabelUtil.findAllByLabel(proxy, "hello", 0, 1); - assertEquals(wikitties.get(0), w); - } -}