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

24 Jan 2012

Author: echatellier
Date: 2012-01-24 18:56:29 +0100 (Tue, 24 Jan 2012)
New Revision: 1357

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

Log:
Fix tests

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-24 12:02:00 UTC (rev 1356)
+++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java	2012-01-24 17:56:29 UTC (rev 1357)
@@ -26,10 +26,7 @@
 package org.nuiton.wikitty;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -52,10 +49,6 @@
 import org.nuiton.wikitty.query.WikittyQueryMaker;
 import org.nuiton.wikitty.query.WikittyQueryParser;
 import org.nuiton.wikitty.query.WikittyQueryResult;
-import org.nuiton.wikitty.search.Criteria;
-import org.nuiton.wikitty.search.PagedResult;
-import org.nuiton.wikitty.search.Search;
-import org.nuiton.wikitty.search.operators.Like;
 import org.nuiton.wikitty.test.Category;
 import org.nuiton.wikitty.test.Product;
 
@@ -177,7 +170,7 @@
         WikittyImportExportService ieService = new WikittyImportExportService(wikittyClient);
         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
         Assert.assertTrue(csvExport.startsWith("\"Wikitty.Id\",\"Wikitty.Ext\",\"WikittyTreeNode.attachment\",\"WikittyTreeNode.name\",\"WikittyTreeNode.parent\""));
         // some data too
@@ -251,18 +244,31 @@
         Assert.assertEquals(1, results4.getTotalResult());
         WikittyTreeNode mySubNode = results4.get(0);
         Assert.assertEquals("MySubNode", mySubNode.getName());
-        System.out.println(mySubNode.getName());
     }
 
     /**
-     * Test que faire l'import 2 fois de suite cause une wikitty obselete
-     * exception.
+     * Test que faire l'import après avoir modifier un des wikitty ecrase les
+     * données.
+     * 
      * @throws IOException 
      */
