Author: jbellis Date: Fri Jun 10 22:22:44 2011 New Revision: 1134464 URL: http://svn.apache.org/viewvc?rev=1134464&view=rev Log: excise mockito
Modified: cassandra/trunk/build.xml cassandra/trunk/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java cassandra/trunk/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java Modified: cassandra/trunk/build.xml URL: http://svn.apache.org/viewvc/cassandra/trunk/build.xml?rev=1134464&r1=1134463&r2=1134464&view=diff ============================================================================== --- cassandra/trunk/build.xml (original) +++ cassandra/trunk/build.xml Fri Jun 10 22:22:44 2011 @@ -378,8 +378,6 @@ url=${svn.entry.url}?pathrev=${svn.entry <dependency groupId="com.thoughtworks.paranamer" artifactId="paranamer-ant" version="2.1"/> <dependency groupId="junit" artifactId="junit" version="4.6" /> - <dependency groupId="org.mockito" artifactId="mockito-core" version="1.8.1"/> - <dependency groupId="org.mockito" artifactId="mockito-all" version="1.8.1"/> <dependency groupId="commons-logging" artifactId="commons-logging" version="1.1.1"/> <dependency groupId="org.apache.rat" artifactId="apache-rat" version="0.6" /> <dependency groupId="com.cloudera.hadoop" artifactId="hadoop-core" version="0.20.2-320"/> @@ -423,8 +421,6 @@ url=${svn.entry.url}?pathrev=${svn.entry (since it depends on them). --> <dependency groupId="com.thoughtworks.paranamer" artifactId="paranamer-ant"/> <dependency groupId="junit" artifactId="junit"/> - <dependency groupId="org.mockito" artifactId="mockito-core"/> - <dependency groupId="org.mockito" artifactId="mockito-all"/> <dependency groupId="commons-logging" artifactId="commons-logging"/> <dependency groupId="org.apache.rat" artifactId="apache-rat"/> <dependency groupId="com.cloudera.hadoop" artifactId="hadoop-core"/> Modified: cassandra/trunk/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java?rev=1134464&r1=1134463&r2=1134464&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java Fri Jun 10 22:22:44 2011 @@ -99,7 +99,7 @@ public class SizeTieredCompactionStrateg /* * Group files of similar size into buckets. */ - <T> List<List<T>> getBuckets(Collection<Pair<T, Long>> files, long minSSTableSize) + static <T> List<List<T>> getBuckets(Collection<Pair<T, Long>> files, long minSSTableSize) { // Sort the list in order to get deterministic results during the grouping below List<Pair<T, Long>> sortedFiles = new ArrayList<Pair<T, Long>>(files); Modified: cassandra/trunk/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java?rev=1134464&r1=1134463&r2=1134464&view=diff ============================================================================== --- cassandra/trunk/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java (original) +++ cassandra/trunk/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java Fri Jun 10 22:22:44 2011 @@ -17,19 +17,15 @@ */ package org.apache.cassandra.db.compaction; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.HashMap; +import java.util.*; import org.junit.Test; import static org.junit.Assert.*; -import static org.mockito.Mockito.mock; -import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.utils.Pair; -public class SizeTieredCompactionStrategyTest { +public class SizeTieredCompactionStrategyTest +{ @Test public void testGetBuckets() { @@ -41,9 +37,7 @@ public class SizeTieredCompactionStrateg pairs.add(pair); } - Map<String, String> emptyOptions = new HashMap<String, String>(); - SizeTieredCompactionStrategy strategy = new SizeTieredCompactionStrategy(mock(ColumnFamilyStore.class), emptyOptions); - List<List<String>> buckets = strategy.getBuckets(pairs, 2); + List<List<String>> buckets = SizeTieredCompactionStrategy.getBuckets(pairs, 2); assertEquals(3, buckets.size()); for (List<String> bucket : buckets) @@ -63,7 +57,7 @@ public class SizeTieredCompactionStrateg pairs.add(pair); } - buckets = strategy.getBuckets(pairs, 2); + buckets = SizeTieredCompactionStrategy.getBuckets(pairs, 2); assertEquals(2, buckets.size()); for (List<String> bucket : buckets) @@ -84,7 +78,7 @@ public class SizeTieredCompactionStrateg pairs.add(pair); } - buckets = strategy.getBuckets(pairs, 10); // notice the min is 10 + buckets = SizeTieredCompactionStrategy.getBuckets(pairs, 10); // notice the min is 10 assertEquals(1, buckets.size()); } }