JBoss Cache SVN: r7536 - core/trunk/src/test/java/org/jboss/cache/cluster.
by jbosscache-commits@lists.jboss.org
Author: mircea.markus
Date: 2009-01-20 11:12:13 -0500 (Tue, 20 Jan 2009)
New Revision: 7536
Modified:
core/trunk/src/test/java/org/jboss/cache/cluster/ReplicationQueueTest.java
Log:
more strict replication controll
Modified: core/trunk/src/test/java/org/jboss/cache/cluster/ReplicationQueueTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/cluster/ReplicationQueueTest.java 2009-01-20 15:42:05 UTC (rev 7535)
+++ core/trunk/src/test/java/org/jboss/cache/cluster/ReplicationQueueTest.java 2009-01-20 16:12:13 UTC (rev 7536)
@@ -7,10 +7,12 @@
import org.jboss.cache.RPCManager;
import org.jboss.cache.UnitTestCacheFactory;
import org.jboss.cache.commands.ReplicableCommand;
+import org.jboss.cache.commands.write.PutKeyValueCommand;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.factories.ComponentRegistry;
import org.jboss.cache.util.TestingUtil;
import org.jboss.cache.util.internals.ReplicationQueueNotifier;
+import org.jboss.cache.util.internals.replicationlisteners.ReplicationListener;
import org.jgroups.Address;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertNotNull;
@@ -29,6 +31,7 @@
ReplicationQueue replQ;
ComponentRegistry registry;
RPCManager originalRpcManager;
+ private ReplicationListener replicationListener;
protected void createCaches() throws Throwable
{
@@ -45,6 +48,7 @@
cache2 = new UnitTestCacheFactory<Object, Object>().createCache(cache.getConfiguration().clone(), getClass());
registerCaches(cache, cache2);
TestingUtil.blockUntilViewsReceived(60000, cache, cache2);
+ replicationListener = ReplicationListener.getReplicationListener(cache2);
}
@AfterMethod
@@ -162,10 +166,10 @@
{
cache.put("/a/b/c" + i, "key", "value");
assertNotNull(cache.get("/a/b/c" + i, "key"));
+ replicationListener.expect(PutKeyValueCommand.class);
}
- ReplicationQueueNotifier notifier = new ReplicationQueueNotifier(cache);
- notifier.waitUntillAllReplicated(500);
-// TestingUtil.sleepThread(500);
+ replicationListener.waitForReplicationToOccur();
+
for (int i = 0; i < COUNT; i++) assertNotNull("on get i = " + i, cache2.get("/a/b/c" + i, "key"));
}
}
17 years, 2 months
JBoss Cache SVN: r7535 - core/trunk/src/test/java/org/jboss/cache/eviction/minttl.
by jbosscache-commits@lists.jboss.org
Author: mircea.markus
Date: 2009-01-20 10:42:05 -0500 (Tue, 20 Jan 2009)
New Revision: 7535
Modified:
core/trunk/src/test/java/org/jboss/cache/eviction/minttl/MinTTLTestBase.java
Log:
due to threading, this test might fail. It haven't fail on a single thread when run 1000 times, so adding a threshold
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/minttl/MinTTLTestBase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/minttl/MinTTLTestBase.java 2009-01-20 15:29:43 UTC (rev 7534)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/minttl/MinTTLTestBase.java 2009-01-20 15:42:05 UTC (rev 7535)
@@ -64,6 +64,7 @@
cache = null;
}
+ @Test(invocationCount = 5, successPercentage = 80)
public void testNoMinimumTTL() throws InterruptedException
{
cache.start();
17 years, 2 months
JBoss Cache SVN: r7534 - core/trunk/src/test/java/org/jboss/cache/api.
by jbosscache-commits@lists.jboss.org
Author: mircea.markus
Date: 2009-01-20 10:29:43 -0500 (Tue, 20 Jan 2009)
New Revision: 7534
Modified:
core/trunk/src/test/java/org/jboss/cache/api/CacheSPITest.java
Log:
more generous timeouts for view change
Modified: core/trunk/src/test/java/org/jboss/cache/api/CacheSPITest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/CacheSPITest.java 2009-01-20 15:28:09 UTC (rev 7533)
+++ core/trunk/src/test/java/org/jboss/cache/api/CacheSPITest.java 2009-01-20 15:29:43 UTC (rev 7534)
@@ -55,13 +55,13 @@
cache2.start();
memb1 = cache1.getMembers();
- TestingUtil.blockUntilViewsReceived(10000, false, cache1, cache2);
+ TestingUtil.blockUntilViewsReceived(60000, true, cache1, cache2);
List memb2 = cache2.getMembers();
assertEquals("View has two members", 2, memb1.size());
assertEquals("Both caches have same view", memb1, memb2);
cache1.stop();
- TestingUtil.blockUntilViewsReceived(10000, false, cache2);
+ TestingUtil.blockUntilViewsReceived(60000, true, cache2);
memb2 = cache2.getMembers();
assertEquals("View has one member", 1, memb2.size());
assertFalse("Coordinator changed", coord.equals(memb2.get(0)));
17 years, 2 months
JBoss Cache SVN: r7533 - core/trunk/src/test/java/org/jboss/cache/buddyreplication.
by jbosscache-commits@lists.jboss.org
Author: mircea.markus
Date: 2009-01-20 10:28:09 -0500 (Tue, 20 Jan 2009)
New Revision: 7533
Modified:
core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesNoPoolWithDataGravitationTest.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java
Log:
more strict replication controll
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesNoPoolWithDataGravitationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesNoPoolWithDataGravitationTest.java 2009-01-20 15:27:34 UTC (rev 7532)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesNoPoolWithDataGravitationTest.java 2009-01-20 15:28:09 UTC (rev 7533)
@@ -458,12 +458,12 @@
assertEquals("value", caches.get(0).get("/2", "key"));
caches.get(0).stop();
- caches = createCaches(3, false, true);
- replicationListener0 = ReplicationListener.getReplicationListener(caches.get(0));
- replicationListener1 = ReplicationListener.getReplicationListener(caches.get(1));
- replicationListener2 = ReplicationListener.getReplicationListener(caches.get(2));
-
- waitForSingleBuddy(caches);
+ //uncoment this if you want to run this test more than once
+// caches = createCaches(3, false, true);
+// replicationListener0 = ReplicationListener.getReplicationListener(caches.get(0));
+// replicationListener1 = ReplicationListener.getReplicationListener(caches.get(1));
+// replicationListener2 = ReplicationListener.getReplicationListener(caches.get(2));
+// waitForSingleBuddy(caches);
}
}
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java 2009-01-20 15:27:34 UTC (rev 7532)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java 2009-01-20 15:28:09 UTC (rev 7533)
@@ -101,7 +101,7 @@
}
else
{
- c.removeNode(Fqn.ROOT);
+ if (c.getComponentRegistry().getState().allowInvocations()) c.removeNode(Fqn.ROOT);
}
}
}
17 years, 2 months
JBoss Cache SVN: r7532 - core/trunk/src/test/java/org/jboss/cache/util/internals/replicationlisteners.
by jbosscache-commits@lists.jboss.org
Author: mircea.markus
Date: 2009-01-20 10:27:34 -0500 (Tue, 20 Jan 2009)
New Revision: 7532
Modified:
core/trunk/src/test/java/org/jboss/cache/util/internals/replicationlisteners/ReplicationListener.java
Log:
refuse to wait for caches that are not started
Modified: core/trunk/src/test/java/org/jboss/cache/util/internals/replicationlisteners/ReplicationListener.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/util/internals/replicationlisteners/ReplicationListener.java 2009-01-20 15:21:32 UTC (rev 7531)
+++ core/trunk/src/test/java/org/jboss/cache/util/internals/replicationlisteners/ReplicationListener.java 2009-01-20 15:27:34 UTC (rev 7532)
@@ -2,6 +2,8 @@
import org.jboss.cache.Cache;
import org.jboss.cache.RPCManager;
+import org.jboss.cache.CacheSPI;
+import org.jboss.cache.CacheStatus;
import org.jboss.cache.commands.ReplicableCommand;
import org.jboss.cache.commands.remote.*;
import org.jboss.cache.commands.tx.PrepareCommand;
@@ -176,6 +178,11 @@
*/
public void waitForReplicationToOccur(long timeoutMillis)
{
+ CacheStatus state = ((CacheSPI) cache).getComponentRegistry().getState();
+ if (!state.equals(CacheStatus.STARTED))
+ {
+ throw new IllegalStateException("Cannot invoke on an cache that is not started: current cache status is " + state);
+ }
// log("enter... ReplicationListener.waitForReplicationToOccur");
waitForReplicationToOccur(timeoutMillis, TimeUnit.MILLISECONDS);
// log("exit... ReplicationListener.waitForReplicationToOccur");
17 years, 2 months
JBoss Cache SVN: r7531 - core/trunk/src/test/java/org/jboss/cache/buddyreplication.
by jbosscache-commits@lists.jboss.org
Author: mircea.markus
Date: 2009-01-20 10:21:32 -0500 (Tue, 20 Jan 2009)
New Revision: 7531
Modified:
core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesNoPoolWithDataGravitationTest.java
Log:
more strict replication controll
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesNoPoolWithDataGravitationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesNoPoolWithDataGravitationTest.java 2009-01-20 14:38:10 UTC (rev 7530)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesNoPoolWithDataGravitationTest.java 2009-01-20 15:21:32 UTC (rev 7531)
@@ -8,6 +8,7 @@
import org.jboss.cache.notifications.annotation.CacheUnblocked;
import org.jboss.cache.notifications.event.Event;
import org.jboss.cache.commands.remote.DataGravitationCleanupCommand;
+import org.jboss.cache.commands.write.PutKeyValueCommand;
import org.jboss.cache.util.CachePrinter;
import org.jboss.cache.util.TestingUtil;
import org.jboss.cache.util.internals.replicationlisteners.ReplicationListener;
@@ -418,28 +419,23 @@
"testSubtreeRetrieval"})
public void testCompleteStateSurvival() throws Exception
{
- CacheBlockListener blockListener = new CacheBlockListener();
-
- caches.get(0).addCacheListener(blockListener);
- caches.get(1).addCacheListener(blockListener);
- caches.get(2).addCacheListener(blockListener);
-
+ replicationListener1.expect(PutKeyValueCommand.class);
caches.get(0).put("/0", "key", "value");
+ replicationListener1.waitForReplicationToOccur();
+
+ replicationListener2.expect(PutKeyValueCommand.class);
caches.get(1).put("/1", "key", "value");
+ replicationListener2.waitForReplicationToOccur();
+
+ replicationListener0.expect(PutKeyValueCommand.class);
caches.get(2).put("/2", "key", "value");
+ replicationListener0.waitForReplicationToOccur();
-// TestingUtil.sleepThread(getSleepTimeout());
- //TestingUtil.sleepThread(caches.get(0).getConfiguration().getStateRetrievalTimeout() * 3);
- blockListener.blockUntilAllCachesAreUnblocked(caches.get(0).getConfiguration().getStateRetrievalTimeout() * 3);
-
caches.get(2).stop();
+ TestingUtil.blockUntilViewsReceived(60000, true, caches.get(0), caches.get(1));
- blockListener.blockUntilAllCachesAreUnblocked(caches.get(0).getConfiguration().getStateRetrievalTimeout() * 5);
-
assertEquals("value", caches.get(0).get("/2", "key"));
- blockListener.blockUntilAllCachesAreUnblocked(caches.get(0).getConfiguration().getStateRetrievalTimeout() * 5);
-
caches.get(1).stop();
// cache[0] is all thats left!!
@@ -463,6 +459,9 @@
caches.get(0).stop();
caches = createCaches(3, false, true);
+ replicationListener0 = ReplicationListener.getReplicationListener(caches.get(0));
+ replicationListener1 = ReplicationListener.getReplicationListener(caches.get(1));
+ replicationListener2 = ReplicationListener.getReplicationListener(caches.get(2));
waitForSingleBuddy(caches);
}
17 years, 2 months
JBoss Cache SVN: r7530 - core/trunk/src/test/resources.
by jbosscache-commits@lists.jboss.org
Author: mircea.markus
Date: 2009-01-20 09:38:10 -0500 (Tue, 20 Jan 2009)
New Revision: 7530
Modified:
core/trunk/src/test/resources/log4j.xml
Log:
allow the file appender to contain TRACEs
Modified: core/trunk/src/test/resources/log4j.xml
===================================================================
--- core/trunk/src/test/resources/log4j.xml 2009-01-20 14:22:21 UTC (rev 7529)
+++ core/trunk/src/test/resources/log4j.xml 2009-01-20 14:38:10 UTC (rev 7530)
@@ -18,7 +18,7 @@
<!-- Rollover at the top of each hour
<param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
-->
- <param name="Threshold" value="INFO"/>
+ <param name="Threshold" value="TRACE"/>
<layout class="org.apache.log4j.PatternLayout">
<!-- The default pattern: Date Priority [Category] Message\n -->
17 years, 2 months
JBoss Cache SVN: r7529 - in core/tags/3.0.2.GA: src/main/java/org/jboss/cache and 1 other directory.
by jbosscache-commits@lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2009-01-20 09:22:21 -0500 (Tue, 20 Jan 2009)
New Revision: 7529
Modified:
core/tags/3.0.2.GA/pom.xml
core/tags/3.0.2.GA/src/main/java/org/jboss/cache/Version.java
Log:
JBoss Cache Release Script: Updating 3.0.2.GA
Modified: core/tags/3.0.2.GA/pom.xml
===================================================================
--- core/tags/3.0.2.GA/pom.xml 2009-01-20 14:21:42 UTC (rev 7528)
+++ core/tags/3.0.2.GA/pom.xml 2009-01-20 14:22:21 UTC (rev 7529)
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
- <jbosscache-core-version>3.0.1-SNAPSHOT</jbosscache-core-version>
+ <jbosscache-core-version>3.0.2.GA</jbosscache-core-version>
<!-- By default only run tests in the "unit" group -->
<defaultTestGroup>unit</defaultTestGroup>
<!-- By default only generate Javadocs when we install the module. -->
@@ -461,7 +461,7 @@
<activeByDefault>false</activeByDefault>
</activation>
<properties>
- <jbosscache-core-version>3.0.2-SNAPSHOT-JBossAS</jbosscache-core-version>
+ <jbosscache-core-version>3.0.2.GA-JBossAS</jbosscache-core-version>
<defaultTestGroup>functional,unit</defaultTestGroup>
<protocol.stack>tcp</protocol.stack>
</properties>
Modified: core/tags/3.0.2.GA/src/main/java/org/jboss/cache/Version.java
===================================================================
--- core/tags/3.0.2.GA/src/main/java/org/jboss/cache/Version.java 2009-01-20 14:21:42 UTC (rev 7528)
+++ core/tags/3.0.2.GA/src/main/java/org/jboss/cache/Version.java 2009-01-20 14:22:21 UTC (rev 7529)
@@ -32,10 +32,10 @@
@Immutable
public class Version
{
- public static final String version = "3.0.1-SNAPSHOT";
+ public static final String version = "3.0.2.GA";
public static final String codename = "Naga";
//public static final String cvs = "$Id$";
- static final byte[] version_id = {'0', '3', '0', '0', 'S'};
+ static final byte[] version_id = {'0','3','0','2','G','A'};
private static final int MAJOR_SHIFT = 11;
private static final int MINOR_SHIFT = 6;
17 years, 2 months