Author: sebb
Date: Thu Apr 3 00:16:40 2014
New Revision: 1584225
URL: http://svn.apache.org/r1584225
Log:
Tidy up
Modified:
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/LRUMapConcurrentTest.java
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/LRUMapConcurrentUnitTest.java
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/SortedPrefArrayUnitTest.java
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/threadpool/ThreadPoolUnitTest.java
Modified:
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/LRUMapConcurrentTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/LRUMapConcurrentTest.java?rev=1584225&r1=1584224&r2=1584225&view=diff
==============================================================================
---
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/LRUMapConcurrentTest.java
(original)
+++
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/LRUMapConcurrentTest.java
Thu Apr 3 00:16:40 2014
@@ -44,16 +44,6 @@ public class LRUMapConcurrentTest
}
/**
- * Description of the Method
- * @param args Description of the Parameter
- */
- public static void main( String args[] )
- {
- String[] testCaseName = { LRUMapConcurrentTest.class.getName() };
- junit.textui.TestRunner.main( testCaseName );
- }
-
- /**
* A unit test suite for JUnit
* @return The test suite
*/
@@ -163,9 +153,9 @@ public class LRUMapConcurrentTest
Iterator<?> it = map.entrySet().iterator();
while ( it.hasNext() )
{
- System.out.println( it.next() );
+ assertNotNull( it.next() );
}
- System.out.println( map.getStatistics() );
+// System.out.println( map.getStatistics() );
// get the max out backwards
for ( int i = total - 1; i >= 0; i-- )
@@ -174,7 +164,7 @@ public class LRUMapConcurrentTest
assertNotNull( "[" + i + ":key] should not be null", res );
}
- System.out.println( map.getStatistics() );
+// System.out.println( map.getStatistics() );
//since we got them backwards the total should be at the end.
// add one confirm that total is gone.
@@ -213,7 +203,7 @@ public class LRUMapConcurrentTest
assertNotNull( "[" + i + ":key] should not be null", res );
}
- System.out.println( map.getStatistics() );
+// System.out.println( map.getStatistics() );
}
Modified:
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/LRUMapConcurrentUnitTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/LRUMapConcurrentUnitTest.java?rev=1584225&r1=1584224&r2=1584225&view=diff
==============================================================================
---
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/LRUMapConcurrentUnitTest.java
(original)
+++
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/LRUMapConcurrentUnitTest.java
Thu Apr 3 00:16:40 2014
@@ -161,9 +161,9 @@ public class LRUMapConcurrentUnitTest
Iterator<?> it = map.entrySet().iterator();
while ( it.hasNext() )
{
- System.out.println( it.next() ); // TODO replace noise with an
assertion
+ assertNotNull( it.next() );
}
- System.out.println( map.getStatistics() ); // TODO replace noise with
an assertion
+// System.out.println( map.getStatistics() );
// get the max out backwards
for ( int i = total - 1; i >= 0; i-- )
@@ -172,7 +172,7 @@ public class LRUMapConcurrentUnitTest
assertNotNull( "[" + i + ":key] should not be null", res );
}
- System.out.println( map.getStatistics() ); // TODO replace noise with
an assertion
+// System.out.println( map.getStatistics() );
//since we got them backwards the total should be at the end.
// add one confirm that total is gone.
Modified:
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/SortedPrefArrayUnitTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/SortedPrefArrayUnitTest.java?rev=1584225&r1=1584224&r2=1584225&view=diff
==============================================================================
---
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/SortedPrefArrayUnitTest.java
(original)
+++
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/SortedPrefArrayUnitTest.java
Thu Apr 3 00:16:40 2014
@@ -394,7 +394,7 @@ public class SortedPrefArrayUnitTest
// DO WORK
Comparable<String> taken = array.takeNearestLargerOrEqual( "04" );
- System.out.println( "testTakeLargerThanGreatest" + array.dumpArray() );
+// System.out.println( "testTakeLargerThanGreatest" + array.dumpArray()
);
assertNull( "We should have nothing since the largest element was
smaller than what we asked for. "
+ " Instead we got " + taken, taken );
Modified:
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/threadpool/ThreadPoolUnitTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/threadpool/ThreadPoolUnitTest.java?rev=1584225&r1=1584224&r2=1584225&view=diff
==============================================================================
---
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/threadpool/ThreadPoolUnitTest.java
(original)
+++
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/threadpool/ThreadPoolUnitTest.java
Thu Apr 3 00:16:40 2014
@@ -59,12 +59,13 @@ public class ThreadPoolUnitTest
pool.execute( new Runnable()
{
+ @Override
public void run()
{
try
{
//System.out.println( cnt );
- System.out.println( "count = " + cnt + " before sleep
current size = " + myPool.getPoolSize() );
+// System.out.println( "count = " + cnt + " before
sleep current size = " + myPool.getPoolSize() );
Thread.sleep( 200 / cnt );
//System.out.println( "count = " + cnt + " after sleep
current size = " + myPool.getPool().getPoolSize() );
}
