Author: jason.greene(a)jboss.com Date: 2008-01-23 20:08:22 -0500 (Wed, 23 Jan 2008) New Revision: 5208 Removed: pojo/trunk/src/test/java/org/jboss/cache/pojo/TestingUtil.java Modified: pojo/trunk/pom.xml pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalTxTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTxTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedCircularGraphTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedObjectGraphTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTxTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncListTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/jmx/NotificationTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/memory/ReplicatedTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/optimistic/AbstractOptimisticTestCase.java pojo/trunk/src/test/java/org/jboss/cache/pojo/region/LocalConcurrentTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/region/LocalTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/ReplicatedTxTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/statetransfer/ReplicatedTest.java Log: Merge from 2.1 Modified: pojo/trunk/pom.xml =================================================================== --- pojo/trunk/pom.xml 2008-01-23 17:56:11 UTC (rev 5207) +++ pojo/trunk/pom.xml 2008-01-24 01:08:22 UTC (rev 5208) @@ -4,13 +4,14 @@ 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-pojo-version>2.1.0-SNAPSHOT</jbosscache-pojo-version> - <jboss.aop.version>2.0.0.beta1</jboss.aop.version> + <jbosscache-pojo-version>2.2.0-SNAPSHOT</jbosscache-pojo-version> + <jbosscache-core-version>2.1.0-SNAPSHOT</jbosscache-core-version> + <jboss.aop.version>2.0.0.CR3</jboss.aop.version> </properties> <parent> <groupId>org.jboss.cache</groupId> <artifactId>jbosscache-common-parent</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> </parent> <groupId>org.jboss.cache</groupId> <artifactId>jbosscache-pojo</artifactId> @@ -27,22 +28,15 @@ <dependency> <groupId>org.jboss.cache</groupId> <artifactId>jbosscache-core</artifactId> - <version>2.1.0.BETA1</version> + <version>${jbosscache-core-version}</version> </dependency> <dependency> <groupId>org.jboss.cache</groupId> <artifactId>jbosscache-core</artifactId> - <version>2.1.0.BETA1</version> + <version>${jbosscache-core-version}</version> <type>test-jar</type> <scope>test</scope> </dependency> - <!-- Hack AOP has broken deps --> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-container</artifactId> - <version>2.0.0.Beta4</version> - <scope>runtime</scope> - </dependency> </dependencies> <build> <plugins> @@ -104,11 +98,6 @@ <!-- HACK: AOP project and plugin has broken deps --> <dependencies> <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-container</artifactId> - <version>2.0.0.Beta4</version> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>1.0.4</version> @@ -116,9 +105,14 @@ <dependency> <groupId>org.jboss.cache</groupId> <artifactId>jbosscache-core</artifactId> - <version>2.1.0-SNAPSHOT</version> + <version>${jbosscache-core-version}</version> </dependency> - </dependencies> + <dependency> + <groupId>org.jboss.aop</groupId> + <artifactId>jboss-aop</artifactId> + <version>${jboss.aop.version}</version> + </dependency> + </dependencies> <executions> <execution> <id>aopc</id> @@ -279,14 +273,13 @@ <!-- basic JBoss repository so that the common parent POM in jbosscache-support can be found --> <repositories> - <repository> - <id>repository.jboss.org</id> - <url>http://repository.jboss.org/maven2</url> - </repository> - <repository> - <id>snapshots.jboss.org</id> - <url>http://snapshots.jboss.org/maven2</url> - </repository> + <repository> + <id>snapshots.jboss.org</id> + <url>http://snapshots.jboss.org/maven2</url> + </repository> + <repository> + <id>repository.jboss.org</id> + <url>http://repository.jboss.org/maven2</url> + </repository> </repositories> - </project> Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest.java 2008-01-23 17:56:11 UTC (rev 5207) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest.java 2008-01-24 01:08:22 UTC (rev 5208) @@ -18,6 +18,7 @@ import org.jboss.cache.config.Configuration; import org.jboss.cache.lock.UpgradeException; +import org.jboss.cache.misc.TestingUtil; import org.jboss.cache.pojo.test.Address; import org.jboss.cache.pojo.test.Person; import org.jboss.cache.transaction.DummyTransactionManager; Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalTxTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalTxTest.java 2008-01-23 17:56:11 UTC (rev 5207) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalTxTest.java 2008-01-24 01:08:22 UTC (rev 5208) @@ -24,6 +24,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jboss.cache.misc.TestingUtil; import org.jboss.cache.pojo.test.Address; import org.jboss.cache.pojo.test.Person; import org.jboss.cache.transaction.DummyTransactionManager; Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTest.java 2008-01-23 17:56:11 UTC (rev 5207) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTest.java 2008-01-24 01:08:22 UTC (rev 5208) @@ -30,7 +30,7 @@ * @author Ben Wang */ -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, enabled=false) public class NewReplicatedTest { Log log_ = LogFactory.getLog(NewReplicatedTest.class); @@ -251,7 +251,7 @@ // restart cache1_ cache1_.stop(); - cache1_.getCache().removeNode(Fqn.fromString("/a")); + //cache1_.getCache().removeNode(Fqn.fromString("/a")); cache1_.start(); // Start from scratch for initial state transfer Person remote = (Person) cache1_.find("/a"); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTxTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTxTest.java 2008-01-23 17:56:11 UTC (rev 5207) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/NewReplicatedTxTest.java 2008-01-24 01:08:22 UTC (rev 5208) @@ -26,6 +26,7 @@ import org.apache.commons.logging.LogFactory; import org.jboss.cache.config.Configuration.CacheMode; import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.misc.TestingUtil; import org.jboss.cache.pojo.test.Address; import org.jboss.cache.pojo.test.Person; import org.jboss.cache.transaction.DummyTransactionManager; @@ -39,7 +40,7 @@ * @author Ben Wang */ -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, enabled=false) public class NewReplicatedTxTest { Log log = LogFactory.getLog(NewReplicatedTxTest.class); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedCircularGraphTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedCircularGraphTest.java 2008-01-23 17:56:11 UTC (rev 5207) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedCircularGraphTest.java 2008-01-24 01:08:22 UTC (rev 5208) @@ -19,6 +19,7 @@ import org.jboss.cache.Fqn; import org.jboss.cache.config.Configuration.CacheMode; import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.misc.TestingUtil; import org.jboss.cache.pojo.test.Link; import org.jboss.cache.pojo.test.NodeManager; import org.jboss.cache.pojo.test.Person; Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedObjectGraphTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedObjectGraphTest.java 2008-01-23 17:56:11 UTC (rev 5207) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedObjectGraphTest.java 2008-01-24 01:08:22 UTC (rev 5208) @@ -7,6 +7,7 @@ import org.jboss.cache.Fqn; import org.jboss.cache.config.Configuration.CacheMode; import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.misc.TestingUtil; import org.jboss.cache.pojo.test.Address; import org.jboss.cache.pojo.test.Person; import org.testng.annotations.AfterMethod; Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTxTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTxTest.java 2008-01-23 17:56:11 UTC (rev 5207) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTxTest.java 2008-01-24 01:08:22 UTC (rev 5208) @@ -19,6 +19,7 @@ import org.apache.commons.logging.LogFactory; import org.jboss.cache.config.Configuration.CacheMode; import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.misc.TestingUtil; import org.jboss.cache.pojo.test.Person; import org.jboss.cache.transaction.DummyTransactionManager; import org.testng.annotations.AfterMethod; Deleted: pojo/trunk/src/test/java/org/jboss/cache/pojo/TestingUtil.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/TestingUtil.java 2008-01-23 17:56:11 UTC (rev 5207) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/TestingUtil.java 2008-01-24 01:08:22 UTC (rev 5208) @@ -1,139 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * - * Distributable under LGPL license. - * See terms of license at gnu.org. - */ - -package org.jboss.cache.pojo; - -import org.jboss.cache.CacheImpl; -import org.jgroups.Address; - -import java.util.List; - -/** - * Utilities for unit testing JBossCache. - * - * @author <a href="mailto://brian.stansberry@jboss.com">Brian Stansberry</a> - * @version $Revision$ - */ -public class TestingUtil -{ - - /** - * @param caches caches which must all have consistent views - * @param timeout max number of ms to loop - * @throws RuntimeException if <code>timeout</code> ms have elapse without - * all caches having the same number of members. - */ - public static void blockUntilViewsReceived(PojoCache[] caches, long timeout) - { - long failTime = System.currentTimeMillis() + timeout; - - while (System.currentTimeMillis() < failTime) - { - org.jboss.cache.pojo.TestingUtil.sleepThread(100); - if (org.jboss.cache.pojo.TestingUtil.areCacheViewsComplete(caches)) - return; - } - - throw new RuntimeException("timed out before caches had complete views"); - } - - /** - */ - public static void blockUntilViewReceived(PojoCache cache, int groupSize, long timeout) - { - long failTime = System.currentTimeMillis() + timeout; - - CacheImpl<Object, Object> tcache = (CacheImpl<Object, Object>) cache.getCache(); - while (System.currentTimeMillis() < failTime) - { - org.jboss.cache.pojo.TestingUtil.sleepThread(100); - if (org.jboss.cache.pojo.TestingUtil.isCacheViewComplete(tcache, groupSize)) - return; - } - - throw new RuntimeException("timed out before caches had complete views"); - } - - /** - * Checks each cache to see if the number of elements in the array - * returned by {@link org.jboss.cache.CacheImpl#getMembers()} matches the size of - * the <code>caches</code> parameter. - * - * @param caches caches that should form a View - * @return <code>true</code> if all caches have - * <code>caches.length</code> members; false otherwise - * @throws IllegalStateException if any of the caches have MORE view - * members than caches.length - */ - public static boolean areCacheViewsComplete(PojoCache[] caches) - { - int memberCount = caches.length; - - for (int i = 0; i < memberCount; i++) - { - CacheImpl<Object, Object> cache = (CacheImpl<Object, Object>) caches[i].getCache(); - return org.jboss.cache.pojo.TestingUtil.isCacheViewComplete(cache, memberCount); - } - - return true; - } - - /** - * FIXME Comment this - * - * @param cache - * @param memberCount - */ - public static boolean isCacheViewComplete(CacheImpl<Object, Object> cache, int memberCount) - { - List<Address> members = cache.getMembers(); - if (members == null || memberCount > members.size()) - { - return false; - } - else if (memberCount < members.size()) - { - // This is an exceptional condition - StringBuffer sb = new StringBuffer("Cache at address "); - sb.append(cache.getLocalAddress()); - sb.append(" had "); - sb.append(members.size()); - sb.append(" members; expecting "); - sb.append(memberCount); - sb.append(". Members were ("); - for (int j = 0; j < members.size(); j++) - { - if (j > 0) - sb.append(", "); - sb.append(members.get(j)); - } - sb.append(')'); - - throw new IllegalStateException(sb.toString()); - } - - return true; - } - - - /** - * Puts the current thread to sleep for the desired number of ms, suppressing - * any exceptions. - * - * @param sleeptime number of ms to sleep - */ - public static void sleepThread(long sleeptime) - { - try - { - Thread.sleep(sleeptime); - } - catch (InterruptedException ie) - { - } - } -} Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncListTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncListTest.java 2008-01-23 17:56:11 UTC (rev 5207) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/collection/ReplicatedSyncListTest.java 2008-01-24 01:08:22 UTC (rev 5208) @@ -29,7 +29,7 @@ * @author Ben Wang */ -@Test(groups = {"functional"}) +@Test(groups = {"functional"}, enabled=false) public class ReplicatedSyncListTest { Log log = LogFactory.getLog(ReplicatedSyncListTest.class); @@ -48,7 +48,7 @@ @AfterMethod(alwaysRun = true) protected void tearDown() throws Exception { - cache1.getCache().removeNode(Fqn.fromString("/")); + //cache1.getCache().removeNode(Fqn.fromString("/")); cache1.stop(); cache2.stop(); } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/jmx/NotificationTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/jmx/NotificationTest.java 2008-01-23 17:56:11 UTC (rev 5207) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/jmx/NotificationTest.java 2008-01-24 01:08:22 UTC (rev 5208) @@ -2,7 +2,7 @@ import javax.management.ObjectName; -import org.jboss.cache.CacheImpl; +import org.jboss.cache.CacheSPI; import org.jboss.cache.config.Configuration; import org.jboss.cache.pojo.PojoCache; import org.jboss.cache.pojo.PojoCacheFactory; @@ -26,7 +26,7 @@ protected Object createCacheAndJmxWrapper() throws Exception { pojoCache = createCache(CLUSTER_NAME); - cache = (CacheImpl<Object, Object>) pojoCache.getCache(); + cache = (CacheSPI<Object, Object>)pojoCache.getCache(); return new PojoCacheJmxWrapper(pojoCache); } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/memory/ReplicatedTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/memory/ReplicatedTest.java 2008-01-23 17:56:11 UTC (rev 5207) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/memory/ReplicatedTest.java 2008-01-24 01:08:22 UTC (rev 5208) @@ -19,9 +19,9 @@ import org.jboss.cache.Fqn; import org.jboss.cache.config.Configuration.CacheMode; import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.misc.TestingUtil; import org.jboss.cache.pojo.PojoCache; import org.jboss.cache.pojo.PojoCacheFactory; -import org.jboss.cache.pojo.TestingUtil; import org.jboss.cache.pojo.test.Address; import org.jboss.cache.pojo.test.Person; import org.jboss.cache.pojo.test.SerializedAddress; Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/optimistic/AbstractOptimisticTestCase.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/optimistic/AbstractOptimisticTestCase.java 2008-01-23 17:56:11 UTC (rev 5207) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/optimistic/AbstractOptimisticTestCase.java 2008-01-24 01:08:22 UTC (rev 5208) @@ -370,7 +370,7 @@ System.out.println("*** " + oa.length); System.arraycopy(oa, 0, na, 0, oa.length); na[oa.length] = new DefaultDataVersion(); - newList.add(MethodCallFactory.create(MethodDeclarations.getVersionedMethod(c.getMethodId()), na)); + newList.add(MethodCallFactory.create(c.getMethodId(), na)); } return newList; } Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/region/LocalConcurrentTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/region/LocalConcurrentTest.java 2008-01-23 17:56:11 UTC (rev 5207) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/region/LocalConcurrentTest.java 2008-01-24 01:08:22 UTC (rev 5208) @@ -17,9 +17,9 @@ import org.jboss.cache.Fqn; import org.jboss.cache.lock.UpgradeException; +import org.jboss.cache.misc.TestingUtil; import org.jboss.cache.pojo.PojoCache; import org.jboss.cache.pojo.PojoCacheFactory; -import org.jboss.cache.pojo.TestingUtil; import org.jboss.cache.pojo.test.Address; import org.jboss.cache.pojo.test.Person; import org.jboss.cache.transaction.DummyTransactionManager; Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/region/LocalTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/region/LocalTest.java 2008-01-23 17:56:11 UTC (rev 5207) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/region/LocalTest.java 2008-01-24 01:08:22 UTC (rev 5208) @@ -107,7 +107,7 @@ Fqn<String> fqn = new Fqn<String>(Fqn.fromString(REGION), InternalConstant.JBOSS_INTERNAL); assertTrue("Internal region node should exist ", cache_.getCache().getRoot().hasChild(fqn)); - System.out.println("Cache content: " +((org.jboss.cache.CacheImpl<Object, Object>)cache_.getCache()).printDetails()); + //System.out.println("Cache content: " +((org.jboss.cache.CacheImpl<Object, Object>)cache_.getCache()).printDetails()); } public void testModification() throws Exception @@ -123,8 +123,8 @@ createPerson("person/test3", "Joe", 32); cache_.detach("person/test3"); - String str = ((CacheImpl<Object, Object>) cache_.getCache()).printDetails(); - System.out.println("**** Details ***/n" + str); + //String str = ((CacheImpl<Object, Object>) cache_.getCache()).printDetails(); + //System.out.println("**** Details ***/n" + str); Fqn<String> fqn = new Fqn<String>(Fqn.fromString(REGION), InternalConstant.JBOSS_INTERNAL); Node<Object, Object> n = cache_.getCache().getRoot().getChild(fqn); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/ReplicatedTxTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/ReplicatedTxTest.java 2008-01-23 17:56:11 UTC (rev 5207) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/rollback/ReplicatedTxTest.java 2008-01-24 01:08:22 UTC (rev 5208) @@ -26,9 +26,9 @@ import org.apache.commons.logging.LogFactory; import org.jboss.cache.config.Configuration.CacheMode; import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; +import org.jboss.cache.misc.TestingUtil; import org.jboss.cache.pojo.PojoCache; import org.jboss.cache.pojo.PojoCacheFactory; -import org.jboss.cache.pojo.TestingUtil; import org.jboss.cache.pojo.test.Person; import org.jboss.cache.transaction.DummyTransactionManager; import org.testng.annotations.AfterMethod; Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/statetransfer/ReplicatedTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/statetransfer/ReplicatedTest.java 2008-01-23 17:56:11 UTC (rev 5207) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/statetransfer/ReplicatedTest.java 2008-01-24 01:08:22 UTC (rev 5208) @@ -79,13 +79,13 @@ cache = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); Person ben = createPerson("/person/test1", "Ben Wang", 40); - System.out.println("\n*** I ***"); - System.out.println(((CacheImpl<Object, Object>) cache.getCache()).printDetails()); + //System.out.println("\n*** I ***"); + //System.out.println(((CacheImpl<Object, Object>) cache.getCache()).printDetails()); cache1 = PojoCacheFactory.createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), toStart); cache1.start(); - System.out.println("\n*** II ***"); - System.out.println(((CacheImpl<Object, Object>) cache1.getCache()).printDetails()); + //System.out.println("\n*** II ***"); + //System.out.println(((CacheImpl<Object, Object>) cache1.getCache()).printDetails()); log.info("testSimple() ...."); assertEquals("Ben Wang", ben.getName());