[jbosscache-commits] JBoss Cache SVN: r7461 - in core/trunk/src: main/java/org/jboss/cache/buddyreplication and 2 other directories.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Wed Jan 14 07:56:28 EST 2009
Author: mircea.markus
Date: 2009-01-14 07:56:28 -0500 (Wed, 14 Jan 2009)
New Revision: 7461
Modified:
core/trunk/src/main/java/org/jboss/cache/DataContainerImpl.java
core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesNoPoolWithDataGravitationTest.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesWithFailoverTest.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java
core/trunk/src/test/java/org/jboss/cache/util/UnitTestTestNGListener.java
Log:
fixing test for jdk6
Modified: core/trunk/src/main/java/org/jboss/cache/DataContainerImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/DataContainerImpl.java 2009-01-14 11:13:22 UTC (rev 7460)
+++ core/trunk/src/main/java/org/jboss/cache/DataContainerImpl.java 2009-01-14 12:56:28 UTC (rev 7461)
@@ -193,6 +193,7 @@
public NodeSPI peek(Fqn fqn, boolean includeDeletedNodes, boolean includeInvalidNodes)
{
+ if (trace) log.trace("peek " + fqn + ", includeDeletedNodes:" +includeDeletedNodes + ", includeInvalidNodes:" + includeInvalidNodes);
if (fqn == null || fqn.size() == 0) return getRoot();
NodeSPI n = getRoot();
int fqnSize = fqn.size();
Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java 2009-01-14 11:13:22 UTC (rev 7460)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java 2009-01-14 12:56:28 UTC (rev 7461)
@@ -888,6 +888,7 @@
{
try
{
+ if (log.isTraceEnabled()) log.trace("Executing assignment call " + membershipCall);
makeRemoteCall(buddies, membershipCall);
break;
}
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-14 11:13:22 UTC (rev 7460)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesNoPoolWithDataGravitationTest.java 2009-01-14 12:56:28 UTC (rev 7461)
@@ -15,6 +15,7 @@
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeClass;
+import org.testng.annotations.AfterMethod;
import javax.transaction.TransactionManager;
import java.util.List;
@@ -44,6 +45,14 @@
}
+ //this is needed here as tesng ignores the call from base class
+ @AfterMethod
+ @Override
+ public void tearDown() throws Exception
+ {
+ super.tearDown();
+ }
+
public void testDataGravitationDontKillOwner() throws Exception
{
Fqn fqn = Fqn.fromString("/test");
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesWithFailoverTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesWithFailoverTest.java 2009-01-14 11:13:22 UTC (rev 7460)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesWithFailoverTest.java 2009-01-14 12:56:28 UTC (rev 7461)
@@ -101,7 +101,6 @@
assertNoLocks(caches);
}
- @Test
public void testDataGravitationKillOwner() throws Exception
{
List<CacheSPI<Object, Object>> cachePool = createCaches(3, false, true);
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-14 11:13:22 UTC (rev 7460)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java 2009-01-14 12:56:28 UTC (rev 7461)
@@ -22,6 +22,8 @@
import static org.testng.AssertJUnit.*;
import static org.testng.AssertJUnit.assertEquals;
import org.testng.annotations.AfterMethod;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import javax.transaction.TransactionManager;
import java.util.ArrayList;
@@ -37,6 +39,7 @@
{
protected final ThreadLocal<List<CacheSPI<Object, Object>>> cachesTL = new ThreadLocal<List<CacheSPI<Object, Object>>>();
protected final BuddyFqnTransformer fqnTransformer = new BuddyFqnTransformer();
+ protected final Log log = LogFactory.getLog(getClass());
@AfterMethod(alwaysRun = true)
public void tearDown() throws Exception
Modified: core/trunk/src/test/java/org/jboss/cache/util/UnitTestTestNGListener.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/util/UnitTestTestNGListener.java 2009-01-14 11:13:22 UTC (rev 7460)
+++ core/trunk/src/test/java/org/jboss/cache/util/UnitTestTestNGListener.java 2009-01-14 12:56:28 UTC (rev 7461)
@@ -12,6 +12,8 @@
import org.testng.ITestContext;
import org.testng.ITestListener;
import org.testng.ITestResult;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
*
@@ -23,49 +25,35 @@
* Holds test classes actually running in all threads.
*/
private ThreadLocal<IClass> threadTestClass = new ThreadLocal<IClass>();
+ Log log = LogFactory.getLog(UnitTestTestNGListener.class);
private int failed = 0;
private int succeded = 0;
private int skipped = 0;
public void onTestStart(ITestResult res) {
-
- /*
- IClass testClass = threadTestClass.get();
- if ((testClass != null) && (! res.getTestClass().equals(testClass))) {
-
-
- // the thread has started testing a new test class
-
- // clean all possibly running caches created in current thread
- boolean cleaned = new UnitTestCacheFactory().cleanUp();
- if (cleaned) {
- // previous test left a cache
- System.err.println(getThreadId() +" WARNING !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
- System.err.println(getThreadId() +" A test method in " + testClass.getName() + " did not clean all cache instances properly.");
- System.err.println(getThreadId() +" Use UnitTestCacheFactory.cleanUp() or TestngUtil.killCaches(...) ");
- System.err.println(getThreadId() +" WARNING !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
- }
- }
- */
-
+ log.info("Starting test " + getTestDesc(res));
threadTestClass.set(res.getTestClass());
}
synchronized public void onTestSuccess(ITestResult arg0) {
System.out.println(getThreadId() + " Test " + getTestDesc(arg0) + " succeded.");
+ log.info("Test succeded " + getTestDesc(arg0) + ".");
succeded++;
printStatus();
}
synchronized public void onTestFailure(ITestResult arg0) {
System.out.println(getThreadId() + " Test " + getTestDesc(arg0) + " failed.");
+ if (arg0.getThrowable() != null) log.error("Test failed " + getTestDesc(arg0), arg0.getThrowable());
failed++;
printStatus();
}
synchronized public void onTestSkipped(ITestResult arg0) {
System.out.println(getThreadId() + " Test " + getTestDesc(arg0) + " skipped.");
+ log.info(" Test " + getTestDesc(arg0) + " skipped.");
+ if (arg0.getThrowable() != null) log.error("Test skipped : " + arg0.getThrowable(), arg0.getThrowable());
skipped++;
printStatus();
}
@@ -73,7 +61,7 @@
public void onTestFailedButWithinSuccessPercentage(ITestResult arg0) {
}
- public void onStart(ITestContext arg0) {
+ public void onStart(ITestContext arg0) {
}
public void onFinish(ITestContext arg0) {
More information about the jbosscache-commits
mailing list