[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/eviction ...
Manik Surtani
msurtani at jboss.com
Tue Jul 18 06:50:46 EDT 2006
User: msurtani
Date: 06/07/18 06:50:46
Modified: tests/functional/org/jboss/cache/eviction
DummyEvictionConfiguration.java
ElementSizeConfigurationTest.java
FIFOConfigurationTest.java
LRUConfigurationTest.java MRUConfigurationTest.java
ReplicatedLRUPolicyTest.java
Log:
Checked in new Habanero interfaces
Updated codebase to deal with new interfaces
Revision Changes Path
1.2 +3 -3 JBossCache/tests/functional/org/jboss/cache/eviction/DummyEvictionConfiguration.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: DummyEvictionConfiguration.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/DummyEvictionConfiguration.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- DummyEvictionConfiguration.java 5 Dec 2005 03:17:14 -0000 1.1
+++ DummyEvictionConfiguration.java 18 Jul 2006 10:50:46 -0000 1.2
@@ -6,16 +6,16 @@
*/
package org.jboss.cache.eviction;
-import org.jboss.cache.ConfigureException;
+import org.jboss.cache.config.ConfigurationException;
import org.w3c.dom.Element;
/**
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class DummyEvictionConfiguration implements EvictionConfiguration
{
- public void parseXMLConfig(Element element) throws ConfigureException
+ public void parseXMLConfig(Element element) throws ConfigurationException
{
//To change body of implemented methods use File | Settings | File Templates.
}
1.2 +3 -3 JBossCache/tests/functional/org/jboss/cache/eviction/ElementSizeConfigurationTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ElementSizeConfigurationTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/ElementSizeConfigurationTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ElementSizeConfigurationTest.java 7 May 2006 03:34:39 -0000 1.1
+++ ElementSizeConfigurationTest.java 18 Jul 2006 10:50:46 -0000 1.2
@@ -7,13 +7,13 @@
package org.jboss.cache.eviction;
import junit.framework.TestCase;
-import org.jboss.cache.ConfigureException;
import org.jboss.cache.xml.XmlHelper;
+import org.jboss.cache.config.ConfigurationException;
import org.w3c.dom.Element;
/**
* @author Daniel Huang
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class ElementSizeConfigurationTest extends TestCase
{
@@ -45,7 +45,7 @@
{
config.parseXMLConfig(element);
}
- catch (ConfigureException ce)
+ catch (ConfigurationException ce)
{
assertTrue("Configure exception properly thrown", true);
return;
1.5 +4 -4 JBossCache/tests/functional/org/jboss/cache/eviction/FIFOConfigurationTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FIFOConfigurationTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/FIFOConfigurationTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- FIFOConfigurationTest.java 7 May 2006 03:34:39 -0000 1.4
+++ FIFOConfigurationTest.java 18 Jul 2006 10:50:46 -0000 1.5
@@ -7,7 +7,7 @@
package org.jboss.cache.eviction;
import junit.framework.TestCase;
-import org.jboss.cache.ConfigureException;
+import org.jboss.cache.config.ConfigurationException;
import org.jboss.cache.xml.XmlHelper;
import org.w3c.dom.Element;
@@ -15,7 +15,7 @@
* Unit test for FIFOConfiguration.
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class FIFOConfigurationTest extends TestCase
{
@@ -46,7 +46,7 @@
{
config.parseXMLConfig(element);
}
- catch (ConfigureException ce)
+ catch (ConfigurationException ce)
{
assertTrue("Configure Exception properly thrown", true);
return;
@@ -67,7 +67,7 @@
{
config.parseXMLConfig(element);
}
- catch (ConfigureException ce)
+ catch (ConfigurationException ce)
{
assertTrue("Configure Exception properly thrown", true);
return;
1.3 +3 -3 JBossCache/tests/functional/org/jboss/cache/eviction/LRUConfigurationTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LRUConfigurationTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/LRUConfigurationTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- LRUConfigurationTest.java 7 Dec 2005 09:12:54 -0000 1.2
+++ LRUConfigurationTest.java 18 Jul 2006 10:50:46 -0000 1.3
@@ -7,7 +7,7 @@
package org.jboss.cache.eviction;
import junit.framework.TestCase;
-import org.jboss.cache.ConfigureException;
+import org.jboss.cache.config.ConfigurationException;
import org.jboss.cache.xml.XmlHelper;
import org.w3c.dom.Element;
@@ -15,7 +15,7 @@
* Unit tests for LRUConfiguration.
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class LRUConfigurationTest extends TestCase
{
@@ -65,7 +65,7 @@
{
config.parseXMLConfig(element);
}
- catch (ConfigureException ce)
+ catch (ConfigurationException ce)
{
caught = true;
}
1.3 +3 -3 JBossCache/tests/functional/org/jboss/cache/eviction/MRUConfigurationTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MRUConfigurationTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/MRUConfigurationTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- MRUConfigurationTest.java 7 Dec 2005 09:12:54 -0000 1.2
+++ MRUConfigurationTest.java 18 Jul 2006 10:50:46 -0000 1.3
@@ -7,7 +7,7 @@
package org.jboss.cache.eviction;
import junit.framework.TestCase;
-import org.jboss.cache.ConfigureException;
+import org.jboss.cache.config.ConfigurationException;
import org.jboss.cache.xml.XmlHelper;
import org.w3c.dom.Element;
@@ -15,7 +15,7 @@
* Unit tests for MRUConfiguration.
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class MRUConfigurationTest extends TestCase
{
@@ -65,7 +65,7 @@
{
config.parseXMLConfig(element);
}
- catch (ConfigureException ce)
+ catch (ConfigurationException ce)
{
caught = true;
}
1.8 +5 -60 JBossCache/tests/functional/org/jboss/cache/eviction/ReplicatedLRUPolicyTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ReplicatedLRUPolicyTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/ReplicatedLRUPolicyTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ReplicatedLRUPolicyTest.java 1 Jun 2006 04:18:18 -0000 1.7
+++ ReplicatedLRUPolicyTest.java 18 Jul 2006 10:50:46 -0000 1.8
@@ -1,13 +1,11 @@
package org.jboss.cache.eviction;
import junit.framework.TestCase;
+import org.jboss.cache.AbstractCacheListener;
import org.jboss.cache.Fqn;
import org.jboss.cache.PropertyConfigurator;
import org.jboss.cache.TreeCache;
-import org.jboss.cache.ExtendedTreeCacheListener;
-import org.jboss.cache.TreeCacheListener;
import org.jboss.cache.misc.TestingUtil;
-import org.jgroups.View;
/**
* @author Ben Wang, Feb 11, 2004
@@ -32,7 +30,7 @@
// cache1_ = new TreeCache();
// initCaches(cache1_);
cache_.setUseMarshalling(true);
- cache_.addTreeCacheListener((TreeCacheListener)listener_);
+ cache_.addTreeCacheListener(listener_);
listener_.resetCounter();
cache_.startService();
@@ -122,7 +120,7 @@
System.out.println("-- " + msg);
}
- class EvictionListener implements ExtendedTreeCacheListener, TreeCacheListener
+ class EvictionListener extends AbstractCacheListener
{
int counter = 0;
@@ -134,62 +132,9 @@
counter = 0;
}
- public void nodeEvict(Fqn fqn, boolean pre) {
- if(pre)
- counter++;
- }
-
- public void nodeRemove(Fqn fqn, boolean pre, boolean isLocal) {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public void nodeModify(Fqn fqn, boolean pre, boolean isLocal) {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public void nodeActivate(Fqn fqn, boolean pre) {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public void nodePassivate(Fqn fqn, boolean pre) {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public void nodeCreated(Fqn fqn) {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public void nodeRemoved(Fqn fqn) {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public void nodeLoaded(Fqn fqn) {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public void nodeEvicted(Fqn fqn) {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public void nodeModified(Fqn fqn) {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public void nodeVisited(Fqn fqn) {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public void cacheStarted(TreeCache cache) {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public void cacheStopped(TreeCache cache) {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public void viewChange(View new_view) // might be MergeView after merging
+ public void nodeEvicted(Fqn fqn, boolean pre, boolean isLocal)
{
- //To change body of implemented methods use File | Settings | File Templates.
+ if(pre) counter++;
}
}
}
More information about the jboss-cvs-commits
mailing list