[Wikitty-commits] r1414 - trunk/wikitty-api/src/test/java/org/nuiton/wikitty

3 Feb 2012

Author: bpoussin
Date: 2012-02-03 19:27:46 +0100 (Fri, 03 Feb 2012)
New Revision: 1414

Url: http://nuiton.org/repositories/revision/wikitty/1414

Log:
suppression de @Ignore sur certain test et correction du code ou du test

Modified:
   trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientAbstractTest.java
   trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java

Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientAbstractTest.java
===================================================================

--- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientAbstractTest.java	2012-02-03 18:26:20 UTC (rev 1413)
+++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientAbstractTest.java	2012-02-03 18:27:46 UTC (rev 1414)
@@ -145,12 +145,14 @@
     /** Manual extension name : media. */
     protected static final String MEDIA_EXTENSION_NAME = "Media";
     /** Manual extension media. */
-    protected static final WikittyExtension MEDIA_EXTENSION = ExtensionFactory.create(MEDIA_EXTENSION_NAME, "6.0")
+    protected static final WikittyExtension MEDIA_EXTENSION =
+            ExtensionFactory.create(MEDIA_EXTENSION_NAME, "6.0")
             .addField("type", WikittyTypes.STRING)
             .extension();
     protected static final String MOVIE_EXTENSION_NAME = "Movies";
     /** Manual extension movies. */
-    protected static final WikittyExtension MOVIE_EXTENSION = ExtensionFactory.create(MOVIE_EXTENSION_NAME, "2.0", MEDIA_EXTENSION_NAME)
+    protected static final WikittyExtension MOVIE_EXTENSION =
+            ExtensionFactory.create(MOVIE_EXTENSION_NAME, "2.0", MEDIA_EXTENSION_NAME)
             .addField("name", WikittyTypes.STRING)
             .addField("authors", WikittyTypes.STRING).maxOccur(Integer.MAX_VALUE)
             .addField("category", WikittyTypes.WIKITTY)
@@ -234,7 +236,7 @@
         edgarMovie.addExtension(MOVIE_EXTENSION);
         edgarMovie.setField(MOVIE_EXTENSION_NAME, "name", "J. Edgar");
         edgarMovie.addToField(MOVIE_EXTENSION_NAME, "authors", "Eastwood");
-        edgarMovie.setField("Movies", "date", "25/12/2011");
+        edgarMovie.setField(MOVIE_EXTENSION_NAME, "date", "25/12/2011");
 
         Wikitty dnrMovie = new WikittyImpl();
         dnrMovie.addExtension(MEDIA_EXTENSION);

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:26:20 UTC (rev 1413)
+++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java	2012-02-03 18:27:46 UTC (rev 1414)
@@ -106,10 +106,10 @@
         w = wikittyClient.store(w);
         w = wikittyClient.restore(id);
         Assert.assertTrue(w.hasExtension(MOVIE_EXTENSION_NAME));
-        Assert.assertTrue(w.hasField("Movies", "name"));
-        Assert.assertTrue(w.hasField("Movies", "authors"));
-        Assert.assertTrue(w.hasField("Movies", "category"));
-        Assert.assertTrue(w.hasField("Movies", "date"));
+        Assert.assertTrue(w.hasField(MOVIE_EXTENSION_NAME, "name"));
+        Assert.assertTrue(w.hasField(MOVIE_EXTENSION_NAME, "authors"));
+        Assert.assertTrue(w.hasField(MOVIE_EXTENSION_NAME, "category"));
+        Assert.assertTrue(w.hasField(MOVIE_EXTENSION_NAME, "date"));
     }
 
     @Test
@@ -118,9 +118,9 @@
         List<String> extIds = wikittyClient.getAllExtensionIds();
         log.debug("extIds: " + extIds);
         Assert.assertEquals(8, extIds.size());
