Author: bpoussin Date: 2012-02-04 02:32:53 +0100 (Sat, 04 Feb 2012) New Revision: 1418 Url: http://nuiton.org/repositories/revision/wikitty/1418 Log: amelioration de l'implementation in memory pour faire passer plus de test Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Element.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryMaker.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorageInMemory.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2012-02-03 18:45:27 UTC (rev 1417) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2012-02-04 01:32:53 UTC (rev 1418) @@ -29,6 +29,7 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.math.BigDecimal; +import java.math.BigInteger; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -1465,7 +1466,8 @@ result = new ArrayList<E>(objects.size()); for (Object o : objects) { BigDecimal v = WikittyUtil.toBigDecimal(o); - result.add((E)v); + Number n = toNumber(target, v); + result.add((E)n); } } else if (Date.class.isAssignableFrom(target)) { result = new ArrayList<E>(objects.size()); @@ -1503,6 +1505,25 @@ return result; } + protected Number toNumber(Class target, BigDecimal v) { + Number result = v; + if (Byte.class.isAssignableFrom(target)) { + result = v.byteValue(); + } else if (Double.class.isAssignableFrom(target)) { + result = v.doubleValue(); + } else if (Float.class.isAssignableFrom(target)) { + result = v.floatValue(); + } else if (Integer.class.isAssignableFrom(target)) { + result = v.intValue(); + } else if (Long.class.isAssignableFrom(target)) { + result = v.longValue(); + } else if (Short.class.isAssignableFrom(target)) { + result = v.shortValue(); + } else if (BigInteger.class.isAssignableFrom(target)) { + result = v.toBigInteger(); + } + return result; + } /** * Convert e parameter to the wanted type and return it. * For business object transformation, if some Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Element.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Element.java 2012-02-03 18:45:27 UTC (rev 1417) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Element.java 2012-02-04 01:32:53 UTC (rev 1418) @@ -79,6 +79,10 @@ result = Element.NODE_PATH; } else if (Element.NODE_DEPTH.getValue().equalsIgnoreCase(v)) { result = Element.NODE_DEPTH; + } else if (Element.ALL_FIELD.getValue().equalsIgnoreCase(v)) { + result = Element.ALL_FIELD; + } else if ("*".equalsIgnoreCase(v)) { + result = Element.ALL_FIELD; } else { result = new ElementField(v); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryMaker.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryMaker.java 2012-02-03 18:45:27 UTC (rev 1417) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryMaker.java 2012-02-04 01:32:53 UTC (rev 1418) @@ -286,7 +286,7 @@ * @see {@link ContainsAll} */ public WikittyQueryMaker containsAll(String element) { - return containsAll(new ElementField(element)); + return containsAll(Element.get(element)); } /** @@ -307,7 +307,7 @@ * @see {@link ContainsAll} */ public <E> WikittyQueryMaker containsAll(String fqfield, Collection<E> values) { - return containsAll(new ElementField(fqfield), values); + return containsAll(Element.get(fqfield), values); } /** @@ -362,7 +362,7 @@ * @see {@link ContainsOne} */ public WikittyQueryMaker containsOne(String element) { - return containsOne(new ElementField(element)); + return containsOne(Element.get(element)); } /** @@ -380,7 +380,7 @@ * @see {@link ContainsOne} */ public <E> WikittyQueryMaker containsOne(String fqfield, Collection<E> values) { - return containsOne(new ElementField(fqfield), values); + return containsOne(Element.get(fqfield), values); } /** @@ -443,7 +443,7 @@ * @see {@link Equals} */ public WikittyQueryMaker eq(String fqfield, Object value) { - return eq(new ElementField(fqfield), value); + return eq(Element.get(fqfield), value); } /** @@ -476,7 +476,7 @@ * @see {@link Equals} */ public WikittyQueryMaker eqIgnoreCaseAndAccent(String fqfield, Object value) { - return eqIgnoreCaseAndAccent(new ElementField(fqfield), value); + return eqIgnoreCaseAndAccent(Element.get(fqfield), value); } /** @@ -557,7 +557,7 @@ * @see {@link NotEquals} */ public WikittyQueryMaker ne(String fqfield, Object value) { - return ne(new ElementField(fqfield), value); + return ne(Element.get(fqfield), value); } /** @@ -589,7 +589,7 @@ * @see {@link NotEquals} */ public WikittyQueryMaker neIgnoreCaseAndAccent(String fqfield, Object value) { - return neIgnoreCaseAndAccent(new ElementField(fqfield), value); + return neIgnoreCaseAndAccent(Element.get(fqfield), value); } /** @@ -647,7 +647,7 @@ * @see {@link Greater} */ public WikittyQueryMaker gt(String fqfield, Object value) { - return gt(new ElementField(fqfield), value); + return gt(Element.get(fqfield), value); } /** @@ -678,7 +678,7 @@ * @see {@link GreaterOrEquals} */ public WikittyQueryMaker ge(String fqfield, Object value) { - return ge(new ElementField(fqfield), value); + return ge(Element.get(fqfield), value); } /** @@ -709,7 +709,7 @@ * @see {@link Less} */ public WikittyQueryMaker lt(String fqfield, Object value) { - return lt(new ElementField(fqfield), value); + return lt(Element.get(fqfield), value); } /** @@ -740,7 +740,7 @@ * @see {@link LessOrEquals} */ public WikittyQueryMaker le(String fqfield, Object value) { - return le(new ElementField(fqfield), value); + return le(Element.get(fqfield), value); } /** @@ -773,7 +773,7 @@ * @see {@link Between} */ public WikittyQueryMaker bw(String fqfield, Object lowerValue, Object upperValue) { - return bw(new ElementField(fqfield), lowerValue, upperValue); + return bw(Element.get(fqfield), lowerValue, upperValue); } /** @@ -797,7 +797,7 @@ * @see {@link Equals} */ public WikittyQueryMaker sw(String fqfield, String value) { - return sw(new ElementField(fqfield), value); + return sw(Element.get(fqfield), value); } /** @@ -819,7 +819,7 @@ * @see {@link NotEquals} */ public WikittyQueryMaker notsw(String fqfield, String value) { - return notsw(new ElementField(fqfield), value); + return notsw(Element.get(fqfield), value); } /** @@ -841,7 +841,7 @@ * @see {@link Equals} */ public WikittyQueryMaker ew(String fqfield, Object value) { - return ew(new ElementField(fqfield), value); + return ew(Element.get(fqfield), value); } /** @@ -863,7 +863,7 @@ * @see {@link NotEquals} */ public WikittyQueryMaker notew(String fqfield, Object value) { - return notew(new ElementField(fqfield), value); + return notew(Element.get(fqfield), value); } /** @@ -915,7 +915,7 @@ * @see {@link Null} */ public WikittyQueryMaker isNull(String fqfield) { - return isNull(new ElementField(fqfield)); + return isNull(Element.get(fqfield)); } /** @@ -936,7 +936,7 @@ * @see {@link NotNull} */ public WikittyQueryMaker isNotNull(String fqfield) { - return isNotNull(new ElementField(fqfield)); + return isNotNull(Element.get(fqfield)); } /** @@ -993,7 +993,7 @@ * @see {@link Like} */ public WikittyQueryMaker like(String fqfield, Object value) { - return like(new ElementField(fqfield), value); + return like(Element.get(fqfield), value); } /** @@ -1024,7 +1024,7 @@ * @see {@link Unlike} */ public WikittyQueryMaker unlike(String fqfield, Object value) { - return unlike(new ElementField(fqfield), value); + return unlike(Element.get(fqfield), value); } /** @@ -1081,7 +1081,7 @@ * @see {@link Select} */ public WikittyQueryMaker select(String element) { - return select(new ElementField(element)); + return select(Element.get(element)); } /** @@ -1091,7 +1091,7 @@ * @see {@link Select} */ public WikittyQueryMaker select(String element, Aggregate aggregate) { - return select(new ElementField(element), aggregate); + return select(Element.get(element), aggregate); } /* @@ -1118,7 +1118,7 @@ // * @see {@link In} // */ // public WikittyQueryMaker in(String foreignFieldName) { -// return in(new ElementField(foreignFieldName)); +// return in(Element.get(foreignFieldName)); // } // // /* Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java 2012-02-03 18:45:27 UTC (rev 1417) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java 2012-02-04 01:32:53 UTC (rev 1418) @@ -189,11 +189,23 @@ // create facet field for (org.nuiton.wikitty.entities.Element e : query.getFacetField()) { - String fqf = e.getValue(); - Object value = w.getFqField(fqf); - if (value != null) { - topic.get(fqf).add(value); - result = true; + if (ElementExtension.EXTENSION.equals(e)) { + String facetName = ElementExtension.EXTENSION.getValue(); + for (String extName : w.getExtensionNames()) { + topic.get(facetName).add(extName); + result = true; + } + } else { + String fqf = e.getValue(); + Object value = w.getFqField(fqf); + if (value != null) { + if (value instanceof Collection) { + topic.get(fqf).addAll((Collection)value); + } else { + topic.get(fqf).add(value); + } + result = true; + } } } @@ -231,13 +243,15 @@ Wikitty w = entry.getValue(); String id = entry.getKey(); Condition c = query.getCondition(); - if (!w.isDeleted() && checkRestriction(this, transaction, c, w)) { - totalResult++; - if (totalResult > first && ids.size() < limit) { - // ajout en tant que resultat - ids.add(id); + if (!w.isDeleted()) { + if (checkRestriction(this, transaction, c, w)) { + totalResult++; + if (totalResult > first && ids.size() < limit) { + // ajout en tant que resultat + ids.add(id); + } + facets.add(w); } - facets.add(w); } } @@ -518,9 +532,7 @@ String exp = String.valueOf(i.next()); for (Object fieldValue : values) { String val = String.valueOf(fieldValue); - result = StringUtils.containsIgnoreCase( - StringUtils.stripAccents(val), - StringUtils.stripAccents(exp)); + result = matchString(val, exp, true); if (result) { // si une des valeurs correspond, on retourne true break; @@ -578,44 +590,17 @@ * @return true if sub match s */ static private boolean matchString(String s, String sub, boolean ignoreCaseAndAccent) { - boolean result; - if (sub.startsWith("*") && sub.endsWith("*")) { - sub = StringUtils.substring(sub, 1, -1); - if (ignoreCaseAndAccent) { - result = StringUtils.containsIgnoreCase( - StringUtils.stripAccents(s), - StringUtils.stripAccents(sub)); - } else { - result = StringUtils.contains(s, sub); - } - } else if (sub.startsWith("*")) { - sub = StringUtils.substring(sub, 1); - if (ignoreCaseAndAccent) { - result = StringUtils.endsWithIgnoreCase( - StringUtils.stripAccents(s), - StringUtils.stripAccents(sub)); - } else { - result = StringUtils.endsWith(s, sub); - } - } else if (sub.endsWith("*")) { - sub = StringUtils.substring(sub, 0, -1); - if (ignoreCaseAndAccent) { - result = StringUtils.startsWithIgnoreCase( - StringUtils.stripAccents(s), - StringUtils.stripAccents(sub)); - } else { - result = StringUtils.startsWith(s, sub); - } - } else { - if (ignoreCaseAndAccent) { - result = StringUtils.equalsIgnoreCase( - StringUtils.stripAccents(s), - StringUtils.stripAccents(sub)); - } else { - result = StringUtils.equals(s, sub); - } - } + if (ignoreCaseAndAccent) { + s = StringUtils.stripAccents(s); + s = s.toLowerCase(); + sub = StringUtils.stripAccents(sub); + sub = sub.toLowerCase(); + } + sub = sub.replaceAll("\\*", ".*"); + sub = sub.replaceAll("\\?", "."); + + boolean result = s.matches(sub); return result; } @@ -1081,7 +1066,7 @@ boolean result = false; result = check(KeywordPredicate, o.getElement(), - evalConditionValue(o.getValue())); + "*" + evalConditionValue(o.getValue()) + "*"); evalStack.push(result); return false; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorageInMemory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorageInMemory.java 2012-02-03 18:45:27 UTC (rev 1417) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorageInMemory.java 2012-02-04 01:32:53 UTC (rev 1418) @@ -60,41 +60,28 @@ throw new WikittyException("Can't clone ?", eee); } String actualVersion = null; + Date deletionDate = null; Wikitty inMemoryWikitty = this.wikitties.get(wikitty.getId()); if (inMemoryWikitty != null) { actualVersion = inMemoryWikitty.getVersion(); + deletionDate = inMemoryWikitty.getDeleteDate(); } String requestedVersion = wikitty.getVersion(); String newVersion = null; if (force) { - if (actualVersion == null) { - //no version in place - if (requestedVersion == null) { - //no version requested - newVersion = WikittyUtil.DEFAULT_VERSION; - } else { - //version requested + // requestedVersion is never null + // versionGreaterThan support null for actualVersion + // and in this case return true + // see javadoc for more explanation + if (WikittyUtil.versionGreaterThan(requestedVersion, actualVersion)) { newVersion = requestedVersion; - } - } else { - //version in place is not null - if (requestedVersion == null || requestedVersion.startsWith(WikittyUtil.DEFAULT_MAJOR_VERSION_PREFIX)) { - //no version requested - newVersion = WikittyUtil.incrementMajorRevision(actualVersion); - } else if (WikittyUtil.versionEquals(actualVersion, requestedVersion)) { - //same version - // wikitty is not modified, do nothing - continue; - } else if (WikittyUtil.versionGreaterThan(requestedVersion, actualVersion)) { - //requested version is newer - newVersion = requestedVersion; } else { - //requested version is obsolete - throw new WikittyObsoleteException(String.format("Your wikitty '%s' is obsolete (saving: '%s'; existing: '%s')", wikitty.getId(), requestedVersion, actualVersion)); + // else take actualVersion as base version + newVersion = WikittyUtil.incrementMajorRevision(actualVersion); } - } } else { - if (WikittyUtil.versionEquals(actualVersion, requestedVersion)) { + if (WikittyUtil.versionEquals(actualVersion, requestedVersion) + && deletionDate == null) { // no modification, continue continue; } else if (WikittyUtil.versionGreaterThan(actualVersion, requestedVersion)) { Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2012-02-03 18:45:27 UTC (rev 1417) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2012-02-04 01:32:53 UTC (rev 1418) @@ -280,8 +280,6 @@ @Test public void testSearchByExampleFacet() throws Exception { - assumeTrueSearchEngineCanRunTest(); // facets - // create some wikitty Wikitty gf1Movie = new WikittyImpl(); gf1Movie.addExtension(MEDIA_EXTENSION); @@ -334,13 +332,11 @@ @Test public void testSearchExtensionFacet() throws Exception { - assumeTrueSearchEngineCanRunTest(); // facets - // essai de facettiser sur les extensions WikittyQuery query = new WikittyQueryMaker().keyword("*").end(); query.setFirst(0); query.setLimit(0); - query.addFacetField(Element.EXTENSION); + query.setFacetExtension(true); WikittyQueryResult<String> result = wikittyClient.findAllByQuery(query); Assert.assertEquals(1, result.getFacetNames().size()); //TODO echatellier 20120112 : revue this code @@ -539,9 +535,6 @@ */ @Test public void testStorageVersionForce() { - // FIXME version force fails, but should work - assumeTrueSearchEngineCanRunTest(); // TODO - // store 1 Wikitty myWikitty = new WikittyImpl(); myWikitty.addExtension(WikittyTreeNodeImpl.extensions); @@ -591,9 +584,6 @@ */ @Test public void testStoragePreviouslyDeleted() { - // FIXME echatellier 20120125 should work - assumeTrueSearchEngineCanRunTest(); - // store 1 Wikitty myWikitty = new WikittyImpl(); myWikitty.addExtension(WikittyTreeNodeImpl.extensions); @@ -720,7 +710,6 @@ public void testFindQueryOnMovies() { // The Dark Knight Rises // Die hard 4 - assumeTrueSearchEngineCanRunTest(); // ? in regex WikittyQuery query = new WikittyQueryMaker().eq(MOVIE_EXTENSION_NAME + ".name", "*ar?*").end(); WikittyQueryResult<String> results = wikittyClient.findAllByQuery(query); Assert.assertEquals(2, results.getAll().size()); @@ -774,7 +763,8 @@ assumeTrueSearchEngineCanRunTest(); // facets WikittyImportExportService ieService = new WikittyImportExportService(wikittyClient); - WikittyQuery query = new WikittyQueryMaker().eq(Element.EXTENSION, WikittyTreeNode.EXT_WIKITTYTREENODE).end(); + WikittyQuery query = new WikittyQueryMaker() + .eq(Element.EXTENSION, WikittyTreeNode.EXT_WIKITTYTREENODE).end(); String csvExport = ieService.syncExportAllByQuery(FORMAT.CSV, query); // extension definition is present in xml export @@ -933,8 +923,6 @@ */ @Test public void testQueryMakerEq() { - assumeTrueSearchEngineCanRunTest(); // ant like patterns - // test strict equals WikittyQuery query = new WikittyQueryMaker().eq(Product.ELEMENT_FIELD_PRODUCT_PRICE, 42).end(); WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query); @@ -963,8 +951,6 @@ */ @Test public void testQueryMakerEqFqf() { - assumeTrueSearchEngineCanRunTest(); // ant like patterns - // test strict equals WikittyQuery query = new WikittyQueryMaker().eq(Product.FQ_FIELD_PRODUCT_PRICE, 42).end(); WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query); @@ -993,9 +979,6 @@ */ @Test public void testQueryMakerNeq() { - // FIXME echatellier 20120125 should work -// assumeTrueSearchEngineCanRunTest(); - // 22 wikitty in init // only one with price == 42 // test strict equals @@ -1136,9 +1119,6 @@ @Test public void testQueryMakerUnlike() throws IOException { - // FIXME echatellier 20120125 should work -// assumeTrueSearchEngineCanRunTest(); - // + 22 in init db importBooks(); // 13 importé = 35 // -6 HP @@ -1149,9 +1129,6 @@ @Test public void testQueryParserUnlike() throws IOException { - // FIXME echatellier 20120125 should work -// assumeTrueSearchEngineCanRunTest(); - // + 22 in init db importBooks(); // 13 importé = 35 // -6 HP @@ -1194,9 +1171,6 @@ @Test public void testQueryMakerNotsw() throws IOException { - // FIXME echatellier 20120125 should work -// assumeTrueSearchEngineCanRunTest(); - // + 22 in init db importBooks(); // 13 importé = 35 // -6 HP @@ -1207,9 +1181,6 @@ @Test public void testQueryParserNotsw() throws IOException { - // FIXME echatellier 20120125 should work -// assumeTrueSearchEngineCanRunTest(); - // + 22 in init db importBooks(); // 13 importé = 35 // -6 HP @@ -1220,9 +1191,6 @@ @Test public void testQueryMakerNotew() throws IOException { - // FIXME echatellier 20120125 should work -// assumeTrueSearchEngineCanRunTest(); - // + 22 in init db importBooks(); // 13 importé = 35 // -1 sorciers @@ -1233,9 +1201,6 @@ @Test public void testQueryParserNotew() throws IOException { - // FIXME echatellier 20120125 should work -// assumeTrueSearchEngineCanRunTest(); - // + 22 in init db importBooks(); // 13 importé = 35 // -1 sorciers @@ -1412,8 +1377,6 @@ @Test public void testSearchFacetSingleField() throws Exception { -// assumeTrueSearchEngineCanRunTest(); // facets - importBooks(); WikittyQuery query = new WikittyQueryMaker().exteq(Product.EXT_PRODUCT).end(); @@ -1432,7 +1395,7 @@ @Test public void testQueryMarkerWilcardEquals() { - assumeTrueSearchEngineCanRunTest(); // wildcard + assumeTrueSearchEngineCanRunTest(); // wildcards WikittyQuery query1 = new WikittyQueryMaker().eq(Product.FQ_FIELD_PRODUCT_NAME, "Lanfeust").end(); WikittyQueryResult<Product> results1 = wikittyClient.findAllByQuery(Product.class, query1); @@ -1478,8 +1441,6 @@ @Test public void testQueryMakerLowerCaseSearch() { - assumeTrueSearchEngineCanRunTest(); // lower case - WikittyQuery query1 = new WikittyQueryMaker().eq(Product.FQ_FIELD_PRODUCT_NAME, "Lanfeust").end(); WikittyQueryResult<Product> results1 = wikittyClient.findAllByQuery(Product.class, query1); Assert.assertEquals(1, results1.getTotalResult()); @@ -1499,8 +1460,6 @@ @Test public void testQueryParserLowerCaseSearch() { - assumeTrueSearchEngineCanRunTest(); // lower case - WikittyQuery query1 = WikittyQueryParser.parse("Product.name=Lanfeust"); WikittyQueryResult<Product> results1 = wikittyClient.findAllByQuery(Product.class, query1); Assert.assertEquals(1, results1.getTotalResult()); @@ -1523,8 +1482,6 @@ */ @Test public void testSearchWithSort1() { -// assumeTrueSearchEngineCanRunTest(); // sorting - // FIXME poussin 20120202 comment savoir que les objets sont bien trie ? // Il y a toute sorte d'extension avec *.name et on ne recupere que // les ID. @@ -1657,7 +1614,6 @@ */ @Test public void testPaginedSearchSelect() throws IOException { - assumeTrueSearchEngineCanRunTest(); // pagination importBooks(); // first @@ -1667,11 +1623,11 @@ query1.setSortAscending(Product.ELEMENT_FIELD_PRODUCT_PRICE); query1.setFirst(0); query1.setLimit(2); - WikittyQueryResult<String> results1 = wikittyClient.findAllByQuery(query1); + WikittyQueryResult<Double> results1 = wikittyClient.findAllByQuery(Double.class, query1); // 17 books, but only 11 differents prices ? Assert.assertEquals(11, results1.getTotalResult()); Assert.assertEquals(2, results1.getAll().size()); - Assert.assertEquals("13.0", results1.get(0)); + Assert.assertEquals(Double.valueOf(13), results1.get(0)); // second // FIXME echatellier 20120201 setLimit -1 us buggy @@ -1684,14 +1640,14 @@ // third query1.setFirst(0); query1.setLimit(0); - results1 = wikittyClient.findAllByQuery(query1); + results1 = wikittyClient.findAllByQuery(Double.class, query1); Assert.assertEquals(11, results1.getTotalResult()); Assert.assertEquals(0, results1.getAll().size()); } @Test public void testQueryMarkerSelectSortAndAggregate() throws Exception { - assumeTrueSearchEngineCanRunTest(); // pas le meme comportement, a verifier + assumeTrueSearchEngineCanRunTest(); // pas le meme comportement, a verifier (il manque le sort in memory) WikittyExtension ext = new WikittyExtension("Test", "1.0", // version @@ -1848,8 +1804,6 @@ @Test public void testQueryMakerEqOnGroup() throws Exception { - assumeTrueSearchEngineCanRunTest(); // regex - // for id for easy debugging WikittyGroupImpl g1 = new WikittyGroupImpl(new WikittyImpl("g1")); g1.setName("Group1"); @@ -1928,8 +1882,6 @@ @Test public void testQueryMarkerSelect() throws Exception { - assumeTrueSearchEngineCanRunTest(); // select not implemented ? - // for id for easy debugging WikittyImpl w = new WikittyImpl("g1"); WikittyGroupImpl g1 = new WikittyGroupImpl(w); @@ -2073,8 +2025,6 @@ */ @Test public void testSearchEngineFullTextSearch() { - assumeTrueSearchEngineCanRunTest(); // regex - // for id for easy debugging WikittyImpl w = new WikittyImpl("label"); WikittyLabelImpl l = new WikittyLabelImpl(w);