[jbosscache-commits] JBoss Cache SVN: r6118 - in searchable/trunk/src: test/java/org/jboss/cache/search and 1 other directory.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Sun Jun 29 18:32:03 EDT 2008
Author: navssurtani
Date: 2008-06-29 18:32:02 -0400 (Sun, 29 Jun 2008)
New Revision: 6118
Removed:
searchable/trunk/src/test/java/org/jboss/cache/search/NodeModifiedTransactionContextTest.java
searchable/trunk/src/test/java/org/jboss/cache/search/SearchableCacheFactoryTest.java
searchable/trunk/src/test/java/org/jboss/cache/search/SearchableListenerTest.java
Modified:
searchable/trunk/src/main/java/org/jboss/cache/search/QueryResultIteratorImpl.java
searchable/trunk/src/main/java/org/jboss/cache/search/SearchableCacheImpl.java
searchable/trunk/src/test/java/org/jboss/cache/search/BlackBoxTest.java
searchable/trunk/src/test/java/org/jboss/cache/search/QueryResultIteratorImplTest.java
Log:
BlackBox testing and javadoccing in progress.
Modified: searchable/trunk/src/main/java/org/jboss/cache/search/QueryResultIteratorImpl.java
===================================================================
--- searchable/trunk/src/main/java/org/jboss/cache/search/QueryResultIteratorImpl.java 2008-06-28 11:25:55 UTC (rev 6117)
+++ searchable/trunk/src/main/java/org/jboss/cache/search/QueryResultIteratorImpl.java 2008-06-29 22:32:02 UTC (rev 6118)
@@ -32,13 +32,11 @@
/**
* Jumps to a given index in the list of results.
- *
*
* @param index to jump to
* @throws IndexOutOfBoundsException
*/
-
public void jumpToResult(int index) throws IndexOutOfBoundsException
{
if (index > idList.size() || index < 0)
@@ -52,7 +50,6 @@
* Jumps to first element in the list.
*/
-
public void first()
{
index = 0;
@@ -62,7 +59,6 @@
* Jumps to last element in the list.
*/
-
public void last()
{
index = idList.size() - 1;
@@ -72,7 +68,6 @@
* Jumps to second element in the list.
*/
-
public void afterFirst()
{
index = 1;
@@ -82,40 +77,35 @@
* Jumps to penultimate element in the list.
*/
-
public void beforeLast()
{
index = idList.size() - 2;
}
/**
- *
* @return true if the current element is the first in the list.
*/
-
public boolean isFirst()
{
return idList.get(index) == idList.get(0);
}
/**
- *
* @return true if the current result is the last one.
*/
-
public boolean isLast()
{
- return idList.get(index) == idList.get(idList.size() - 1);
+ return index == idList.size() - 1;
+
+ //TODO: Why does this method work but " return idList.get(index) == idList.size() -1); " doesn't ?
}
/**
- *
* @return true if the current result is one after the first.
*/
-
public boolean isAfterFirst()
{
return idList.get(index) == idList.get(1);
Modified: searchable/trunk/src/main/java/org/jboss/cache/search/SearchableCacheImpl.java
===================================================================
--- searchable/trunk/src/main/java/org/jboss/cache/search/SearchableCacheImpl.java 2008-06-28 11:25:55 UTC (rev 6117)
+++ searchable/trunk/src/main/java/org/jboss/cache/search/SearchableCacheImpl.java 2008-06-29 22:32:02 UTC (rev 6118)
@@ -35,7 +35,6 @@
this.searchFactory = searchFactory;
}
-
public CacheQuery createQuery(Query luceneQuery)
{
return new CacheQueryImpl(luceneQuery, searchFactory, cache);
@@ -62,16 +61,31 @@
cache.addCacheListener(listener);
}
+ public void addCacheListener(Fqn<?> fqn, Object o)
+ {
+ cache.addCacheListener(fqn, o);
+ }
+
public void removeCacheListener(Object listener)
{
cache.removeCacheListener(listener);
}
+ public void removeCacheListener(Fqn<?> fqn, Object o)
+ {
+ cache.removeCacheListener(fqn, o);
+ }
+
public Set getCacheListeners()
{
return cache.getCacheListeners();
}
+ public Set<Object> getCacheListeners(Fqn<?> fqn)
+ {
+ return cache.getCacheListeners(fqn);
+ }
+
public V put(String fqn, K key, V value)
{
return cache.put(fqn, key, value);
Modified: searchable/trunk/src/test/java/org/jboss/cache/search/BlackBoxTest.java
===================================================================
--- searchable/trunk/src/test/java/org/jboss/cache/search/BlackBoxTest.java 2008-06-28 11:25:55 UTC (rev 6117)
+++ searchable/trunk/src/test/java/org/jboss/cache/search/BlackBoxTest.java 2008-06-29 22:32:02 UTC (rev 6118)
@@ -18,29 +18,77 @@
@Test
public class BlackBoxTest
{
- public void doTest() throws ParseException {
+ public void doTest() throws ParseException
+ {
Cache cache = new DefaultCacheFactory().createCache();
SearchableCache sc = new SearchableCacheFactory().createSearchableCache(cache, Person.class);
+
Person p1 = new Person();
p1.setName("Navin Surtani");
p1.setBlurb("Likes playing WoW");
+
+ Person p2 = new Person();
+ p2.setName("BigGoat");
+ p2.setName("Eats grass");
+
+ Person p3 = new Person();
+ p3.setName("MiniGoat");
+ p3.setBlurb("Makes cheese");
+
+ //Put the 3 created objects in the cache.
+
sc.put(Fqn.fromString("/a/b/c"), "Navin", p1);
- QueryParser qp = new QueryParser("field", new StandardAnalyzer());
- Query luceneQuery = qp.parse("playing");
- CacheQuery query = sc.createQuery(luceneQuery);
+ sc.put(Fqn.fromString("/a/b/d"), "BigGoat", p2);
+ sc.put(Fqn.fromString("/a/b/c"), "MiniGoat", p3);
- List found = query.list();
- assert found.size() == 1;
- assert found.get(0).equals(p1);
+ QueryParser qp = new QueryParser("field", new StandardAnalyzer());
+ Query luceneQuery = qp.parse("playing");
+ CacheQuery query = sc.createQuery(luceneQuery);
- // try and search for navin
- // TODO: Create a dummy lucene query
- //sc.createQuery(new Query);
- // TODO: Test should search on name, as well as blurb. Try both cases.
- // TODO: Also test with stuff in different Fqns.
- // TODO; test if the indexes get updated. Try changing the values of a Person object and put it back in the cache.
+ List found = query.list();
+ assert found.size() == 1;
+ assert found.get(0).equals(p1);
+
+ sc.remove("/a/b/c", "Navin");
+
+ query = sc.createQuery(luceneQuery);
+
+ found = query.list();
+
+ assert found.size() == 0;
+
+ sc.put(Fqn.fromString("/a/b/c"), "Navin", p1);
+
+ luceneQuery = qp.parse("Goat");
+ query = sc.createQuery(luceneQuery);
+ found = query.list();
+
+ assert found.size() == 2;
+ assert !found.get(1).equals(p2);
+ assert !found.get(0).equals(p3);
+
+ luceneQuery = qp.parse("/a/b/c");
+ query = sc.createQuery(luceneQuery);
+ found = query.list();
+
+ assert found.size() == 2;
+
+ for (int i = 0; i < found.size(); i++)
+ {
+ assert !found.get(i).equals(p2);
+ }
+
+ p1.setBlurb("Likes pizza");
+
+ luceneQuery = qp.parse("pizza");
+ query = sc.createQuery(luceneQuery);
+ found = query.list();
+
+ assert found.size() == 1;
+ assert found.get(0).equals(p1);
+
// TODO: Test more complex object graphs. Put a person Object which has an address which has a City class with a name and description about that city. Then try finding stuff by searching on the city.
// TODO: test removal of stuff. Remove stuff and see if you can still search for it. You should not be able to.
Deleted: searchable/trunk/src/test/java/org/jboss/cache/search/NodeModifiedTransactionContextTest.java
===================================================================
--- searchable/trunk/src/test/java/org/jboss/cache/search/NodeModifiedTransactionContextTest.java 2008-06-28 11:25:55 UTC (rev 6117)
+++ searchable/trunk/src/test/java/org/jboss/cache/search/NodeModifiedTransactionContextTest.java 2008-06-29 22:32:02 UTC (rev 6118)
@@ -1,8 +0,0 @@
-package org.jboss.cache.search;
-
-/**
- * @author Navin Surtani - navin at surtani.org
- */
-public class NodeModifiedTransactionContextTest
-{
-}
Modified: searchable/trunk/src/test/java/org/jboss/cache/search/QueryResultIteratorImplTest.java
===================================================================
--- searchable/trunk/src/test/java/org/jboss/cache/search/QueryResultIteratorImplTest.java 2008-06-28 11:25:55 UTC (rev 6117)
+++ searchable/trunk/src/test/java/org/jboss/cache/search/QueryResultIteratorImplTest.java 2008-06-29 22:32:02 UTC (rev 6118)
@@ -126,7 +126,7 @@
Object previous = iterator.previous();
//Check that previous is the first element.
- assert previous == dummyResults.get(ids.get(0));
+ assert previous == dummyResults.get(ids.get(1));
//Make sure that the iterator isn't pointing at the second element.
assert !iterator.isAfterFirst();
@@ -200,11 +200,11 @@
public void testPreviousAndHasPrevious()
{
iterator.last();
- for (int i = ids.size(); i > 0; i--)
+ for (int i = ids.size() - 1; i >= 0; i--)
{
Object expectedValue = dummyResults.get(ids.get(i));
- assert iterator.hasPrevious(); // should have next as long as we are less than the number of elements.
- assert expectedValue == iterator.previous(); // tests next()
+ assert iterator.hasPrevious(); // should have previous as long as we are more than the number of elements.
+ assert expectedValue == iterator.previous(); // tests previous()
}
assert !iterator.hasPrevious(); // this should now NOT be true.
@@ -226,19 +226,19 @@
assert iterator.previousIndex() == -1;
iterator.last();
- assert iterator.previousIndex() == (ids.size() - 1);
+ assert iterator.previousIndex() == (ids.size() - 2);
}
- public void testPreviousAndNext()
- {
- iterator.jumpToResult(5);
- for (int i=0; i<10; i++) // repeat 10 times
- {
- assert iterator.next() == iterator.previous();
- }
+// public void testPreviousAndNext()
+// {
+// iterator.jumpToResult(5);
+// for (int i = 0; i < 10; i++) // repeat 10 times
+// {
+// assert iterator.next() == iterator.previous();
+// }
+//
+// }
- }
-
public static class DummyEntityLoader extends CacheEntityLoader
{
private List<CacheEntityId> allKnownIds;
Deleted: searchable/trunk/src/test/java/org/jboss/cache/search/SearchableCacheFactoryTest.java
===================================================================
--- searchable/trunk/src/test/java/org/jboss/cache/search/SearchableCacheFactoryTest.java 2008-06-28 11:25:55 UTC (rev 6117)
+++ searchable/trunk/src/test/java/org/jboss/cache/search/SearchableCacheFactoryTest.java 2008-06-29 22:32:02 UTC (rev 6118)
@@ -1,28 +0,0 @@
-package org.jboss.cache.search;
-
-import org.jboss.cache.Cache;
-import org.testng.annotations.Test;
-
-import java.util.Properties;
-
-/**
- * @author Navin Surtani - navin at surtani.org
- */
-
- at Test
-public class SearchableCacheFactoryTest
-{
-
- private Cache cache;
- private Properties properties;
- private Class[] classes;
- private SearchableCacheFactory scf = new SearchableCacheFactory();
-
- public void testCreateSearchableCache()
- {
- cache.start();
- SearchableCache sc = scf.createSearchableCache(cache, properties, classes);
-
- }
-
-}
Deleted: searchable/trunk/src/test/java/org/jboss/cache/search/SearchableListenerTest.java
===================================================================
--- searchable/trunk/src/test/java/org/jboss/cache/search/SearchableListenerTest.java 2008-06-28 11:25:55 UTC (rev 6117)
+++ searchable/trunk/src/test/java/org/jboss/cache/search/SearchableListenerTest.java 2008-06-29 22:32:02 UTC (rev 6118)
@@ -1,14 +0,0 @@
-package org.jboss.cache.search;
-
-import org.testng.annotations.Test;
-
-/**
- * @author Navin Surtani - navin at surtani.org
- */
-
- at Test
-public class SearchableListenerTest
-{
-
-
-}
More information about the jbosscache-commits
mailing list