[infinispan-commits] Infinispan SVN: r2360 - in branches/4.2.x/core/src/test/java/org/infinispan: distribution and 2 other directories.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2010-09-14 09:26:59 -0400 (Tue, 14 Sep 2010)
New Revision: 2360

Modified:
   branches/4.2.x/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadTest.java
   branches/4.2.x/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java
   branches/4.2.x/core/src/test/java/org/infinispan/distribution/rehash/L1OnRehashTest.java
   branches/4.2.x/core/src/test/java/org/infinispan/distribution/rehash/RehashTestBase.java
   branches/4.2.x/core/src/test/java/org/infinispan/test/fwk/TcpMPingEnvironmentTest.java
   branches/4.2.x/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
Log:
Cleaned up some logging

Modified: branches/4.2.x/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadTest.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadTest.java	2010-09-14 09:01:03 UTC (rev 2359)
+++ branches/4.2.x/core/src/test/java/org/infinispan/api/mvcc/PutForExternalReadTest.java	2010-09-14 13:26:59 UTC (rev 2360)
@@ -256,7 +256,6 @@
       assert tt2.getRemoteTxCount() == 0 : "Cache 2 should have no stale global TXs";
       assert tt2.getLocalTxCount() == 0 : "Cache 2 should have no stale local TXs";
 
-      System.out.println("PutForExternalReadTest.testMemLeakOnSuspendedTransactions");
       replListener2.expectWithTx(PutKeyValueCommand.class);
       tm1.begin();
       cache1.putForExternalRead(key, value);

Modified: branches/4.2.x/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java	2010-09-14 09:01:03 UTC (rev 2359)
+++ branches/4.2.x/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java	2010-09-14 13:26:59 UTC (rev 2360)
@@ -173,8 +173,6 @@
 
 
    protected void initAndTest() {
-      System.out.println("Caches are " + cacheAddresses);
-
       for (Cache<Object, String> c : caches) assert c.isEmpty();
 
       c1.put("k1", "value");

Modified: branches/4.2.x/core/src/test/java/org/infinispan/distribution/rehash/L1OnRehashTest.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/distribution/rehash/L1OnRehashTest.java	2010-09-14 09:01:03 UTC (rev 2359)
+++ branches/4.2.x/core/src/test/java/org/infinispan/distribution/rehash/L1OnRehashTest.java	2010-09-14 13:26:59 UTC (rev 2360)
@@ -69,7 +69,6 @@
    public void testInvalidationBehaviorOnRehash() {
       // start with 2 caches...
       List<MagicKey> keys = init();
-      System.out.println("Old CH positions are " + getConsistentHash(c1));
       // add 1
       performRehashEvent();
       int joinerPos = waitForRehashCompletion();
@@ -81,7 +80,6 @@
       // 3. C1, C2, J
       // for the purpose of CH, 1 == 3.
 
-      System.out.println("New CH positions are " + getConsistentHash(c1));
       // invalidations happen asynchronously!  :(
       TestingUtil.sleepThread(2000);
 

Modified: branches/4.2.x/core/src/test/java/org/infinispan/distribution/rehash/RehashTestBase.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/distribution/rehash/RehashTestBase.java	2010-09-14 09:01:03 UTC (rev 2359)
+++ branches/4.2.x/core/src/test/java/org/infinispan/distribution/rehash/RehashTestBase.java	2010-09-14 13:26:59 UTC (rev 2360)
@@ -124,8 +124,6 @@
 
       // lets first see what the value of k1 is on c1 ...
 
-      System.out.println("***** K1 on C1 is " + c1.get(keys.get(0)));
-
       assertOnAllCachesAndOwnership(keys.get(0), "transactionally_replaced");
       assertOnAllCachesAndOwnership(keys.get(1), "v" + 2);
       assertOnAllCachesAndOwnership(keys.get(2), "v" + 3);

Modified: branches/4.2.x/core/src/test/java/org/infinispan/test/fwk/TcpMPingEnvironmentTest.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/test/fwk/TcpMPingEnvironmentTest.java	2010-09-14 09:01:03 UTC (rev 2359)
+++ branches/4.2.x/core/src/test/java/org/infinispan/test/fwk/TcpMPingEnvironmentTest.java	2010-09-14 13:26:59 UTC (rev 2360)
@@ -65,19 +65,15 @@
          BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
 
          String line = reader.readLine();
-         System.out.println("line = " + line);
          StringBuilder result = new StringBuilder();
          while (line != null) {
             result.append(line).append('\n');
             line = reader.readLine();
          }
          log.trace(printPrefix + result);
-         System.out.println(printPrefix + result);
          inputStream.close();
       } catch (IOException e) {
          log.trace("Cannot print " + printPrefix + " !",e);
-         System.out.println("Cannot print " + printPrefix + " !" + e);
-         e.printStackTrace();
       }
    }
 
@@ -85,9 +81,6 @@
     * Tests that different clusters are created and that they don't overlap.
     */
    public void testDifferentClusters() throws Exception {
-      log.trace("aaaaa");
-      log.info("aaaaa");
-
       JChannel first1 = new JChannel("stacks/tcp_mping/tcp1.xml");
       JChannel first2 = new JChannel("stacks/tcp_mping/tcp1.xml");
       JChannel first3 = new JChannel("stacks/tcp_mping/tcp1.xml");

Modified: branches/4.2.x/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java	2010-09-14 09:01:03 UTC (rev 2359)
+++ branches/4.2.x/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java	2010-09-14 13:26:59 UTC (rev 2360)
@@ -322,11 +322,7 @@
       public String getNextCacheName() {
          int index = cacheManagers.size();
          char name = (char) ((int)'A' + index);
-         StringBuffer result = new StringBuffer(5);
-         for (int i = 0; i < 5; i++) {
-            result.append(name);
-         }
-         return result.toString();
+         return "Node" + name;
       }
 
       public void add(String methodName, DefaultCacheManager cm) {