-        Assert.assertTrue(extIds.contains("Movies[2.0]"));
-        WikittyExtension ext = wikittyClient.restoreExtension("Movies[2.0]");
-        Assert.assertEquals("Movies", ext.getName());
+        Assert.assertTrue(extIds.contains(MOVIE_EXTENSION_NAME+"[2.0]"));
+        WikittyExtension ext = wikittyClient.restoreExtension(MOVIE_EXTENSION_NAME+"[2.0]");
+        Assert.assertEquals(MOVIE_EXTENSION_NAME, ext.getName());
         Assert.assertEquals("2.0", ext.getVersion());
         Assert.assertEquals(MOVIE_EXTENSION, ext);
     }
@@ -167,7 +167,7 @@
         Assert.assertEquals(1, extIds.size());
 
         WikittyExtension ext = wikittyClient.restoreExtension(extIds.get(0));
-        Assert.assertEquals("Movies", ext.getName());
+        Assert.assertEquals(MOVIE_EXTENSION_NAME, ext.getName());
         Assert.assertEquals("2.0", ext.getVersion());
         Assert.assertEquals(MOVIE_EXTENSION, ext);
     }
@@ -615,11 +615,7 @@
         Assert.assertNotNull(restoredWikitty);
     }
 
-    /**
-     * FIXME echatellier 20120131 fix test (fails with solr analyzer)
-     */
     @Test
-    @Ignore
     public void testStorageBinaryField() {
         String extName = "BinaryExt";
         byte[] bytes = "Coucou le monde".getBytes();
@@ -639,7 +635,7 @@
         Wikitty restoredWikitty = wikittyClient.restore(w.getId());
         Assert.assertNotNull(restoredWikitty);
         Assert.assertEquals("LeBin", restoredWikitty.getFieldAsString(extName, "name"));
-        Assert.assertEquals(bytes, restoredWikitty.getFieldAsBytes(extName, "content"));
+        Assert.assertTrue(Arrays.equals(bytes, restoredWikitty.getFieldAsBytes(extName, "content")));
     }
 
     @Test
@@ -728,7 +724,7 @@
         // The Dark Knight Rises
         // Die hard 4
         assumeTrueSearchEngineCanRunTest(); // ? in regex
-        WikittyQuery query = new WikittyQueryMaker().eq("Movies.name", "*ar?*").end();
+        WikittyQuery query = new WikittyQueryMaker().eq(MOVIE_EXTENSION_NAME + ".name", "*ar?*").end();
         WikittyQueryResult<String> results = wikittyClient.findAllByQuery(query);
         Assert.assertEquals(2, results.getAll().size());
     }
@@ -1001,13 +997,13 @@
     @Test
     public void testQueryMakerNeq() {
         // FIXME echatellier 20120125 should work
-        assumeTrueSearchEngineCanRunTest();
+//        assumeTrueSearchEngineCanRunTest();
 
         // 22 wikitty in init
         // only one with price == 42
         // test strict equals
         WikittyQuery query = new WikittyQueryMaker().ne(Product.FQ_FIELD_PRODUCT_PRICE, 42).end();
-        WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
+        WikittyQueryResult<String> results = wikittyClient.findAllByQuery(query);
         Assert.assertEquals(21, results.getTotalResult());
         Assert.assertEquals(21, results.getAll().size());
     }
@@ -1127,7 +1123,7 @@
         importBooks(); // 13 importé = 35
         // -1 avec cet id
         WikittyQuery query = new WikittyQueryMaker().idne("db9dc782-e650-4fd4-83ac-3c1c5c136cde").end();
-        WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
+        WikittyQueryResult<String> results = wikittyClient.findAllByQuery(query);
         Assert.assertEquals(34, results.getTotalResult());
     }
     
@@ -1137,33 +1133,33 @@
         importBooks(); // 13 importé = 35
         // -1 avec cet id
         WikittyQuery query = WikittyQueryParser.parse("id!=db9dc782-e650-4fd4-83ac-3c1c5c136cde");
