[jbosscache-commits] JBoss Cache SVN: r7289 - in core/trunk/src/test/java/org/jboss/cache/eviction: minttl and 1 other directory.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Fri Dec 12 03:38:03 EST 2008
Author: mircea.markus
Date: 2008-12-12 03:38:03 -0500 (Fri, 12 Dec 2008)
New Revision: 7289
Modified:
core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeAlgorithmTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizePolicyTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeQueueTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/EvictionQueueListTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/ExpirationPolicyTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/FIFOPolicyTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/FIFOQueueTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/LFUAlgorithmTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/LFUPolicyTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/LRUAlgorithmTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/LRUPolicyTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/MRUPolicyTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/OptimisticEvictionTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/ProgrammaticLRUPolicyTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/RegionTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/ReplicatedLRUPolicyTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/minttl/FIFOMinTTLTest.java
Log:
removed System.out.print
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeAlgorithmTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeAlgorithmTest.java 2008-12-12 08:37:13 UTC (rev 7288)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeAlgorithmTest.java 2008-12-12 08:38:03 UTC (rev 7289)
@@ -56,8 +56,6 @@
int count = 6;
for (NodeEntry ne : queue)
{
- System.out.println(ne);
-
if (count > 0)
{
assertEquals(count, ne.getNumberOfElements());
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizePolicyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizePolicyTest.java 2008-12-12 08:37:13 UTC (rev 7288)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizePolicyTest.java 2008-12-12 08:38:03 UTC (rev 7289)
@@ -92,18 +92,15 @@
}
}
- System.out.println(cache);
EvictionController evController = new EvictionController(cache);
evController.startEviction();
TestingUtil.sleepThread(200); // small grace period
- System.out.println(cache);
for (int i = 0; i < 10; i++)
{
String f = "/org/jboss/test/data/" + i;
Node node = cache.getNode(f);
- System.out.println("Node for " + f + " is " + node);
if (i % 2 == 0)
{
if (i < 6)
@@ -148,7 +145,6 @@
String str = rootStr + Integer.toString(i);
Fqn fqn = Fqn.fromString(str);
Node node = cache.getNode(fqn);
- System.out.println(i + " " + node);
if (i > 9)
{
assertNull("Testing at " + i, node);
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeQueueTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeQueueTest.java 2008-12-12 08:37:13 UTC (rev 7288)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeQueueTest.java 2008-12-12 08:38:03 UTC (rev 7289)
@@ -68,7 +68,6 @@
k = 0;
for (NodeEntry ne : queue)
{
- System.out.println(ne.toString());
// the first 250 elements should have (250 - 1 - n) * 2 elements. The rest should have 0 elements.
int expectedElements = 0;
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/EvictionQueueListTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/EvictionQueueListTest.java 2008-12-12 08:37:13 UTC (rev 7288)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/EvictionQueueListTest.java 2008-12-12 08:38:03 UTC (rev 7289)
@@ -250,27 +250,4 @@
assertEquals(0, list.size());
}
-/*
- public void testSort() throws Exception
- {
- Comparator lfuComp = new LFUComparator();
- // this will create a reverse sorted list. LFUComparator will sort items from lowest node visits to highest
- // node visits.
- for(int i = 0, j = 9; i < 10; i++, j--)
- {
- NodeEntry ne = new NodeEntry("/" + Integer.toString(i));
- ne.setNumberOfNodeVisits(j);
- list.addToBottom(new EvictionListEntry(ne));
- }
-
- list.sort(lfuComp);
-
- EvictionListEntry entries[] = list.toArray();
-
- for(int i = 0; i < 10; i++)
- {
- System.out.println(entries[i].node);
- assertEquals(i, entries[i].node.getNumberOfNodeVisits());
- }
- } */
}
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ExpirationPolicyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/ExpirationPolicyTest.java 2008-12-12 08:37:13 UTC (rev 7288)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/ExpirationPolicyTest.java 2008-12-12 08:38:03 UTC (rev 7289)
@@ -59,8 +59,6 @@
future = System.currentTimeMillis() + 500;
past = System.currentTimeMillis() - 200;
-
- System.out.println(eAC);
}
@AfterMethod(alwaysRun = true)
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/FIFOPolicyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/FIFOPolicyTest.java 2008-12-12 08:37:13 UTC (rev 7288)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/FIFOPolicyTest.java 2008-12-12 08:38:03 UTC (rev 7289)
@@ -47,7 +47,6 @@
{
initCaches();
wakeupIntervalMillis = cache.getConfiguration().getEvictionConfig().getWakeupInterval();
- log("wakeupInterval is " + wakeupIntervalMillis);
if (wakeupIntervalMillis < 0)
{
fail("testEviction(): eviction thread wake up interval is illegal " + wakeupIntervalMillis);
@@ -320,7 +319,6 @@
{
fail("Exception generated in put() " + t1_ex);
}
- log("nodes/locks: " + cache.getNumberOfNodes() + "/" + cache.getNumberOfLocksHeld());
TestingUtil.sleepThread(1000);
if (counter > 5)
{// run for 5 seconds
@@ -331,10 +329,4 @@
for (MyPutter p : putters) p.join();
}
-
- void log(String msg)
- {
- System.out.println("-- " + msg);
- }
-
}
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/FIFOQueueTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/FIFOQueueTest.java 2008-12-12 08:37:13 UTC (rev 7288)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/FIFOQueueTest.java 2008-12-12 08:38:03 UTC (rev 7289)
@@ -115,8 +115,6 @@
{
queue.addNodeEntry(new NodeEntry("/test/" + Integer.toString(i)));
}
- System.out.println("Took " + (System.currentTimeMillis() - begin) + "ms to add " + CAPACITY + " entries to queue");
-
assertEquals(CAPACITY, queue.getNumberOfNodes());
begin = System.currentTimeMillis();
@@ -126,8 +124,6 @@
queue.removeNodeEntry(new NodeEntry("/test/" + Integer.toString(i)));
}
- System.out.println("Took " + (System.currentTimeMillis() - begin) + "ms to remove " + CAPACITY + " entries to queue");
-
assertEquals(0, queue.getNumberOfNodes());
begin = System.currentTimeMillis();
@@ -135,8 +131,6 @@
{
queue.addNodeEntry(new NodeEntry("/test/" + Integer.toString(i)));
}
- System.out.println("Took " + (System.currentTimeMillis() - begin) + "ms to readd " + CAPACITY + " entries to queue");
-
assertEquals(CAPACITY, queue.getNumberOfNodes());
NodeEntry ne;
begin = System.currentTimeMillis();
@@ -146,9 +140,6 @@
queue.removeNodeEntry(ne);
}
- System.out.println("Took " + (System.currentTimeMillis() - begin) + "ms to iterate via getFirstNodeEntry() and remove (pop from top of queue) " +
- CAPACITY + " entries from queue");
-
assertEquals(0, queue.getNumberOfNodes());
}
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/LFUAlgorithmTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/LFUAlgorithmTest.java 2008-12-12 08:37:13 UTC (rev 7288)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/LFUAlgorithmTest.java 2008-12-12 08:38:03 UTC (rev 7289)
@@ -184,7 +184,6 @@
for (NodeEntry ne : queue)
{
- System.out.println("Fqn: " + ne.getFqn() + " NodeVisits: " + ne.getNumberOfNodeVisits());
assertEquals(1, ne.getNumberOfNodeVisits());
}
@@ -214,14 +213,10 @@
region.registerEvictionEvent(fqn10, VISIT_NODE_EVENT);
algo.process(region.getEvictionEventQueue());
- System.out.println();
- System.out.println();
-
int count = 0;
for (NodeEntry ne : queue)
{
count++;
- System.out.println("Fqn: " + ne.getFqn() + " NodeVisits: " + ne.getNumberOfNodeVisits());
if (count == 5 || count == 6)
{
assertEquals(2, ne.getNumberOfNodeVisits());
@@ -254,14 +249,11 @@
region.registerEvictionEvent(fqn12, ADD_NODE_EVENT);
algo.process(region.getEvictionEventQueue());
- System.out.println();
- System.out.println();
count = 0;
for (NodeEntry ne : queue)
{
count++;
- System.out.println("Fqn: " + ne.getFqn() + " NodeVisits: " + ne.getNumberOfNodeVisits());
if (count == 7 || count == 8)
{
assertEquals(2, ne.getNumberOfNodeVisits());
@@ -293,13 +285,10 @@
algo.process(region.getEvictionEventQueue());
- System.out.println();
- System.out.println();
count = 0;
for (NodeEntry ne : queue)
{
count++;
- System.out.println("Fqn: " + ne.getFqn() + " NodeVisits: " + ne.getNumberOfNodeVisits());
if (count == 5 || count == 6)
{
assertEquals(2, ne.getNumberOfNodeVisits());
@@ -338,13 +327,10 @@
algo.process(region.getEvictionEventQueue());
- System.out.println();
- System.out.println();
count = 0;
for (NodeEntry ne : queue)
{
count++;
- System.out.println("Fqn: " + ne.getFqn() + " NodeVisits: " + ne.getNumberOfNodeVisits());
if (count == 5 || count == 6)
{
assertEquals(2, ne.getNumberOfNodeVisits());
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/LFUPolicyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/LFUPolicyTest.java 2008-12-12 08:37:13 UTC (rev 7288)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/LFUPolicyTest.java 2008-12-12 08:38:03 UTC (rev 7289)
@@ -329,7 +329,6 @@
{
fail("Exception generated in put() " + t1_ex);
}
- log("nodes/locks: " + cache.getNumberOfNodes() + "/" + cache.getNumberOfLocksHeld());
TestingUtil.sleepThread(1000);
if (counter > 5)
{// run for 5 seconds
@@ -338,10 +337,4 @@
}
}
}
-
- void log(String msg)
- {
- System.out.println("-- " + msg);
- }
-
}
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/LRUAlgorithmTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/LRUAlgorithmTest.java 2008-12-12 08:37:13 UTC (rev 7288)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/LRUAlgorithmTest.java 2008-12-12 08:38:03 UTC (rev 7289)
@@ -383,9 +383,4 @@
queue.removeNodeEntry(ne);
}
}
-
- void log(String msg)
- {
- System.out.println("-- " + msg);
- }
}
\ No newline at end of file
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/LRUPolicyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/LRUPolicyTest.java 2008-12-12 08:37:13 UTC (rev 7288)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/LRUPolicyTest.java 2008-12-12 08:38:03 UTC (rev 7289)
@@ -61,7 +61,6 @@
cache = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(conf, getClass());
wakeupIntervalMillis = cache.getConfiguration().getEvictionConfig().getWakeupInterval();
- System.out.println("-- wakeupInterval is " + wakeupIntervalMillis);
if (wakeupIntervalMillis < 0)
{
fail("testEviction(): eviction thread wake up interval is illegal " + wakeupIntervalMillis);
@@ -90,7 +89,6 @@
cache.put(fqn, str, str);
}
- System.out.println("-- Marking as in-use");
cache.getRegionManager().getRegion(Fqn.fromString(rootStr + 5), false).markNodeCurrentlyInUse(Fqn.fromString(rootStr + 5), 0);
for (int i = 10; i < 15; i++)
@@ -139,9 +137,7 @@
e.printStackTrace();
}
}
- System.out.println(cache.toString());
TestingUtil.sleepThread(wakeupIntervalMillis + 500);
- System.out.println(cache.toString());
String val = (String) cache.get(rootStr + "3", rootStr + "3");
assertNull("Node should be empty ", val);
}
@@ -150,8 +146,6 @@
{
String rootStr = "/org/jboss/test/data/";
- System.out.println("REGIONS: " + cache.getRegionManager().dumpRegions());
-
final Fqn fqn7 = Fqn.fromString(rootStr + "7");
for (int i = 0; i < 10; i++)
@@ -164,8 +158,6 @@
cache.getNode(fqn7);// just to keep it fresh
}
- System.out.println("Cache: " + CachePrinter.printCacheDetails(cache));
-
Thread retrieverThread = new Thread()
{
@Override
@@ -199,7 +191,6 @@
new EvictionController(cache).startEviction(true);
assert waitForEviction(cache, 30, TimeUnit.SECONDS, Fqn.fromString(rootStr + 7));
val = (String) cache.get(rootStr + "7", rootStr + "7");
- System.out.println("-- val=" + val);
assertNull("Node should be empty ", val);
}
@@ -245,7 +236,6 @@
// Give eviction time to run a few times, then confirm parent
// is completely gone
long period = (wakeupIntervalMillis + testRegionTTLMillis) * 2;
- System.out.println("-- Sleeping for " + period);
TestingUtil.sleepThread(period);
assertFalse("Parent not completely removed", cache.getRoot().hasChild(parent));
}
@@ -310,7 +300,6 @@
{
fail("Exception generated in put() " + t1_ex);
}
- System.out.println("-- nodes/locks: " + cache.getNumberOfNodes() + "/" + cache.getNumberOfLocksHeld());
TestingUtil.sleepThread(1000);
if (counter > 5)
{// run for 5 seconds
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/MRUPolicyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/MRUPolicyTest.java 2008-12-12 08:37:13 UTC (rev 7288)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/MRUPolicyTest.java 2008-12-12 08:38:03 UTC (rev 7289)
@@ -41,7 +41,6 @@
{
initCaches();
wakeupIntervalMillis = cache.getConfiguration().getEvictionConfig().getWakeupInterval();
- log("wakeupInterval is " + wakeupIntervalMillis);
if (wakeupIntervalMillis < 0)
{
fail("testEviction(): eviction thread wake up interval is illegal " + wakeupIntervalMillis);
@@ -173,7 +172,6 @@
{
fail("Exception generated in put() " + t1_ex);
}
- log("nodes/locks: " + cache.getNumberOfNodes() + "/" + cache.getNumberOfLocksHeld());
TestingUtil.sleepThread(1000);
if (counter > 5)
{// run for 5 seconds
@@ -182,9 +180,4 @@
}
}
}
-
- private void log(String s)
- {
- System.out.println(s);
- }
}
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/OptimisticEvictionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/OptimisticEvictionTest.java 2008-12-12 08:37:13 UTC (rev 7288)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/OptimisticEvictionTest.java 2008-12-12 08:38:03 UTC (rev 7289)
@@ -69,7 +69,6 @@
public void testInterceptorChain() throws Exception
{
List interceptors = cache.getInterceptorChain();
- System.out.println(interceptors);
Iterator i = interceptors.iterator();
boolean found = false;
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ProgrammaticLRUPolicyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/ProgrammaticLRUPolicyTest.java 2008-12-12 08:37:13 UTC (rev 7288)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/ProgrammaticLRUPolicyTest.java 2008-12-12 08:38:03 UTC (rev 7289)
@@ -59,7 +59,6 @@
{
initCaches();
wakeupIntervalMillis = cache.getConfiguration().getEvictionConfig().getWakeupInterval();
- log("wakeupInterval is " + wakeupIntervalMillis);
if (wakeupIntervalMillis < 0)
{
fail("testEviction(): eviction thread wake up interval is illegal " + wakeupIntervalMillis);
@@ -116,9 +115,7 @@
String val = (String) cache.get(rootStr + "3", rootStr + "3");
assertNotNull("DataNode should be empty ", val);
- System.out.println(cache.toString());
assert waitForEviction(cache, 30, TimeUnit.SECONDS, Fqn.fromString(rootStr + 3));
- System.out.println(cache.toString());
val = (String) cache.get(rootStr + "3", rootStr + "3");
assertNull("DataNode should be empty ", val);
}
@@ -169,9 +166,7 @@
fail("Failed to get" + e);
}
- System.out.println(cache.toString());
assert waitForEviction(cache, 30, TimeUnit.SECONDS, fqn);
- System.out.println(cache.toString());
try
{
@@ -220,10 +215,8 @@
Integer in = 3;
Fqn fqn = Fqn.fromRelativeElements(rootfqn, in);
- System.out.println(cache.toString());
assert waitForEviction(cache, 30, TimeUnit.SECONDS, fqn);
- System.out.println(cache.toString());
try
{
Object val = cache.get(fqn, in);
@@ -235,10 +228,4 @@
fail("Failed to get" + e);
}
}
-
- private void log(String msg)
- {
- System.out.println("-- " + msg);
- }
-
}
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/RegionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/RegionTest.java 2008-12-12 08:37:13 UTC (rev 7288)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/RegionTest.java 2008-12-12 08:38:03 UTC (rev 7289)
@@ -98,11 +98,6 @@
}
- void log(String msg)
- {
- System.out.println("-- " + msg);
- }
-
EvictionEvent takeLastEvent(RegionImpl r) throws InterruptedException
{
return r.getEvictionEventQueue().poll(0, TimeUnit.MILLISECONDS);
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ReplicatedLRUPolicyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/ReplicatedLRUPolicyTest.java 2008-12-12 08:37:13 UTC (rev 7288)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/ReplicatedLRUPolicyTest.java 2008-12-12 08:38:03 UTC (rev 7289)
@@ -135,11 +135,6 @@
assertNotNull("DataNode should not be null", val);
}
- void log(String msg)
- {
- System.out.println("-- " + msg);
- }
-
@CacheListener
public class EvictionListener
{
@@ -158,7 +153,6 @@
@NodeEvicted
public void nodeEvicted(Event e)
{
- System.out.println(e);
if (e.isPre()) counter++;
}
}
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/minttl/FIFOMinTTLTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/minttl/FIFOMinTTLTest.java 2008-12-12 08:37:13 UTC (rev 7288)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/minttl/FIFOMinTTLTest.java 2008-12-12 08:38:03 UTC (rev 7289)
@@ -61,7 +61,6 @@
while (busyThreadRunning)
{
- System.out.println("Busy thread working... ");
cache.put(fqn2, "k", "v");
TestingUtil.sleepRandom(150);
}
More information about the jbosscache-commits
mailing list