Author: echatellier Date: 2012-01-26 17:57:06 +0100 (Thu, 26 Jan 2012) New Revision: 1377 Url: http://nuiton.org/repositories/revision/wikitty/1377 Log: Test refactoring Added: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/query/FacetTopicTest.java Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/query/WikittyQueryTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/search/FacetTopicTest.java Added: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/query/FacetTopicTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/query/FacetTopicTest.java (rev 0) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/query/FacetTopicTest.java 2012-01-26 16:57:06 UTC (rev 1377) @@ -0,0 +1,88 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin, Chatellier Eric + * %% + * 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.query; + +import java.util.Arrays; +import java.util.HashSet; +import java.util.TreeSet; + +import junit.framework.Assert; + +import org.junit.Test; + +/** + * Test FacetTopic and comparators. + * + * @author poussin + */ +public class FacetTopicTest { + + /** + * Test of toString method, of class FacetTopic. + */ + @Test + public void testNameComparator() { + TreeSet<FacetTopic> countSort = new TreeSet<FacetTopic>(new FacetTopicCountComparator()); + TreeSet<FacetTopic> nameSort = new TreeSet<FacetTopic>(new FacetTopicNameComparator(false)); + TreeSet<FacetTopic> nameIgnoreCaseSort = new TreeSet<FacetTopic>(new FacetTopicNameComparator(true)); + + FacetTopic a5 = new FacetTopic("test", "a", 5); + FacetTopic b4 = new FacetTopic("test", "b", 4); + FacetTopic c3 = new FacetTopic("test", "c", 3); + FacetTopic d2 = new FacetTopic("test", "d", 2); + FacetTopic e1 = new FacetTopic("test", "e", 1); + FacetTopic A0 = new FacetTopic("test", "A", 0); + + + countSort.add(a5); + nameSort.add(a5); + nameIgnoreCaseSort.add(a5); + + countSort.add(b4); + nameSort.add(b4); + nameIgnoreCaseSort.add(b4); + + countSort.add(c3); + nameSort.add(c3); + nameIgnoreCaseSort.add(c3); + + countSort.add(d2); + nameSort.add(d2); + nameIgnoreCaseSort.add(d2); + + countSort.add(e1); + nameSort.add(e1); + nameIgnoreCaseSort.add(e1); + + countSort.add(A0); + nameSort.add(A0); + nameIgnoreCaseSort.add(A0); + + Assert.assertEquals(new HashSet<FacetTopic>(Arrays.asList(A0, e1, d2, c3, b4, a5)), countSort); + Assert.assertEquals(new HashSet<FacetTopic>(Arrays.asList(A0, a5, b4, c3, d2, e1)), nameSort); + Assert.assertEquals(new HashSet<FacetTopic>(Arrays.asList(a5, b4, c3, d2, e1)), nameIgnoreCaseSort); + } +} Property changes on: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/query/FacetTopicTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/query/WikittyQueryTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/query/WikittyQueryTest.java 2012-01-26 16:39:21 UTC (rev 1376) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/query/WikittyQueryTest.java 2012-01-26 16:57:06 UTC (rev 1377) @@ -46,7 +46,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(WikittyQueryTest.class); - @Test public void testParseAliasAndTree() throws Exception { WikittyQueryParser parser = new WikittyQueryParser(); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/search/FacetTopicTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/search/FacetTopicTest.java 2012-01-26 16:39:21 UTC (rev 1376) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/search/FacetTopicTest.java 2012-01-26 16:57:06 UTC (rev 1377) @@ -42,7 +42,6 @@ import java.util.TreeSet; import org.junit.Test; -import static org.junit.Assert.*; /** *