-        WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
+        WikittyQueryResult<String> results = wikittyClient.findAllByQuery(query);
         Assert.assertEquals(34, results.getTotalResult());
     }
     
     @Test
     public void testQueryMakerUnlike() throws IOException {
         // FIXME echatellier 20120125 should work
-        assumeTrueSearchEngineCanRunTest();
+//        assumeTrueSearchEngineCanRunTest();
 
         // + 22 in init db
         importBooks(); // 13 importé = 35
         // -6 HP
         WikittyQuery query = new WikittyQueryMaker().unlike(Product.ELEMENT_FIELD_PRODUCT_NAME, "*Potter*").end();
-        WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
+        WikittyQueryResult<String> results = wikittyClient.findAllByQuery(query);
         Assert.assertEquals(29, results.getTotalResult()); // -6 HP = 11
     }
     
     @Test
     public void testQueryParserUnlike() throws IOException {
         // FIXME echatellier 20120125 should work
-        assumeTrueSearchEngineCanRunTest();
+//        assumeTrueSearchEngineCanRunTest();
 
         // + 22 in init db
         importBooks(); // 13 importé = 35
         // -6 HP
         WikittyQuery query = WikittyQueryParser.parse("Product.name UNLIKE *Potter*");
-        WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
+        WikittyQueryResult<String> results = wikittyClient.findAllByQuery(query);
         Assert.assertEquals(29, results.getTotalResult()); // -6 HP = 11
     }
     
@@ -1202,52 +1198,52 @@
     @Test
     public void testQueryMakerNotsw() throws IOException {
         // FIXME echatellier 20120125 should work
-        assumeTrueSearchEngineCanRunTest();
+//        assumeTrueSearchEngineCanRunTest();
 
         // + 22 in init db
         importBooks(); // 13 importé = 35
         // -6 HP
         WikittyQuery query = new WikittyQueryMaker().notsw(Product.ELEMENT_FIELD_PRODUCT_NAME, "Harry").end();
-        WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
+        WikittyQueryResult<String> results = wikittyClient.findAllByQuery(query);
         Assert.assertEquals(29, results.getTotalResult());
     }
 
     @Test
     public void testQueryParserNotsw() throws IOException {
         // FIXME echatellier 20120125 should work
-        assumeTrueSearchEngineCanRunTest();
+//        assumeTrueSearchEngineCanRunTest();
 
         // + 22 in init db
         importBooks(); // 13 importé = 35
         // -6 HP
         WikittyQuery query = WikittyQueryParser.parse("Product.name!=Harry*");
-        WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
+        WikittyQueryResult<String> results = wikittyClient.findAllByQuery(query);
         Assert.assertEquals(29, results.getTotalResult());
     }
 
     @Test
     public void testQueryMakerNotew() throws IOException {
         // FIXME echatellier 20120125 should work
-        assumeTrueSearchEngineCanRunTest();
+//        assumeTrueSearchEngineCanRunTest();
 
         // + 22 in init db
         importBooks(); // 13 importé = 35
         // -1 sorciers
         WikittyQuery query = new WikittyQueryMaker().notew(Product.ELEMENT_FIELD_PRODUCT_NAME, "sorciers").end();
-        WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
+        WikittyQueryResult<String> results = wikittyClient.findAllByQuery(query);
         Assert.assertEquals(34, results.getTotalResult());
     }
 
     @Test
     public void testQueryParserNotew() throws IOException {
         // FIXME echatellier 20120125 should work
-        assumeTrueSearchEngineCanRunTest();
+//        assumeTrueSearchEngineCanRunTest();
 
         // + 22 in init db
         importBooks(); // 13 importé = 35
         // -1 sorciers
         WikittyQuery query = WikittyQueryParser.parse("Product.name!=*sorciers");
-        WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
+        WikittyQueryResult<String> results = wikittyClient.findAllByQuery(query);
         Assert.assertEquals(34, results.getTotalResult());
     }
 
@@ -1318,7 +1314,7 @@
     public void testQueryMakerTrue() {
         // 22 in init db
         WikittyQuery query = new WikittyQueryMaker().rTrue().end();
-        WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
+        WikittyQueryResult<String> results = wikittyClient.findAllByQuery(query);
         Assert.assertEquals(22, results.getTotalResult());
     }
 
