[jboss-cvs] JBossAS SVN: r80314 - projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Oct 31 08:55:28 EDT 2008


Author: alesj
Date: 2008-10-31 08:55:27 -0400 (Fri, 31 Oct 2008)
New Revision: 80314

Added:
   projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/CachePolicyVFSCacheTest.java
   projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/MapVFSCacheTest.java
Modified:
   projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/LRUCacheTestCase.java
   projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/SoftRefCacheTestCase.java
   projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/TimedCacheTestCase.java
   projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/VFSCacheTest.java
   projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/WeakRefCacheTestCase.java
Log:
Test statistics.
Currently failing due to SoftValueHashMap bug.

Added: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/CachePolicyVFSCacheTest.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/CachePolicyVFSCacheTest.java	                        (rev 0)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/CachePolicyVFSCacheTest.java	2008-10-31 12:55:27 UTC (rev 80314)
@@ -0,0 +1,42 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.virtual.test;
+
+import org.jboss.virtual.spi.VFSContext;
+
+/**
+ * Map VFSCache Test.
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+public abstract class CachePolicyVFSCacheTest extends VFSCacheTest
+{
+   public CachePolicyVFSCacheTest(String name)
+   {
+      super(name);
+   }
+
+   protected void testCachedContexts(Iterable<VFSContext> iter)
+   {
+      assertFalse(iter.iterator().hasNext());
+   }
+}
\ No newline at end of file

Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/LRUCacheTestCase.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/LRUCacheTestCase.java	2008-10-31 12:45:14 UTC (rev 80313)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/LRUCacheTestCase.java	2008-10-31 12:55:27 UTC (rev 80314)
@@ -30,7 +30,7 @@
  *
  * @author <a href="ales.justin at jboss.com">Ales Justin</a>
  */
-public class LRUCacheTestCase extends VFSCacheTest
+public class LRUCacheTestCase extends CachePolicyVFSCacheTest
 {
    public LRUCacheTestCase(String name)
    {

Copied: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/MapVFSCacheTest.java (from rev 80284, projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/VFSCacheTest.java)
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/MapVFSCacheTest.java	                        (rev 0)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/MapVFSCacheTest.java	2008-10-31 12:55:27 UTC (rev 80314)
@@ -0,0 +1,43 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.virtual.test;
+
+import org.jboss.virtual.spi.VFSContext;
+
+/**
+ * Map VFSCache Test.
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+public abstract class MapVFSCacheTest extends VFSCacheTest
+{
+   public MapVFSCacheTest(String name)
+   {
+      super(name);
+   }
+
+   protected void testCachedContexts(Iterable<VFSContext> iter)
+   {
+      VFSContext context = iter.iterator().next();
+      assertNotNull(context);
+   }
+}
\ No newline at end of file

Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/SoftRefCacheTestCase.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/SoftRefCacheTestCase.java	2008-10-31 12:45:14 UTC (rev 80313)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/SoftRefCacheTestCase.java	2008-10-31 12:55:27 UTC (rev 80314)
@@ -30,7 +30,7 @@
  *
  * @author <a href="ales.justin at jboss.com">Ales Justin</a>
  */
-public class SoftRefCacheTestCase extends VFSCacheTest
+public class SoftRefCacheTestCase extends MapVFSCacheTest
 {
    public SoftRefCacheTestCase(String name)
    {

Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/TimedCacheTestCase.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/TimedCacheTestCase.java	2008-10-31 12:45:14 UTC (rev 80313)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/TimedCacheTestCase.java	2008-10-31 12:55:27 UTC (rev 80314)
@@ -30,7 +30,7 @@
  *
  * @author <a href="ales.justin at jboss.com">Ales Justin</a>
  */
-public class TimedCacheTestCase extends VFSCacheTest
+public class TimedCacheTestCase extends CachePolicyVFSCacheTest
 {
    public TimedCacheTestCase(String name)
    {

Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/VFSCacheTest.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/VFSCacheTest.java	2008-10-31 12:45:14 UTC (rev 80313)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/VFSCacheTest.java	2008-10-31 12:55:27 UTC (rev 80314)
@@ -29,6 +29,7 @@
 import org.jboss.virtual.VirtualFile;
 import org.jboss.virtual.spi.cache.VFSCache;
 import org.jboss.virtual.spi.cache.VFSCacheFactory;
+import org.jboss.virtual.spi.cache.CacheStatistics;
 import org.jboss.virtual.spi.VFSContext;
 
 /**
@@ -85,6 +86,43 @@
       }
    }
 
+   protected abstract void testCachedContexts(Iterable<VFSContext> iter);
+
+   public void testCacheStatistics() throws Exception
+   {
+      URL url = getResource("/vfs/test/nested");
+
+      VFSCache cache = createCache();
+      cache.start();
+      try
+      {
+         if (cache instanceof CacheStatistics)
+         {
+            CacheStatistics statistics = CacheStatistics.class.cast(cache);
+            VFSCacheFactory.setInstance(cache);
+            try
+            {
+               VirtualFile root = VFS.getRoot(url);
+               assertNotNull(root);
+
+               Iterable<VFSContext> iter = statistics.getCachedContexts();
+               testCachedContexts(iter);
+
+               assertEquals(1, statistics.size());
+               assertTrue(statistics.lastInsert() != 0);
+            }
+            finally
+            {
+               VFSCacheFactory.setInstance(null);
+            }
+         }
+      }
+      finally
+      {
+         cache.stop();
+      }
+   }
+
    private class WrapperVFSCache implements VFSCache
    {
       private VFSCache delegate;

Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/WeakRefCacheTestCase.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/WeakRefCacheTestCase.java	2008-10-31 12:45:14 UTC (rev 80313)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/WeakRefCacheTestCase.java	2008-10-31 12:55:27 UTC (rev 80314)
@@ -30,7 +30,7 @@
  *
  * @author <a href="ales.justin at jboss.com">Ales Justin</a>
  */
-public class WeakRefCacheTestCase extends VFSCacheTest
+public class WeakRefCacheTestCase extends MapVFSCacheTest
 {
    public WeakRefCacheTestCase(String name)
    {




More information about the jboss-cvs-commits mailing list