[3/4] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

[marcuse]

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0c9b8f6/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
----------------------------------------------------------------------
diff --cc 
test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
index 6ea8168,da54eee..85880a5
--- 
a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
+++ 
b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
@@@ -20,16 -20,12 +20,17 @@@ package org.apache.cassandra.db.compact
  import java.nio.ByteBuffer;
  import java.util.Arrays;
  import java.util.Collection;
 +import java.util.HashMap;
 +import java.util.Iterator;
  import java.util.List;
 +import java.util.Map;
+ import java.util.Random;
  import java.util.UUID;
  
 +import org.apache.cassandra.io.sstable.format.SSTableReader;
  import org.junit.After;
  import org.junit.Before;
 +import org.junit.BeforeClass;
  import org.junit.Test;
  import org.junit.runner.RunWith;
  
@@@ -172,14 -101,14 +175,14 @@@ public class LeveledCompactionStrategyT
          waitForLeveling(cfs);
          WrappingCompactionStrategy strategy = (WrappingCompactionStrategy) 
cfs.getCompactionStrategy();
          // Checking we're not completely bad at math
-         assert strategy.getSSTableCountPerLevel()[1] > 0;
-         assert strategy.getSSTableCountPerLevel()[2] > 0;
+         assertTrue(strategy.getSSTableCountPerLevel()[1] > 0);
+         assertTrue(strategy.getSSTableCountPerLevel()[2] > 0);
  
          Range<Token> range = new Range<>(Util.token(""), Util.token(""));
 -        int gcBefore = 
keyspace.getColumnFamilyStore(cfname).gcBefore(System.currentTimeMillis());
 +        int gcBefore = 
keyspace.getColumnFamilyStore(CF_STANDARDDLEVELED).gcBefore(System.currentTimeMillis());
          UUID parentRepSession = UUID.randomUUID();
 -        
ActiveRepairService.instance.registerParentRepairSession(parentRepSession, 
Arrays.asList(cfs), Arrays.asList(range));
 -        RepairJobDesc desc = new RepairJobDesc(parentRepSession, 
UUID.randomUUID(), ksname, cfname, range);
 +        
ActiveRepairService.instance.registerParentRepairSession(parentRepSession, 
Arrays.asList(cfs), Arrays.asList(range), false);
 +        RepairJobDesc desc = new RepairJobDesc(parentRepSession, 
UUID.randomUUID(), KEYSPACE1, CF_STANDARDDLEVELED, range);
          Validator validator = new Validator(desc, 
FBUtilities.getBroadcastAddress(), gcBefore);
          CompactionManager.instance.submitValidation(cfs, validator).get();
      }