[jbosscache-commits] JBoss Cache SVN: r6149 - in searchable/trunk: src/test/java/org/jboss/cache/search and 1 other directories.

Author: manik.surtani(a)jboss.com Date: 2008-07-02 06:54:19 -0400 (Wed, 02 Jul 2008) New Revision: 6149 Modified: searchable/trunk/pom.xml searchable/trunk/src/test/java/org/jboss/cache/search/QueryResultIteratorImplTest.java searchable/trunk/src/test/java/org/jboss/cache/search/TransformerTest.java searchable/trunk/src/test/java/org/jboss/cache/search/blackbox/ClusteredCacheTest.java searchable/trunk/src/test/java/org/jboss/cache/search/blackbox/LocalCacheTest.java searchable/trunk/src/test/java/org/jboss/cache/search/blackbox/LocalPOJOCacheTest.java Log: TestNG test grouping Modified: searchable/trunk/pom.xml =================================================================== --- searchable/trunk/pom.xml 2008-07-02 10:52:43 UTC (rev 6148) +++ searchable/trunk/pom.xml 2008-07-02 10:54:19 UTC (rev 6149) @@ -5,8 +5,6 @@ <modelVersion>4.0.0</modelVersion> <properties> <jbosscache-searchable-version>0.1-SNAPSHOT</jbosscache-searchable-version> - <!-- By default only run tests in the "unit" group --> - <defaultTestGroup>unit</defaultTestGroup> <!-- By default only generate Javadocs when we install the module. --> <javadocPhase>install</javadocPhase> </properties> @@ -48,18 +46,18 @@ <version>1.0.4</version> </dependency> - <dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <version>1.4.2</version> </dependency> <dependency> - <groupId>org.hibernate.apache.lucene.solr</groupId> - <artifactId>apache-solr-analyzer</artifactId> - <version>1.2.0</version> - <scope>test</scope> - </dependency> + <groupId>org.hibernate.apache.lucene.solr</groupId> + <artifactId>apache-solr-analyzer</artifactId> + <version>1.2.0</version> + <scope>test</scope> + </dependency> </dependencies> <build> Modified: searchable/trunk/src/test/java/org/jboss/cache/search/QueryResultIteratorImplTest.java =================================================================== --- searchable/trunk/src/test/java/org/jboss/cache/search/QueryResultIteratorImplTest.java 2008-07-02 10:52:43 UTC (rev 6148) +++ searchable/trunk/src/test/java/org/jboss/cache/search/QueryResultIteratorImplTest.java 2008-07-02 10:54:19 UTC (rev 6149) @@ -16,7 +16,7 @@ * Test class for the QueryResultIteratorImpl */ -@Test +@Test(groups = "functional") public class QueryResultIteratorImplTest { List<CacheEntityId> ids; Modified: searchable/trunk/src/test/java/org/jboss/cache/search/TransformerTest.java =================================================================== --- searchable/trunk/src/test/java/org/jboss/cache/search/TransformerTest.java 2008-07-02 10:52:43 UTC (rev 6148) +++ searchable/trunk/src/test/java/org/jboss/cache/search/TransformerTest.java 2008-07-02 10:54:19 UTC (rev 6149) @@ -4,18 +4,17 @@ import org.testng.annotations.Test; /** -@author Navin Surtani - navin(a)surtani.org - - Unit-test class for the Transformer class. + * @author Navin Surtani - navin(a)surtani.org + * <p/> + * Unit-test class for the Transformer class. */ -@Test +@Test(groups = "functional") public class TransformerTest { /** * Tests the generateId method. - * */ public void testGenerateId() @@ -28,12 +27,11 @@ assert generatedId.contentEquals("Fqn=[/a/b/c]Key=[key]"); - assert ! generatedId.contentEquals("/ab/c/d"); + assert !generatedId.contentEquals("/ab/c/d"); } /** * Tests the getFqn method. - * */ public void testGetFqn() { @@ -58,53 +56,53 @@ assert key.contentEquals("thisIsMyKey"); - assert ! key.contentEquals("thisIsNotMyKey"); + assert !key.contentEquals("thisIsNotMyKey"); } - @Test (expectedExceptions = NullPointerException.class) + @Test(expectedExceptions = NullPointerException.class) public void testGetKeyWithNull() { Transformer.getKey(null); } - @Test (expectedExceptions = InvalidFqnException.class) + @Test(expectedExceptions = InvalidFqnException.class) public void testGenerateIdWithHackedString() { Transformer.generateId(Fqn.fromString("/Fqn=[/a/b/c"), "x"); } - @Test (expectedExceptions = InvalidFqnException.class) + @Test(expectedExceptions = InvalidFqnException.class) public void testGenerateIdWithHackedFqn() { Transformer.generateId(Fqn.fromString("/Fqn=[/a/b/c"), "x"); } - @Test (expectedExceptions = InvalidFqnException.class) + @Test(expectedExceptions = InvalidFqnException.class) public void testGenerateIdWithHackedFqn2() { Transformer.generateId(Fqn.fromString("/]Key=[/a/b/c"), "x"); } - @Test (expectedExceptions = InvalidFqnException.class) + @Test(expectedExceptions = InvalidFqnException.class) public void testGenerateIdWithHackedKey() { Transformer.generateId(Fqn.fromString("/a/b/c"), "]Key=["); } - @Test (expectedExceptions = InvalidFqnException.class) + @Test(expectedExceptions = InvalidFqnException.class) public void testGenerateIdWithHackedKey2() { Transformer.generateId(Fqn.fromString("/a/b/c"), "Fqn=["); } - @Test (expectedExceptions = InvalidFqnException.class) + @Test(expectedExceptions = InvalidFqnException.class) public void testGenerateIdWithNullKey() { Transformer.generateId(Fqn.fromString("/a/b/c"), null); } - @Test (expectedExceptions = InvalidFqnException.class) + @Test(expectedExceptions = InvalidFqnException.class) public void testGenerateIdWithNullFqn() { Transformer.generateId(null, "x"); Modified: searchable/trunk/src/test/java/org/jboss/cache/search/blackbox/ClusteredCacheTest.java =================================================================== --- searchable/trunk/src/test/java/org/jboss/cache/search/blackbox/ClusteredCacheTest.java 2008-07-02 10:52:43 UTC (rev 6148) +++ searchable/trunk/src/test/java/org/jboss/cache/search/blackbox/ClusteredCacheTest.java 2008-07-02 10:54:19 UTC (rev 6149) @@ -1,27 +1,26 @@ package org.jboss.cache.search.blackbox; +import org.apache.lucene.analysis.standard.StandardAnalyzer; +import org.apache.lucene.queryParser.ParseException; +import org.apache.lucene.queryParser.QueryParser; +import org.apache.lucene.search.Query; import org.jboss.cache.Cache; import org.jboss.cache.DefaultCacheFactory; import org.jboss.cache.Fqn; -import org.jboss.cache.search.SearchableCache; import org.jboss.cache.search.CacheQuery; +import org.jboss.cache.search.SearchableCache; import org.jboss.cache.search.SearchableCacheFactory; import org.jboss.cache.search.test.Person; -import org.testng.annotations.Test; -import org.testng.annotations.BeforeMethod; import org.testng.annotations.AfterMethod; -import org.apache.lucene.queryParser.QueryParser; -import org.apache.lucene.queryParser.ParseException; -import org.apache.lucene.search.Query; -import org.apache.lucene.analysis.standard.StandardAnalyzer; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; - import java.util.List; /** * @author Navin Surtani - navin(a)surtani.org */ -@Test +@Test(groups = "functional") public class ClusteredCacheTest { Cache cache1, cache2; Modified: searchable/trunk/src/test/java/org/jboss/cache/search/blackbox/LocalCacheTest.java =================================================================== --- searchable/trunk/src/test/java/org/jboss/cache/search/blackbox/LocalCacheTest.java 2008-07-02 10:52:43 UTC (rev 6148) +++ searchable/trunk/src/test/java/org/jboss/cache/search/blackbox/LocalCacheTest.java 2008-07-02 10:54:19 UTC (rev 6149) @@ -1,29 +1,28 @@ package org.jboss.cache.search.blackbox; -import org.jboss.cache.search.SearchableCache; -import org.jboss.cache.search.SearchableCacheFactory; -import org.jboss.cache.search.CacheQuery; -import org.jboss.cache.search.QueryResultIterator; -import org.jboss.cache.search.test.Person; +import org.apache.lucene.analysis.standard.StandardAnalyzer; +import org.apache.lucene.queryParser.ParseException; +import org.apache.lucene.queryParser.QueryParser; +import org.apache.lucene.search.Query; import org.jboss.cache.Cache; import org.jboss.cache.DefaultCacheFactory; import org.jboss.cache.Fqn; -import org.testng.annotations.BeforeMethod; +import org.jboss.cache.search.CacheQuery; +import org.jboss.cache.search.QueryResultIterator; +import org.jboss.cache.search.SearchableCache; +import org.jboss.cache.search.SearchableCacheFactory; +import org.jboss.cache.search.test.Person; import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.lucene.queryParser.QueryParser; -import org.apache.lucene.queryParser.ParseException; -import org.apache.lucene.analysis.standard.StandardAnalyzer; -import org.apache.lucene.search.Query; import java.util.List; -import java.util.Iterator; /** * @author Navin Surtani - navin(a)surtani.org */ -@Test +@Test(groups = "functional") public class LocalCacheTest { SearchableCache searchableCache; @@ -92,7 +91,6 @@ } - public void testMultipleResults() throws ParseException { queryParser = new QueryParser("name", new StandardAnalyzer()); @@ -139,7 +137,7 @@ cacheQuery = searchableCache.createQuery(luceneQuery); found = cacheQuery.list(); - assert found.size() == 2: "Size of list should be 2"; + assert found.size() == 2 : "Size of list should be 2"; assert found.contains(person2); assert found.contains(person3); assert !found.contains(person4) : "This should not contain object person4"; @@ -153,7 +151,7 @@ cacheQuery = searchableCache.createQuery(luceneQuery); found = cacheQuery.list(); - assert found.size() == 3: "Size of list should be 3"; + assert found.size() == 3 : "Size of list should be 3"; assert found.contains(person2); assert found.contains(person3); assert found.contains(person4) : "This should now contain object person4"; @@ -169,7 +167,7 @@ assert found.size() == 2; assert found.contains(person2); - assert found.contains(person3): "This should still contain object person3"; + assert found.contains(person3) : "This should still contain object person3"; searchableCache.remove(Fqn.fromString("/a/b/c/"), person3); @@ -179,7 +177,7 @@ assert found.size() == 1; assert found.contains(person2); - assert !found.contains(person3): "The search should not return person3"; + assert !found.contains(person3) : "The search should not return person3"; } Modified: searchable/trunk/src/test/java/org/jboss/cache/search/blackbox/LocalPOJOCacheTest.java =================================================================== --- searchable/trunk/src/test/java/org/jboss/cache/search/blackbox/LocalPOJOCacheTest.java 2008-07-02 10:52:43 UTC (rev 6148) +++ searchable/trunk/src/test/java/org/jboss/cache/search/blackbox/LocalPOJOCacheTest.java 2008-07-02 10:54:19 UTC (rev 6149) @@ -1,33 +1,34 @@ package org.jboss.cache.search.blackbox; -import org.testng.annotations.Test; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.AfterMethod; +import org.apache.lucene.analysis.standard.StandardAnalyzer; +import org.apache.lucene.queryParser.ParseException; +import org.apache.lucene.queryParser.QueryParser; +import org.apache.lucene.search.Query; +import org.jboss.cache.Cache; +import org.jboss.cache.DefaultCacheFactory; +import org.jboss.cache.Fqn; +import org.jboss.cache.config.Configuration; +import org.jboss.cache.pojo.PojoCache; +import org.jboss.cache.pojo.PojoCacheFactory; +import org.jboss.cache.search.CacheQuery; import org.jboss.cache.search.SearchableCache; -import org.jboss.cache.search.CacheQuery; import org.jboss.cache.search.SearchableCacheFactory; import org.jboss.cache.search.test.Person; -import org.jboss.cache.pojo.PojoCache; -import org.jboss.cache.pojo.PojoCacheFactory; -import org.jboss.cache.config.Configuration; -import org.jboss.cache.Cache; -import org.jboss.cache.DefaultCacheFactory; -import org.jboss.cache.Fqn; -import org.apache.lucene.queryParser.QueryParser; -import org.apache.lucene.queryParser.ParseException; -import org.apache.lucene.search.Query; -import org.apache.lucene.analysis.standard.StandardAnalyzer; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; import java.util.List; /** * Same as LocalCacheTest except that you will use a POJO Cache instead and use pojoCache.attach() ad pojoCache.detach() * instead of cache.put() and cache.remove(). - * <p /> + * <p/> + * * @author Navin Surtani - navin(a)surtani.org */ -@Test +@Test(groups = "functional") public class LocalPOJOCacheTest { SearchableCache searchableCache; @@ -73,8 +74,8 @@ public void tearDown() { - if(pojo != null) pojo.stop(); - if(searchableCache != null) searchableCache.stop(); + if (pojo != null) pojo.stop(); + if (searchableCache != null) searchableCache.stop(); } public void testSimple() throws ParseException @@ -132,7 +133,7 @@ cacheQuery = searchableCache.createQuery(luceneQuery); found = cacheQuery.list(); - assert found.size() == 2: "Size of list should be 2"; + assert found.size() == 2 : "Size of list should be 2"; assert found.contains(person2); assert found.contains(person3); assert !found.contains(person4) : "This should not contain object person4"; @@ -146,7 +147,7 @@ cacheQuery = searchableCache.createQuery(luceneQuery); found = cacheQuery.list(); - assert found.size() == 3: "Size of list should be 3"; + assert found.size() == 3 : "Size of list should be 3"; assert found.contains(person2); assert found.contains(person3); assert found.contains(person4) : "This should now contain object person4"; @@ -160,7 +161,7 @@ assert found.size() == 2; assert found.contains(person2); - assert found.contains(person3): "This should still contain object person3"; + assert found.contains(person3) : "This should still contain object person3"; pojo.detach(Fqn.fromString("/a/b/c/")); @@ -170,7 +171,7 @@ assert found.size() == 1; assert found.contains(person2); - assert !found.contains(person3): "The search should not return person3"; + assert !found.contains(person3) : "The search should not return person3"; }