You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2013/03/06 23:25:41 UTC
[3/17] git commit: Fix unit tests on java7 Patch by Marcus Eriksson,
reviewed by brandonwilliams for CASSANDRA-5315
Fix unit tests on java7
Patch by Marcus Eriksson, reviewed by brandonwilliams for CASSANDRA-5315
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bf8c1ce9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bf8c1ce9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bf8c1ce9
Branch: refs/heads/cassandra-1.2
Commit: bf8c1ce9aea60349b21284861051f47fafc54180
Parents: 2b87bfe
Author: Brandon Williams <br...@apache.org>
Authored: Wed Mar 6 16:15:34 2013 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Mar 6 16:15:34 2013 -0600
----------------------------------------------------------------------
.../cassandra/config/DatabaseDescriptorTest.java | 3 +++
.../unit/org/apache/cassandra/config/DefsTest.java | 3 +++
test/unit/org/apache/cassandra/db/CleanupTest.java | 3 +++
.../apache/cassandra/db/ColumnFamilyStoreTest.java | 3 +++
test/unit/org/apache/cassandra/db/ScrubTest.java | 3 +++
.../cassandra/db/compaction/CompactionsTest.java | 4 ++++
.../compaction/LeveledCompactionStrategyTest.java | 4 ++++
.../org/apache/cassandra/dht/BootStrapperTest.java | 3 +++
.../cassandra/io/sstable/SSTableReaderTest.java | 3 +++
.../cassandra/locator/TokenMetadataTest.java | 4 ++++
.../service/StorageServiceServerTest.java | 3 +++
.../cassandra/streaming/StreamingTransferTest.java | 3 +++
12 files changed, 39 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf8c1ce9/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java b/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java
index 99fc58d..92fcb44 100644
--- a/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java
+++ b/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java
@@ -18,6 +18,7 @@
*/
package org.apache.cassandra.config;
+import org.apache.cassandra.OrderedJUnit4ClassRunner;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.gms.Gossiper;
import org.apache.cassandra.locator.SimpleStrategy;
@@ -25,9 +26,11 @@ import org.apache.cassandra.service.MigrationManager;
import org.apache.cassandra.thrift.InvalidRequestException;
import org.junit.Test;
+import org.junit.runner.RunWith;
import java.io.IOException;
+@RunWith(OrderedJUnit4ClassRunner.class)
public class DatabaseDescriptorTest
{
@Test
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf8c1ce9/test/unit/org/apache/cassandra/config/DefsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/config/DefsTest.java b/test/unit/org/apache/cassandra/config/DefsTest.java
index 69db1f6..6dedc89 100644
--- a/test/unit/org/apache/cassandra/config/DefsTest.java
+++ b/test/unit/org/apache/cassandra/config/DefsTest.java
@@ -24,6 +24,7 @@ import java.nio.ByteBuffer;
import java.util.*;
import java.util.concurrent.ExecutionException;
+import org.apache.cassandra.OrderedJUnit4ClassRunner;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
import org.apache.cassandra.db.*;
@@ -44,7 +45,9 @@ import org.apache.cassandra.thrift.IndexType;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.junit.Test;
+import org.junit.runner.RunWith;
+@RunWith(OrderedJUnit4ClassRunner.class)
public class DefsTest extends SchemaLoader
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf8c1ce9/test/unit/org/apache/cassandra/db/CleanupTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/CleanupTest.java b/test/unit/org/apache/cassandra/db/CleanupTest.java
index 94e28c9..c9fd0c8 100644
--- a/test/unit/org/apache/cassandra/db/CleanupTest.java
+++ b/test/unit/org/apache/cassandra/db/CleanupTest.java
@@ -27,6 +27,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.ExecutionException;
+import org.apache.cassandra.OrderedJUnit4ClassRunner;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
import org.apache.cassandra.config.ConfigurationException;
@@ -46,7 +47,9 @@ import org.apache.cassandra.thrift.IndexOperator;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.NodeId;
import org.junit.Test;
+import org.junit.runner.RunWith;
+@RunWith(OrderedJUnit4ClassRunner.class)
public class CleanupTest extends SchemaLoader
{
public static final int LOOPS = 200;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf8c1ce9/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
index 3f40464..ad087ee 100644
--- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
@@ -26,6 +26,7 @@ import java.util.*;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
+import org.apache.cassandra.OrderedJUnit4ClassRunner;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
import org.apache.cassandra.config.ColumnDefinition;
@@ -56,7 +57,9 @@ import static org.apache.cassandra.db.TableTest.assertColumns;
import static org.junit.Assert.assertNull;
import org.junit.Test;
+import org.junit.runner.RunWith;
+@RunWith(OrderedJUnit4ClassRunner.class)
public class ColumnFamilyStoreTest extends SchemaLoader
{
static byte[] bytes1, bytes2;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf8c1ce9/test/unit/org/apache/cassandra/db/ScrubTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/ScrubTest.java b/test/unit/org/apache/cassandra/db/ScrubTest.java
index abec718..3ae5419 100644
--- a/test/unit/org/apache/cassandra/db/ScrubTest.java
+++ b/test/unit/org/apache/cassandra/db/ScrubTest.java
@@ -27,7 +27,9 @@ import java.util.List;
import java.util.concurrent.ExecutionException;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.apache.cassandra.OrderedJUnit4ClassRunner;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
import org.apache.cassandra.config.DatabaseDescriptor;
@@ -46,6 +48,7 @@ import static org.junit.Assert.fail;
import java.util.*;
+@RunWith(OrderedJUnit4ClassRunner.class)
public class ScrubTest extends SchemaLoader
{
public String TABLE = "Keyspace1";
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf8c1ce9/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
index c73935a..675781d 100644
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
@@ -29,9 +29,12 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import org.junit.Test;
+import org.junit.runner.RunWith;
+
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNotNull;
+import org.apache.cassandra.OrderedJUnit4ClassRunner;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
import org.apache.cassandra.config.DatabaseDescriptor;
@@ -46,6 +49,7 @@ import org.apache.cassandra.io.util.FileUtils;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
+@RunWith(OrderedJUnit4ClassRunner.class)
public class CompactionsTest extends SchemaLoader
{
public static final String TABLE1 = "Keyspace1";
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf8c1ce9/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
index c372c8f..24882e8 100644
--- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
@@ -22,8 +22,11 @@ import java.util.*;
import java.util.concurrent.Future;
import org.junit.Test;
+import org.junit.runner.RunWith;
+
import static org.junit.Assert.*;
+import org.apache.cassandra.OrderedJUnit4ClassRunner;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
import org.apache.cassandra.db.*;
@@ -37,6 +40,7 @@ import org.apache.cassandra.service.AntiEntropyService;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
+@RunWith(OrderedJUnit4ClassRunner.class)
public class LeveledCompactionStrategyTest extends SchemaLoader
{
/*
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf8c1ce9/test/unit/org/apache/cassandra/dht/BootStrapperTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/dht/BootStrapperTest.java b/test/unit/org/apache/cassandra/dht/BootStrapperTest.java
index 30c0254..df53b10 100644
--- a/test/unit/org/apache/cassandra/dht/BootStrapperTest.java
+++ b/test/unit/org/apache/cassandra/dht/BootStrapperTest.java
@@ -28,7 +28,9 @@ import java.util.Set;
import java.util.Map;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.apache.cassandra.OrderedJUnit4ClassRunner;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.config.Schema;
import org.apache.cassandra.db.Table;
@@ -42,6 +44,7 @@ import org.apache.cassandra.utils.FBUtilities;
import static org.junit.Assert.assertEquals;
+@RunWith(OrderedJUnit4ClassRunner.class)
public class BootStrapperTest extends SchemaLoader
{
@Test
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf8c1ce9/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
index 334179f..420898e 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
@@ -32,7 +32,9 @@ import java.util.*;
import java.util.concurrent.ExecutionException;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.apache.cassandra.OrderedJUnit4ClassRunner;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
import org.apache.cassandra.cache.KeyCacheKey;
@@ -58,6 +60,7 @@ import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.CLibrary;
import org.apache.cassandra.utils.Pair;
+@RunWith(OrderedJUnit4ClassRunner.class)
public class SSTableReaderTest extends SchemaLoader
{
static Token t(int i)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf8c1ce9/test/unit/org/apache/cassandra/locator/TokenMetadataTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/locator/TokenMetadataTest.java b/test/unit/org/apache/cassandra/locator/TokenMetadataTest.java
index 9f93b2f..3366bf7 100644
--- a/test/unit/org/apache/cassandra/locator/TokenMetadataTest.java
+++ b/test/unit/org/apache/cassandra/locator/TokenMetadataTest.java
@@ -24,14 +24,18 @@ import com.google.common.collect.Iterators;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.runner.RunWith;
+
import static org.junit.Assert.assertEquals;
import static org.apache.cassandra.Util.token;
+import org.apache.cassandra.OrderedJUnit4ClassRunner;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.locator.TokenMetadata;
import org.apache.cassandra.service.StorageService;
+@RunWith(OrderedJUnit4ClassRunner.class)
public class TokenMetadataTest
{
public final static String ONE = "1";
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf8c1ce9/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java b/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java
index 0bcaff4..9f899e6 100644
--- a/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java
+++ b/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java
@@ -25,7 +25,9 @@ import java.util.Collections;
import java.util.List;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.apache.cassandra.OrderedJUnit4ClassRunner;
import org.apache.cassandra.config.ConfigurationException;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.SchemaLoader;
@@ -34,6 +36,7 @@ import org.apache.cassandra.config.DatabaseDescriptor;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+@RunWith(OrderedJUnit4ClassRunner.class)
public class StorageServiceServerTest
{
@Test
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf8c1ce9/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
index 1be057e..f224032 100644
--- a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
+++ b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
@@ -20,6 +20,7 @@ package org.apache.cassandra.streaming;
*/
import static junit.framework.Assert.assertEquals;
+import org.apache.cassandra.OrderedJUnit4ClassRunner;
import org.apache.cassandra.Util;
import static org.apache.cassandra.Util.column;
import static org.apache.cassandra.Util.addMutation;
@@ -47,11 +48,13 @@ import org.apache.cassandra.utils.NodeId;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.cassandra.utils.ByteBufferUtil;
+@RunWith(OrderedJUnit4ClassRunner.class)
public class StreamingTransferTest extends SchemaLoader
{
private static final Logger logger = LoggerFactory.getLogger(StreamingTransferTest.class);