@@ -1326,7 +1322,7 @@
     public void testQueryParseTrue() {
         // 22 in init db
         WikittyQuery query = WikittyQueryParser.parse("TRUE");
-        WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
+        WikittyQueryResult<String> results = wikittyClient.findAllByQuery(query);
         Assert.assertEquals(22, results.getTotalResult());
     }
     
@@ -1419,7 +1415,7 @@
 
     @Test
     public void testSearchFacetSingleField() throws Exception {
-        assumeTrueSearchEngineCanRunTest(); // facets
+//        assumeTrueSearchEngineCanRunTest(); // facets
  
         importBooks();
 
@@ -1437,11 +1433,7 @@
         Assert.assertEquals(1, result.getTopic(Product.ELEMENT_FIELD_PRODUCT_CATEGORY).get(3).getCount());
     }
 
-    /**
-     * FIXME echatellier 20120131 fix test (fails with solr analyzer)
-     */
     @Test
-    @Ignore
     public void testQueryMarkerWilcardEquals() {
         assumeTrueSearchEngineCanRunTest(); // wildcard
 
@@ -1449,26 +1441,22 @@
         WikittyQueryResult<Product> results1 = wikittyClient.findAllByQuery(Product.class, query1);
         Assert.assertEquals(1, results1.getTotalResult());
 
-        WikittyQuery query2 = new WikittyQueryMaker().eq("*" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + Product.FIELD_PRODUCT_NAME, "Lanfeust").end();
-        WikittyQueryResult<Product> results2 = wikittyClient.findAllByQuery(Product.class, query2);
-        Assert.assertEquals(1, results2.getTotalResult());
+        // ???13
+        WikittyQuery query4 = new WikittyQueryMaker().eq("*.name." + WikittyTypes.STRING, "Lanfeust").end();
+        WikittyQueryResult<Product> results4 = wikittyClient.findAllByQuery(Product.class, query4);
+        Assert.assertEquals(1, results4.getTotalResult());
 
         // ???
         WikittyQuery query3 = new WikittyQueryMaker().eq("Product.name." + WikittyTypes.STRING, "Lanfeust").end();
         WikittyQueryResult<Product> results3 = wikittyClient.findAllByQuery(Product.class, query3);
         Assert.assertEquals(1, results3.getTotalResult());
 
-        // ???13
-        WikittyQuery query4 = new WikittyQueryMaker().eq("*.name." + WikittyTypes.STRING, "Lanfeust").end();
-        WikittyQueryResult<Product> results4 = wikittyClient.findAllByQuery(Product.class, query4);
-        Assert.assertEquals(1, results4.getTotalResult());
+        WikittyQuery query2 = new WikittyQueryMaker().eq("*" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + Product.FIELD_PRODUCT_NAME, "Lanfeust").end();
+        WikittyQueryResult<Product> results2 = wikittyClient.findAllByQuery(Product.class, query2);
+        Assert.assertEquals(1, results2.getTotalResult());
     }
 
-    /**
-     * FIXME echatellier 20120131 fix test (fails with solr analyzer)
-     */
     @Test
-    @Ignore
     public void testQueryParserWilcardEquals() {
         assumeTrueSearchEngineCanRunTest(); // wildcard
 
@@ -1538,12 +1526,15 @@
      */
     @Test
     public void testSearchWithSort1() {
-        assumeTrueSearchEngineCanRunTest(); // sorting
+//        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.
         WikittyQuery query1 = WikittyQueryParser.parse("*.name=*");
         query1.setSortAscending(new ElementField("*.name"));
-        WikittyQueryResult<Product> results1 = wikittyClient.findAllByQuery(Product.class, query1);
-        Assert.assertEquals(15, results1.getTotalResult());
+        WikittyQueryResult<String> results1 = wikittyClient.findAllByQuery(query1);
+        Assert.assertEquals(22, results1.getTotalResult());
     }
     
     /**

    

[Wikitty-commits] r1414 - trunk/wikitty-api/src/test/java/org/nuiton/wikitty

bpoussin＠users.nuiton.org