Author: bpoussin Date: 2013-02-24 02:29:16 +0100 (Sun, 24 Feb 2013) New Revision: 1544 Url: http://nuiton.org/projects/wikitty/repository/revisions/1544 Log: correction des tests suites au differente modif pour avg si la division ne tombe pas juste on garde 20 chiffres apres la virgule Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionAvg.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionAvg.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionAvg.java 2013-02-24 00:07:23 UTC (rev 1543) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionAvg.java 2013-02-24 01:29:16 UTC (rev 1544) @@ -1,6 +1,7 @@ package org.nuiton.wikitty.query.function; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -77,7 +78,12 @@ } } } - BigDecimal avg = total.divide(new BigDecimal(cpt)); + BigDecimal avg; + if (cpt == 0) { + avg = new BigDecimal(0); + } else { + avg = total.divide(new BigDecimal(cpt), 20, RoundingMode.HALF_UP); + } ListObjectOrMap result = new ListObjectOrMap(); result.add(getName(), avg); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2013-02-24 00:07:23 UTC (rev 1543) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2013-02-24 01:29:16 UTC (rev 1544) @@ -1777,45 +1777,59 @@ // test aggregate { - WikittyQuery q = new WikittyQueryMaker().select(new FunctionAvg(null, new FunctionFieldValue(null, "Test.number"))).end(); + WikittyQuery q = new WikittyQueryMaker() + .select(new FunctionAvg(null, new FunctionFieldValue(null, "Test.number"))) + .where().exteq("Test").end(); WikittyQueryResult<String> result = wikittyClient.findAllByQuery(q); System.out.println("q: " + result); Assert.assertEquals("3", result.peek()); } { - WikittyQuery q = new WikittyQueryMaker().select(new FunctionCount(null, new FunctionFieldValue(null, "Test.number"))).end(); + WikittyQuery q = new WikittyQueryMaker() + .select(new FunctionCount(null, new FunctionFieldValue(null, "Test.number"))) + .where().exteq("Test").end(); WikittyQueryResult<String> result = wikittyClient.findAllByQuery(q); System.out.println("q: " + result); Assert.assertEquals("4", result.peek()); } { - WikittyQuery q = new WikittyQueryMaker().select(new FunctionMax(null, new FunctionFieldValue(null, "Test.number"))).end(); + WikittyQuery q = new WikittyQueryMaker() + .select(new FunctionMax(null, new FunctionFieldValue(null, "Test.number"))) + .where().exteq("Test").end(); WikittyQueryResult<Double> result = wikittyClient.findAllByQuery(Double.class, q); System.out.println("q: " + result); Assert.assertEquals(Double.valueOf(10), result.peek()); } { - WikittyQuery q = new WikittyQueryMaker().select(new FunctionMax(null, new FunctionFieldValue(null, "Test.number"))).end() + WikittyQuery q = new WikittyQueryMaker() + .select(new FunctionMax(null, new FunctionFieldValue(null, "Test.number"))) + .where().exteq("Test").end() .addSortDescending(new ElementField("Test", "number")); WikittyQueryResult<Double> result = wikittyClient.findAllByQuery(Double.class, q); System.out.println("q: " + result); Assert.assertEquals(Double.valueOf(10), result.peek()); } { - WikittyQuery q = new WikittyQueryMaker().select(new FunctionMin(null, new FunctionFieldValue(null, "Test.number"))).end(); + WikittyQuery q = new WikittyQueryMaker() + .select(new FunctionMin(null, new FunctionFieldValue(null, "Test.number"))) + .where().exteq("Test").end(); WikittyQueryResult<Double> result = wikittyClient.findAllByQuery(Double.class, q); System.out.println("q: " + result); Assert.assertEquals(Double.valueOf(-4.0), result.peek()); } { - WikittyQuery q = new WikittyQueryMaker().select(new FunctionMin(null, new FunctionFieldValue(null, "Test.number"))).end() + WikittyQuery q = new WikittyQueryMaker() + .select(new FunctionMin(null, new FunctionFieldValue(null, "Test.number"))) + .where().exteq("Test").end() .addSortDescending(new ElementField("Test", "number")); WikittyQueryResult<Double> result = wikittyClient.findAllByQuery(Double.class, q); System.out.println("q: " + result); Assert.assertEquals(Double.valueOf(-4.0), result.peek()); } { - WikittyQuery q = new WikittyQueryMaker().select(new FunctionSum(null, new FunctionFieldValue(null, "Test.number"))).end(); + WikittyQuery q = new WikittyQueryMaker() + .select(new FunctionSum(null, new FunctionFieldValue(null, "Test.number"))) + .where().exteq("Test").end(); WikittyQueryResult<Double> result = wikittyClient.findAllByQuery(Double.class, q); System.out.println("q: " + result); Assert.assertEquals(Double.valueOf(12), result.peek()); @@ -1955,7 +1969,7 @@ @Test public void testQueryMarkerSelect() throws Exception { - // for id for easy debugging + // force id for easy debugging WikittyImpl w = new WikittyImpl("g1"); WikittyGroupImpl g1 = new WikittyGroupImpl(w); g1.setName("Group1"); @@ -1972,6 +1986,8 @@ { WikittyQuery query = new WikittyQueryMaker() .select(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME) + .where() + .exteq(WikittyGroup.EXT_WIKITTYGROUP) .end(); WikittyQueryResult<String> result = wikittyClient.findAllByQuery(query);