[infinispan-commits] Infinispan SVN: r1544 - trunk/query/src/test/java/org/infinispan/query/blackbox.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2010-02-24 09:08:48 -0500 (Wed, 24 Feb 2010)
New Revision: 1544

Modified:
   trunk/query/src/test/java/org/infinispan/query/blackbox/KeyTypeTest.java
Log:
Fixed leaking cache manager

Modified: trunk/query/src/test/java/org/infinispan/query/blackbox/KeyTypeTest.java
===================================================================
--- trunk/query/src/test/java/org/infinispan/query/blackbox/KeyTypeTest.java	2010-02-24 14:03:47 UTC (rev 1543)
+++ trunk/query/src/test/java/org/infinispan/query/blackbox/KeyTypeTest.java	2010-02-24 14:08:48 UTC (rev 1544)
@@ -29,9 +29,11 @@
 import org.infinispan.query.CacheQuery;
 import org.infinispan.query.QueryFactory;
 import org.infinispan.query.backend.QueryHelper;
+import org.infinispan.query.helper.TestQueryHelperFactory;
 import org.infinispan.query.test.CustomKey;
 import org.infinispan.query.test.Person;
 import org.infinispan.test.SingleCacheManagerTest;
+import org.infinispan.test.TestingUtil;
 import org.infinispan.test.fwk.TestCacheManagerFactory;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
@@ -56,36 +58,26 @@
    QueryHelper qh;
    Person person1;
 
+   public KeyTypeTest() {
+      cleanup = CleanupPhase.AFTER_METHOD;
+   }
+
    @Override
    protected CacheManager createCacheManager() throws Exception {
       Configuration c = getDefaultClusteredConfig(LOCAL, true);
       c.setIndexingEnabled(true);
       c.setIndexLocalOnly(false);
-      return TestCacheManagerFactory.createCacheManager(c, true);
-   }
+      cacheManager = TestCacheManagerFactory.createCacheManager(c, true);
+      cache = cacheManager.getCache();
+      qh = TestQueryHelperFactory.createTestQueryHelperInstance(cache, Person.class);
 
-   @BeforeMethod (alwaysRun = true)
-   public void setUp() throws Exception{
-      CacheManager manager = createCacheManager();
-      cache = manager.getCache();
-      qh = new QueryHelper(cache, new Properties(), Person.class);
-
       person1 = new Person();
       person1.setName("Navin");
       person1.setBlurb("Owns a macbook");
       person1.setAge(20);
-
-
+      return cacheManager;
    }
 
-   @AfterMethod(alwaysRun = true)
-   public void tearDown() {
-      if (cache != null) {
-         cache.clear();
-         cache.stop();
-      }
-   }
-
    public void testPrimitiveAndStringKeys(){
       String key1 = "key1";
       int key2 = 2;
@@ -131,6 +123,7 @@
 
       Term term = new Term("blurb", "owns");
       CacheQuery cacheQuery = new QueryFactory(cache, qh).getQuery(new TermQuery(term));
-      assert cacheQuery.getResultSize() == 3;
+      int i;
+      assert (i = cacheQuery.getResultSize()) == 3 : "Expected 3, was " + i;
    }
 }