JBoss Cache SVN: r7309 - in core/trunk/src/test/java/org/jboss/cache: transaction/pessimistic and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-12-12 03:57:24 -0500 (Fri, 12 Dec 2008)
New Revision: 7309
Modified:
core/trunk/src/test/java/org/jboss/cache/passivation/ReplicatedPassivationIntegrationTest.java
core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/ConcurrentTransactionalTest.java
Log:
removed system.out.err
Modified: core/trunk/src/test/java/org/jboss/cache/passivation/ReplicatedPassivationIntegrationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/passivation/ReplicatedPassivationIntegrationTest.java 2008-12-12 08:52:57 UTC (rev 7308)
+++ core/trunk/src/test/java/org/jboss/cache/passivation/ReplicatedPassivationIntegrationTest.java 2008-12-12 08:57:24 UTC (rev 7309)
@@ -161,7 +161,6 @@
void log(String msg)
{
- System.out.println("-- " + msg);
}
@CacheListener
@@ -187,8 +186,6 @@
if (!ne.isPre())
{
counter++;
- System.out.println("nodeActivate(): counter: " + counter);
- System.out.println("nodeActivate(): " + ne.getFqn());
}
}
@@ -197,7 +194,6 @@
{
if (ne.isPre())
{
- System.out.println("nodePassivate(): " + ne.getFqn());
}
}
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/ConcurrentTransactionalTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/ConcurrentTransactionalTest.java 2008-12-12 08:52:57 UTC (rev 7308)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/ConcurrentTransactionalTest.java 2008-12-12 08:57:24 UTC (rev 7309)
@@ -65,8 +65,8 @@
TestingUtil.killCaches(cache);
cache = null;
thread_ex = null;
- // We just can't kill DummyTransactionManager. We are sharing single instance in more tests.
- TestingUtil.killTransaction(TransactionSetup.getManager());
+ // We just can't kill DummyTransactionManager. We are sharing single instance in more tests.
+ TestingUtil.killTransaction(TransactionSetup.getManager());
}
public void testConcurrentAccessWithRWLock() throws Throwable
@@ -101,9 +101,7 @@
long now = System.currentTimeMillis();
log("*** Time elapsed: " + (now - current));
- System.out.println("cache content: " + cache.toString());
Set<Integer> keys = cache.getNode(Fqn.fromString("/a/b/c")).getKeys();
- System.out.println("number of keys=" + keys.size());
if (keys.size() != NUM)
{
@@ -111,27 +109,13 @@
try
{
- System.out.println("size=" + keys.size());
List<Integer> l = new LinkedList<Integer>(keys);
Collections.sort(l);
- System.out.println("keys: " + l);
- for (int i = 0; i < NUM; i++)
- {
- if (!l.contains(i))
- {
- System.out.println("missing: " + i);
- }
- }
-
LinkedList<Integer> duplicates = new LinkedList<Integer>();
for (Integer integer : l)
{
- if (duplicates.contains(integer))
+ if (!duplicates.contains(integer))
{
- System.out.println(integer + " is a duplicate");
- }
- else
- {
duplicates.add(integer);
}
}
15 years, 4 months
- 1
- 0
JBoss Cache SVN: r7308 - core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-12-12 03:52:57 -0500 (Fri, 12 Dec 2008)
New Revision: 7308
Modified:
core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AbortionTest.java
core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/PessimisticTransactionTest.java
core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/PrepareTxTest.java
Log:
removed System.out.print
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AbortionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AbortionTest.java 2008-12-12 08:51:34 UTC (rev 7307)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/AbortionTest.java 2008-12-12 08:52:57 UTC (rev 7308)
@@ -167,7 +167,6 @@
OrderedSynchronizationHandler osh = transactionContext.getOrderedSynchronizationHandler();
final Transaction finalTx = tx;
- System.out.println("Notify called.");
// add an aborting sync handler.
Synchronization abort = new Synchronization()
{
@@ -177,7 +176,6 @@
if (abortBeforeCompletion)
{
cache3.getConfiguration().getRuntimeConfig().getChannel().close();
- System.out.println("Returning from abort.beforeCompletion");
try
{
finalTx.setRollbackOnly();
@@ -195,14 +193,12 @@
if (!abortBeforeCompletion)
{
cache3.getConfiguration().getRuntimeConfig().getChannel().close();
- System.out.println("Returning from abort.afterCompletion");
throw new RuntimeException("Dummy exception");
}
}
};
osh.registerAtHead(abort);
- System.out.println("Added sync handler.");
}
}
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/PessimisticTransactionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/PessimisticTransactionTest.java 2008-12-12 08:51:34 UTC (rev 7307)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/PessimisticTransactionTest.java 2008-12-12 08:52:57 UTC (rev 7308)
@@ -265,11 +265,8 @@
try
{
tx.begin();
- System.out.println("initial state:\n" + cache);
cache.put("/bela/ban", "key", "value");
- System.out.println("after put():\n" + cache);
tx.rollback();
- System.out.println("after rollback():\n" + cache);
assertNull("node should be not existent", cache.getNode("/bela/ban"));
}
@@ -818,8 +815,6 @@
cache.put(fqn, "entry", "rollback");
tx.rollback();
- System.out.println("Cache: " + CachePrinter.printCacheDetails(cache));
-
assertEquals("Node should keep the commited value", "commit", cache.getNode(fqn).get("entry"));// THIS FAILS
}
@@ -852,13 +847,9 @@
try
{
thread_tx = startTransaction();
- log("acquiring RL");
cache.get("/1/2/3", "foo");// acquires RLs on all 3 nodes
- log("RL acquired successfully");
sleep(2000);
- log("committing TX");
thread_tx.commit();// releases RLs
- log("committed TX");
}
catch (Exception e)
{
@@ -882,12 +873,8 @@
{
sleep(500);// give the Reader a chance to acquire the RLs
thread_tx = startTransaction();
- log("acquiring WL");
cache.put("/1", "foo", "bar2");// needs to acquired a WL on /1
- log("acquired WL successfully");
- log("committing TX");
thread_tx.commit();
- log("committed TX");
}
catch (Exception e)
{
@@ -1064,10 +1051,4 @@
assertEquals("v", this.cache.get(fqn, "k"));
}
-
- private static void log(String msg)
- {
- System.out.println(Thread.currentThread().getName() + ": " + msg);
- }
-
}
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/PrepareTxTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/PrepareTxTest.java 2008-12-12 08:51:34 UTC (rev 7307)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/PrepareTxTest.java 2008-12-12 08:52:57 UTC (rev 7308)
@@ -95,8 +95,6 @@
TransactionTable tx_table = cache.getTransactionTable();
num_local_txs = tx_table.getNumLocalTransactions();
num_global_txs = tx_table.getNumGlobalTransactions();
- System.out.println("Number of Transactions: " + num_local_txs + "\nNumber of GlobalTransactions: " + num_global_txs + "\nTransactionTable:\n "
- + tx_table.toString(true));
assertEquals(num_local_txs, num_global_txs);
assertEquals(0, num_local_txs);
}
@@ -149,8 +147,6 @@
TransactionTable tx_table = cache.getTransactionTable();
num_local_txs = tx_table.getNumLocalTransactions();
num_global_txs = tx_table.getNumGlobalTransactions();
- System.out.println("Number of Transactions: " + num_local_txs + "\nNumber of GlobalTransactions: " + num_global_txs + "\nTransactionTable:\n "
- + tx_table.toString(true));
assertEquals(num_local_txs, num_global_txs);
assertEquals(0, num_local_txs);
}
15 years, 4 months
- 1
- 0
JBoss Cache SVN: r7307 - core/trunk/src/test/java/org/jboss/cache/transaction.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-12-12 03:51:34 -0500 (Fri, 12 Dec 2008)
New Revision: 7307
Modified:
core/trunk/src/test/java/org/jboss/cache/transaction/ConcurrentBankTest.java
core/trunk/src/test/java/org/jboss/cache/transaction/DeadlockTest.java
core/trunk/src/test/java/org/jboss/cache/transaction/InvocationContextCleanupTest.java
core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelReadCommittedNodeCreationRollbackTest.java
core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelReadCommittedTest.java
core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelRepeatableReadTest.java
core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelSerializableTest.java
core/trunk/src/test/java/org/jboss/cache/transaction/RemoveOnTxTest.java
Log:
removed System.out.print
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/ConcurrentBankTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/ConcurrentBankTest.java 2008-12-12 08:50:23 UTC (rev 7306)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/ConcurrentBankTest.java 2008-12-12 08:51:34 UTC (rev 7307)
@@ -89,16 +89,9 @@
one.join();
two.join();
- log("lock info:\n" + CachePrinter.printCacheLockingInfo(cache) + testFailedinThread);
assert !testFailedinThread;
}
- private static void log(String msg)
- {
- // System.out.println("-- [" + Thread.currentThread() + "]: " + msg);
- log.info("-- [" + Thread.currentThread() + "]: " + msg);
- }
-
private class Teller extends Thread
{
CacheSPI<Object, Integer> cache;
@@ -138,7 +131,6 @@
tx.commit();// releases read lock
int sum = sumAccounts(accounts);
- log(anz + ": " + accounts + " Summe: " + sum);
// the sum of all accounts always has to be 3000
if (sum != 3000)
{
@@ -156,13 +148,11 @@
}
catch (TimeoutException timeout_ex)
{
- System.out.println("transaction is rolled back, will try again (ex=" + timeout_ex.getClass() + ")");
tx.rollback();
again = true;
}
catch (Throwable e)
{
- System.out.println("transaction is rolled back, will try again (ex=" + e.getMessage() + ")");
tx.rollback();
again = true;
}
@@ -182,17 +172,14 @@
*/
public void deposit(String from, String to, int amount, UserTransaction tx) throws Exception
{
- log("deposit(" + from + ", " + to + ", " + amount + ") called.");
int act;
// debit
act = cache.get(NODE, from);
cache.put(NODE, from, act - amount);
- log("deposit(" + from + ", " + to + ", " + amount + ") debited.");
// eventually rollback the transaction
if ((int) (Math.random() * ROLLBACK_CHANCE) == 0)
{
- log("!!!manually set rollback (" + from + ", " + to + ", " + amount + ").");
tx.setRollbackOnly();
throw new Exception("Manually set rollback!");
}
@@ -201,7 +188,6 @@
act = cache.get(NODE, to);
cache.put(NODE, to, act + amount);
- log("deposit(" + from + ", " + to + ", " + amount + ") finished.");
}
/**
@@ -209,7 +195,6 @@
*/
public HashMap<Object, Integer> getAccounts() throws CacheException
{
- log("getAccounts() called.");
HashMap<Object, Integer> result = new HashMap<Object, Integer>();
try
{
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/DeadlockTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/DeadlockTest.java 2008-12-12 08:50:23 UTC (rev 7306)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/DeadlockTest.java 2008-12-12 08:51:34 UTC (rev 7307)
@@ -224,7 +224,6 @@
}
TestingUtil.sleepThread((long) 1000);
- log("locks: " + CachePrinter.printCacheLockingInfo(cache));
synchronized (lock)
{
@@ -245,9 +244,7 @@
putter.start();
remover.start();
TestingUtil.sleepThread((long) 5000);
- log("stopping Putter");
putter.looping = false;
- log("stopping Remover");
remover.looping = false;
putter.join();
remover.join();
@@ -260,9 +257,7 @@
putter.start();
remover.start();
TestingUtil.sleepThread((long) 5000);
- log("stopping Putter");
putter.looping = false;
- log("stopping Remover");
remover.looping = false;
putter.join();
remover.join();
@@ -275,9 +270,7 @@
putter.start();
remover.start();
TestingUtil.sleepThread((long) 5000);
- log("stopping Putter");
putter.looping = false;
- log("stopping Remover");
remover.looping = false;
putter.join();
remover.join();
@@ -311,7 +304,6 @@
}
catch (Exception t)
{
- System.out.println(getName() + ": " + t);
if (thread_ex == null)
{
thread_ex = t;
@@ -350,7 +342,6 @@
break;
}
tm = startTransaction();
- log("remove(" + fqn + ")");
cache.removeNode(fqn);
sleep(random(20));
tm.commit();
@@ -390,7 +381,6 @@
break;
}
tm = startTransaction();
- log("put(" + fqn + ")");
cache.put(fqn, "foo", "bar");
sleep(random(20));
tm.commit();
@@ -427,20 +417,15 @@
protected void _run() throws Exception
{
tm = startTransaction();
- log("get(" + fqn + ")");
cache.get(fqn, "bla");// acquires RL
- log("done, locks: " + CachePrinter.printCacheLockingInfo(cache));
synchronized (this)
{
wait();
}
- log("put(" + fqn + ")");
cache.put(fqn, "key", "val");// need to upgrade RL to WL
- log("done, locks: " + CachePrinter.printCacheLockingInfo(cache));
tm.commit();
- log("committed TX, locks: " + CachePrinter.printCacheLockingInfo(cache));
}
}
@@ -464,8 +449,6 @@
tm = startTransaction();
try
{
- log("get(" + fqn + ")");
-
cache.get(fqn, "bla");// acquires RL
synchronized (lock)
@@ -473,15 +456,11 @@
lock.wait();
}
- log("put(" + fqn + ")");
cache.put(fqn, "key", "val");// need to upgrade RL to WL
- log("done, locks: " + CachePrinter.printCacheLockingInfo(cache));
tm.commit();
- log("committed TX, locks: " + CachePrinter.printCacheLockingInfo(cache));
}
catch (UpgradeException upge)
{
- log("Exception upgrading lock");
tm.rollback();
}
}
@@ -503,15 +482,11 @@
}
catch (UpgradeException upgradeEx)
{
- log("received UpgradeException as expected");
tm.rollback();
- log("rolled back TX, locks: " + CachePrinter.printCacheLockingInfo(cache));
}
catch (TimeoutException timeoutEx)
{
- log("received TimeoutException as expected");
tm.rollback();
- log("rolled back TX, locks: " + CachePrinter.printCacheLockingInfo(cache));
}
}
}
@@ -530,18 +505,13 @@
protected void _run() throws Exception
{
tm = startTransaction();
- log("put(" + fqn1 + ")");
cache.put(fqn1, "key", "val");// need to upgrade RL to WL
- log("done, locks: " + CachePrinter.printCacheLockingInfo(cache));
synchronized (this)
{
wait();
}
- log("put(" + fqn2 + ")");
cache.put(fqn2, "key", "val");// need to upgrade RL to WL
- log("done, locks: " + CachePrinter.printCacheLockingInfo(cache));
tm.commit();
- log("committed TX, locks: " + CachePrinter.printCacheLockingInfo(cache));
}
}
@@ -561,18 +531,11 @@
}
catch (TimeoutException timeoutEx)
{
- log("received TimeoutException as expected");
tm.rollback();
- log("rolled back TX, locks: " + CachePrinter.printCacheLockingInfo(cache));
}
}
}
- private static void log(String msg)
- {
- System.out.println(Thread.currentThread().getName() + ": " + msg);
- }
-
private TransactionManager startTransaction() throws SystemException, NotSupportedException
{
TransactionManager mgr = cache.getTransactionManager();
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/InvocationContextCleanupTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/InvocationContextCleanupTest.java 2008-12-12 08:50:23 UTC (rev 7306)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/InvocationContextCleanupTest.java 2008-12-12 08:51:34 UTC (rev 7307)
@@ -97,8 +97,6 @@
{
}
- System.out.println(CachePrinter.printCacheLockingInfo(caches[0]));
- System.out.println(CachePrinter.printCacheLockingInfo(caches[1]));
assertEquals("y", cache0.get("/test", "x"));
assertEquals("y", cache0.get("/test", "x"));
}
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelReadCommittedNodeCreationRollbackTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelReadCommittedNodeCreationRollbackTest.java 2008-12-12 08:50:23 UTC (rev 7306)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelReadCommittedNodeCreationRollbackTest.java 2008-12-12 08:51:34 UTC (rev 7307)
@@ -91,8 +91,6 @@
{
TransactionManager tm = startTransaction();
- System.out.println("Writing /a/1");
-
// Create an empty parent node and a node with data
Fqn a1 = Fqn.fromRelativeElements(PARENT, "1");
cache.put(a1, KEY, VALUE);
@@ -103,8 +101,6 @@
// wait until the second thread writes and allows me to rollback or until I timeout
firstCanRollback.await(3000, TimeUnit.MILLISECONDS);
- System.out.println("rolling back");
-
tm.rollback();
assertNull("a1 empty", cache.get(a1, KEY));
@@ -123,7 +119,6 @@
}
finally
{
- System.out.println("first thread exits");
secondCanWrite.countDown();
secondCanRead.countDown();
firstDone.countDown();
@@ -143,8 +138,6 @@
// wait until the first thread has created PARENT and a child
secondCanWrite.await();
- System.out.println("writing a2");
-
// create a second child under parent
Fqn a2 = Fqn.fromRelativeElements(PARENT, "2");
try
@@ -154,7 +147,6 @@
catch (TimeoutException good)
{
// first thread locked us out of parent
- System.out.println("Prevented from writing a2 -- " + good.getLocalizedMessage());
return;
}
@@ -178,7 +170,6 @@
}
finally
{
- System.out.println("second thread exits");
firstCanRollback.countDown();
secondDone.countDown();
}
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelReadCommittedTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelReadCommittedTest.java 2008-12-12 08:50:23 UTC (rev 7306)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelReadCommittedTest.java 2008-12-12 08:51:34 UTC (rev 7307)
@@ -132,7 +132,6 @@
}
finally
{
- System.out.println("reader thread exits");
if (tm != null)
{
try
@@ -174,8 +173,6 @@
// wait until the reader thread reads and allows me to rollback or until I timeout
writerCanWrite.await(3, TimeUnit.SECONDS);
- System.out.println("rolling back");
-
tm.rollback();
}
catch (AssertionError e)
@@ -189,7 +186,6 @@
}
finally
{
- System.out.println("writer thread exits");
readerCanRead.countDown();
writerDone.countDown();
}
@@ -270,7 +266,6 @@
}
finally
{
- System.out.println("writer thread exits");
readerCanRead.countDown();
writerDone.countDown();
}
@@ -293,7 +288,6 @@
}
finally
{
- System.out.println("reader thread exits");
readerDone.countDown();
}
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelRepeatableReadTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelRepeatableReadTest.java 2008-12-12 08:50:23 UTC (rev 7306)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelRepeatableReadTest.java 2008-12-12 08:51:34 UTC (rev 7307)
@@ -106,7 +106,6 @@
}
finally
{
- System.out.println("writer thread exits");
readerCanRead.countDown();
writerDone.countDown();
}
@@ -129,7 +128,6 @@
}
finally
{
- System.out.println("reader thread exits");
readerDone.countDown();
}
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelSerializableTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelSerializableTest.java 2008-12-12 08:50:23 UTC (rev 7306)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelSerializableTest.java 2008-12-12 08:51:34 UTC (rev 7307)
@@ -107,7 +107,6 @@
}
finally
{
- System.out.println("writer thread exits");
readerCanRead.countDown();
writerDone.countDown();
}
@@ -130,7 +129,6 @@
}
finally
{
- System.out.println("reader thread exits");
readerDone.countDown();
}
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/RemoveOnTxTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/RemoveOnTxTest.java 2008-12-12 08:50:23 UTC (rev 7306)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/RemoveOnTxTest.java 2008-12-12 08:51:34 UTC (rev 7307)
@@ -69,18 +69,14 @@
try
{
tm.begin();
- print("put()");
cache.put("/a/b/c", "test", "test");
assertTrue(cache.get("/a/b/c", "test").equals("test"));
- print("remove()");
cache.removeNode("/a/b");
assertTrue(!cache.exists("/a/b"));
assertTrue(!cache.exists("/a/b/c"));
cache.put("/a/b/d", "test1", "test1");
assertTrue(!cache.exists("/a/b/c"));
assertTrue(cache.exists("/a/b/d"));
- print("Exists? " + cache.exists("/a/b/c"));
- print("get(): " + cache.get("/a/b/c", "test"));
tm.commit();
assertTrue(cache.peek(Fqn.fromString("/a/b/c"), true, true) == null);
assertTrue(!cache.exists("/a/b/c"));
@@ -92,13 +88,9 @@
throw ex;
}
dataContainer.printLockInfo();
- System.out.println(" lock info " + dataContainer.printLockInfo());
try
{
tm.begin();
- print(cache.exists("/a/b/c"));
- print("get(): " + cache.get("/a/b/c", "test"));
- print("get(): " + cache.get("/a/b/c", "test"));
Transaction t = tm.suspend();
try
{
@@ -108,10 +100,7 @@
ignore.printStackTrace();
}
tm.resume(t);
- print("get(): " + cache.get("/a/b/c", "test"));
- print(cache.exists("/a/b/c"));
cache.put("/a/b/c", "test", "test");
- print(cache.exists("/a/b/c"));
tm.commit();
}
catch (Exception ex) {
@@ -120,32 +109,19 @@
}
}
- private void print(Object s)
- {
- System.out.println(s);
- }
- private void print(boolean s)
- {
- System.out.println(s);
- }
-
public void testReal() throws Exception
{
TransactionManager tm = cache.getTransactionManager();
tm.begin();
- print("put()");
cache.put("/a/b/c", "test", "test");
assertTrue(cache.get("/a/b/c", "test").equals("test"));
- print("remove()");
cache.removeNode("/a/b");
assertTrue(!cache.exists("/a/b"));
assertTrue(!cache.exists("/a/b/c"));
cache.put("/a/b/d", "test1", "test1");
assertTrue(!cache.exists("/a/b/c"));
assertTrue(cache.exists("/a/b/d"));
- print("Exists? " + cache.exists("/a/b/c"));
- print("get(): " + cache.get("/a/b/c", "test"));
tm.commit();
assertNull(cache.peek(Fqn.fromString("/a/b/c"), true, true));
assertTrue(!cache.exists("/a/b/c"));
@@ -157,7 +133,6 @@
{
TransactionManager tm = cache.getTransactionManager();
tm.begin();
- print("put()");
cache.put("/a/b/c", "test", "test");
assertTrue(cache.peek(Fqn.fromString("/a/b/c"), true, true) != null);
cache.removeNode("/a/b");
15 years, 4 months
- 1
- 0
JBoss Cache SVN: r7306 - core/trunk/src/test/java/org/jboss/cache/passivation.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-12-12 03:50:23 -0500 (Fri, 12 Dec 2008)
New Revision: 7306
Modified:
core/trunk/src/test/java/org/jboss/cache/passivation/BasicPassivationTest.java
core/trunk/src/test/java/org/jboss/cache/passivation/ConcurrentPassivationTest.java
core/trunk/src/test/java/org/jboss/cache/passivation/LocalPassivationIntegrationTest.java
core/trunk/src/test/java/org/jboss/cache/passivation/PassivationTestsBase.java
core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToJDBCCacheLoaderTest.java
Log:
removed System.out.print
Modified: core/trunk/src/test/java/org/jboss/cache/passivation/BasicPassivationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/passivation/BasicPassivationTest.java 2008-12-12 08:49:20 UTC (rev 7305)
+++ core/trunk/src/test/java/org/jboss/cache/passivation/BasicPassivationTest.java 2008-12-12 08:50:23 UTC (rev 7306)
@@ -46,7 +46,6 @@
{
initCaches();
wakeupIntervalMillis = cache.getConfiguration().getEvictionConfig().getWakeupInterval();
- log("wakeupInterval is " + wakeupIntervalMillis);
if (wakeupIntervalMillis < 0)
{
fail("testEviction(): eviction thread wake up interval is illegal " + wakeupIntervalMillis);
@@ -81,9 +80,7 @@
cache.put(FQNSTR, FQNSTR, FQNSTR);
- System.out.println(cache.toString());
TestingUtil.sleepThread(2100);
- System.out.println(cache.toString());
assert !(cache.exists(FQNSTR) && cache.getNode(FQNSTR).getKeys().contains(FQNSTR)) : "Should have been evicted!!";
Object val = cache.get(FQNSTR, FQNSTR);
@@ -113,11 +110,6 @@
}
- private void log(String msg)
- {
- System.out.println("-- " + msg);
- }
-
@CacheListener
public class TestCacheListener
{
@@ -130,7 +122,6 @@
if (!ne.getFqn().isChildOrEquals(Fqn.fromString(FQNSTR)))
return;// don't care about fqn that doesn't belong to me.
- log("got event " + ne);
if (ne.getType() == Event.Type.NODE_ACTIVATED)
activationCount++;
else if (ne.getType() == Event.Type.NODE_PASSIVATED)
Modified: core/trunk/src/test/java/org/jboss/cache/passivation/ConcurrentPassivationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/passivation/ConcurrentPassivationTest.java 2008-12-12 08:49:20 UTC (rev 7305)
+++ core/trunk/src/test/java/org/jboss/cache/passivation/ConcurrentPassivationTest.java 2008-12-12 08:50:23 UTC (rev 7306)
@@ -75,8 +75,6 @@
// Loop for long enough to have 5 runs of the eviction thread
long loopDone = System.currentTimeMillis() + (5 * wakeupIntervalMillis);
- System.out.println("Initialised; Loop for " + (5 * wakeupIntervalMillis) + " millis");
-
while (System.currentTimeMillis() < loopDone)
{
// If any get returns null, that's a failure
Modified: core/trunk/src/test/java/org/jboss/cache/passivation/LocalPassivationIntegrationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/passivation/LocalPassivationIntegrationTest.java 2008-12-12 08:49:20 UTC (rev 7305)
+++ core/trunk/src/test/java/org/jboss/cache/passivation/LocalPassivationIntegrationTest.java 2008-12-12 08:50:23 UTC (rev 7306)
@@ -57,7 +57,6 @@
listener_.resetCounter();
wakeupIntervalMillis = cache.getConfiguration().getEvictionConfig().getWakeupInterval();
- log("wakeupInterval is " + wakeupIntervalMillis);
if (wakeupIntervalMillis <= 0)
{
fail("testEviction(): eviction thread wake up interval is illegal " + wakeupIntervalMillis);
@@ -90,11 +89,6 @@
assertEquals("Eviction counter ", 1, listener_.getCounter());
}
- private void log(String msg)
- {
- System.out.println("-- " + msg);
- }
-
@CacheListener
public class PassivationListener
{
@@ -118,17 +112,12 @@
if (!ne.isPre())
{
counter++;
- System.out.println("nodeActivate(): counter: " + counter);
}
}
@NodePassivated
public void nodePassivated(NodeEvent ne)
{
- if (ne.isPre())
- {
- System.out.println("nodePassivate(): " + ne.getFqn());
- }
}
@NodeLoaded
Modified: core/trunk/src/test/java/org/jboss/cache/passivation/PassivationTestsBase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/passivation/PassivationTestsBase.java 2008-12-12 08:49:20 UTC (rev 7305)
+++ core/trunk/src/test/java/org/jboss/cache/passivation/PassivationTestsBase.java 2008-12-12 08:50:23 UTC (rev 7306)
@@ -191,7 +191,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);
assert (exists("/1/2/3/4"));
assert (exists("/a/b/c"));
@@ -209,7 +208,6 @@
cache.removeNode(Fqn.ROOT);// remove nothing
cache.put("1/2/3/4/5/d", "key", "val");// put in memory
cache.evict(Fqn.fromString("1/2/3/4/5/d"));// passivate node
- System.out.println("-- checking for 1/2/3/4/5/d");
addDelay();
try
{
@@ -222,7 +220,6 @@
cache.getNode("1/2/3/4/5/d");// get from loader but doesn't load attributes
assertEquals(true, loader.exists(Fqn.fromString("1/2/3/4/5/d")));
assert (exists("1/2/3/4/5/d"));
- System.out.println("-- 1/2/3/4/5/d exists");
cache.get("1/2/3/4/5/d", "key");// activate node
assertEquals(false, loader.exists(Fqn.fromString("1/2/3/4/5/d")));
}
@@ -381,7 +378,6 @@
assertTrue(loader.exists(Fqn.fromString("/a")));// children haven't been loaded
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.get("/a/1", "test");// activate node
assertFalse(loader.exists(Fqn.fromString("/a/1")));
@@ -411,7 +407,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());
cache.get("/a/1", "test");// activate node
assertFalse(loader.exists(Fqn.fromString("/a/1")));
@@ -440,7 +435,6 @@
assertFalse(loader.exists(Fqn.fromString("/a/1")));// loaded attributes and has no children
Set children = cache.getNode("/a").getChildrenNames();// load children names
assertNotNull("No children were loaded", children);
- System.out.println("children: " + children);
assertEquals("3 children weren't loaded", 3, children.size());
assertTrue(loader.exists(Fqn.fromString("/a")));//loaded children but didn't initalizae them
}
@@ -465,7 +459,6 @@
assertFalse(loader.exists(Fqn.fromString("/a/3")));
Set children = cache.getNode("/a").getChildrenNames();// get node's children names
assertNotNull("No children were loaded", children);
- System.out.println("children: " + children);
assertEquals("3 children weren't loaded", 3, children.size());
assertNull(cache.get("/a", "test"));// load attributes and has no children by now, activation
assertFalse(loader.exists(Fqn.fromString("/a")));
@@ -484,7 +477,6 @@
assertFalse(loader.exists(Fqn.fromString("/a/3")));
children = cache.getNode("/a").getChildrenNames();// get children names
assertNotNull("No children were loaded", children);
- System.out.println("children: " + children);
assertEquals("3 children weren't loaded", 3, children.size());
assertNull(cache.get("/a", "test"));// load attributes and has no children by now, activation
assertFalse(loader.exists(Fqn.fromString("/a")));
@@ -514,7 +506,6 @@
assertFalse(loader.exists(Fqn.fromString("/a/3")));
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());
assertNull(cache.get("/a", "test"));// activate node
Modified: core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToJDBCCacheLoaderTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToJDBCCacheLoaderTest.java 2008-12-12 08:49:20 UTC (rev 7305)
+++ core/trunk/src/test/java/org/jboss/cache/passivation/PassivationToJDBCCacheLoaderTest.java 2008-12-12 08:50:23 UTC (rev 7306)
@@ -43,7 +43,6 @@
public void shutDownDatabase()
{
TestDbPropertiesFactory.shutdownInMemoryDatabase(props);
- System.out.println("Test execution took: " + (System.currentTimeMillis() - durration)/1000);
}
private Properties getJDBCProps()
15 years, 4 months
- 1
- 0
JBoss Cache SVN: r7305 - core/trunk/src/test/java/org/jboss/cache.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-12-12 03:49:20 -0500 (Fri, 12 Dec 2008)
New Revision: 7305
Modified:
core/trunk/src/test/java/org/jboss/cache/AbstractMultipleCachesTest.java
core/trunk/src/test/java/org/jboss/cache/AbstractSingleCacheTest.java
core/trunk/src/test/java/org/jboss/cache/CallbackTest.java
core/trunk/src/test/java/org/jboss/cache/FqnTest.java
core/trunk/src/test/java/org/jboss/cache/GetKeysTest.java
core/trunk/src/test/java/org/jboss/cache/GlobalTransactionTest.java
core/trunk/src/test/java/org/jboss/cache/UnitTestCacheFactory.java
Log:
removed System.out.print
Modified: core/trunk/src/test/java/org/jboss/cache/AbstractMultipleCachesTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/AbstractMultipleCachesTest.java 2008-12-12 08:48:42 UTC (rev 7304)
+++ core/trunk/src/test/java/org/jboss/cache/AbstractMultipleCachesTest.java 2008-12-12 08:49:20 UTC (rev 7305)
@@ -1,9 +1,6 @@
package org.jboss.cache;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.*;
import org.jboss.cache.util.TestingUtil;
import java.util.Set;
@@ -13,24 +10,25 @@
/**
* @author Mircea.Markus(a)jboss.com
*/
+@Test(groups = {"functional", "unit"})
public abstract class AbstractMultipleCachesTest<K, V> extends AbstractCacheTest<K,V>
{
protected Set<CacheSPI<K, V>> caches = new HashSet<CacheSPI<K,V>>();
- @BeforeTest
+ @BeforeClass
public void create() throws Throwable
{
createCaches();
}
@AfterClass
- public void destroy()
+ protected void destroy()
{
TestingUtil.killCaches(caches.toArray(new Cache[caches.size()]));
}
@AfterMethod
- public void clearContent() throws Throwable
+ protected void clearContent() throws Throwable
{
for (CacheSPI<K, V> cache : caches)
{
@@ -40,7 +38,7 @@
protected abstract void createCaches() throws Throwable;
- public void registerCaches(Cache... caches)
+ final protected void registerCaches(Cache... caches)
{
for (Cache c: caches) this.caches.add((CacheSPI<K, V>) c);
}
Modified: core/trunk/src/test/java/org/jboss/cache/AbstractSingleCacheTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/AbstractSingleCacheTest.java 2008-12-12 08:48:42 UTC (rev 7304)
+++ core/trunk/src/test/java/org/jboss/cache/AbstractSingleCacheTest.java 2008-12-12 08:49:20 UTC (rev 7305)
@@ -3,32 +3,34 @@
import org.testng.annotations.BeforeClass;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.AfterClass;
+import org.testng.annotations.Test;
import org.jboss.cache.util.TestingUtil;
/**
* @author Mircea.Markus(a)jboss.com
*/
+@Test(groups = {"functional", "unit"})
public abstract class AbstractSingleCacheTest<K, V> extends AbstractCacheTest<K, V>
{
protected CacheSPI<K, V> cache;
@BeforeClass
- public void create()
+ protected void create()
{
cache = createCache();
}
@AfterClass
- public void destroy()
+ protected void destroy()
{
TestingUtil.killCaches(cache);
}
@AfterMethod
- public void clearContent()
+ protected void clearContent()
{
super.clearContent(cache);
}
- public abstract CacheSPI<K, V> createCache();
+ protected abstract CacheSPI<K, V> createCache();
}
Modified: core/trunk/src/test/java/org/jboss/cache/CallbackTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/CallbackTest.java 2008-12-12 08:48:42 UTC (rev 7304)
+++ core/trunk/src/test/java/org/jboss/cache/CallbackTest.java 2008-12-12 08:49:20 UTC (rev 7305)
@@ -42,7 +42,6 @@
cache.put(FQN_A, null);
assertTrue(cache.exists(FQN_A));
assertTrue(cache.exists(FQN_B));//created by callback
- System.out.println("cache locks:\n" + CachePrinter.printCacheLockingInfo(cache));
assertEquals(0, cache.getNumberOfLocksHeld());
}
@@ -53,7 +52,6 @@
cache.put(FQN_A, null);
assertTrue(cache.exists(FQN_A));
- System.out.println("cache locks:\n" + CachePrinter.printCacheLockingInfo(cache));
assertEquals(0, cache.getNumberOfLocksHeld());
}
@@ -66,7 +64,6 @@
cache.put("/a", null);
assertTrue(cache.exists(FQN_A));
assertTrue(cache.exists(FQN_B));
- System.out.println("cache locks:\n" + CachePrinter.printCacheLockingInfo(cache));
assertEquals(0, cache.getNumberOfLocksHeld());
}
@@ -185,9 +182,7 @@
{
if (!c.exists(FQN_B))
{
- System.out.println("PutListener: creating node " + FQN_B);
c.put(FQN_B, KEY, VALUE);
- System.out.println("PutListener: created node " + FQN_B);
}
}
catch (CacheException ex)
Modified: core/trunk/src/test/java/org/jboss/cache/FqnTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/FqnTest.java 2008-12-12 08:48:42 UTC (rev 7304)
+++ core/trunk/src/test/java/org/jboss/cache/FqnTest.java 2008-12-12 08:49:20 UTC (rev 7305)
@@ -53,7 +53,6 @@
public void testNull()
{
Fqn fqn = Fqn.ROOT;
- log("null fqn is " + fqn);
assert 0 == fqn.size();
int hcode = fqn.hashCode();
assert hcode != -1;
@@ -62,7 +61,6 @@
public void testOne()
{
Fqn fqn = Fqn.fromElements(22);
- log("one fqn is " + fqn);
assert 1 == fqn.size();
int hcode = fqn.hashCode();
assert hcode != -1;
@@ -78,11 +76,9 @@
public void testFqn()
{
Fqn fqn = Fqn.fromString("/a/b/c");
- log("fqn is " + fqn);
assert 3 == fqn.size();
Fqn fqn2 = Fqn.fromElements("a", "b", "c");
- log("fqn2 is " + fqn2);
assert 3 == fqn.size();
assert fqn.equals(fqn2);
assert fqn.hashCode() == fqn2.hashCode();
@@ -91,7 +87,6 @@
public void testHereogeneousNames()
{
Fqn fqn = Fqn.fromElements("string", 38, true);
- log("fqn is " + fqn);
assert 3 == fqn.size();
Fqn fqn2 = Fqn.fromElements("string", 38, true);
@@ -104,7 +99,6 @@
Fqn fqn1, fqn2;
fqn1 = Fqn.fromElements("a", "b", "c");
fqn2 = Fqn.fromString("/a/b/c");
- log("fqn is " + fqn1);
assert fqn1.equals(fqn2);
HashMap<Fqn, Integer> map = new HashMap<Fqn, Integer>();
@@ -385,11 +379,6 @@
}
}
- void log(String msg)
- {
- System.out.println("-- " + msg);
- }
-
public void testReplacingDirectAncestor()
{
Fqn fqn = Fqn.fromString("/a/b/c");
Modified: core/trunk/src/test/java/org/jboss/cache/GetKeysTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/GetKeysTest.java 2008-12-12 08:48:42 UTC (rev 7304)
+++ core/trunk/src/test/java/org/jboss/cache/GetKeysTest.java 2008-12-12 08:49:20 UTC (rev 7305)
@@ -43,7 +43,6 @@
cache.put("/a/b/c", "city", "Kreuzlingen");
Set keys = cache.getNode("/a/b/c").getKeys();
- log("keys are " + keys);
assertNotNull(keys);
assertEquals(3, keys.size());
@@ -62,7 +61,6 @@
cache.put("/a/b/c/3", null);
Set children = cache.getNode("/a/b/c").getChildrenNames();
- log("children are " + children);
assertNotNull(children);
assertEquals(3, children.size());
@@ -89,9 +87,4 @@
//expected
}
}
-
- void log(String msg)
- {
- System.out.println("-- " + msg);
- }
}
Modified: core/trunk/src/test/java/org/jboss/cache/GlobalTransactionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/GlobalTransactionTest.java 2008-12-12 08:48:42 UTC (rev 7304)
+++ core/trunk/src/test/java/org/jboss/cache/GlobalTransactionTest.java 2008-12-12 08:49:20 UTC (rev 7305)
@@ -37,7 +37,6 @@
tx1 = GlobalTransaction.create(a1);
tx2 = GlobalTransaction.create(a1);
- System.out.println("\ntx1: " + tx1 + "\ntx2: " + tx2);
assertTrue(tx1.equals(tx2) == false);
tx2 = tx1;
@@ -50,7 +49,6 @@
{
IpAddress a1 = new IpAddress("localhost", 4444);
GlobalTransaction tx1 = GlobalTransaction.create(a1);
- System.out.println("\ntx1: " + tx1);
assertFalse(tx1.equals(Thread.currentThread()));
}
@@ -59,7 +57,6 @@
{
IpAddress a1 = new IpAddress("localhost", 4444);
GlobalTransaction tx1 = GlobalTransaction.create(a1);
- System.out.println("\ntx1: " + tx1);
assertFalse(tx1.equals(null));
}
@@ -73,7 +70,6 @@
tx1 = GlobalTransaction.create(a1);
tx2 = GlobalTransaction.create(a1);
- System.out.println("\ntx1: " + tx1 + "\ntx2: " + tx2);
assertTrue(tx1.equals(tx2) == false);
int hcode_1 = tx1.hashCode();
@@ -114,9 +110,6 @@
tx1_copy = (GlobalTransaction) in.readObject();
tx2_copy = (GlobalTransaction) in.readObject();
- System.out.println("\ntx1: " + tx1 + ", tx1_copy: " + tx1_copy +
- "\ntx2: " + tx2 + ", tx2_copy: " + tx2_copy);
-
assertNotNull(tx1_copy);
assertNotNull(tx2_copy);
assertEquals(tx1, tx1_copy);
@@ -165,10 +158,4 @@
assertFalse(tx1.equals(tx2));
assertFalse(tx2.equals(tx1));
}
-
-
- void log(String msg)
- {
- System.out.println("-- [" + Thread.currentThread() + "]: " + msg);
- }
}
Modified: core/trunk/src/test/java/org/jboss/cache/UnitTestCacheFactory.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/UnitTestCacheFactory.java 2008-12-12 08:48:42 UTC (rev 7304)
+++ core/trunk/src/test/java/org/jboss/cache/UnitTestCacheFactory.java 2008-12-12 08:49:20 UTC (rev 7305)
@@ -114,7 +114,6 @@
}
catch (ConfigurationException e)
{
- System.out.println("Detected legacy configuration file format when parsing [" + configFileName + "]. Migrating to the new (3.x) file format is recommended. See FAQs for details.");
XmlConfigurationParser2x oldParser = new XmlConfigurationParser2x();
c = oldParser.parseFile(configFileName);
}
@@ -140,12 +139,6 @@
public Cache<K, V> createCache(Configuration configuration, boolean start, Class ownerClass) throws ConfigurationException
{
- // - Do not print out this exception - since tests are ALSO run from IDEs on the main thread. - MANIK
-// if (!Thread.currentThread().getName().contains("pool"))
-// {
-// System.out.println("CreateCache called from wrong thread: " + Thread.currentThread().getName());
-// }
-
checkCaches(ownerClass);
tryMCastAddress();
@@ -227,10 +220,9 @@
{
caches.remove(c);
allCaches.remove(c);
- }
- else if (allCaches.contains(c))
+ } else if (allCaches.contains(c))
{
- System.out.println("[" + Thread.currentThread().getName() + "] WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Remove cache called from different thread.");
+ System.err.println("[" + Thread.currentThread().getName() + "] WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Remove cache called from different thread.");
Thread.dumpStack();
}
}
@@ -254,18 +246,7 @@
if (clusterName.indexOf(Thread.currentThread().getName()) == -1)
{
clusterName = clusterName + "-" + Thread.currentThread().getName();
-// System.out.println(getThreadId() + " Setting cluster name " + newClusterName);
}
-
-// String testName = extractTestName();
-
- // prepend test name
- /*
- if (clusterName.indexOf(testName) == -1) {
- clusterName = testName + "-" + clusterName;
- }
- */
-
configuration.setClusterName(clusterName);
}
@@ -300,10 +281,8 @@
{
String origAddr = m.group().substring(m.group().indexOf("=") + 1);
String newAddr = threadMcastIP.get();
-// System.out.println(getThreadId() + " Replacing mcast_addr " + origAddr + " with " + newAddr);
clusterConfig = m.replaceFirst("mcast_addr=" + newAddr);
- }
- else
+ } else
{
Thread.dumpStack();
System.exit(1);
@@ -316,7 +295,6 @@
{
// String origPort = m.group().substring(m.group().indexOf("=") + 1);
String newPort = threadMcastPort.get().toString();
- // System.out.println(getThreadId() + " Replacing mcast_port " + origPort + " with " + newPort);
clusterConfig = m.replaceFirst("mcast_port=" + newPort);
}
@@ -342,9 +320,9 @@
if (cleanUp())
{
- System.out.print(threadId + "WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ");
- System.out.print(threadId + " A test method in " + lastTestClass + " did not clean all cache instances properly. ");
- System.out.println(threadId + " Use UnitTestCacheFactory.cleanUp() or TestngUtil.killCaches(...) ");
+ System.err.print(threadId + "WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ");
+ System.err.print(threadId + " A test method in " + lastTestClass + " did not clean all cache instances properly. ");
+ System.err.println(threadId + " Use UnitTestCacheFactory.cleanUp() or TestngUtil.killCaches(...) ");
}
}
15 years, 4 months
- 1
- 0
JBoss Cache SVN: r7304 - in core/trunk/src/test/java/org/jboss/cache/testng: other and 1 other directories.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-12-12 03:48:42 -0500 (Fri, 12 Dec 2008)
New Revision: 7304
Added:
core/trunk/src/test/java/org/jboss/cache/testng/other/
core/trunk/src/test/java/org/jboss/cache/testng/other/Derived.java
core/trunk/src/test/java/org/jboss/cache/testng/other/third/
core/trunk/src/test/java/org/jboss/cache/testng/other/third/SecondDerived.java
Removed:
core/trunk/src/test/java/org/jboss/cache/testng/Derived.java
Modified:
core/trunk/src/test/java/org/jboss/cache/testng/Base.java
Log:
removed System.out.print
Modified: core/trunk/src/test/java/org/jboss/cache/testng/Base.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/testng/Base.java 2008-12-12 08:47:58 UTC (rev 7303)
+++ core/trunk/src/test/java/org/jboss/cache/testng/Base.java 2008-12-12 08:48:42 UTC (rev 7304)
@@ -5,67 +5,27 @@
/**
* @author Mircea.Markus(a)jboss.com
*/
-@Test(groups = "functional", testName = "sadsadsa")
-public class Base
+@Test(groups = "functional")
+public abstract class Base
{
- private int value = -5;
-
- static int count;
-
- public Base(int value)
- {
- this.value = value;
- }
-
- public Base()
- {
- }
-
- @Factory
- public static Object[] createInstances()
- {
- Base base = new Base(1);
- Base base2 = new Base(2);
- return new Object[]{base, base2};
- }
-
-
@BeforeClass
public void beforeTest()
{
- System.out.println("Base.beforeTest" + value);
+ System.out.println("Base.beforeTest");
}
@AfterClass
public void afterTest()
{
- System.out.println("Base.afterTest" + value);
+ System.out.println("Base.afterTest");
}
- public void testBaseAaaaaa()
- {
- System.out.println(getThreadName() + "aaaaaaaaaaaa" + value);
- }
-
@BeforeMethod
public void beforeMethod()
{
- System.out.println("Base.beforeMethod" + value);
+ System.out.println("Base.beforeMethod");
}
- @AfterMethod
- public void afterMethod()
- {
- System.out.println("Base.afterMethod" + value);
- }
-
- public void testBaseBbbbbbb()
- {
- count++;
-// if (count == 2) throw new RuntimeException();
- System.out.println(getThreadName() + "bbbbbbbbbbbbb" + value);
- }
-
protected String getThreadName()
{
return "[" + getClass() + " ************ -> " + Thread.currentThread().getName() + "] ";
Deleted: core/trunk/src/test/java/org/jboss/cache/testng/Derived.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/testng/Derived.java 2008-12-12 08:47:58 UTC (rev 7303)
+++ core/trunk/src/test/java/org/jboss/cache/testng/Derived.java 2008-12-12 08:48:42 UTC (rev 7304)
@@ -1,30 +0,0 @@
-package org.jboss.cache.testng;
-
-import org.testng.annotations.Test;
-
-/**
- * @author Mircea.Markus(a)jboss.com
- */
-@Test(groups = "functional" , testName = "Same")
-public class Derived extends Base
-{
- public Derived(int value)
- {
- super(value);
- }
-
- // public void testDerivedCcccc()
-// {
-// System.out.println(getThreadName() + "ccccccccccccccccc");
-// }
-//
-// public void testDerivedDdddd()
-// {
-// System.out.println(getThreadName() + "dddddddddddddddddddd");
-// }
-//
-// protected String getThreadName()
-// {
-// return "[" + getClass() + " ************ -> " + Thread.currentThread().getName() + "] ";
-// }
-}
Copied: core/trunk/src/test/java/org/jboss/cache/testng/other/Derived.java (from rev 7283, core/trunk/src/test/java/org/jboss/cache/testng/Derived.java)
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/testng/other/Derived.java (rev 0)
+++ core/trunk/src/test/java/org/jboss/cache/testng/other/Derived.java 2008-12-12 08:48:42 UTC (rev 7304)
@@ -0,0 +1,27 @@
+package org.jboss.cache.testng.other;
+
+import org.testng.annotations.Test;
+import org.jboss.cache.testng.Base;
+
+/**
+ * @author Mircea.Markus(a)jboss.com
+ */
+@Test(groups = "functional" , testName = "testng.other.Derived")
+public class Derived extends Base
+{
+
+ public void testDerivedCcccc()
+ {
+ System.out.println(getThreadName() + "ccccccccccccccccc");
+ }
+
+ public void testDerivedDdddd()
+ {
+ System.out.println(getThreadName() + "dddddddddddddddddddd");
+ }
+
+ protected String getThreadName()
+ {
+ return "[" + getClass() + " ************ -> " + Thread.currentThread().getName() + "] ";
+ }
+}
Property changes on: core/trunk/src/test/java/org/jboss/cache/testng/other/Derived.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: core/trunk/src/test/java/org/jboss/cache/testng/other/third/SecondDerived.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/testng/other/third/SecondDerived.java (rev 0)
+++ core/trunk/src/test/java/org/jboss/cache/testng/other/third/SecondDerived.java 2008-12-12 08:48:42 UTC (rev 7304)
@@ -0,0 +1,12 @@
+package org.jboss.cache.testng.other.third;
+
+import org.jboss.cache.testng.other.Derived;
+import org.testng.annotations.Test;
+
+/**
+ * @author Mircea.Markus(a)jboss.com
+ */
+@Test (groups = "functional", testName = "tesng.other.third.SecondDerived")
+public class SecondDerived extends Derived
+{
+}
15 years, 4 months
- 1
- 0
JBoss Cache SVN: r7303 - in core/trunk/src/test/java/org/jboss/cache/util: concurrent/locks and 2 other directories.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-12-12 03:47:58 -0500 (Fri, 12 Dec 2008)
New Revision: 7303
Modified:
core/trunk/src/test/java/org/jboss/cache/util/CachesTest.java
core/trunk/src/test/java/org/jboss/cache/util/DeltaMapTest.java
core/trunk/src/test/java/org/jboss/cache/util/TestDbPropertiesFactory.java
core/trunk/src/test/java/org/jboss/cache/util/TestingUtil.java
core/trunk/src/test/java/org/jboss/cache/util/UnitTestTestNGListener.java
core/trunk/src/test/java/org/jboss/cache/util/concurrent/locks/OwnableReentrantLockTest.java
core/trunk/src/test/java/org/jboss/cache/util/internals/EvictionWatcher.java
core/trunk/src/test/java/org/jboss/cache/util/internals/ReplicationQueueNotifier.java
core/trunk/src/test/java/org/jboss/cache/util/internals/replicationlisteners/OptimisticReplicationListener.java
core/trunk/src/test/java/org/jboss/cache/util/internals/replicationlisteners/ReplicationListener.java
Log:
removed System.out.print
Modified: core/trunk/src/test/java/org/jboss/cache/util/CachesTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/util/CachesTest.java 2008-12-12 08:44:51 UTC (rev 7302)
+++ core/trunk/src/test/java/org/jboss/cache/util/CachesTest.java 2008-12-12 08:47:58 UTC (rev 7303)
@@ -192,7 +192,6 @@
m.put(h, 21);
assertEquals(42, m.get(f));
assertEquals(69, m.get(g));
- System.out.println(printDetails(cache));
}
private String printDetails(Cache c)
Modified: core/trunk/src/test/java/org/jboss/cache/util/DeltaMapTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/util/DeltaMapTest.java 2008-12-12 08:44:51 UTC (rev 7302)
+++ core/trunk/src/test/java/org/jboss/cache/util/DeltaMapTest.java 2008-12-12 08:47:58 UTC (rev 7303)
@@ -128,8 +128,6 @@
{
dm.remove(null);
dm.put(K, Y);
- System.out.println(dm.toDebugString());
- System.out.println(dm.toString());
Iterator<Entry<String, String>> i = dm.entrySet().iterator();
assertEquals(true, i.hasNext());
assertEquals(true, i.hasNext());
Modified: core/trunk/src/test/java/org/jboss/cache/util/TestDbPropertiesFactory.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/util/TestDbPropertiesFactory.java 2008-12-12 08:44:51 UTC (rev 7302)
+++ core/trunk/src/test/java/org/jboss/cache/util/TestDbPropertiesFactory.java 2008-12-12 08:47:58 UTC (rev 7303)
@@ -51,7 +51,6 @@
String shutDownConnection = getShutdownUrl(props);
String url = props.getProperty("cache.jdbc.url");
assert url != null;
- System.out.println("shutDownConnection = " + shutDownConnection);
conn = DriverManager.getConnection(shutDownConnection);
st = conn.createStatement();
st.execute("SHUTDOWN");
@@ -79,7 +78,6 @@
String dbName = getDatabaseName(props);
String toDel = TestingUtil.TEST_FILES + File.separator + dbName;
TestingUtil.recursiveFileRemove(toDel);
- System.out.println("Deleted file " + toDel);
}
public static String getDatabaseName(Properties prop)
@@ -99,7 +97,6 @@
//jdbc:derby:jbossdb;create=true
StringTokenizer tokenizer = new StringTokenizer(url,";");
String result = tokenizer.nextToken() + ";" + "shutdown=true";
- System.out.println("result = " + result);
return result;
}
@@ -113,7 +110,6 @@
boolean found = matcher.find();
assert found;
String newJdbcUrl = matcher.replaceFirst(extractTestName() + userIndex.incrementAndGet());
- System.out.println("newJdbcUrl = " + newJdbcUrl);
toReturn.put("cache.jdbc.url", newJdbcUrl);
return toReturn;
}
Modified: core/trunk/src/test/java/org/jboss/cache/util/TestingUtil.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/util/TestingUtil.java 2008-12-12 08:44:51 UTC (rev 7302)
+++ core/trunk/src/test/java/org/jboss/cache/util/TestingUtil.java 2008-12-12 08:47:58 UTC (rev 7303)
@@ -412,7 +412,6 @@
{
if (file.exists())
{
- System.out.println("Deleting file " + file);
recursivedelete(file);
}
}
@@ -427,7 +426,6 @@
recursivedelete(file);
}
}
- //System.out.println("File " + f.toURI() + " deleted = " + f.delete());
f.delete();
}
@@ -480,28 +478,28 @@
{
spi.stop();
} catch (Throwable t) {
- System.out.println(Thread.currentThread().getName() + " !!!!!!!!!!!!!!!!!!!!! WARNING - Cache instance refused to stop.");
+ System.err.println(Thread.currentThread().getName() + " !!!!!!!!!!!!!!!!!!!!! WARNING - Cache instance refused to stop.");
t.printStackTrace();
}
try {
spi.destroy();
} catch (Throwable t) {
- System.out.println(Thread.currentThread().getName() + " !!!!!!!!!!!!!!!!!!!!! WARNING - Cache instance refused to destroy.");
- t.printStackTrace();
+ System.err.println(Thread.currentThread().getName() + " !!!!!!!!!!!!!!!!!!!!! WARNING - Cache instance refused to destroy.");
+ t.printStackTrace();
}
if (channel != null)
{
if (channel.isOpen()) {
- System.out.println(Thread.currentThread().getName() + "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Channel still opened.");
+ System.err.println(Thread.currentThread().getName() + "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Channel still opened.");
Thread.dumpStack();
channel.close();
}
if (channel.isOpen()) {
- System.out.println(Thread.currentThread().getName() + "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Channel close failed.");
+ System.err.println(Thread.currentThread().getName() + "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Channel close failed.");
System.exit(-1);
}
if (channel.isConnected()) {
- System.out.println(Thread.currentThread().getName() + "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Channel still connected.");
+ System.err.println(Thread.currentThread().getName() + "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Channel still connected.");
Thread.dumpStack();
System.exit(-1);
}
@@ -683,23 +681,12 @@
public static void dumpCacheContents(List caches)
{
- System.out.println("**** START: Cache Contents ****");
int count = 1;
for (Object o : caches)
{
CacheSPI c = (CacheSPI) o;
- if (c == null)
- {
- System.out.println(" ** Cache " + count + " is null!");
- }
- else
- {
- System.out.println(" ** Cache " + count + " is " + c.getLocalAddress());
- System.out.println(" " + CachePrinter.printCacheDetails(c));
- }
count++;
}
- System.out.println("**** END: Cache Contents ****");
}
public static void dumpCacheContents(Cache... caches)
Modified: core/trunk/src/test/java/org/jboss/cache/util/UnitTestTestNGListener.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/util/UnitTestTestNGListener.java 2008-12-12 08:44:51 UTC (rev 7302)
+++ core/trunk/src/test/java/org/jboss/cache/util/UnitTestTestNGListener.java 2008-12-12 08:47:58 UTC (rev 7303)
@@ -29,13 +29,11 @@
private int skipped = 0;
public void onTestStart(ITestResult res) {
- System.out.println(getThreadId() + " Starting test " + getTestDesc(res));
-
+
/*
IClass testClass = threadTestClass.get();
if ((testClass != null) && (! res.getTestClass().equals(testClass))) {
- System.out.println(getThreadId() + " New test class" + res.getTestClass() + ", was " + testClass);
// the thread has started testing a new test class
@@ -43,10 +41,10 @@
boolean cleaned = new UnitTestCacheFactory().cleanUp();
if (cleaned) {
// previous test left a cache
- System.out.println(getThreadId() +" WARNING !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
- System.out.println(getThreadId() +" A test method in " + testClass.getName() + " did not clean all cache instances properly.");
- System.out.println(getThreadId() +" Use UnitTestCacheFactory.cleanUp() or TestngUtil.killCaches(...) ");
- System.out.println(getThreadId() +" WARNING !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+ 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 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
}
}
*/
Modified: core/trunk/src/test/java/org/jboss/cache/util/concurrent/locks/OwnableReentrantLockTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/util/concurrent/locks/OwnableReentrantLockTest.java 2008-12-12 08:44:51 UTC (rev 7302)
+++ core/trunk/src/test/java/org/jboss/cache/util/concurrent/locks/OwnableReentrantLockTest.java 2008-12-12 08:47:58 UTC (rev 7303)
@@ -348,9 +348,7 @@
{
final InvocationContextContainer icc = getInvocationContextContainer();
final OwnableReentrantLock lock = new OwnableReentrantLock(icc);
- System.out.println(lock.toString());
lock.lockInterruptibly();
- System.out.println(lock.toString());
try
{
Modified: core/trunk/src/test/java/org/jboss/cache/util/internals/EvictionWatcher.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/util/internals/EvictionWatcher.java 2008-12-12 08:44:51 UTC (rev 7302)
+++ core/trunk/src/test/java/org/jboss/cache/util/internals/EvictionWatcher.java 2008-12-12 08:47:58 UTC (rev 7303)
@@ -51,8 +51,6 @@
fqnsToWaitFor.remove(ee.getFqn());
latch.countDown();
}
-
- if (ee.isPre()) System.out.println("Saw " + ee.getFqn() + " was expecting? " + xpect);
}
/**
Modified: core/trunk/src/test/java/org/jboss/cache/util/internals/ReplicationQueueNotifier.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/util/internals/ReplicationQueueNotifier.java 2008-12-12 08:44:51 UTC (rev 7302)
+++ core/trunk/src/test/java/org/jboss/cache/util/internals/ReplicationQueueNotifier.java 2008-12-12 08:47:58 UTC (rev 7303)
@@ -48,7 +48,6 @@
{
ReplicationQueue original = (ReplicationQueue) TestingUtil.extractField(BaseRpcInterceptor.class, interceptor, "replicationQueue");
TestingUtil.replaceField(new ReplicationQueueDelegate(original),"replicationQueue", interceptor, BaseRpcInterceptor.class);
- log("replaced replicationQueue in " + interceptor.getClass());
}
}
@@ -64,7 +63,6 @@
throw new RuntimeException(e);
}
}
- log("returning from waitUntillAllReplicated call");
}
private class ReplicationQueueDelegate extends ReplicationQueue
@@ -79,7 +77,6 @@
@Override
public void flush()
{
- log("Flush invoked!");
original.flush();
synchronized (replicated)
{
@@ -87,9 +84,4 @@
}
}
}
-
- private void log(String str)
- {
- System.out.println("ReplicationQueueNotifier >>> " + str);
- }
}
Modified: core/trunk/src/test/java/org/jboss/cache/util/internals/replicationlisteners/OptimisticReplicationListener.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/util/internals/replicationlisteners/OptimisticReplicationListener.java 2008-12-12 08:44:51 UTC (rev 7302)
+++ core/trunk/src/test/java/org/jboss/cache/util/internals/replicationlisteners/OptimisticReplicationListener.java 2008-12-12 08:47:58 UTC (rev 7303)
@@ -51,7 +51,6 @@
protected void postReplicateExecution(ReplicateCommand realOne)
{
- int initialExpectations = expectedCommands.size();
List<ReplicableCommand> mods = getAllModifications(realOne);
for (Iterator<Class<? extends ReplicableCommand>> typeIt = expectedCommands.iterator(); typeIt.hasNext();)
{
@@ -67,8 +66,6 @@
}
}
}
- int remainingExpectations = expectedCommands.size();
- System.out.println("Processed command: " + realOne + ". " + (initialExpectations - remainingExpectations) + " identified, remaining " + remainingExpectations);
}
private List<ReplicableCommand> getAllModifications(ReplicateCommand realOne)
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 2008-12-12 08:44:51 UTC (rev 7302)
+++ core/trunk/src/test/java/org/jboss/cache/util/internals/replicationlisteners/ReplicationListener.java 2008-12-12 08:47:58 UTC (rev 7303)
@@ -154,7 +154,6 @@
private Object process(Object result)
{
- System.out.println(localAddress + " >>>> " + result );
boolean isReplicate = result instanceof ReplicateCommand;
boolean isRemote = result != null && isRemoteCommand(result.getClass());
if ((isReplicate || isRemote) && (expectedCommands != null))
@@ -234,7 +233,6 @@
protected void postReplicateExecution(ReplicateCommand realOne)
{
- System.out.println("Processed command: " + realOne + "; expecting " + expectedCommands.size() + " commands");
Iterator<Class<? extends ReplicableCommand>> it = expectedCommands.iterator();
while (it.hasNext())
{
@@ -251,7 +249,6 @@
}
}
}
- System.out.println("After process expecing : " + expectedCommands.size() + " commands");
}
/**
15 years, 4 months
- 1
- 0
JBoss Cache SVN: r7302 - core/trunk/src/test/java/org/jboss/cache/statetransfer.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-12-12 03:44:51 -0500 (Fri, 12 Dec 2008)
New Revision: 7302
Modified:
core/trunk/src/test/java/org/jboss/cache/statetransfer/ForcedStateTransferTest.java
core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferConcurrencyTest.java
core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferTestBase.java
Log:
removed System.out.print
Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/ForcedStateTransferTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/statetransfer/ForcedStateTransferTest.java 2008-12-12 08:44:07 UTC (rev 7301)
+++ core/trunk/src/test/java/org/jboss/cache/statetransfer/ForcedStateTransferTest.java 2008-12-12 08:44:51 UTC (rev 7302)
@@ -217,7 +217,6 @@
if (!alreadyHung && toHang.equals(fqn))
{
asleep = true;
- //System.out.println("Hanging thread changing node " + fqn);
alreadyHung = true;
TestingUtil.sleepThread((long) 30000);
done = true;
Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferConcurrencyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferConcurrencyTest.java 2008-12-12 08:44:07 UTC (rev 7301)
+++ core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferConcurrencyTest.java 2008-12-12 08:44:51 UTC (rev 7302)
@@ -146,7 +146,6 @@
Fqn fqn = Fqn.fromRelativeElements(A_B, names[j]);
assertEquals("Incorrect value for " + fqn + " on activator " + names[i],
"VALUE", activators[i].getCacheValue(fqn));
- // System.out.println(names[i] + ":" + fqn + " = " + activators[i].getCacheValue(fqn));
}
}
}
@@ -391,7 +390,6 @@
Region r = cacheA.getRegion(Fqn.fromString("/" + names[i]), true);
r.registerContextClassLoader(getClass().getClassLoader());
r.deactivate();
- System.out.println("Run " + x + "-- /" + names[i] + " deactivated on A");
stressors[i].startPuts();
}
@@ -405,10 +403,8 @@
// Activate cacheA
for (CacheStressor stressor : stressors)
{
- System.out.println("Activating /" + stressor.getName() + " on A");
cacheA.getRegion(Fqn.fromString("/" + stressor.getName()), true).activate();
stressor.stopPuts();
- System.out.println("Run " + x + "-- /" + stressor.getName() + " activated on A");
// Reacquire one semaphore ticket
boolean acquired = semaphore.tryAcquire(60, TimeUnit.SECONDS);
if (!acquired)
@@ -493,7 +489,6 @@
int events = nodeEventQueueSize;
while (events > 0)
{
- System.out.println(++i + ") Queue contains : " + region.getEvictionEventQueue().poll(0, TimeUnit.MILLISECONDS));
events = region.getEvictionEventQueue().size();
}
boolean mvcc = cache2.getConfiguration().getNodeLockingScheme() == NodeLockingScheme.MVCC;
@@ -593,7 +588,6 @@
int dataCount = children.size();
if (dataCount < maxCountData)
{
- System.out.println("data " + dataCount + " < " + maxCountData + " elapsed = " + (System.currentTimeMillis() - start));
sawDataDecrease = true;
}
else
@@ -609,7 +603,6 @@
int baseCount = children.size();
if (baseCount < maxCountBase)
{
- System.out.println("base " + baseCount + " < " + maxCountBase + " elapsed = " + (System.currentTimeMillis() - start));
sawBaseDecrease = true;
}
else
@@ -643,14 +636,12 @@
children = parent.getChildren();
if (children != null)
{
- System.out.println(children.size());
assertTrue("Excess children evicted", children.size() <= 5);
}
parent = cache2.getRoot().getChild(Fqn.fromString("/org/jboss/data"));
children = parent.getChildren();
if (children != null)
{
- System.out.println(children.size());
assertTrue("Excess children evicted", children.size() <= 25000);
}
@@ -686,10 +677,8 @@
@SuppressWarnings("unchecked")
void useCache() throws Exception
{
- System.out.println("---- Cache" + name + " = " + cache.getLocalAddress() + " being used");
TestingUtil.sleepRandom(5000);
createAndActivateRegion(cache, A_B);
- System.out.println(name + " activated region" + " " + System.currentTimeMillis());
Fqn childFqn = Fqn.fromRelativeElements(A_B, name);
cache.put(childFqn, "KEY", "VALUE");
}
@@ -782,8 +771,6 @@
i++;
}
- System.out.println(name + ": last put [#" + i + "] -- " + fqn + " = " + (factor / SUBTREE_SIZE));
-
semaphore.release();
// Go to sleep until directed otherwise
Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferTestBase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferTestBase.java 2008-12-12 08:44:07 UTC (rev 7301)
+++ core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferTestBase.java 2008-12-12 08:44:51 UTC (rev 7302)
@@ -332,8 +332,6 @@
{
Map<String, Cache> caches = cachesTL.get();
- System.out.println("*** in tearDown()");
-
// Restore the TCL in case a test changed it
Thread.currentThread().setContextClassLoader(orig_TCL_TL.get());
@@ -371,7 +369,6 @@
}
catch (Exception e)
{
- System.out.println("Exception stopping cache " + e.getMessage());
e.printStackTrace(System.out);
}
}
@@ -471,14 +468,12 @@
{
throw new Exception(name + " cannot acquire semaphore");
}
- //System.out.println(name + " acquired semaphore");
useCache();
}
catch (Exception e)
{
- System.out.println(name + ": " + e.getLocalizedMessage());
e.printStackTrace(System.out);
// Save it for the test to check
15 years, 4 months
- 1
- 0
JBoss Cache SVN: r7301 - core/trunk/src/test/java/org/jboss/cache/replicated.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-12-12 03:44:07 -0500 (Fri, 12 Dec 2008)
New Revision: 7301
Modified:
core/trunk/src/test/java/org/jboss/cache/replicated/AsyncReplTest.java
core/trunk/src/test/java/org/jboss/cache/replicated/PessimisticSyncReplTxTest.java
core/trunk/src/test/java/org/jboss/cache/replicated/ReplicationExceptionTest.java
core/trunk/src/test/java/org/jboss/cache/replicated/SyncCacheListenerTest.java
core/trunk/src/test/java/org/jboss/cache/replicated/SyncReplTest.java
Log:
removed System.out.print
Modified: core/trunk/src/test/java/org/jboss/cache/replicated/AsyncReplTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/replicated/AsyncReplTest.java 2008-12-12 08:43:28 UTC (rev 7300)
+++ core/trunk/src/test/java/org/jboss/cache/replicated/AsyncReplTest.java 2008-12-12 08:44:07 UTC (rev 7301)
@@ -46,11 +46,9 @@
{
AsyncReplTestTL tl = new AsyncReplTestTL();
threadLocal.set(tl);
- log("creating cache1");
tl.cache1 = createCache("CacheGroup");
tl.replListener1 = ReplicationListener.getReplicationListener(tl.cache1);
- log("creating cache2");
tl.cache2 = createCache("CacheGroup");
tl.replListener2 = ReplicationListener.getReplicationListener(tl.cache2);
}
@@ -199,7 +197,6 @@
{
cache1.put("a/b/c", "age", 38);
cache4 = createCache("CacheGroup");
- System.out.println("" + cache4.getMembers());
assertEquals(3, cache4.getMembers().size());// cache1, cache2 and cache4
assertEquals("\"age\" should be 38", 38, cache4.get("/a/b/c", "age"));
}
@@ -211,7 +208,6 @@
{
if (cache4 != null)
{
- System.out.println("cache4's view: " + cache4.getMembers());
cache4.stop();
}
}
@@ -232,7 +228,6 @@
// value on cache2 may be 38 or not yet replicated
age = (Integer) cache2.get("/a/b/c", "age");
- log("attr \"age\" of \"/a/b/c\" on cache2=" + age);
assertTrue("should be either null or 38", age == null || age == 38);
}
catch (Exception e)
@@ -259,7 +254,6 @@
// value on cache2 may be 38 or not yet replicated
age = (Integer) cache2.get("/a/b/c", "age");
- log("attr \"age\" of \"/a/b/c\" on cache2=" + age);
assertTrue("should be either null or 38", age == null || age == 38);
}
catch (Exception e)
@@ -267,9 +261,4 @@
fail(e.toString());
}
}
-
- private void log(String msg)
- {
- System.out.println("-- [" + Thread.currentThread() + "]: " + msg);
- }
}
Modified: core/trunk/src/test/java/org/jboss/cache/replicated/PessimisticSyncReplTxTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/replicated/PessimisticSyncReplTxTest.java 2008-12-12 08:43:28 UTC (rev 7300)
+++ core/trunk/src/test/java/org/jboss/cache/replicated/PessimisticSyncReplTxTest.java 2008-12-12 08:44:07 UTC (rev 7301)
@@ -204,7 +204,6 @@
tm = beginTransaction();
cache1.put(NODE1, "age", 38);
- System.out.println("TransactionTable for cache1 after cache1.put():\n" + cache1.getTransactionTable().toString(true));
tm.commit();
/*
@@ -212,7 +211,6 @@
cache1.put(NODE1, "age", new Integer(38));
cache1.put(NODE2, "name", "Ben of The Far East");
cache1.put(NODE3, "key", "UnknowKey");
- System.out.println("TransactionTable for cache1 after cache1.put():\n" + cache1.getTransactionTable().toString(true));
tx.commit();
*/
@@ -224,7 +222,6 @@
cache1.put(NODE2, "AOPInstance", new AOPInstance());
cache1.put(NODE1, "AOPInstance", new AOPInstance());
tx.commit();
- System.out.println("TransactionTable for cache1 after cache1.put():\n" + cache1.getTransactionTable().toString(true));
*/
}
@@ -245,14 +242,9 @@
tm = beginTransaction();
cache1.put(NODE1, "age", 38);
- System.out.println("TransactionTable for cache1 after cache1.put():\n" + cache1.getTransactionTable().toString(true));
cache2.put(NODE2, "age", 39);
- System.out.println("TransactionTable for cache2 after cache2.put():\n" + cache2.getTransactionTable().toString(true));
- System.out.println("cache1 before commit:\n" + CachePrinter.printCacheLockingInfo(cache1));
- System.out.println("cache2 before commit:\n" + CachePrinter.printCacheLockingInfo(cache2));
-
try
{
tm.commit();
@@ -263,9 +255,6 @@
//should be a classic deadlock here.
}
- System.out.println("cache1 after commit:\n" + CachePrinter.printCacheLockingInfo(cache1));
- System.out.println("cache2 after commit:\n" + CachePrinter.printCacheLockingInfo(cache2));
-
/*
assertTrue(cache1.exists(NODE1));
assertTrue(cache1.exists(NODE2));
@@ -291,8 +280,6 @@
assertEquals(0, cache1.getNumberOfLocksHeld());
assertEquals(0, cache2.getNumberOfLocksHeld());
- System.out.println("TransactionTable for cache1:\n" + cache1.getTransactionTable().toString(true));
- System.out.println("TransactionTable for cache2:\n" + cache2.getTransactionTable().toString(true));
}
public void testSyncReplWithModficationsOnBothCachesSameData() throws Exception
@@ -302,14 +289,9 @@
initCaches(Configuration.CacheMode.REPL_SYNC);
tm = beginTransaction();
cache1.put(NODE, "age", 38);
- System.out.println("TransactionTable for cache1 after cache1.put():\n" + cache1.getTransactionTable().toString(true));
cache2.put(NODE, "age", 39);
- System.out.println("TransactionTable for cache2 after cache2.put():\n" + cache2.getTransactionTable().toString(true));
- System.out.println("cache1 before commit:\n" + CachePrinter.printCacheLockingInfo(cache1));
- System.out.println("cache2 before commit:\n" + CachePrinter.printCacheLockingInfo(cache2));
-
try
{
tm.commit();
@@ -317,12 +299,8 @@
}
catch (RollbackException rollback)
{
- System.out.println("Transaction was rolled back, this is correct");
}
- System.out.println("cache1 after commit:\n" + CachePrinter.printCacheLockingInfo(cache1));
- System.out.println("cache2 after commit:\n" + CachePrinter.printCacheLockingInfo(cache2));
-
assertEquals(0, cache1.getNumberOfLocksHeld());
assertEquals(0, cache2.getNumberOfLocksHeld());
@@ -345,9 +323,6 @@
cache1.put(fqn1, "age", 38);
cache2.put(fqn2, "age", 39);
- System.out.println("cache1 (before commit):\n" + CachePrinter.printCacheLockingInfo(cache1));
- System.out.println("cache2 (before commit):\n" + CachePrinter.printCacheLockingInfo(cache2));
-
// this will rollback the transaction
Transaction tx = tm.getTransaction();
tx.registerSynchronization(new TransactionAborter(tx));
@@ -359,12 +334,8 @@
}
catch (RollbackException rollback)
{
- System.out.println("Transaction was rolled back, this is correct");
}
- System.out.println("cache1 (after rollback):\n" + CachePrinter.printCacheLockingInfo(cache1));
- System.out.println("cache2 (after rollback):\n" + CachePrinter.printCacheLockingInfo(cache2));
-
assertEquals(0, cache1.getNumberOfLocksHeld());
assertEquals(0, cache2.getNumberOfLocksHeld());
@@ -394,9 +365,6 @@
tm = beginTransaction();
cache1.put(NODE1, "age", 38);
- System.out.println("cache1 (before commit):\n" + CachePrinter.printCacheLockingInfo(cache1));
- System.out.println("cache2 (before commit):\n" + CachePrinter.printCacheLockingInfo(cache2));
-
// instead of a listener lets just get a WL on ROOT on cache2. And hold on to it.
Transaction tx = tm.suspend();
@@ -404,7 +372,6 @@
cache2.getRoot().put("x", "y");
Transaction tx2 = cache2.getTransactionManager().suspend();
- System.out.println("cache2 (before commit):\n" + CachePrinter.printCacheLockingInfo(cache2));
tm.resume(tx);
try
@@ -414,7 +381,6 @@
}
catch (RollbackException rollback)
{
- System.out.println("Transaction was rolled back, this is correct");
}
finally
{
@@ -425,9 +391,6 @@
// Sleep, as the commit call to cache2 is async
TestingUtil.sleepThread(1000);
- System.out.println("cache1 (after rollback):\n" + CachePrinter.printCacheLockingInfo(cache1));
- System.out.println("cache2 (after rollback):\n" + CachePrinter.printCacheLockingInfo(cache2));
-
//assertNull(tal.getCallbackException());
assertEquals(0, cache1.getNumberOfLocksHeld());
@@ -512,8 +475,6 @@
cache1.put("/bela/ban", "name", "Bela Ban");
TestingUtil.sleepThread(2000);// Thread2 will be blocked until we commit
tm.commit();
- System.out.println("[Thread1] ** LOCK INFO cache1: " + CachePrinter.printCacheLockingInfo(cache1));
- System.out.println("[Thread1] ** LOCK INFO cache2: " + CachePrinter.printCacheLockingInfo(cache2));
}
catch (Throwable ex)
{
@@ -533,14 +494,8 @@
{
TestingUtil.sleepThread(1000);// give Thread1 time to acquire the lock
tm = beginTransaction();
- System.out.println("[Thread2] ** LOCK INFO cache1: " + CachePrinter.printCacheLockingInfo(cache1));
- System.out.println("[Thread2] ** LOCK INFO cache2: " + CachePrinter.printCacheLockingInfo(cache2));
cache1.put("/bela/ban", "name", "Michelle Ban");
- System.out.println("[Thread2] ** LOCK INFO cache1: " + CachePrinter.printCacheLockingInfo(cache1));
- System.out.println("[Thread2] ** LOCK INFO cache2: " + CachePrinter.printCacheLockingInfo(cache2));
tm.commit();
- System.out.println("[Thread2] ** LOCK INFO cache1: " + CachePrinter.printCacheLockingInfo(cache1));
- System.out.println("[Thread2] ** LOCK INFO cache2: " + CachePrinter.printCacheLockingInfo(cache2));
}
catch (Throwable ex)
{
@@ -635,15 +590,11 @@
{
tm = beginTransaction(c1);
c1.put("/thread/" + getName(), null);
- System.out.println("Thread " + getName() + " after put(): " + c1.toString());
- System.out.println("Thread " + getName() + " waiting on mutex");
synchronized (mutex)
{
mutex.wait();
}
- System.out.println("Thread " + getName() + " committing");
tm.commit();
- System.out.println("Thread " + getName() + " committed successfully");
}
catch (Exception e)
{
@@ -672,15 +623,12 @@
for (int i = 0; i < threads.length; i++)
{
MyThread thread = threads[i];
- System.out.println("starting thread #" + i);
thread.start();
}
TestingUtil.sleepThread(6000);
synchronized (myMutex)
{
- System.out.println("cache is " + CachePrinter.printCacheLockingInfo(c1));
- System.out.println("******************* SIGNALLING THREADS ********************");
myMutex.notifyAll();
}
@@ -689,7 +637,6 @@
try
{
thread.join();
- System.out.println("Joined thread " + thread.getName());
}
catch (InterruptedException e)
{
@@ -697,7 +644,6 @@
}
}
- System.out.println("FINAL c1:\n" + CachePrinter.printCacheDetails(c1) + "\nlocks:\n" + CachePrinter.printCacheLockingInfo(c1));
assertEquals(0, c1.getNumberOfLocksHeld());
assertEquals(0, c2.getNumberOfLocksHeld());
@@ -764,7 +710,6 @@
}
catch (RollbackException rollback_ex)
{
- System.out.println("received rollback exception as expected");
}
catch (Throwable ex)
{
@@ -805,21 +750,15 @@
try
{
lock.acquire();
- System.out.println("-- t1 has lock");
c1.put("/a/b/c", "age", 38);
- System.out.println("[Thread1] set value to 38");
- System.out.println("-- t1 releases lock");
lock.release();
TestingUtil.sleepThread(300);
Thread.yield();
lock.acquire();
- System.out.println("-- t1 has lock");
c1.put("/a/b/c", "age", 39);
- System.out.println("[Thread1] set value to 39");
- System.out.println("-- t1 releases lock");
lock.release();
assertEquals(39, c1.get("/a/b/c", "age"));
}
@@ -844,20 +783,15 @@
TestingUtil.sleepThread(100);
Thread.yield();
lock.acquire();
- System.out.println("-- t2 has lock");
// Should replicate the value right away.
Integer val = (Integer) cache2.get("/a/b/c", "age");
- System.out.println("[Thread2] value is " + val);
assertEquals(new Integer(38), val);
- System.out.println("-- t2 releases lock");
lock.release();
TestingUtil.sleepThread(300);
Thread.yield();
TestingUtil.sleepThread(500);
lock.acquire();
- System.out.println("-- t2 has lock");
val = (Integer) cache2.get("/a/b/c", "age");
- System.out.println("-- t2 releases lock");
lock.release();
assertEquals(new Integer(39), val);
}
@@ -963,7 +897,6 @@
}
catch (RollbackException ex)
{
- System.out.println("[Thread1] received RollbackException, as expected. Rolling back changes");
} finally
{
threadOneSecondPart.release();
Modified: core/trunk/src/test/java/org/jboss/cache/replicated/ReplicationExceptionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/replicated/ReplicationExceptionTest.java 2008-12-12 08:43:28 UTC (rev 7300)
+++ core/trunk/src/test/java/org/jboss/cache/replicated/ReplicationExceptionTest.java 2008-12-12 08:44:07 UTC (rev 7301)
@@ -120,12 +120,8 @@
catch (RuntimeException runtime)
{
Throwable t = runtime.getCause();
- if (t instanceof NotSerializableException)
+ if (! (t instanceof NotSerializableException))
{
- System.out.println("received NotSerializableException - as expected");
- }
- else
- {
throw runtime;
}
}
@@ -148,7 +144,6 @@
}
catch (RollbackException rollback)
{
- System.out.println("received RollbackException - as expected");
}
catch (Exception e)
{
Modified: core/trunk/src/test/java/org/jboss/cache/replicated/SyncCacheListenerTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/replicated/SyncCacheListenerTest.java 2008-12-12 08:43:28 UTC (rev 7300)
+++ core/trunk/src/test/java/org/jboss/cache/replicated/SyncCacheListenerTest.java 2008-12-12 08:44:07 UTC (rev 7301)
@@ -49,19 +49,16 @@
@BeforeMethod(alwaysRun = true)
public void setUp() throws Exception
{
- System.out.println("*** starting setUp()");
//old_factory = System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
System.setProperty(Context.INITIAL_CONTEXT_FACTORY, FACTORY);
initCaches();
- System.out.println("*** finished setUp()");
}
@AfterMethod(alwaysRun = true)
public void tearDown() throws Exception
{
- System.out.println("*** starting tearDown()");
- // We just can't kill DummyTransactionManager. We are sharing single instance in more tests.
+ // We just can't kill DummyTransactionManager. We are sharing single instance in more tests.
TestingUtil.killTransaction(DummyTransactionManager.getInstance());
destroyCaches();
/*
@@ -71,7 +68,6 @@
old_factory = null;
}
*/
- System.out.println("*** finished tearDown()");
}
private void initCaches()
@@ -247,7 +243,6 @@
@NodeModified
public void callback(NodeEvent e)
{
- System.out.println("Callback got event " + e);
log_.debug("Callback got event " + e);
assertFalse("node was removed on remote cache so isLocal should be false", e.isOriginLocal());
}
Modified: core/trunk/src/test/java/org/jboss/cache/replicated/SyncReplTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/replicated/SyncReplTest.java 2008-12-12 08:43:28 UTC (rev 7300)
+++ core/trunk/src/test/java/org/jboss/cache/replicated/SyncReplTest.java 2008-12-12 08:44:07 UTC (rev 7301)
@@ -32,13 +32,11 @@
@BeforeMethod(alwaysRun = true)
public void setUp()
{
- System.out.println("*** In setUp()");
Cache<Object, Object>[] caches = new Cache[2];
caches[0] = new UnitTestCacheFactory<Object, Object>().createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), getClass());
caches[1] = new UnitTestCacheFactory<Object, Object>().createCache(UnitTestCacheConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), getClass());
cachesTL.set(caches);
TestingUtil.blockUntilViewsReceived(caches, 5000);
- System.out.println("*** Finished setUp()");
}
@AfterMethod(alwaysRun = true)
15 years, 4 months
- 1
- 0
JBoss Cache SVN: r7300 - core/trunk/src/test/java/org/jboss/cache/options.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-12-12 03:43:28 -0500 (Fri, 12 Dec 2008)
New Revision: 7300
Modified:
core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsReplTest.java
Log:
removed System.out.print
Modified: core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsReplTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsReplTest.java 2008-12-12 08:43:17 UTC (rev 7299)
+++ core/trunk/src/test/java/org/jboss/cache/options/ExplicitVersionsReplTest.java 2008-12-12 08:43:28 UTC (rev 7300)
@@ -96,8 +96,6 @@
mgr.begin();
// don't explicitly set a data version.
- System.out.println("************ stage 2");
-
// force an IC scrub
//cache[1].getInvocationContext().setOptionOverrides(null);
cache[1].put(fqn, key, "value2");
15 years, 4 months
- 1
- 0