[jbosscache-commits] JBoss Cache SVN: r7294 - in core/trunk/src/test/java/org/jboss/cache/loader: deadlock and 1 other directory.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Fri Dec 12 03:40:31 EST 2008
Author: mircea.markus
Date: 2008-12-12 03:40:31 -0500 (Fri, 12 Dec 2008)
New Revision: 7294
Modified:
core/trunk/src/test/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderCompatibilityTest.java
core/trunk/src/test/java/org/jboss/cache/loader/AsyncFileCacheLoaderTest.java
core/trunk/src/test/java/org/jboss/cache/loader/C3p0ConnectionFactoryTest.java
core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderMethodCallCounterTest.java
core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderTestsBase.java
core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderWithReplicationTest.java
core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderTest.java
core/trunk/src/test/java/org/jboss/cache/loader/ConcurrentPutRemoveEvictTest.java
core/trunk/src/test/java/org/jboss/cache/loader/DummyInMemoryCacheLoader.java
core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderConnectionTest.java
core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderStateTransferTest.java
core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderTest.java
core/trunk/src/test/java/org/jboss/cache/loader/S3CacheLoaderTest.java
core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheLoaderTest.java
core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheServerTest.java
core/trunk/src/test/java/org/jboss/cache/loader/TxCacheLoaderTest.java
core/trunk/src/test/java/org/jboss/cache/loader/deadlock/ConcurrentCreationDeadlockTest.java
Log:
removed System.out.print
Modified: core/trunk/src/test/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderCompatibilityTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderCompatibilityTest.java 2008-12-12 08:39:59 UTC (rev 7293)
+++ core/trunk/src/test/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderCompatibilityTest.java 2008-12-12 08:40:31 UTC (rev 7294)
@@ -54,7 +54,6 @@
public void shutDownDatabase()
{
TestDbPropertiesFactory.shutdownInMemoryDatabase(props);
- System.out.println("Test execution took: " + (System.currentTimeMillis() - durration)/1000);
}
/**
Modified: core/trunk/src/test/java/org/jboss/cache/loader/AsyncFileCacheLoaderTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/AsyncFileCacheLoaderTest.java 2008-12-12 08:39:59 UTC (rev 7293)
+++ core/trunk/src/test/java/org/jboss/cache/loader/AsyncFileCacheLoaderTest.java 2008-12-12 08:40:31 UTC (rev 7294)
@@ -93,7 +93,6 @@
loader.put(fqn, map);
loader.put(fqn, "a", "b");
loader.put(Collections.singletonList(mod));
- System.out.println(loader.get(fqn));
assertEquals("put right away", 3, loader.get(fqn).size());
loader.remove(fqn);
}
@@ -124,7 +123,6 @@
"cache.async.pollWait=10\n" +
"");
CacheLoader loader = cache.getCacheLoaderManager().getCacheLoader();
- System.out.println("Loader " + loader);
cache.put(Fqn.ROOT, "key1", "value1");
Thread.sleep(100);
assertEquals(null, loader.put(Fqn.ROOT, "key1", "value1"));
Modified: core/trunk/src/test/java/org/jboss/cache/loader/C3p0ConnectionFactoryTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/C3p0ConnectionFactoryTest.java 2008-12-12 08:39:59 UTC (rev 7293)
+++ core/trunk/src/test/java/org/jboss/cache/loader/C3p0ConnectionFactoryTest.java 2008-12-12 08:40:31 UTC (rev 7294)
@@ -40,7 +40,6 @@
public void shutDownDatabase()
{
TestDbPropertiesFactory.shutdownInMemoryDatabase(props);
- System.out.println("Test execution took: " + (System.currentTimeMillis() - durration)/1000);
}
@BeforeMethod(alwaysRun = true)
Modified: core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderMethodCallCounterTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderMethodCallCounterTest.java 2008-12-12 08:39:59 UTC (rev 7293)
+++ core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderMethodCallCounterTest.java 2008-12-12 08:40:31 UTC (rev 7294)
@@ -48,34 +48,18 @@
public void testPut()
{
cache.put("/node", "key", "value");
- printReport("putKeyValue", dummyLoader);
}
public void testGet()
{
cache.get("/node", "key");
- printReport("getKey", dummyLoader);
}
public void testRemove()
{
cache.remove("/node", "key");
- printReport("removeKey", dummyLoader);
}
- private void printReport(String test, DummyCountingCacheLoader d)
- {
- System.out.println("------------------------------");
- System.out.println(" Test name: " + test);
- System.out.println(" cache loader stats:");
- System.out.println(" put count: " + d.getPutCount());
- System.out.println(" get count: " + d.getGetCount());
- System.out.println(" exists count: " + d.getExistsCount());
- System.out.println(" remove count: " + d.getRemoveCount());
- System.out.println(" getChildrenNames count: " + d.getGetChildrenNamesCount());
- System.out.println("------------------------------");
- }
-
public void testLoopedGets()
{
// put an object in cache
Modified: core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderTestsBase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderTestsBase.java 2008-12-12 08:39:59 UTC (rev 7293)
+++ core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderTestsBase.java 2008-12-12 08:40:31 UTC (rev 7294)
@@ -189,7 +189,6 @@
cache.get(NODE, "X");
cache.put(NODE, m2);
Map<Object, Object> data = cache.getNode(NODE).getData();
- System.out.println("data = " + data);
assertEquals("combined", 4, data.size());
}
@@ -400,7 +399,6 @@
cache.put("/1/2/3/4/5/d/two", null);
cache.put("/1/2/3/4/5/d/three", null);
// cache.put("/a/b/c", "newKey", "newValue");
- System.out.println("cache: " + cache);
assertTrue(cache.exists("/1/2/3/4"));
assertTrue(cache.exists("/a/b/c"));
@@ -419,12 +417,10 @@
cache.removeNode(Fqn.ROOT);
cache.put("1/2/3/4/5/d", "key", "val");
cache.evict(Fqn.fromString("1/2/3/4/5/d"));
- System.out.println("-- checking for 1/2/3/4/5/d");
addDelay();
assert (!exists("1/2/3/4/5/d", null));// exists() doesn't load
cache.getNode("1/2/3/4/5/d");// get *does* load
assertTrue(cache.exists("1/2/3/4/5/d"));
- System.out.println("-- 1/2/3/4/5/d exists");
}
@@ -592,7 +588,6 @@
Set children = cache.getNode("/a").getChildrenNames();
assertNotNull("No children were loaded", children);
- System.out.println("children: " + children);
assertEquals("3 children weren't loaded", 3, children.size());
}
catch (Exception e)
@@ -620,7 +615,6 @@
Set children = cache.getNode("/a").getChildrenNames();
assertNotNull("No children were loaded", children);
- System.out.println("children: " + children);
assertEquals("3 children weren't loaded", 3, children.size());
}
catch (Exception e)
@@ -645,7 +639,6 @@
cache.getNode("/a/1");
Set children = cache.getNode("/a").getChildrenNames();
assertNotNull("No children were loaded", children);
- System.out.println("children: " + children);
assertEquals("3 children weren't loaded", 3, children.size());
}
@@ -667,7 +660,6 @@
cache.getNode("/a/1");
Set children = cache.getNode("/a").getChildrenNames();
assertNotNull("No children were loaded", children);
- System.out.println("children: " + children);
assertEquals("3 children weren't loaded", 3, children.size());
cache.evict(Fqn.fromString("/a/1"));
@@ -680,7 +672,6 @@
cache.getNode("/a/1");
children = cache.getNode("/a").getChildrenNames();
assertNotNull("No children were loaded", children);
- System.out.println("children: " + children);
assertEquals("3 children weren't loaded", 3, children.size());
}
catch (Exception e)
@@ -708,12 +699,10 @@
cache.getNode("/a/1");
Set children = cache.getNode("/a").getChildrenNames();
assertNotNull("No children were loaded", children);
- System.out.println("children: " + children);
assertEquals("3 children weren't loaded", 3, children.size());
children = cache.getNode("/a").getChildrenNames();
assertNotNull("No children were loaded", children);
- System.out.println("children: " + children);
assertEquals("3 children weren't loaded", 3, children.size());
}
catch (Exception e)
@@ -1684,7 +1673,6 @@
}
catch (UnsupportedOperationException ex)
{
- System.out.println("caught unsupported operation exception that's okay: " + ex);
return;
}
@@ -1879,7 +1867,6 @@
}
catch (UnsupportedOperationException ex)
{
- System.out.println("caught unsupported operation exception (this is expected): " + ex);
}
finally
{
@@ -1898,7 +1885,6 @@
}
catch (UnsupportedOperationException ex)
{
- System.out.println("caught unsupported operation exception (this is expected): " + ex);
}
finally
{
Modified: core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderWithReplicationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderWithReplicationTest.java 2008-12-12 08:39:59 UTC (rev 7293)
+++ core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderWithReplicationTest.java 2008-12-12 08:40:31 UTC (rev 7294)
@@ -251,9 +251,6 @@
assertEquals("value", cache1.get(fqn, key));
assertEquals("value", cache2.get(fqn, key));
- System.out.println(loader1.get(fqn));
- System.out.println(loader2.get(fqn));
-
assertEquals("value", loader1.get(fqn).get(key));
assertEquals("value", loader2.get(fqn).get(key));
Modified: core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderTest.java 2008-12-12 08:39:59 UTC (rev 7293)
+++ core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderTest.java 2008-12-12 08:40:31 UTC (rev 7294)
@@ -90,7 +90,6 @@
@AfterMethod(alwaysRun = true)
public void tearDown()
{
- System.out.println("***** TEARING DOWN ***** ");
if (cache1 != null)
{
TestingUtil.killCaches(cache1);
@@ -268,7 +267,6 @@
latch.await();
for (int i = 0; i < loops; i++)
{
-// System.out.println("Evict in loop " + i);
Fqn f = singleFqn ? fqn : fqns.get(r.nextInt(fqns.size()));
cache1.evict(f);
TestingUtil.sleepRandom(50);
@@ -296,7 +294,6 @@
latch.await();
for (int i = 0; i < loops; i++)
{
-// System.out.println("Write in loop " + i);
Fqn f = singleFqn ? fqn : fqns.get(r.nextInt(fqns.size()));
cache2.put(f, "k", "v");
TestingUtil.sleepRandom(50);
@@ -321,7 +318,6 @@
latch.await();
for (int i = 0; i < loops; i++)
{
-// System.out.println("R1 in loop " + i);
loader1.get(singleFqn ? fqn : fqns.get(r.nextInt(fqns.size())));
TestingUtil.sleepRandom(50);
}
@@ -343,7 +339,6 @@
latch.await();
for (int i = 0; i < loops; i++)
{
-// System.out.println("R2 in loop " + i);
loader1.getChildrenNames(singleFqn ? fqn.getParent() : fqns.get(r.nextInt(fqns.size())).getParent());
TestingUtil.sleepRandom(50);
}
@@ -365,7 +360,6 @@
latch.await();
for (int i = 0; i < loops; i++)
{
-// System.out.println("R3 in loop " + i);
loader1.getChildrenNames(singleFqn ? fqn : fqns.get(r.nextInt(fqns.size())));
TestingUtil.sleepRandom(50);
}
Modified: core/trunk/src/test/java/org/jboss/cache/loader/ConcurrentPutRemoveEvictTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/ConcurrentPutRemoveEvictTest.java 2008-12-12 08:39:59 UTC (rev 7293)
+++ core/trunk/src/test/java/org/jboss/cache/loader/ConcurrentPutRemoveEvictTest.java 2008-12-12 08:40:31 UTC (rev 7294)
@@ -102,7 +102,6 @@
// note that we sometimes get a null back. This is incorrect and inconsistent, but has to do with locks being held
// on nodes. Very similar to http://jira.jboss.org/jira/browse/JBCACHE-1165
String value = cache.get(fqn, key);
- System.out.println("Thread " + getName() + " got value " + value);
}
catch (Exception e)
{
Modified: core/trunk/src/test/java/org/jboss/cache/loader/DummyInMemoryCacheLoader.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/DummyInMemoryCacheLoader.java 2008-12-12 08:39:59 UTC (rev 7293)
+++ core/trunk/src/test/java/org/jboss/cache/loader/DummyInMemoryCacheLoader.java 2008-12-12 08:40:31 UTC (rev 7294)
@@ -28,9 +28,10 @@
@ThreadSafe
public class DummyInMemoryCacheLoader extends AbstractCacheLoader
{
+
+ private static Log log = LogFactory.getLog(DummyInMemoryCacheLoader.class);
// Do NOT access this map directly. always use getNodesMap() since it may be overridden.
protected Map<Fqn, DummyNode> nodes = new ConcurrentHashMap<Fqn, DummyNode>();
- protected Log log = LogFactory.getLog(DummyInMemoryCacheLoader.class);
protected Map<Object, List<Modification>> transactions = new ConcurrentHashMap<Object, List<Modification>>();
protected boolean debug; // whether to dump System.out messages as well as log messages or not
protected final Object NULL = new Object()
@@ -274,7 +275,7 @@
protected void debugMessage(String msg)
{
- if (debug) System.out.println(" DummyInMemoryCacheLoader debug: " + msg);
+ if (log.isTraceEnabled()) log.trace(msg);
}
/**
Modified: core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderConnectionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderConnectionTest.java 2008-12-12 08:39:59 UTC (rev 7293)
+++ core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderConnectionTest.java 2008-12-12 08:40:31 UTC (rev 7294)
@@ -46,7 +46,6 @@
for (int i = 0; i < 100; i++)
{
cache.put(Fqn.fromElements("C", Integer.toString(i)), "Blah", Integer.toString(i));
- System.out.println("added " + i + " dummy node to Jboss cache.");
}
assertConnectionsClosed();
Modified: core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderStateTransferTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderStateTransferTest.java 2008-12-12 08:39:59 UTC (rev 7293)
+++ core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderStateTransferTest.java 2008-12-12 08:40:31 UTC (rev 7294)
@@ -51,12 +51,10 @@
private Properties props1;
private Properties props2;
- private long durration;
@BeforeTest
public void createDatabase()
{
- durration = System.currentTimeMillis();
props1 = TestDbPropertiesFactory.getTestDbProperties();
props2 = TestDbPropertiesFactory.getTestDbProperties();
}
@@ -66,7 +64,6 @@
{
TestDbPropertiesFactory.shutdownInMemoryDatabase(props1);
TestDbPropertiesFactory.shutdownInMemoryDatabase(props2);
- System.out.println("Test execution took: " + (System.currentTimeMillis() - durration)/1000);
}
@@ -113,11 +110,9 @@
first = (CacheSPI) new UnitTestCacheFactory().createCache(getConfiguration(props1), getClass());
long cacheStartTime = System.currentTimeMillis() - startTime;
- System.out.println("cacheStartTime = " + cacheStartTime);
for (int i = 0; i < 5012; i++)
{
first.put("a/b/"+i, "k","v");
- if (i%1000 == 0) System.out.println(i + " operations executed so far");
}
startTime = System.currentTimeMillis();
second = (CacheSPI) new UnitTestCacheFactory().createCache(getConfiguration(props2), getClass());
@@ -127,6 +122,5 @@
{
second.get("a/b/"+ i, "k").equals("v");
}
- System.out.println("stateTranferTime = " + stateTranferTime);
}
}
Modified: core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderTest.java 2008-12-12 08:39:59 UTC (rev 7293)
+++ core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderTest.java 2008-12-12 08:40:31 UTC (rev 7294)
@@ -54,7 +54,6 @@
public void shutDownDatabase()
{
TestDbPropertiesFactory.shutdownInMemoryDatabase(props);
- System.out.println("Test execution took: " + (System.currentTimeMillis() - durration)/1000);
}
protected void configureCache() throws Exception
Modified: core/trunk/src/test/java/org/jboss/cache/loader/S3CacheLoaderTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/S3CacheLoaderTest.java 2008-12-12 08:39:59 UTC (rev 7293)
+++ core/trunk/src/test/java/org/jboss/cache/loader/S3CacheLoaderTest.java 2008-12-12 08:40:31 UTC (rev 7294)
@@ -58,9 +58,7 @@
"cache.s3.secretAccessKey=" + System.getProperty("secretKey") + "\n" ;
}
CacheLoaderConfig config = getSingleCacheLoaderConfig("", "org.jboss.cache.loader.s3.S3CacheLoader", properties, false, true, false);
- // System.out.println(config);
Properties p = config.getFirstCacheLoaderConfig().getProperties();
- // System.out.println(p);
assertNotNull(p.get("cache.s3.accessKeyId"));
assertNotNull(p.get("cache.s3.secretAccessKey"));
cache.getConfiguration().setCacheLoaderConfig(config);
Modified: core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheLoaderTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheLoaderTest.java 2008-12-12 08:39:59 UTC (rev 7293)
+++ core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheLoaderTest.java 2008-12-12 08:40:31 UTC (rev 7294)
@@ -28,7 +28,6 @@
// {
// try
// {
-// System.out.println("Starting TcpCacheServer");
// cacheServer = new TcpCacheServer();
// cacheServer.setBindAddress("127.0.0.1");
// cacheServer.setPort(12121);
@@ -73,7 +72,6 @@
// {
// if (cacheServer != null)
// {
-// System.out.println("Stopping TcpCacheServer");
// cacheServer.stop();
// }
// }
Modified: core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheServerTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheServerTest.java 2008-12-12 08:39:59 UTC (rev 7293)
+++ core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheServerTest.java 2008-12-12 08:40:31 UTC (rev 7294)
@@ -40,7 +40,6 @@
{
if (cache_server != null)
{
- System.out.println("Stopping TcpCacheServer");
cache_server.stop();
}
}
@@ -77,7 +76,6 @@
if (cache_server != null)
{
- System.out.println("Stopping TcpCacheServer");
cache_server.stop();
cache_server = null;
}
@@ -99,7 +97,6 @@
{
try
{
- System.out.println("Starting TcpCacheServer");
cache_server.create();
cache_server.start();
}
Modified: core/trunk/src/test/java/org/jboss/cache/loader/TxCacheLoaderTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/TxCacheLoaderTest.java 2008-12-12 08:39:59 UTC (rev 7293)
+++ core/trunk/src/test/java/org/jboss/cache/loader/TxCacheLoaderTest.java 2008-12-12 08:40:31 UTC (rev 7294)
@@ -145,7 +145,6 @@
}
catch (RollbackException rollback)
{
- System.out.println("--- TX was rolled back (as expected)");
assertTrue(true);
}
Modified: core/trunk/src/test/java/org/jboss/cache/loader/deadlock/ConcurrentCreationDeadlockTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/deadlock/ConcurrentCreationDeadlockTest.java 2008-12-12 08:39:59 UTC (rev 7293)
+++ core/trunk/src/test/java/org/jboss/cache/loader/deadlock/ConcurrentCreationDeadlockTest.java 2008-12-12 08:40:31 UTC (rev 7294)
@@ -241,17 +241,6 @@
}
/**
- * Log a message.
- *
- * @param msg The meessage to be logged.
- */
- private void log(String msg)
- {
- System.out.println(System.currentTimeMillis() + " "
- + Thread.currentThread() + " " + msg);
- }
-
- /**
* A worker thread that applies the concurrent modifications.
*
* @author Marian Nikolov
@@ -312,7 +301,6 @@
for (int i = m_start; i < m_start + m_count; i++)
{
m_state = -1;
- log("enter " + i);
if (checkAndSetState())
{
return;
@@ -355,12 +343,10 @@
return;
}
time = System.currentTimeMillis() - time;
- log("leave " + i + " took " + time + " msec");
}
}
catch (Exception e)
{
- log("caught exception in state " + m_state + ": " + e);
e.printStackTrace();
mcl_exception = e;
}
@@ -376,7 +362,6 @@
if (mcl_exception != null)
{
// another worker failed, terminate
- log("detected failure in state " + m_state);
return true;
}
m_state++;
More information about the jbosscache-commits
mailing list