-    @Test(expected=WikittyException.class)
+    @Test
     public void testImportTwice() throws IOException {
+        // first import
         importClients();
+
+        // modify one
+        Wikitty w = wikittyClient.restore("fbcc8aed-7f67-4e3c-a9aa-221373765f8d");
+        Assert.assertNotNull("Erreur d'import de fichier csv", w);
+        w.setField("Client", "name", "titi");
+        wikittyClient.store(w);
+
+        // second import sould fail
         importClients();
+
+        // aa
+        w = wikittyClient.restore("fbcc8aed-7f67-4e3c-a9aa-221373765f8d");
+        Assert.assertEquals("Toto", w.getFieldAsString("Client", "name"));
     }
 
     /**
@@ -500,34 +506,34 @@
 
     @Test
     public void testQueryMakerIdneq() throws IOException {
-        importBooks(); // pour un wid connu
+        importBooks(); // 4 + 13 importé = 17
         WikittyQuery query = new WikittyQueryMaker().idne("db9dc782-e650-4fd4-83ac-3c1c5c136cde").end();
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
-        Assert.assertEquals(28, results.getTotalResult());
+        Assert.assertEquals(16, results.getTotalResult()); // 17 livre en base
     }
     
     @Test
     public void testQueryParserIdneq() throws IOException {
-        importBooks(); // pour un wid connu
+        importBooks(); // 4 + 13 importé = 17
         WikittyQuery query = WikittyQueryParser.parse("id!=db9dc782-e650-4fd4-83ac-3c1c5c136cde");
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
-        Assert.assertEquals(16, results.getTotalResult());
+        Assert.assertEquals(16, results.getTotalResult()); // 17 livre en base
     }
     
     @Test
     public void testQueryMakerUnlike() throws IOException {
-        importBooks();
-        WikittyQuery query = new WikittyQueryMaker().unlike(Product.ELEMENT_FIELD_PRODUCT_NAME, "*potter*").end();
+        importBooks(); // 4 + 13 importé = 17
+        WikittyQuery query = new WikittyQueryMaker().unlike(Product.ELEMENT_FIELD_PRODUCT_NAME, "*Potter*").end();
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
-        Assert.assertEquals(11, results.getTotalResult());
+        Assert.assertEquals(11, results.getTotalResult()); // -6 HP = 11
     }
     
     @Test
     public void testQueryParserUnlike() throws IOException {
-        importBooks();
-        WikittyQuery query = WikittyQueryParser.parse("Product.name UNLIKE *potter*");
+        importBooks(); // 4 + 13 importé = 17
+        WikittyQuery query = WikittyQueryParser.parse("Product.name UNLIKE *Potter*");
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
-        Assert.assertEquals(11, results.getTotalResult());
+        Assert.assertEquals(11, results.getTotalResult()); // -6 HP = 11
     }
     
     @Test
@@ -567,6 +573,22 @@
         importBooks();
         WikittyQuery query = new WikittyQueryMaker().notsw(Product.ELEMENT_FIELD_PRODUCT_NAME, "Harry").end();
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
+        Assert.assertEquals(11, results.getTotalResult()); // -6 HP = 11
+    }
+
+    @Test
+    public void testQueryParserNotsw() throws IOException {
+        importBooks();
+        WikittyQuery query = WikittyQueryParser.parse("Product.name!=Harry*");
+        WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
+        Assert.assertEquals(11, results.getTotalResult()); // -6 HP = 11
+    }
+
+    @Test
+    public void testQueryMakerNotew() throws IOException {
+        importBooks();
+        WikittyQuery query = new WikittyQueryMaker().notew(Product.ELEMENT_FIELD_PRODUCT_NAME, "sorciers").end();
+        WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
         Assert.assertEquals(11, results.getTotalResult());
     }
 
@@ -613,9 +635,9 @@
     @Test
     public void testQueryParserIsNull() throws IOException {
         importBooks();
-        WikittyQuery query = WikittyQueryParser.parse("Produit.category=NULL");
+        WikittyQuery query = WikittyQueryParser.parse("Product.category=NULL");
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
-        Assert.assertEquals(1, results.getTotalResult());
+        Assert.assertEquals(2, results.getTotalResult());
     }
 
     @Test
@@ -629,7 +651,7 @@
     @Test
     public void testQueryParserIsNotNull() throws IOException {
         importBooks();
-        WikittyQuery query = WikittyQueryParser.parse("Produit.category!=NULL");
+        WikittyQuery query = WikittyQueryParser.parse("Product.category!=NULL");
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
         Assert.assertEquals(15, results.getTotalResult());
     }
@@ -640,20 +662,34 @@
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
         Assert.assertEquals(0, results.getTotalResult());
     }
+    
+    @Test
+    public void testQueryMakerTrue() {
+        WikittyQuery query = new WikittyQueryMaker().rTrue().end();
+        WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
+        Assert.assertEquals(4, results.getTotalResult());
+    }
 
     @Test
     public void testQueryParseTrue() {
         WikittyQuery query = WikittyQueryParser.parse("TRUE");
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
-        Assert.assertEquals(1, results.getTotalResult());
+        Assert.assertEquals(4, results.getTotalResult());
     }
+    
+    @Test
+    public void testQueryParseFalse() {
+        WikittyQuery query = WikittyQueryParser.parse("FALSE");
+        WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
+        Assert.assertEquals(0, results.getTotalResult());
+    }
 
     @Test
     public void testQueryMakerAnd() throws IOException {
         importBooks();
         WikittyQuery query = new WikittyQueryMaker().and()
                 .sw(Product.FQ_FIELD_PRODUCT_NAME, "Harry")
-                .notew(Product.ELEMENT_FIELD_PRODUCT_NAME, "sorcier").end();
+                .notew(Product.ELEMENT_FIELD_PRODUCT_NAME, "sorciers").end();
         WikittyQueryResult<Product> results = wikittyClient.findAllByQuery(Product.class, query);
         Assert.assertEquals(5, results.getTotalResult());
     }
@@ -704,10 +740,11 @@
         // et qui appartiennet a une catégory nommé "history"
         WikittyQuery query = new WikittyQueryMaker().and()
                 .bw(Product.ELEMENT_FIELD_PRODUCT_PRICE, 0, 75)
-                .select(Product.ELEMENT_FIELD_PRODUCT_CATEGORY)
-                    .eq(Category.FQ_FIELD_CATEGORY_CODE, "history").end();
+                .containsOne(Product.ELEMENT_FIELD_PRODUCT_CATEGORY)
+                    .select(Element.ID)
+                        .eq(Category.FQ_FIELD_CATEGORY_CODE, "history").end();
         WikittyQueryResult<String> results = wikittyClient.findAllByQuery(query);
-        Assert.assertEquals(9, results.getTotalResult());
+        Assert.assertEquals(3, results.getTotalResult());
     }
     
     /**

    

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

echatellier＠users.nuiton.org