Author: echatellier Date: 2010-06-07 16:20:02 +0200 (Mon, 07 Jun 2010) New Revision: 104 Url: http://nuiton.org/repositories/revision/wikitty/104 Log: Fix tests compilation Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceInMemory.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java trunk/wikitty-hbase-impl/src/test/java/org/nuiton/wikitty/hbase/test/AbstractTestHbase.java trunk/wikitty-hbase-impl/src/test/java/org/nuiton/wikitty/hbase/test/StorageHbaseTest.java trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java trunk/wikitty-jpa-impl/src/test/java/org/nuiton/wikitty/jpa/test/StorageJPATest.java trunk/wikitty-multistorage-impl/src/test/java/org/nuiton/wikitty/multistorage/test/MultiStorageTest.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/AbstractTestSolr.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceInMemory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceInMemory.java 2010-06-07 14:07:40 UTC (rev 103) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceInMemory.java 2010-06-07 14:20:02 UTC (rev 104) @@ -330,9 +330,10 @@ break; } } - + } - return new PagedResult<String>(firstIndex, endIndex, criteria.getRestriction().toString(), null, ids ); + + return new PagedResult<String>(firstIndex, endIndex, criteria.getRestriction().toString(), null, ids ); } @Override Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java 2010-06-07 14:07:40 UTC (rev 103) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java 2010-06-07 14:20:02 UTC (rev 104) @@ -128,7 +128,7 @@ Wikitty w = createWikitty( wValue, EXTNAME, EXT_TEST ); result.add( w ); } - ws.store(result); + ws.store(null, result); return result; } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java 2010-06-07 14:07:40 UTC (rev 103) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java 2010-06-07 14:20:02 UTC (rev 104) @@ -35,7 +35,7 @@ protected WikittyImportExportService getImportExportService() { if (ieService == null) { - ieService = new WikittyImportExportService(ws); + ieService = new WikittyImportExportService(null, ws); } return ieService; } @@ -135,7 +135,7 @@ "7ca86742-5957-4659-b12f-4915cbef9193", "77d7640c-573d-421c-a7e9-9b70bd025983" }; - List<Wikitty> wikitties = ws.restore(Arrays.asList(ids)); + List<Wikitty> wikitties = ws.restore(null, Arrays.asList(ids)); assertEquals(3, wikitties.size()); } } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceTest.java 2010-06-07 14:07:40 UTC (rev 103) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceTest.java 2010-06-07 14:20:02 UTC (rev 104) @@ -63,7 +63,7 @@ FieldType fieldType = new FieldType(FieldType.TYPE.STRING, 1, 1); extension.addField("field" + i, fieldType); } - wikittyService.storeExtension(extension); + wikittyService.storeExtension(null, extension); Collection<Wikitty> wikitties = new ArrayList<Wikitty>(WIKITTY_SIZE); for (int i = 0; i < WIKITTY_SIZE; i++) { @@ -75,7 +75,7 @@ wikitties.add(wikitty); } long start = System.currentTimeMillis(); - wikittyService.store(wikitties); + wikittyService.store(null, wikitties); long end = System.currentTimeMillis(); log.info("[Performance" + fieldSize + "] Write times : " + ((end - start) / 1000) + "s"); @@ -83,7 +83,7 @@ start = System.currentTimeMillis(); for (int i = 0; i < WIKITTY_SIZE; i++) { int nextInt = random.nextInt(WIKITTY_SIZE); - wikittyService.restore("Performance" + fieldSize + "id" + nextInt); + wikittyService.restore(null, "Performance" + fieldSize + "id" + nextInt); } end = System.currentTimeMillis(); log.info("[Performance" + fieldSize + "] Read times : " + ((end - start) / 1000) + "s"); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java 2010-06-07 14:07:40 UTC (rev 103) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java 2010-06-07 14:20:02 UTC (rev 104) @@ -55,12 +55,12 @@ w.setField(ext.getName(), "age", "125"); wikitties.add( w ); - ws.store(wikitties); + ws.store(null, wikitties); Criteria criteria = Search.query() .eq("testExt.name", "Guillaume") .criteria(); - PagedResult<Wikitty> result = ws.findAllByCriteria(criteria); + PagedResult<Wikitty> result = ws.findAllByCriteria(null, criteria); List<Wikitty> found = result.getAll(); assertEquals(1, found.size()); log.info( found.get(0).getFieldAsString(ext.getName(), "name") ); @@ -68,7 +68,7 @@ criteria = Search.query() .eq("testExt.age", "125") .criteria(); - result = ws.findAllByCriteria(criteria); + result = ws.findAllByCriteria(null, criteria); found = result.getAll(); assertEquals(1, found.size()); log.info( found.get(0).getFieldAsString(ext.getName(), "name") ); @@ -76,7 +76,7 @@ criteria = Search.query() .gt("testExt.age", "10") .criteria(); - result = ws.findAllByCriteria(criteria); + result = ws.findAllByCriteria(null, criteria); found = result.getAll(); assertEquals(2, found.size()); log.info( found.get(0).getFieldAsString(ext.getName(), "name") ); @@ -86,7 +86,7 @@ exemple.addExtension(ext); exemple.setField(ext.getName(), "name", "Guillaume"); exemple.setField(ext.getName(), "age", "27"); - result = ws.findAllByCriteria( Search.query(exemple).criteria() ); + result = ws.findAllByCriteria(null, Search.query(exemple).criteria() ); found = result.getAll(); assertEquals(1, found.size()); log.info( found.get(0).getFieldAsString(ext.getName(), "name") ); @@ -95,7 +95,7 @@ exemple.addExtension(ext); exemple.setField(ext.getName(), "name", "Guillaume"); exemple.setField(ext.getName(), "age", "125"); - result = ws.findAllByCriteria( Search.query(exemple).criteria() ); + result = ws.findAllByCriteria(null, Search.query(exemple).criteria() ); found = result.getAll(); assertEquals(0, found.size()); // log.info( found.get(0).getFieldAsString(ext.getName(), "name") ); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-06-07 14:07:40 UTC (rev 103) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-06-07 14:20:02 UTC (rev 104) @@ -43,21 +43,21 @@ public void testStoreRestoreBasics() throws Exception { Wikitty w = createBasicWikitty(); String id = w.getId(); - ws.store( w ); - w = ws.restore( id ); - assertTrue( w.hasExtension(EXTNAME) ); + ws.store(null, w); + w = ws.restore(null, id); + assertTrue(w.hasExtension(EXTNAME)); for ( int i = 0; i < 3; i++ ) { - assertTrue( w.hasField(EXTNAME, "fieldName" + i) ); + assertTrue( w.hasField(EXTNAME, "fieldName" + i)); } } @Test public void testExtensionMethod() throws Exception { - ws.storeExtension(Arrays.asList(EXT_TEST)); - List<String> extIds = ws.getAllExtensionIds(); + ws.storeExtension(null, Arrays.asList(EXT_TEST)); + List<String> extIds = ws.getAllExtensionIds(null); log.debug("extIds: " + extIds); assertEquals(1, extIds.size()); - WikittyExtension ext = ws.restoreExtension(extIds.get(0)); + WikittyExtension ext = ws.restoreExtension(null, extIds.get(0)); assertEquals(EXT_TEST.getName(), ext.getName()); assertEquals(EXT_TEST.getVersion(), ext.getVersion()); assertEquals(EXT_TEST, ext); @@ -65,12 +65,12 @@ @Test public void testExtensionRequires() throws Exception { - ws.storeExtension(Arrays.asList(EXT_REQUIRED, EXT_REQUIRES)); - List<String> extIds = ws.getAllExtensionsRequires(EXTREQUIRED); + ws.storeExtension(null, Arrays.asList(EXT_REQUIRED, EXT_REQUIRES)); + List<String> extIds = ws.getAllExtensionsRequires(null, EXTREQUIRED); log.debug("extIds: " + extIds); assertEquals(1, extIds.size()); - WikittyExtension ext = ws.restoreExtension(extIds.get(0)); + WikittyExtension ext = ws.restoreExtension(null, extIds.get(0)); assertEquals(EXT_REQUIRES.getName(), ext.getName()); assertEquals(EXT_REQUIRES.getVersion(), ext.getVersion()); assertEquals(EXT_REQUIRES, ext); @@ -101,9 +101,9 @@ wikitties.add( w ); ids.add( w.getId() ); } - ws.store(wikitties); + ws.store(null, wikitties); - wikitties = ws.restore(ids); + wikitties = ws.restore(null, ids); int wIndex = 0; for ( String wValue : wValues ) { Wikitty w = wikitties.get(wIndex); @@ -141,7 +141,7 @@ Wikitty w = null; // should be ignored (?) try { - ws.store( w ); + ws.store(null, w); fail("store(null) Must throw an exception !"); } catch (Exception e) { // OK ! @@ -149,8 +149,8 @@ w = new Wikitty(); String id = w.getId(); - ws.store( w ); - w = ws.restore(id); + ws.store(null, w); + w = ws.restore(null, id); assertEquals( id, w.getId() ); } @@ -163,12 +163,12 @@ "String other[0-n] unique not null" )); - ws.storeExtension(Arrays.asList(ext)); + ws.storeExtension(null, Arrays.asList(ext)); Wikitty w = new Wikitty(); w.addExtension(ext); try { - ws.store(w); + ws.store(null, w); assertFalse("not null contraint don't work on String", true); } catch (WikittyException eee) { eee.printStackTrace(); @@ -177,7 +177,7 @@ w.setField("TestConstraint", "id", "toto"); try { - ws.store(w); + ws.store(null, w); assertFalse("not null contraint don't work in Collection", true); } catch (WikittyException eee) { eee.printStackTrace(); @@ -185,18 +185,18 @@ } w.addToField("TestConstraint", "other", "titi"); - ws.store(w); + ws.store(null, w); w.addToField("TestConstraint", "ext", "tata"); w.addToField("TestConstraint", "ext", "titi"); - ws.store(w); + ws.store(null, w); - Wikitty w2 = ws.restore(w.getId()); + Wikitty w2 = ws.restore(null, w.getId()); w2.addToField("TestConstraint", "ext", "tata"); // tata ne doit pas s'ajouter w2.addToField("TestConstraint", "ext", "toto"); - ws.store(w2); - Wikitty w3 = ws.restore(w.getId()); + ws.store(null, w2); + Wikitty w3 = ws.restore(null, w.getId()); HashSet set = new HashSet(Arrays.asList("tata", "titi", "toto")); assertEquals(set, w3.getFieldAsSet("TestConstraint", "ext", String.class)); @@ -228,7 +228,7 @@ Wikitty w = createWikitty( wValue, EXTNAME, EXT_TEST ); wikitties.add( w ); } - ws.store(wikitties); + ws.store(null, wikitties); // search test Wikitty w = new Wikitty(); @@ -236,7 +236,7 @@ w.setField(EXT_TEST.getName(), "fieldName1", "003309"); Criteria criteria = Search.query(w).criteria() .addSortDescending(EXT_TEST.getName() + ".fieldName0"); - PagedResult<Wikitty> resultFind = ws.findAllByCriteria(criteria); + PagedResult<Wikitty> resultFind = ws.findAllByCriteria(null, criteria); assertEquals(2, resultFind.size()); assertEquals(wikitties.subList(0, 2), resultFind.getAll()); @@ -268,7 +268,7 @@ Wikitty w = createWikitty( wValue, EXTNAME, EXT_TEST ); wikitties.add( w ); } - ws.store(wikitties); + ws.store(null, wikitties); // search test Wikitty w = new Wikitty(); @@ -278,7 +278,7 @@ .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS) .addFacetField(EXT_TEST.getName()+".fieldName0") .addFacetField(EXT_TEST.getName()+".fieldName1"); - PagedResult<Wikitty> resultFind = ws.findAllByCriteria(criteria); + PagedResult<Wikitty> resultFind = ws.findAllByCriteria(null, criteria); List<String> facetNames = new ArrayList<String>(resultFind.getFacetNames()); Collections.sort(facetNames); @@ -321,7 +321,7 @@ for( Wikitty w : wikitties ) { oldIdVersion.put(w.getId(), w.getVersion()); } - UpdateResponse response = ws.store(wikitties); + UpdateResponse response = ws.store(null, wikitties); for (Wikitty w : wikitties) { response.update(w); String v1 = w.getVersion(); @@ -336,7 +336,7 @@ w.addExtension(EXT_TEST); w.setField(EXT_TEST.getName(), "fieldName0", "chaiseICI"); Criteria criteria = Search.query(w).criteria(); - Wikitty resultFind = ws.findByCriteria(criteria); + Wikitty resultFind = ws.findByCriteria(null, criteria); Wikitty wikittySource = wikitties.get(1); assertEquals(w.getFieldAsString(EXT_TEST.getName(), "fieldName0"), @@ -357,17 +357,17 @@ // test to find deleted wikitty // test if solr index is coherent with database Criteria criteria1 = Search.query().eq("id", wikittySource.getId()).criteria(); - Wikitty searchedWikitty1 = ws.findByCriteria(criteria1); + Wikitty searchedWikitty1 = ws.findByCriteria(null, criteria1); Assert.assertNotNull(searchedWikitty1); - ws.delete(wikittySource.getId()); - Wikitty deletedObject = ws.restore(wikittySource.getId()); + ws.delete(null, wikittySource.getId()); + Wikitty deletedObject = ws.restore(null, wikittySource.getId()); assertNull(deletedObject); // test to find deleted wikitty // test if solr index is coherent with database Criteria criteria2 = Search.query().eq("id", wikittySource.getId()).criteria(); - Wikitty searchedWikitty2 = ws.findByCriteria(criteria2); + Wikitty searchedWikitty2 = ws.findByCriteria(null, criteria2); Assert.assertNull(searchedWikitty2); } @@ -381,22 +381,22 @@ // labelisation test Wikitty w1 = wikitties.get(0); - ws.addLabel(w1.getId(), "titi"+ts); - ws.addLabel(w1.getId(), "toto"+ts); + ws.addLabel(null, w1.getId(), "titi"+ts); + ws.addLabel(null, w1.getId(), "toto"+ts); Wikitty w2 = wikitties.get(1); - ws.addLabel(w2.getId(), "tata"+ts); - ws.addLabel(w2.getId(), "titi"+ts); + ws.addLabel(null, w2.getId(), "tata"+ts); + ws.addLabel(null, w2.getId(), "titi"+ts); Wikitty w3 = wikitties.get(2); - ws.addLabel(w3.getId(), "tutu"+ts); - ws.addLabel(w3.getId(), "titi"+ts); + ws.addLabel(null, w3.getId(), "tutu"+ts); + ws.addLabel(null, w3.getId(), "titi"+ts); - Wikitty wt = ws.findByLabel("toto"+ts ); + Wikitty wt = ws.findByLabel(null, "toto"+ts ); assertEquals(w1, wt); - Set<String> labels = ws.findAllAppliedLabels(w2.getId()); + Set<String> labels = ws.findAllAppliedLabels(null, w2.getId()); assertEquals(new HashSet(Arrays.asList("tata"+ts, "titi"+ts)), labels); } @@ -425,7 +425,7 @@ // leaf.addChild( subLeaf.getWikittyId() ); } } - ws.store(wikittyNodes); // store treeNodes. + ws.store(null, wikittyNodes); // store treeNodes. Wikitty table = wikitties.get(0); Wikitty chaise = wikitties.get(1); @@ -435,7 +435,7 @@ assign( table, root, "cat-1" ); assign( bureau, root, "cat-2/subcat-2-4" ); - Tree t = ws.restoreTree( root.getWikitty().getId() ); + Tree t = ws.restoreTree(null, root.getWikitty().getId() ); t.getName().equals("MyCategoryRoot"); @@ -450,7 +450,7 @@ Criteria criteria = Search.query(node.getWikitty()).criteria() .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - List<Wikitty> wikitties = ws.findAllByCriteria(criteria).getAll(); + List<Wikitty> wikitties = ws.findAllByCriteria(null, criteria).getAll(); for ( Wikitty child : wikitties ) { if (!child.hasExtension(TreeNode.EXT_TREENODE)) { continue; @@ -464,6 +464,6 @@ fail( "Unable to find node " + nodeName + " inside " + currentNode.getName() ); } currentNode.addChildren( wikitty.getId() ); - ws.store(currentNode.getWikitty()); + ws.store(null, currentNode.getWikitty()); } } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java 2010-06-07 14:07:40 UTC (rev 103) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java 2010-06-07 14:20:02 UTC (rev 104) @@ -56,11 +56,11 @@ ext ); String id = w.getId(); - wikittyService.store(w); + wikittyService.store(null, w); ((WikittyServiceInMemory)wikittyService).saveToPersistenceFile(); wikittyService = new WikittyServiceInMemory( tempPersistFile ); - w = wikittyService.restore(id); + w = wikittyService.restore(null, id); assertTrue( w.hasField(extName, "fieldName0") ); assertEquals( 123, w.getFieldAsInt(extName, "fieldName0") ); assertTrue( w.hasField(extName, "fieldName1") ); Modified: trunk/wikitty-hbase-impl/src/test/java/org/nuiton/wikitty/hbase/test/AbstractTestHbase.java =================================================================== --- trunk/wikitty-hbase-impl/src/test/java/org/nuiton/wikitty/hbase/test/AbstractTestHbase.java 2010-06-07 14:07:40 UTC (rev 103) +++ trunk/wikitty-hbase-impl/src/test/java/org/nuiton/wikitty/hbase/test/AbstractTestHbase.java 2010-06-07 14:20:02 UTC (rev 104) @@ -30,7 +30,7 @@ @Before public void deleteAll() throws Exception { WikittyServiceHBase hbaseService = ((WikittyServiceHBase) ws); - hbaseService.clear(); + hbaseService.clear(null); } } Modified: trunk/wikitty-hbase-impl/src/test/java/org/nuiton/wikitty/hbase/test/StorageHbaseTest.java =================================================================== --- trunk/wikitty-hbase-impl/src/test/java/org/nuiton/wikitty/hbase/test/StorageHbaseTest.java 2010-06-07 14:07:40 UTC (rev 103) +++ trunk/wikitty-hbase-impl/src/test/java/org/nuiton/wikitty/hbase/test/StorageHbaseTest.java 2010-06-07 14:20:02 UTC (rev 104) @@ -34,6 +34,6 @@ @Before public void deleteAll() throws Exception { WikittyServiceHBase hbaseService = ((WikittyServiceHBase) ws); - hbaseService.clear(); + hbaseService.clear(null); } } Modified: trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java =================================================================== --- trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java 2010-06-07 14:07:40 UTC (rev 103) +++ trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java 2010-06-07 14:20:02 UTC (rev 104) @@ -34,6 +34,6 @@ @Before public void deleteAll() throws Exception { WikittyServiceJDBC service = ((WikittyServiceJDBC) ws); - service.clear(); + service.clear(null); } } Modified: trunk/wikitty-jpa-impl/src/test/java/org/nuiton/wikitty/jpa/test/StorageJPATest.java =================================================================== --- trunk/wikitty-jpa-impl/src/test/java/org/nuiton/wikitty/jpa/test/StorageJPATest.java 2010-06-07 14:07:40 UTC (rev 103) +++ trunk/wikitty-jpa-impl/src/test/java/org/nuiton/wikitty/jpa/test/StorageJPATest.java 2010-06-07 14:20:02 UTC (rev 104) @@ -39,6 +39,6 @@ @Before public void deleteAll() throws Exception { WikittyServiceJPA service = ((WikittyServiceJPA) ws); - service.clear(); + service.clear(null); } } Modified: trunk/wikitty-multistorage-impl/src/test/java/org/nuiton/wikitty/multistorage/test/MultiStorageTest.java =================================================================== --- trunk/wikitty-multistorage-impl/src/test/java/org/nuiton/wikitty/multistorage/test/MultiStorageTest.java 2010-06-07 14:07:40 UTC (rev 103) +++ trunk/wikitty-multistorage-impl/src/test/java/org/nuiton/wikitty/multistorage/test/MultiStorageTest.java 2010-06-07 14:20:02 UTC (rev 104) @@ -61,7 +61,7 @@ // create wikitty service service = new WikittyServiceMultiStorage(configuration); - service.clear(); + service.clear(null); } //@Test @@ -70,9 +70,9 @@ WikittyExtension extension = new WikittyExtension("extension"); Wikitty wikitty = new Wikitty(); wikitty.addExtension(extension); - service.store(wikitty); + service.store(null, wikitty); - Wikitty restore = service.restore(wikitty.getId()); + Wikitty restore = service.restore(null, wikitty.getId()); Assert.assertNotNull(restore); } Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-06-07 14:07:40 UTC (rev 103) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-06-07 14:20:02 UTC (rev 104) @@ -684,8 +684,9 @@ } int numFound = (int)resp.getResults().getNumFound(); + // FIXME null security token PagedResult<String> result = new PagedResult<String>( - firstIndex, numFound, queryString, facets, ids); + null, firstIndex, numFound, queryString, facets, ids); return result; } catch (SolrServerException e) { Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/AbstractTestSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/AbstractTestSolr.java 2010-06-07 14:07:40 UTC (rev 103) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/AbstractTestSolr.java 2010-06-07 14:20:02 UTC (rev 104) @@ -29,7 +29,7 @@ @Before public void deleteAll() throws Exception { WikittyServiceSolr hbaseService = ((WikittyServiceSolr) ws); - hbaseService.clear(); + hbaseService.clear(null); } } Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java 2010-06-07 14:07:40 UTC (rev 103) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java 2010-06-07 14:20:02 UTC (rev 104) @@ -120,7 +120,7 @@ Wikitty w = StorageTest.createWikitty( wValue, lonelyExtension.getName(), lonelyExtension ); result.add( w ); } - ws.store(result); + ws.store(null, result); return result.toArray( new Wikitty[]{} ); } @@ -130,7 +130,7 @@ .eq("Test.name_s", "chaise") .criteria() .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - PagedResult<Wikitty> result = ws.findAllByCriteria(criteria); + PagedResult<Wikitty> result = ws.findAllByCriteria(null, criteria); List<Wikitty> list = result.getAll(); assertEquals(1, list.size()); @@ -147,7 +147,7 @@ .criteria() .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - PagedResult<Wikitty> result = ws.findAllByCriteria(criteria); + PagedResult<Wikitty> result = ws.findAllByCriteria(null, criteria); List<Wikitty> list = result.getAll(); assertEquals(4, list.size()); @@ -157,7 +157,7 @@ .criteria() .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - result = ws.findAllByCriteria(criteria); + result = ws.findAllByCriteria(null, criteria); list = result.getAll(); assertEquals(3, list.size()); } @@ -172,7 +172,7 @@ .criteria() .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - PagedResult<Wikitty> result = ws.findAllByCriteria(criteria); + PagedResult<Wikitty> result = ws.findAllByCriteria(null, criteria); List<Wikitty> list = result.getAll(); assertEquals( 2, list.size() ); } @@ -180,17 +180,17 @@ @Test public void testKeywordSearch() throws Exception { Criteria criteria = Search.query().keyword("bureau").criteria(); - PagedResult<Wikitty> pagedResult = ws.findAllByCriteria(criteria); + PagedResult<Wikitty> pagedResult = ws.findAllByCriteria(null, criteria); List<Wikitty> result = pagedResult.getAll(); assertEquals(1, result.size()); criteria = Search.query().keyword("nothing").criteria(); - pagedResult = ws.findAllByCriteria(criteria); + pagedResult = ws.findAllByCriteria(null, criteria); result = pagedResult.getAll(); assertEquals(0, result.size()); criteria = Search.query().keyword("*33*").criteria(); - pagedResult = ws.findAllByCriteria(criteria); + pagedResult = ws.findAllByCriteria(null, criteria); result = pagedResult.getAll(); assertEquals(3, result.size()); @@ -198,7 +198,7 @@ .keyword("*33*") .eq("Test.name", "bureau") .criteria(); - pagedResult = ws.findAllByCriteria(criteria); + pagedResult = ws.findAllByCriteria(null, criteria); result = pagedResult.getAll(); assertEquals(1, result.size()); } @@ -208,7 +208,7 @@ Criteria criteria = Search.query().keyword("*").criteria(); criteria.addFacetField(Element.ELT_EXTENSION); - PagedResult<Wikitty> result = ws.findAllByCriteria(criteria); + PagedResult<Wikitty> result = ws.findAllByCriteria(null, criteria); assertEquals(13, result.getAll().size()); List<FacetTopic> topics = result.getTopic(Element.ELT_EXTENSION); @@ -232,14 +232,14 @@ .eq("Test.enabled", "true") .criteria(); - PagedResult<Wikitty> result = ws.findAllByCriteria(criteria); + PagedResult<Wikitty> result = ws.findAllByCriteria(null, criteria); assertEquals(1, result.getNumFound()); criteria = Search.query() .eq("Test.enabled", "false") .criteria(); - result = ws.findAllByCriteria(criteria); + result = ws.findAllByCriteria(null, criteria); assertEquals(2, result.getNumFound()); } @@ -249,14 +249,14 @@ query.not().eq("Test.name", "bureau"); Criteria criteria = query.criteria(); - PagedResult<Wikitty> result = ws.findAllByCriteria(criteria); + PagedResult<Wikitty> result = ws.findAllByCriteria(null, criteria); assertEquals(12, result.getNumFound()); query = Search.query().eq("Test.amount", "003300"); query.not().eq("Test.name", "bureau"); criteria = query.criteria(); - result = ws.findAllByCriteria(criteria); + result = ws.findAllByCriteria(null, criteria); assertEquals(1, result.getNumFound()); } @@ -268,7 +268,7 @@ .criteria() .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - PagedResult<Wikitty> result = ws.findAllByCriteria(criteria); + PagedResult<Wikitty> result = ws.findAllByCriteria(null, criteria); List<Wikitty> list = result.getAll(); assertEquals(1, list.size()); @@ -282,7 +282,7 @@ .criteria() .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - result = ws.findAllByCriteria(criteria); + result = ws.findAllByCriteria(null, criteria); list = result.getAll(); assertEquals(12, list.size()); } @@ -294,7 +294,7 @@ example.setField("Product", "price", 20); Criteria criteria = Search.query(example).criteria(); - PagedResult<Wikitty> result = ws.findAllByCriteria(criteria); + PagedResult<Wikitty> result = ws.findAllByCriteria(null, criteria); assertEquals(3, result.getNumFound()); } @@ -304,7 +304,7 @@ Criteria criteria = Search.query().eq(Element.ELT_EXTENSION, "Product").criteria(); criteria.addFacetField("Product.value"); - PagedResult<Wikitty> result = ws.findAllByCriteria(criteria); + PagedResult<Wikitty> result = ws.findAllByCriteria(null, criteria); List<FacetTopic> topics = result.getTopic("Product.value"); for (FacetTopic topic : topics) { String topicName = topic.getTopicName(); @@ -322,7 +322,7 @@ Criteria facet2 = Search.query().eq("Product.value", "2").criteria("2"); criteria.addFacetCriteria(facet2); - result = ws.findAllByCriteria(criteria); + result = ws.findAllByCriteria(null, criteria); topics = result.getTopic("1"); FacetTopic topic = topics.get(0); @@ -349,38 +349,38 @@ criteria.setFirstIndex(0); criteria.setEndIndex(0); - PagedResult<Wikitty> result = ws.findAllByCriteria(criteria); + PagedResult<Wikitty> result = ws.findAllByCriteria(null, criteria); assertEquals(13, result.getNumFound()); - ws.syncEngin(); + ws.syncEngin(null); - result = ws.findAllByCriteria(criteria); + result = ws.findAllByCriteria(null, criteria); assertTrue(13 <= result.getNumFound()); } @Test public void testLikeSearch() throws Exception { Criteria criteria = Search.query().like("Category.name", "hArDwArE", Like.SearchAs.ToLowerCase).criteria(); - PagedResult<Wikitty> pagedResult = ws.findAllByCriteria(criteria); + PagedResult<Wikitty> pagedResult = ws.findAllByCriteria(null, criteria); List<Wikitty> result = pagedResult.getAll(); assertEquals(1, result.size()); criteria = Search.query().like("Category.name", "*wAre", Like.SearchAs.ToLowerCase).criteria(); - pagedResult = ws.findAllByCriteria(criteria); + pagedResult = ws.findAllByCriteria(null, criteria); result = pagedResult.getAll(); assertEquals(1, result.size()); criteria = Search.query().like("Category.name", "Har*", Like.SearchAs.ToLowerCase).criteria(); - pagedResult = ws.findAllByCriteria(criteria); + pagedResult = ws.findAllByCriteria(null, criteria); result = pagedResult.getAll(); assertEquals(1, result.size()); criteria = Search.query().like("Test.description", "help", Like.SearchAs.AsText).criteria(); - pagedResult = ws.findAllByCriteria(criteria); + pagedResult = ws.findAllByCriteria(null, criteria); assertEquals(1, pagedResult.getNumFound()); criteria = Search.query().like("Test.description", "helped", Like.SearchAs.AsText).criteria(); - pagedResult = ws.findAllByCriteria(criteria); + pagedResult = ws.findAllByCriteria(null, criteria); assertEquals(1, pagedResult.getNumFound()); } @@ -392,7 +392,7 @@ .criteria() .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - PagedResult<Wikitty> result = ws.findAllByCriteria(criteria); + PagedResult<Wikitty> result = ws.findAllByCriteria(null, criteria); List<Wikitty> list = result.getAll(); assertEquals(1, list.size()); @@ -404,7 +404,7 @@ .criteria() .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - result = ws.findAllByCriteria(criteria); + result = ws.findAllByCriteria(null, criteria); list = result.getAll(); assertEquals(0, list.size()); } Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java 2010-06-07 14:07:40 UTC (rev 103) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java 2010-06-07 14:20:02 UTC (rev 104) @@ -68,7 +68,7 @@ extension = ExtensionFactory.create("test", "1") .addField("name", TYPE.STRING) .extension(); - ws.storeExtension(Arrays.asList(extension)); + ws.storeExtension(null, Arrays.asList(extension)); } /** @@ -112,7 +112,7 @@ if(found == null) { found = createNode(name, parent); log.debug("[Storing] " + name + " with id " + found.getId()); - ws.store(found); + ws.store(null, found); assertNotNull(findNode(name)); } parent = found.getId(); @@ -128,12 +128,12 @@ leaf.setField("test", "name", value); log.debug("[Storing] " + value + " with id " + leaf.getId()); - ws.store(leaf); + ws.store(null, leaf); Wikitty node = findNode(nodeName); assertNotNull(node); node.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_CHILDREN, leaf.getId()); - ws.store(node); + ws.store(null, node); } /** @@ -141,7 +141,7 @@ */ protected Wikitty findNode(String nodeName) { Criteria criteria = Search.query().eq(TreeNode.FQ_FIELD_NAME, nodeName).criteria(); - Wikitty wikitty = ws.findByCriteria(criteria); + Wikitty wikitty = ws.findByCriteria(null, criteria); return wikitty; } @@ -150,7 +150,7 @@ */ protected Wikitty findValue(String value) { Criteria criteria = Search.query().eq("test.name", value).criteria(); - Wikitty wikitty = ws.findByCriteria(criteria); + Wikitty wikitty = ws.findByCriteria(null, criteria); return wikitty; } @@ -169,7 +169,7 @@ // Sum children node in node String nodeId = node.getId(); - Map<TreeNode, Integer> children = ws.restoreChildren(nodeId, null); + Map<TreeNode, Integer> children = ws.restoreChildren(null, nodeId, null); for (Integer count : children.values()) { sum += count; @@ -200,7 +200,7 @@ Wikitty root = findNode("root"); String rootId = root.getId(); - Tree tree = ws.restoreTree(rootId); + Tree tree = ws.restoreTree(null, rootId); assertNotNull(tree); } @@ -224,7 +224,7 @@ Wikitty node1 = findNode("node1"); String node1Id = node1.getId(); - Map<TreeNode, Integer> children = ws.restoreChildren(node1Id, null); + Map<TreeNode, Integer> children = ws.restoreChildren(null, node1Id, null); assertEquals(3, children.size()); } @@ -234,7 +234,7 @@ String node1Id = node1.getId(); Criteria filter = Search.query().eq("test.name", "value 3").criteria(); - Map<TreeNode, Integer> children = ws.restoreChildren(node1Id, filter); + Map<TreeNode, Integer> children = ws.restoreChildren(null, node1Id, filter); assertEquals(3, children.size()); } @@ -243,7 +243,7 @@ Wikitty node11 = findNode("node11"); String node11Id = node11.getId(); - Entry<TreeNode, Integer> count = ws.restoreNode(node11Id, null); + Entry<TreeNode, Integer> count = ws.restoreNode(null, node11Id, null); assertEquals(3, count.getValue().intValue()); } @@ -253,7 +253,7 @@ String node11Id = node11.getId(); Criteria filter = Search.query().eq("test.name", "value 3").criteria(); - Entry<TreeNode, Integer> count = ws.restoreNode(node11Id, filter); + Entry<TreeNode, Integer> count = ws.restoreNode(null, node11Id, filter); assertEquals(1, count.getValue().intValue()); } @@ -262,19 +262,19 @@ // Check that node 2 it has any child Wikitty node2 = findNode("node2"); String node2Id = node2.getId(); - Map<TreeNode, Integer> children = ws.restoreChildren(node2Id, null); + Map<TreeNode, Integer> children = ws.restoreChildren(null, node2Id, null); assertEquals(0, children.size()); // Create a new node, child of node 2 Wikitty nodeWikitty = createNode("node21", node2Id); - ws.store(nodeWikitty); + ws.store(null, nodeWikitty); // Retrieve it to check Wikitty found = findNode("node21"); assertNotNull(found); // Check that it was great added as node2 child - children = ws.restoreChildren(node2Id, null); + children = ws.restoreChildren(null, node2Id, null); assertEquals(1, children.size()); } @@ -286,13 +286,13 @@ // Create a leaf Wikitty leaf = StorageTest.createWikitty("name=totoTheLeaf", "test", extension); - ws.store(leaf); + ws.store(null, leaf); // Add it in the node2 (now: two values in it) Wikitty node = findNode("node2"); assertNotNull(node); node.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_CHILDREN, leaf.getId()); - ws.store(node); + ws.store(null, node); // now, there is one more value for the root node int newSum = sum(root); @@ -309,7 +309,7 @@ Wikitty node121 = findNode("node121"); int node121Init = sum(node121); String node121Id = node121.getId(); - ws.delete(node121Id); + ws.delete(null, node121Id); // node12 must have any child Wikitty node12 = findNode("node12"); @@ -327,7 +327,7 @@ Wikitty node11 = findNode("node11"); String node11Id = node11.getId(); - ws.delete(Arrays.asList(node1Id, node11Id)); + ws.delete(null, Arrays.asList(node1Id, node11Id)); // check that root node has weel one less children value newRootChidlren = sum(root); @@ -344,7 +344,7 @@ Wikitty node = findNode("node11"); List<String> leafs = node.getFieldAsList(TreeNode.EXT_TREENODE, TreeNode.FIELD_CHILDREN, String.class); node.removeFromField(TreeNode.EXT_TREENODE, TreeNode.FIELD_CHILDREN, leafs.get(0)); - ws.store(node); + ws.store(null, node); // now, there is one more value for the root node int newSum = sum(root); @@ -360,7 +360,7 @@ // Remove a value Wikitty value4 = findValue("value 4"); String value4Id = value4.getId(); - ws.delete(value4Id); + ws.delete(null, value4Id); // now, there is one more value for the root node int newSum = sum(root); @@ -383,7 +383,7 @@ // Move node 1 in mode 2 node121.setField(TreeNode.EXT_TREENODE, TreeNode.FIELD_PARENT, node2); - ws.store(node121); + ws.store(null, node121); // now, there is less value node 121 for the node 1 int newSum1 = sum(node1); @@ -400,22 +400,22 @@ createBranch("node3/node32"); Wikitty value = StorageTest.createWikitty("name=value", "test", extension); - ws.store(value); + ws.store(null, value); String valueId = value.getId(); Wikitty node31 = findNode("node31"); node31.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_CHILDREN, valueId); - ws.store(node31); + ws.store(null, node31); Wikitty node32 = findNode("node32"); node32.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_CHILDREN, valueId); - ws.store(node32); + ws.store(null, node32); Wikitty node3 = findNode("node3"); int sum = sum(node3); assertEquals(2, sum); - Entry<TreeNode, Integer> count = ws.restoreNode(node3.getId(), null); + Entry<TreeNode, Integer> count = ws.restoreNode(null, node3.getId(), null); assertEquals(1, count.getValue().intValue()); sum = sum(node31);