http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/db/LegacyCellNameTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/LegacyCellNameTest.java b/test/unit/org/apache/cassandra/db/LegacyCellNameTest.java index fa29b1e..8398ede 100644 --- a/test/unit/org/apache/cassandra/db/LegacyCellNameTest.java +++ b/test/unit/org/apache/cassandra/db/LegacyCellNameTest.java @@ -17,14 +17,22 @@ */ package org.apache.cassandra.db; +import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.config.CFMetaData; +import org.apache.cassandra.config.DatabaseDescriptor; import static junit.framework.Assert.assertTrue; public class LegacyCellNameTest { + @BeforeClass + public static void setupDD() + { + DatabaseDescriptor.daemonInitialization(); + } + @Test public void testColumnSameNameAsPartitionKeyCompactStorage() throws Exception {
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/db/ReadCommandTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/ReadCommandTest.java b/test/unit/org/apache/cassandra/db/ReadCommandTest.java index 663080b..fddd347 100644 --- a/test/unit/org/apache/cassandra/db/ReadCommandTest.java +++ b/test/unit/org/apache/cassandra/db/ReadCommandTest.java @@ -26,6 +26,7 @@ import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.config.CFMetaData; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.marshal.AsciiType; import org.apache.cassandra.db.marshal.BytesType; import org.apache.cassandra.db.partitions.FilteredPartition; @@ -44,6 +45,8 @@ public class ReadCommandTest @BeforeClass public static void defineSchema() throws ConfigurationException { + DatabaseDescriptor.daemonInitialization(); + CFMetaData metadata1 = SchemaLoader.standardCFMD(KEYSPACE, CF1); CFMetaData metadata2 = CFMetaData.Builder.create(KEYSPACE, CF2) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/db/ReadMessageTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/ReadMessageTest.java b/test/unit/org/apache/cassandra/db/ReadMessageTest.java index 4047cc9..f76bf93 100644 --- a/test/unit/org/apache/cassandra/db/ReadMessageTest.java +++ b/test/unit/org/apache/cassandra/db/ReadMessageTest.java @@ -30,6 +30,7 @@ import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.ColumnDefinition; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.commitlog.CommitLogTestReplayer; import org.apache.cassandra.db.partitions.PartitionUpdate; import org.apache.cassandra.db.rows.Row; @@ -43,8 +44,6 @@ import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.schema.KeyspaceParams; -import org.apache.cassandra.service.CassandraDaemon; -import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.ByteBufferUtil; public class ReadMessageTest @@ -58,9 +57,7 @@ public class ReadMessageTest @BeforeClass public static void defineSchema() throws ConfigurationException { - CassandraDaemon daemon = new CassandraDaemon(); - daemon.completeSetup(); //startup must be completed, otherwise commit log failure must kill JVM regardless of failure policy - StorageService.instance.registerDaemon(daemon); + DatabaseDescriptor.daemonInitialization(); CFMetaData cfForReadMetadata = CFMetaData.Builder.create(KEYSPACE1, CF_FOR_READ_TEST) .addPartitionKey("key", BytesType.instance) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/db/RecoveryManagerFlushedTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/RecoveryManagerFlushedTest.java b/test/unit/org/apache/cassandra/db/RecoveryManagerFlushedTest.java index 86fa5b4..0b20343 100644 --- a/test/unit/org/apache/cassandra/db/RecoveryManagerFlushedTest.java +++ b/test/unit/org/apache/cassandra/db/RecoveryManagerFlushedTest.java @@ -36,6 +36,7 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.ParameterizedClass; +import org.apache.cassandra.config.SchemaConstants; import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.commitlog.CommitLog; import org.apache.cassandra.exceptions.ConfigurationException; @@ -43,7 +44,6 @@ import org.apache.cassandra.io.compress.DeflateCompressor; import org.apache.cassandra.io.compress.LZ4Compressor; import org.apache.cassandra.io.compress.SnappyCompressor; import org.apache.cassandra.schema.KeyspaceParams; -import org.apache.cassandra.schema.SchemaKeyspace; import org.apache.cassandra.security.EncryptionContext; import org.apache.cassandra.security.EncryptionContextGenerator; import org.apache.cassandra.utils.FBUtilities; @@ -95,8 +95,8 @@ public class RecoveryManagerFlushedTest public void testWithFlush() throws Exception { // Flush everything that may be in the commit log now to start fresh - FBUtilities.waitOnFutures(Keyspace.open(SystemKeyspace.NAME).flush()); - FBUtilities.waitOnFutures(Keyspace.open(SchemaKeyspace.NAME).flush()); + FBUtilities.waitOnFutures(Keyspace.open(SchemaConstants.SYSTEM_KEYSPACE_NAME).flush()); + FBUtilities.waitOnFutures(Keyspace.open(SchemaConstants.SCHEMA_KEYSPACE_NAME).flush()); CompactionManager.instance.disableAutoCompaction(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/db/RowTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/RowTest.java b/test/unit/org/apache/cassandra/db/RowTest.java index 7294b3a..5fdb98a 100644 --- a/test/unit/org/apache/cassandra/db/RowTest.java +++ b/test/unit/org/apache/cassandra/db/RowTest.java @@ -31,6 +31,7 @@ import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.ColumnDefinition; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.db.rows.*; import org.apache.cassandra.db.marshal.AbstractType; @@ -58,6 +59,7 @@ public class RowTest @BeforeClass public static void defineSchema() throws ConfigurationException { + DatabaseDescriptor.daemonInitialization(); CFMetaData cfMetadata = CFMetaData.Builder.create(KEYSPACE1, CF_STANDARD1) .addPartitionKey("key", BytesType.instance) .addClusteringColumn("col1", AsciiType.instance) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java b/test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java index 45a2c1e..64695aa 100644 --- a/test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java +++ b/test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java @@ -36,6 +36,7 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.ColumnDefinition; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.Schema; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.QueryProcessor; @@ -73,6 +74,8 @@ public class SinglePartitionSliceCommandTest @BeforeClass public static void defineSchema() throws ConfigurationException { + DatabaseDescriptor.daemonInitialization(); + cfm = CFMetaData.Builder.create(KEYSPACE, TABLE) .addPartitionKey("k", UTF8Type.instance) .addStaticColumn("s", UTF8Type.instance) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/db/SystemKeyspaceTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/SystemKeyspaceTest.java b/test/unit/org/apache/cassandra/db/SystemKeyspaceTest.java index 0bbf56f..cc06473 100644 --- a/test/unit/org/apache/cassandra/db/SystemKeyspaceTest.java +++ b/test/unit/org/apache/cassandra/db/SystemKeyspaceTest.java @@ -30,6 +30,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.config.SchemaConstants; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.dht.ByteOrderedPartitioner.BytesToken; @@ -49,6 +50,8 @@ public class SystemKeyspaceTest @BeforeClass public static void prepSnapshotTracker() { + DatabaseDescriptor.daemonInitialization(); + if (FBUtilities.isWindows) WindowsFailedSnapshotTracker.deleteOldSnapshots(); } @@ -119,9 +122,9 @@ public class SystemKeyspaceTest public void snapshotSystemKeyspaceIfUpgrading() throws IOException { // First, check that in the absence of any previous installed version, we don't create snapshots - for (ColumnFamilyStore cfs : Keyspace.open(SystemKeyspace.NAME).getColumnFamilyStores()) + for (ColumnFamilyStore cfs : Keyspace.open(SchemaConstants.SYSTEM_KEYSPACE_NAME).getColumnFamilyStores()) cfs.clearUnsafe(); - Keyspace.clearSnapshot(null, SystemKeyspace.NAME); + Keyspace.clearSnapshot(null, SchemaConstants.SYSTEM_KEYSPACE_NAME); int baseline = getDeferredDeletionCount(); @@ -130,7 +133,7 @@ public class SystemKeyspaceTest // now setup system.local as if we're upgrading from a previous version setupReleaseVersion(getOlderVersionString()); - Keyspace.clearSnapshot(null, SystemKeyspace.NAME); + Keyspace.clearSnapshot(null, SchemaConstants.SYSTEM_KEYSPACE_NAME); assertDeletedOrDeferred(baseline); // Compare versions again & verify that snapshots were created for all tables in the system ks @@ -139,7 +142,7 @@ public class SystemKeyspaceTest // clear out the snapshots & set the previous recorded version equal to the latest, we shouldn't // see any new snapshots created this time. - Keyspace.clearSnapshot(null, SystemKeyspace.NAME); + Keyspace.clearSnapshot(null, SchemaConstants.SYSTEM_KEYSPACE_NAME); setupReleaseVersion(FBUtilities.getReleaseVersionString()); SystemKeyspace.snapshotOnVersionChange(); @@ -149,7 +152,7 @@ public class SystemKeyspaceTest // 10 files expected. assertDeletedOrDeferred(baseline + 10); - Keyspace.clearSnapshot(null, SystemKeyspace.NAME); + Keyspace.clearSnapshot(null, SchemaConstants.SYSTEM_KEYSPACE_NAME); } @Test @@ -238,7 +241,7 @@ public class SystemKeyspaceTest private Set<String> getSystemSnapshotFiles() { Set<String> snapshottedTableNames = new HashSet<>(); - for (ColumnFamilyStore cfs : Keyspace.open(SystemKeyspace.NAME).getColumnFamilyStores()) + for (ColumnFamilyStore cfs : Keyspace.open(SchemaConstants.SYSTEM_KEYSPACE_NAME).getColumnFamilyStores()) { if (!cfs.getSnapshotDetails().isEmpty()) snapshottedTableNames.add(cfs.getColumnFamilyName()); http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/db/TransformerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/TransformerTest.java b/test/unit/org/apache/cassandra/db/TransformerTest.java index d56d8cd..fe87af8 100644 --- a/test/unit/org/apache/cassandra/db/TransformerTest.java +++ b/test/unit/org/apache/cassandra/db/TransformerTest.java @@ -26,6 +26,7 @@ import org.junit.Test; import junit.framework.Assert; import org.apache.cassandra.Util; import org.apache.cassandra.config.CFMetaData; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.marshal.BytesType; import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.db.rows.*; @@ -38,6 +39,10 @@ import org.apache.cassandra.utils.ByteBufferUtil; public class TransformerTest { + static + { + DatabaseDescriptor.daemonInitialization(); + } static final CFMetaData metadata = metadata(); static final DecoratedKey partitionKey = new BufferDecoratedKey(new Murmur3Partitioner.LongToken(0L), ByteBufferUtil.EMPTY_BYTE_BUFFER); http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/db/aggregation/GroupMakerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/aggregation/GroupMakerTest.java b/test/unit/org/apache/cassandra/db/aggregation/GroupMakerTest.java index 6a55921..563a709 100644 --- a/test/unit/org/apache/cassandra/db/aggregation/GroupMakerTest.java +++ b/test/unit/org/apache/cassandra/db/aggregation/GroupMakerTest.java @@ -19,6 +19,7 @@ package org.apache.cassandra.db.aggregation; import java.nio.ByteBuffer; +import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.config.DatabaseDescriptor; @@ -34,6 +35,12 @@ import static org.junit.Assert.assertTrue; public class GroupMakerTest { + @BeforeClass + public static void setupDD() + { + DatabaseDescriptor.daemonInitialization(); + } + @Test public void testIsNewGroupWithClusteringColumns() { http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerTest.java b/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerTest.java index 397a8eb..af23821 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/CommitLogSegmentManagerTest.java @@ -61,9 +61,10 @@ public class CommitLogSegmentManagerTest private final static byte[] entropy = new byte[1024 * 256]; @BeforeClass - public static void defineSchema() throws ConfigurationException + public static void defineSchema() { new Random().nextBytes(entropy); + DatabaseDescriptor.daemonInitialization(); DatabaseDescriptor.setCommitLogCompression(new ParameterizedClass("LZ4Compressor", ImmutableMap.of())); DatabaseDescriptor.setCommitLogSegmentSize(1); DatabaseDescriptor.setCommitLogSync(CommitLogSync.periodic); @@ -122,4 +123,4 @@ public class CommitLogSegmentManagerTest // The allocated count should reach the limit again. Util.spinAssertEquals(3, () -> clsm.getActiveSegments().size(), 5); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java b/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java index 90e4ffc..d55b59f 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java @@ -57,6 +57,11 @@ import org.apache.cassandra.db.commitlog.CommitLogReplayer.CommitLogReplayExcept */ public class CommitLogUpgradeTest { + static + { + DatabaseDescriptor.daemonInitialization(); + } + static final String DATA_DIR = "test/data/legacy-commitlog/"; static final String PROPERTIES_FILE = "hash.txt"; static final String CFID_PROPERTY = "cfid"; http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/db/commitlog/SegmentReaderTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/commitlog/SegmentReaderTest.java b/test/unit/org/apache/cassandra/db/commitlog/SegmentReaderTest.java index 1e8d944..d9d5e4c 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/SegmentReaderTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/SegmentReaderTest.java @@ -30,8 +30,10 @@ import java.util.function.BiFunction; import javax.crypto.Cipher; import org.junit.Assert; +import org.junit.BeforeClass; import org.junit.Test; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.commitlog.CommitLogSegmentReader.CompressedSegmenter; import org.apache.cassandra.db.commitlog.CommitLogSegmentReader.EncryptedSegmenter; import org.apache.cassandra.db.commitlog.CommitLogSegmentReader.SyncSegment; @@ -51,6 +53,12 @@ public class SegmentReaderTest { static final Random random = new Random(); + @BeforeClass + public static void setupDD() + { + DatabaseDescriptor.daemonInitialization(); + } + @Test public void compressedSegmenter_LZ4() throws IOException { http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/db/commitlog/SnapshotDeletingTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/commitlog/SnapshotDeletingTest.java b/test/unit/org/apache/cassandra/db/commitlog/SnapshotDeletingTest.java index e6ac60d..413e716 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/SnapshotDeletingTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/SnapshotDeletingTest.java @@ -26,6 +26,7 @@ import static org.junit.Assert.*; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.config.CFMetaData; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.Keyspace; @@ -45,6 +46,7 @@ public class SnapshotDeletingTest @BeforeClass public static void defineSchema() throws Exception { + DatabaseDescriptor.daemonInitialization(); GCInspector.register(); // Needed to init the output file where we print failed snapshots. This is called on node startup. WindowsFailedSnapshotTracker.deleteOldSnapshots(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/db/compaction/CompactionIteratorTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionIteratorTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionIteratorTest.java index 129d1e7..dc5fd06 100644 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionIteratorTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionIteratorTest.java @@ -30,6 +30,7 @@ import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.config.CFMetaData; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.DeletionTime; @@ -50,7 +51,7 @@ public class CompactionIteratorTest private static final String KSNAME = "CompactionIteratorTest"; private static final String CFNAME = "Integer1"; - static final DecoratedKey kk = Util.dk("key"); + static final DecoratedKey kk; static final CFMetaData metadata; private static final int RANGE = 1000; private static final int COUNT = 100; @@ -58,6 +59,10 @@ public class CompactionIteratorTest Map<List<Unfiltered>, DeletionTime> deletionTimes = new HashMap<>(); static { + DatabaseDescriptor.daemonInitialization(); + + kk = Util.dk("key"); + SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(KSNAME, KeyspaceParams.simple(1), http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/db/context/CounterContextTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/context/CounterContextTest.java b/test/unit/org/apache/cassandra/db/context/CounterContextTest.java index a72d30d..72e9548 100644 --- a/test/unit/org/apache/cassandra/db/context/CounterContextTest.java +++ b/test/unit/org/apache/cassandra/db/context/CounterContextTest.java @@ -22,9 +22,11 @@ package org.apache.cassandra.db.context; import java.nio.ByteBuffer; +import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.Util; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ClockAndCount; import org.apache.cassandra.db.context.CounterContext.Relationship; import org.apache.cassandra.utils.ByteBufferUtil; @@ -48,6 +50,12 @@ public class CounterContextTest private static final int countLength = 8; private static final int stepLength = idLength + clockLength + countLength; + @BeforeClass + public static void setupDD() + { + DatabaseDescriptor.daemonInitialization(); + } + @Test public void testAllocate() { http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/db/lifecycle/HelpersTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/lifecycle/HelpersTest.java b/test/unit/org/apache/cassandra/db/lifecycle/HelpersTest.java index 3549523..1db7944 100644 --- a/test/unit/org/apache/cassandra/db/lifecycle/HelpersTest.java +++ b/test/unit/org/apache/cassandra/db/lifecycle/HelpersTest.java @@ -32,6 +32,7 @@ import org.junit.Test; import junit.framework.Assert; import org.apache.cassandra.MockSchema; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.compaction.OperationType; import org.apache.cassandra.io.sstable.format.SSTableReader; @@ -45,6 +46,7 @@ public class HelpersTest @BeforeClass public static void setUp() { + DatabaseDescriptor.daemonInitialization(); MockSchema.cleanup(); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/db/lifecycle/TrackerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/lifecycle/TrackerTest.java b/test/unit/org/apache/cassandra/db/lifecycle/TrackerTest.java index 84e3e05..4d1e6f0 100644 --- a/test/unit/org/apache/cassandra/db/lifecycle/TrackerTest.java +++ b/test/unit/org/apache/cassandra/db/lifecycle/TrackerTest.java @@ -74,6 +74,7 @@ public class TrackerTest @BeforeClass public static void setUp() { + DatabaseDescriptor.daemonInitialization(); MockSchema.cleanup(); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/db/lifecycle/ViewTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/lifecycle/ViewTest.java b/test/unit/org/apache/cassandra/db/lifecycle/ViewTest.java index 445f110..229f72c 100644 --- a/test/unit/org/apache/cassandra/db/lifecycle/ViewTest.java +++ b/test/unit/org/apache/cassandra/db/lifecycle/ViewTest.java @@ -33,6 +33,7 @@ import org.junit.Test; import junit.framework.Assert; import org.apache.cassandra.MockSchema; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Memtable; import org.apache.cassandra.db.PartitionPosition; @@ -50,6 +51,7 @@ public class ViewTest @BeforeClass public static void setUp() { + DatabaseDescriptor.daemonInitialization(); MockSchema.cleanup(); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/db/marshal/TypeParserTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/marshal/TypeParserTest.java b/test/unit/org/apache/cassandra/db/marshal/TypeParserTest.java index 808a680..ecfe910 100644 --- a/test/unit/org/apache/cassandra/db/marshal/TypeParserTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/TypeParserTest.java @@ -18,6 +18,7 @@ */ package org.apache.cassandra.db.marshal; +import org.junit.BeforeClass; import org.junit.Test; import static org.junit.Assert.assertSame; @@ -30,6 +31,12 @@ import org.apache.cassandra.exceptions.SyntaxException; public class TypeParserTest { + @BeforeClass + public static void initDD() + { + DatabaseDescriptor.daemonInitialization(); + } + @Test public void testParse() throws ConfigurationException, SyntaxException { http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/db/rows/RowAndDeletionMergeIteratorTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/rows/RowAndDeletionMergeIteratorTest.java b/test/unit/org/apache/cassandra/db/rows/RowAndDeletionMergeIteratorTest.java index 93dc904..e4c04fb 100644 --- a/test/unit/org/apache/cassandra/db/rows/RowAndDeletionMergeIteratorTest.java +++ b/test/unit/org/apache/cassandra/db/rows/RowAndDeletionMergeIteratorTest.java @@ -28,6 +28,8 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.db.ClusteringPrefix; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.db.*; import org.apache.cassandra.db.filter.ColumnFilter; @@ -59,6 +61,7 @@ public class RowAndDeletionMergeIteratorTest @BeforeClass public static void defineSchema() throws ConfigurationException { + DatabaseDescriptor.daemonInitialization(); CFMetaData cfMetadata = CFMetaData.Builder.create(KEYSPACE1, CF_STANDARD1) .addPartitionKey("key", AsciiType.instance) .addClusteringColumn("col1", Int32Type.instance) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/db/rows/RowsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/rows/RowsTest.java b/test/unit/org/apache/cassandra/db/rows/RowsTest.java index ba03478..5629f3f 100644 --- a/test/unit/org/apache/cassandra/db/rows/RowsTest.java +++ b/test/unit/org/apache/cassandra/db/rows/RowsTest.java @@ -35,6 +35,7 @@ import org.junit.Test; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.ColumnDefinition; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.db.Clustering; import org.apache.cassandra.db.DeletionTime; @@ -56,6 +57,7 @@ public class RowsTest static { + DatabaseDescriptor.daemonInitialization(); kcvm = CFMetaData.Builder.create(KEYSPACE, KCVM_TABLE) .addPartitionKey("k", IntegerType.instance) .addClusteringColumn("c", IntegerType.instance) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/db/rows/UnfilteredRowIteratorsMergeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/rows/UnfilteredRowIteratorsMergeTest.java b/test/unit/org/apache/cassandra/db/rows/UnfilteredRowIteratorsMergeTest.java index 3335c02..4578ad1 100644 --- a/test/unit/org/apache/cassandra/db/rows/UnfilteredRowIteratorsMergeTest.java +++ b/test/unit/org/apache/cassandra/db/rows/UnfilteredRowIteratorsMergeTest.java @@ -32,6 +32,7 @@ import org.junit.Test; import org.apache.cassandra.Util; import org.apache.cassandra.config.CFMetaData; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.*; import org.apache.cassandra.db.marshal.AsciiType; import org.apache.cassandra.db.marshal.Int32Type; @@ -40,6 +41,10 @@ import org.apache.cassandra.utils.FBUtilities; public class UnfilteredRowIteratorsMergeTest { + static + { + DatabaseDescriptor.daemonInitialization(); + } static DecoratedKey partitionKey = Util.dk("key"); static DeletionTime partitionLevelDeletion = DeletionTime.LIVE; static CFMetaData metadata = CFMetaData.Builder.create("UnfilteredRowIteratorsMergeTest", "Test"). http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/db/view/ViewUtilsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/view/ViewUtilsTest.java b/test/unit/org/apache/cassandra/db/view/ViewUtilsTest.java index c238f36..89bb44a 100644 --- a/test/unit/org/apache/cassandra/db/view/ViewUtilsTest.java +++ b/test/unit/org/apache/cassandra/db/view/ViewUtilsTest.java @@ -46,6 +46,7 @@ public class ViewUtilsTest @BeforeClass public static void setUp() throws ConfigurationException { + DatabaseDescriptor.daemonInitialization(); IEndpointSnitch snitch = new PropertyFileSnitch(); DatabaseDescriptor.setEndpointSnitch(snitch); Keyspace.setInitialized(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/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 74126ee..7662faa 100644 --- a/test/unit/org/apache/cassandra/dht/BootStrapperTest.java +++ b/test/unit/org/apache/cassandra/dht/BootStrapperTest.java @@ -61,6 +61,7 @@ public class BootStrapperTest @BeforeClass public static void setup() throws ConfigurationException { + DatabaseDescriptor.daemonInitialization(); oldPartitioner = StorageService.instance.setPartitionerUnsafe(Murmur3Partitioner.instance); SchemaLoader.startGossiper(); SchemaLoader.prepareServer(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/dht/KeyCollisionTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/dht/KeyCollisionTest.java b/test/unit/org/apache/cassandra/dht/KeyCollisionTest.java index ade6ec1..c0ff9ca 100644 --- a/test/unit/org/apache/cassandra/dht/KeyCollisionTest.java +++ b/test/unit/org/apache/cassandra/dht/KeyCollisionTest.java @@ -54,6 +54,7 @@ public class KeyCollisionTest @BeforeClass public static void defineSchema() throws ConfigurationException { + DatabaseDescriptor.daemonInitialization(); oldPartitioner = StorageService.instance.setPartitionerUnsafe(LengthPartitioner.instance); SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(KEYSPACE1, http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/dht/PartitionerTestCase.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/dht/PartitionerTestCase.java b/test/unit/org/apache/cassandra/dht/PartitionerTestCase.java index cb892a7..30b773b 100644 --- a/test/unit/org/apache/cassandra/dht/PartitionerTestCase.java +++ b/test/unit/org/apache/cassandra/dht/PartitionerTestCase.java @@ -25,8 +25,10 @@ import java.util.Map; import java.util.Random; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.service.StorageService; import static org.junit.Assert.assertEquals; @@ -38,6 +40,12 @@ public abstract class PartitionerTestCase public abstract void initPartitioner(); + @BeforeClass + public static void initDD() + { + DatabaseDescriptor.daemonInitialization(); + } + @Before public void clean() { http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/dht/RangeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/dht/RangeTest.java b/test/unit/org/apache/cassandra/dht/RangeTest.java index 5cd94e2..495979e 100644 --- a/test/unit/org/apache/cassandra/dht/RangeTest.java +++ b/test/unit/org/apache/cassandra/dht/RangeTest.java @@ -28,9 +28,12 @@ import java.util.Set; import com.google.common.base.Joiner; import org.apache.commons.lang3.StringUtils; +import org.junit.BeforeClass; import org.junit.Test; import org.apache.commons.collections.CollectionUtils; + +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.PartitionPosition; import org.apache.cassandra.dht.ByteOrderedPartitioner.BytesToken; import org.apache.cassandra.dht.RandomPartitioner.BigIntegerToken; @@ -42,6 +45,12 @@ import static org.junit.Assert.*; public class RangeTest { + @BeforeClass + public static void setupDD() + { + DatabaseDescriptor.daemonInitialization(); + } + @Test public void testContains() { http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/dht/StreamStateStoreTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/dht/StreamStateStoreTest.java b/test/unit/org/apache/cassandra/dht/StreamStateStoreTest.java index 86781d9..fd9b03e 100644 --- a/test/unit/org/apache/cassandra/dht/StreamStateStoreTest.java +++ b/test/unit/org/apache/cassandra/dht/StreamStateStoreTest.java @@ -20,8 +20,10 @@ package org.apache.cassandra.dht; import java.net.InetAddress; import java.util.Collections; +import org.junit.BeforeClass; import org.junit.Test; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.streaming.DefaultConnectionFactory; import org.apache.cassandra.streaming.StreamEvent; import org.apache.cassandra.streaming.StreamSession; @@ -33,6 +35,12 @@ import static org.junit.Assert.assertTrue; public class StreamStateStoreTest { + @BeforeClass + public static void initDD() + { + DatabaseDescriptor.daemonInitialization(); + } + @Test public void testUpdateAndQueryAvailableRanges() { @@ -73,4 +81,4 @@ public class StreamStateStoreTest // as well as the old one assertTrue(store.isDataAvailable("keyspace1", factory.fromString("50"))); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/gms/EndpointStateTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/gms/EndpointStateTest.java b/test/unit/org/apache/cassandra/gms/EndpointStateTest.java index b06c435..2453fe8 100644 --- a/test/unit/org/apache/cassandra/gms/EndpointStateTest.java +++ b/test/unit/org/apache/cassandra/gms/EndpointStateTest.java @@ -26,6 +26,7 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; +import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.config.DatabaseDescriptor; @@ -39,6 +40,12 @@ public class EndpointStateTest public volatile VersionedValue.VersionedValueFactory valueFactory = new VersionedValue.VersionedValueFactory(DatabaseDescriptor.getPartitioner()); + @BeforeClass + public static void setupDD() + { + DatabaseDescriptor.daemonInitialization(); + } + @Test public void testMultiThreadedReadConsistency() throws InterruptedException { http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/gms/FailureDetectorTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/gms/FailureDetectorTest.java b/test/unit/org/apache/cassandra/gms/FailureDetectorTest.java index 9325922..dca00b1 100644 --- a/test/unit/org/apache/cassandra/gms/FailureDetectorTest.java +++ b/test/unit/org/apache/cassandra/gms/FailureDetectorTest.java @@ -45,6 +45,8 @@ public class FailureDetectorTest { // slow unit tests can cause problems with FailureDetector's GC pause handling System.setProperty("cassandra.max_local_pause_in_ms", "20000"); + + DatabaseDescriptor.daemonInitialization(); } @Test http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/gms/GossiperTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/gms/GossiperTest.java b/test/unit/org/apache/cassandra/gms/GossiperTest.java index 4c5cc7c..83f12d1 100644 --- a/test/unit/org/apache/cassandra/gms/GossiperTest.java +++ b/test/unit/org/apache/cassandra/gms/GossiperTest.java @@ -29,6 +29,7 @@ import org.junit.Before; import org.junit.Test; import org.apache.cassandra.Util; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.RandomPartitioner; import org.apache.cassandra.dht.Token; @@ -39,6 +40,10 @@ import static org.junit.Assert.assertEquals; public class GossiperTest { + static + { + DatabaseDescriptor.daemonInitialization(); + } static final IPartitioner partitioner = new RandomPartitioner(); StorageService ss = StorageService.instance; TokenMetadata tmd = StorageService.instance.getTokenMetadata(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/gms/SerializationsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/gms/SerializationsTest.java b/test/unit/org/apache/cassandra/gms/SerializationsTest.java index e50b461..0df266f 100644 --- a/test/unit/org/apache/cassandra/gms/SerializationsTest.java +++ b/test/unit/org/apache/cassandra/gms/SerializationsTest.java @@ -19,6 +19,7 @@ package org.apache.cassandra.gms; import org.apache.cassandra.AbstractSerializationsTester; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.util.DataInputPlus.DataInputStreamPlus; @@ -26,6 +27,7 @@ import org.apache.cassandra.io.util.DataOutputStreamPlus; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.FBUtilities; +import org.junit.BeforeClass; import org.junit.Test; import java.io.IOException; @@ -38,6 +40,12 @@ import java.util.Map; public class SerializationsTest extends AbstractSerializationsTester { + @BeforeClass + public static void initDD() + { + DatabaseDescriptor.daemonInitialization(); + } + private void testEndpointStateWrite() throws IOException { DataOutputStreamPlus out = getOutput("gms.EndpointState.bin"); http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/hints/ChecksummedDataInputTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/hints/ChecksummedDataInputTest.java b/test/unit/org/apache/cassandra/hints/ChecksummedDataInputTest.java index 5a48b21..7325e74 100644 --- a/test/unit/org/apache/cassandra/hints/ChecksummedDataInputTest.java +++ b/test/unit/org/apache/cassandra/hints/ChecksummedDataInputTest.java @@ -24,8 +24,10 @@ import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.zip.CRC32; +import org.junit.BeforeClass; import org.junit.Test; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.io.util.RandomAccessReader; import org.apache.cassandra.io.util.SequentialWriter; @@ -38,6 +40,12 @@ import static org.junit.Assert.assertFalse; public class ChecksummedDataInputTest { + @BeforeClass + public static void setupDD() + { + DatabaseDescriptor.daemonInitialization(); + } + @Test public void testReadMethods() throws IOException { http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/hints/LegacyHintsMigratorTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/hints/LegacyHintsMigratorTest.java b/test/unit/org/apache/cassandra/hints/LegacyHintsMigratorTest.java index 87abdac..78849e3 100644 --- a/test/unit/org/apache/cassandra/hints/LegacyHintsMigratorTest.java +++ b/test/unit/org/apache/cassandra/hints/LegacyHintsMigratorTest.java @@ -30,6 +30,7 @@ import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.Schema; +import org.apache.cassandra.config.SchemaConstants; import org.apache.cassandra.db.*; import org.apache.cassandra.db.marshal.UUIDType; import org.apache.cassandra.db.partitions.PartitionUpdate; @@ -79,7 +80,7 @@ public class LegacyHintsMigratorTest private static void testNothingToMigrate(File directory) { // truncate system.hints to enseure nothing inside - Keyspace.open(SystemKeyspace.NAME).getColumnFamilyStore(SystemKeyspace.LEGACY_HINTS).truncateBlocking(); + Keyspace.open(SchemaConstants.SYSTEM_KEYSPACE_NAME).getColumnFamilyStore(SystemKeyspace.LEGACY_HINTS).truncateBlocking(); new LegacyHintsMigrator(directory, 128 * 1024 * 1024).migrate(); HintsCatalog catalog = HintsCatalog.load(directory, HintsService.EMPTY_PARAMS); assertEquals(0, catalog.stores().count()); @@ -124,7 +125,7 @@ public class LegacyHintsMigratorTest new LegacyHintsMigrator(directory, 128 * 1024 * 1024).migrate(); // validate that the hints table is truncated now - assertTrue(Keyspace.open(SystemKeyspace.NAME).getColumnFamilyStore(SystemKeyspace.LEGACY_HINTS).isEmpty()); + assertTrue(Keyspace.open(SchemaConstants.SYSTEM_KEYSPACE_NAME).getColumnFamilyStore(SystemKeyspace.LEGACY_HINTS).isEmpty()); HintsCatalog catalog = HintsCatalog.load(directory, HintsService.EMPTY_PARAMS); http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java b/test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java index e3994ef..067109a 100644 --- a/test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java +++ b/test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java @@ -28,6 +28,7 @@ import org.junit.Test; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.ColumnDefinition; +import org.apache.cassandra.config.SchemaConstants; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.cql3.restrictions.StatementRestrictions; @@ -474,7 +475,7 @@ public class CassandraIndexTest extends CQLTester createIndex(String.format("CREATE INDEX %s ON %%s(c)", indexName)); waitForIndex(KEYSPACE, tableName, indexName); // check that there are no other rows in the built indexes table - assertRows(execute(String.format("SELECT * FROM %s.\"%s\"", SystemKeyspace.NAME, SystemKeyspace.BUILT_INDEXES)), + assertRows(execute(String.format("SELECT * FROM %s.\"%s\"", SchemaConstants.SYSTEM_KEYSPACE_NAME, SystemKeyspace.BUILT_INDEXES)), row(KEYSPACE, indexName)); // rebuild the index and verify the built status table @@ -482,7 +483,7 @@ public class CassandraIndexTest extends CQLTester waitForIndex(KEYSPACE, tableName, indexName); // check that there are no other rows in the built indexes table - assertRows(execute(String.format("SELECT * FROM %s.\"%s\"", SystemKeyspace.NAME, SystemKeyspace.BUILT_INDEXES)), + assertRows(execute(String.format("SELECT * FROM %s.\"%s\"", SchemaConstants.SYSTEM_KEYSPACE_NAME, SystemKeyspace.BUILT_INDEXES)), row(KEYSPACE, indexName)); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/index/sasi/disk/OnDiskIndexTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/index/sasi/disk/OnDiskIndexTest.java b/test/unit/org/apache/cassandra/index/sasi/disk/OnDiskIndexTest.java index a3985ca..10dc7a8 100644 --- a/test/unit/org/apache/cassandra/index/sasi/disk/OnDiskIndexTest.java +++ b/test/unit/org/apache/cassandra/index/sasi/disk/OnDiskIndexTest.java @@ -23,6 +23,7 @@ import java.util.*; import java.util.concurrent.ThreadLocalRandom; import java.util.stream.Collectors; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.Operator; import org.apache.cassandra.db.BufferDecoratedKey; import org.apache.cassandra.db.DecoratedKey; @@ -48,10 +49,18 @@ import com.google.common.collect.Iterators; import com.google.common.collect.Sets; import junit.framework.Assert; + +import org.junit.BeforeClass; import org.junit.Test; public class OnDiskIndexTest { + @BeforeClass + public static void setupDD() + { + DatabaseDescriptor.daemonInitialization(); + } + @Test public void testStringSAConstruction() throws Exception { http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/index/sasi/disk/TokenTreeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/index/sasi/disk/TokenTreeTest.java b/test/unit/org/apache/cassandra/index/sasi/disk/TokenTreeTest.java index b26bb44..927e165 100644 --- a/test/unit/org/apache/cassandra/index/sasi/disk/TokenTreeTest.java +++ b/test/unit/org/apache/cassandra/index/sasi/disk/TokenTreeTest.java @@ -24,6 +24,8 @@ import java.util.*; import com.google.common.collect.Iterators; import com.google.common.collect.PeekingIterator; + +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.BufferDecoratedKey; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.dht.Murmur3Partitioner; @@ -41,6 +43,8 @@ import org.apache.cassandra.io.util.RandomAccessReader; import org.apache.cassandra.io.util.SequentialWriter; import junit.framework.Assert; + +import org.junit.BeforeClass; import org.junit.Test; import org.apache.commons.lang3.builder.HashCodeBuilder; import com.carrotsearch.hppc.LongOpenHashSet; @@ -52,6 +56,12 @@ public class TokenTreeTest { private static final Function<Long, DecoratedKey> KEY_CONVERTER = new KeyConverter(); + @BeforeClass + public static void setupDD() + { + DatabaseDescriptor.daemonInitialization(); + } + static LongSet singleOffset = new LongOpenHashSet() {{ add(1); }}; static LongSet bigSingleOffset = new LongOpenHashSet() {{ add(2147521562L); }}; static LongSet shortPackableCollision = new LongOpenHashSet() {{ add(2L); add(3L); }}; // can pack two shorts http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java b/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java index 2de6b62..3380e30 100644 --- a/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java +++ b/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java @@ -23,7 +23,10 @@ import java.io.IOException; import java.io.RandomAccessFile; import java.util.Random; +import org.junit.BeforeClass; import org.junit.Test; + +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ClusteringComparator; import org.apache.cassandra.db.marshal.BytesType; import org.apache.cassandra.exceptions.ConfigurationException; @@ -41,6 +44,12 @@ import static org.junit.Assert.assertTrue; public class CompressedRandomAccessReaderTest { + @BeforeClass + public static void setupDD() + { + DatabaseDescriptor.daemonInitialization(); + } + @Test public void testResetAndTruncate() throws IOException { http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java b/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java index fa9643b..a088e20 100644 --- a/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java +++ b/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java @@ -29,10 +29,12 @@ import static org.junit.Assert.assertEquals; import com.google.common.io.Files; import org.junit.After; +import org.junit.BeforeClass; import org.junit.Test; import junit.framework.Assert; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ClusteringComparator; import org.apache.cassandra.db.marshal.BytesType; import org.apache.cassandra.db.marshal.UTF8Type; @@ -45,6 +47,12 @@ public class CompressedSequentialWriterTest extends SequentialWriterTest { private CompressionParams compressionParameters; + @BeforeClass + public static void setupDD() + { + DatabaseDescriptor.daemonInitialization(); + } + private void runTests(String testName) throws IOException { // Test small < 1 chunk data set http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterClientTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterClientTest.java b/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterClientTest.java index 7f50a03..7fed8b1 100644 --- a/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterClientTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterClientTest.java @@ -29,6 +29,7 @@ import org.junit.Before; import org.junit.Test; import org.apache.cassandra.config.Config; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.tools.Util; @@ -43,8 +44,7 @@ public class CQLSSTableWriterClientTest public void setUp() { this.testDirectory = Files.createTempDir(); - Util.initDatabaseDescriptor(); - Config.setClientMode(true); + DatabaseDescriptor.daemonInitialization(); } @After http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java b/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java index fb1de7c..02edf3a 100644 --- a/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java @@ -33,6 +33,7 @@ import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; +import org.apache.cassandra.auth.AuthConfig; import org.apache.cassandra.config.*; import org.apache.cassandra.cql3.*; import org.apache.cassandra.cql3.functions.UDHelper; @@ -53,6 +54,12 @@ import static org.junit.Assert.fail; public class CQLSSTableWriterTest { + static + { + DatabaseDescriptor.daemonInitialization(); + AuthConfig.applyAuthz(); + } + @BeforeClass public static void setup() throws Exception { http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java index baa6fad..f3757a0 100644 --- a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java @@ -24,9 +24,11 @@ import java.nio.ByteBuffer; import java.util.*; import com.google.common.collect.Lists; +import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.Util; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.*; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.RandomPartitioner; @@ -43,6 +45,12 @@ import static org.junit.Assert.*; public class IndexSummaryTest { + @BeforeClass + public static void initDD() + { + DatabaseDescriptor.daemonInitialization(); + } + IPartitioner partitioner = Util.testPartitioner(); @Test http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTestBase.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTestBase.java b/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTestBase.java index 0abd7bc..a123a22 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTestBase.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTestBase.java @@ -64,6 +64,8 @@ public class SSTableWriterTestBase extends SchemaLoader @BeforeClass public static void defineSchema() throws ConfigurationException { + DatabaseDescriptor.daemonInitialization(); + if (FBUtilities.isWindows) { standardMode = DatabaseDescriptor.getDiskAccessMode(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/io/sstable/format/ClientModeSSTableTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/format/ClientModeSSTableTest.java b/test/unit/org/apache/cassandra/io/sstable/format/ClientModeSSTableTest.java index 6b0427b..7a741f9 100644 --- a/test/unit/org/apache/cassandra/io/sstable/format/ClientModeSSTableTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/format/ClientModeSSTableTest.java @@ -28,7 +28,7 @@ import org.junit.Test; import org.apache.cassandra.concurrent.ScheduledExecutors; import org.apache.cassandra.config.CFMetaData; -import org.apache.cassandra.config.Config; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.Slices; import org.apache.cassandra.db.filter.ColumnFilter; import org.apache.cassandra.db.marshal.BytesType; @@ -53,7 +53,7 @@ public class ClientModeSSTableTest @BeforeClass public static void defineSchema() throws ConfigurationException { - Config.setClientMode(true); + DatabaseDescriptor.toolInitialization(); metadata = CFMetaData.Builder.createDense(KSNAME, CFNAME, false, false) .addPartitionKey("key", BytesType.instance) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/io/sstable/format/SSTableFlushObserverTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/format/SSTableFlushObserverTest.java b/test/unit/org/apache/cassandra/io/sstable/format/SSTableFlushObserverTest.java index dafad37..f4c2f46 100644 --- a/test/unit/org/apache/cassandra/io/sstable/format/SSTableFlushObserverTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/format/SSTableFlushObserverTest.java @@ -52,10 +52,18 @@ import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; import junit.framework.Assert; + +import org.junit.BeforeClass; import org.junit.Test; public class SSTableFlushObserverTest { + @BeforeClass + public static void initDD() + { + DatabaseDescriptor.daemonInitialization(); + } + private static final String KS_NAME = "test"; private static final String CF_NAME = "flush_observer"; @@ -79,7 +87,7 @@ public class SSTableFlushObserverTest if (!directory.exists() && !directory.mkdirs()) throw new FSWriteError(new IOException("failed to create tmp directory"), directory.getAbsolutePath()); - SSTableFormat.Type sstableFormat = DatabaseDescriptor.getSSTableFormat(); + SSTableFormat.Type sstableFormat = SSTableFormat.Type.current(); BigTableWriter writer = new BigTableWriter(new Descriptor(sstableFormat.info.getLatestVersion().version, directory, http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/io/sstable/metadata/MetadataSerializerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/metadata/MetadataSerializerTest.java b/test/unit/org/apache/cassandra/io/sstable/metadata/MetadataSerializerTest.java index eb50c11..9df3e11 100644 --- a/test/unit/org/apache/cassandra/io/sstable/metadata/MetadataSerializerTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/metadata/MetadataSerializerTest.java @@ -25,6 +25,7 @@ import java.util.Collections; import java.util.EnumSet; import java.util.Map; +import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; @@ -47,6 +48,12 @@ import static org.junit.Assert.assertEquals; public class MetadataSerializerTest { + @BeforeClass + public static void initDD() + { + DatabaseDescriptor.daemonInitialization(); + } + @Test public void testSerialization() throws IOException { @@ -127,7 +134,7 @@ public class MetadataSerializerTest File statsFileLb = serialize(originalMetadata, serializer, BigFormat.instance.getVersion(newV)); File statsFileLa = serialize(originalMetadata, serializer, BigFormat.instance.getVersion(oldV)); // Reading both as earlier version should yield identical results. - Descriptor desc = new Descriptor(oldV, statsFileLb.getParentFile(), "", "", 0, DatabaseDescriptor.getSSTableFormat()); + Descriptor desc = new Descriptor(oldV, statsFileLb.getParentFile(), "", "", 0, SSTableFormat.Type.current()); try (RandomAccessReader inLb = RandomAccessReader.open(statsFileLb); RandomAccessReader inLa = RandomAccessReader.open(statsFileLa)) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java b/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java index 8dcf708..44be53d 100644 --- a/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java +++ b/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java @@ -19,17 +19,19 @@ */ package org.apache.cassandra.io.util; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.utils.ByteBufferUtil; +import org.apache.cassandra.utils.SyncUtil; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.nio.ByteBuffer; import java.util.Arrays; +import org.junit.BeforeClass; import org.junit.Test; -import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.SyncUtil; - import static org.apache.cassandra.Util.expectEOF; import static org.apache.cassandra.Util.expectException; import static org.junit.Assert.assertEquals; @@ -37,6 +39,12 @@ import static org.junit.Assert.assertTrue; public class BufferedRandomAccessFileTest { + @BeforeClass + public static void setupDD() + { + DatabaseDescriptor.daemonInitialization(); + } + @Test public void testReadAndWrite() throws Exception { http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/io/util/ChecksummedRandomAccessReaderTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/util/ChecksummedRandomAccessReaderTest.java b/test/unit/org/apache/cassandra/io/util/ChecksummedRandomAccessReaderTest.java index 72a08a1..545c3e3 100644 --- a/test/unit/org/apache/cassandra/io/util/ChecksummedRandomAccessReaderTest.java +++ b/test/unit/org/apache/cassandra/io/util/ChecksummedRandomAccessReaderTest.java @@ -24,12 +24,21 @@ import java.io.RandomAccessFile; import java.util.Arrays; import java.util.concurrent.ThreadLocalRandom; +import org.junit.BeforeClass; import org.junit.Test; import static org.junit.Assert.*; +import org.apache.cassandra.config.DatabaseDescriptor; + public class ChecksummedRandomAccessReaderTest { + @BeforeClass + public static void setupDD() + { + DatabaseDescriptor.daemonInitialization(); + } + @Test public void readFully() throws IOException { http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/io/util/ChecksummedSequentialWriterTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/util/ChecksummedSequentialWriterTest.java b/test/unit/org/apache/cassandra/io/util/ChecksummedSequentialWriterTest.java index 65ffdba..29d4eea 100644 --- a/test/unit/org/apache/cassandra/io/util/ChecksummedSequentialWriterTest.java +++ b/test/unit/org/apache/cassandra/io/util/ChecksummedSequentialWriterTest.java @@ -24,14 +24,22 @@ import java.util.ArrayList; import java.util.List; import org.junit.After; +import org.junit.BeforeClass; import junit.framework.Assert; +import org.apache.cassandra.config.DatabaseDescriptor; public class ChecksummedSequentialWriterTest extends SequentialWriterTest { private final List<TestableCSW> writers = new ArrayList<>(); + @BeforeClass + public static void setupDD() + { + DatabaseDescriptor.daemonInitialization(); + } + @After public void cleanup() { http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/io/util/DataOutputTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/util/DataOutputTest.java b/test/unit/org/apache/cassandra/io/util/DataOutputTest.java index e082b19..813ba23 100644 --- a/test/unit/org/apache/cassandra/io/util/DataOutputTest.java +++ b/test/unit/org/apache/cassandra/io/util/DataOutputTest.java @@ -38,12 +38,20 @@ import java.util.concurrent.Callable; import java.util.concurrent.ThreadLocalRandom; import org.junit.Assert; +import org.junit.BeforeClass; import org.junit.Test; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.utils.ByteBufferUtil; public class DataOutputTest { + @BeforeClass + public static void setupDD() + { + DatabaseDescriptor.daemonInitialization(); + } + @Test public void testWrappedDataOutputStreamPlus() throws IOException { http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/io/util/FileUtilsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/util/FileUtilsTest.java b/test/unit/org/apache/cassandra/io/util/FileUtilsTest.java index e70d706..09612c8 100644 --- a/test/unit/org/apache/cassandra/io/util/FileUtilsTest.java +++ b/test/unit/org/apache/cassandra/io/util/FileUtilsTest.java @@ -27,6 +27,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.Arrays; +import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.config.DatabaseDescriptor; @@ -37,6 +38,12 @@ import static org.junit.Assert.assertTrue; public class FileUtilsTest { + @BeforeClass + public static void setupDD() + { + DatabaseDescriptor.daemonInitialization(); + } + @Test public void testTruncate() throws IOException { http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/io/util/MmappedRegionsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/util/MmappedRegionsTest.java b/test/unit/org/apache/cassandra/io/util/MmappedRegionsTest.java index f34c00f..39c9689 100644 --- a/test/unit/org/apache/cassandra/io/util/MmappedRegionsTest.java +++ b/test/unit/org/apache/cassandra/io/util/MmappedRegionsTest.java @@ -24,11 +24,13 @@ import java.nio.ByteBuffer; import java.util.Random; import com.google.common.primitives.Ints; +import org.junit.BeforeClass; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ClusteringComparator; import org.apache.cassandra.db.marshal.BytesType; import org.apache.cassandra.io.compress.CompressedSequentialWriter; @@ -47,6 +49,12 @@ public class MmappedRegionsTest { private static final Logger logger = LoggerFactory.getLogger(MmappedRegionsTest.class); + @BeforeClass + public static void setupDD() + { + DatabaseDescriptor.daemonInitialization(); + } + private static ByteBuffer allocateBuffer(int size) { ByteBuffer ret = ByteBuffer.allocate(Ints.checkedCast(size)); http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/io/util/RandomAccessReaderTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/util/RandomAccessReaderTest.java b/test/unit/org/apache/cassandra/io/util/RandomAccessReaderTest.java index e5cc1c3..8941d2a 100644 --- a/test/unit/org/apache/cassandra/io/util/RandomAccessReaderTest.java +++ b/test/unit/org/apache/cassandra/io/util/RandomAccessReaderTest.java @@ -36,6 +36,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; +import org.junit.BeforeClass; import org.junit.Test; import org.slf4j.Logger; @@ -43,6 +44,7 @@ import org.slf4j.LoggerFactory; import static org.junit.Assert.*; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.compress.BufferType; import org.apache.cassandra.utils.ByteBufferUtil; @@ -50,6 +52,12 @@ public class RandomAccessReaderTest { private static final Logger logger = LoggerFactory.getLogger(RandomAccessReaderTest.class); + @BeforeClass + public static void setupDD() + { + DatabaseDescriptor.daemonInitialization(); + } + private static final class Parameters { final long fileLength; http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/io/util/SequentialWriterTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/util/SequentialWriterTest.java b/test/unit/org/apache/cassandra/io/util/SequentialWriterTest.java index 2797384..002ed23 100644 --- a/test/unit/org/apache/cassandra/io/util/SequentialWriterTest.java +++ b/test/unit/org/apache/cassandra/io/util/SequentialWriterTest.java @@ -28,10 +28,12 @@ import java.util.concurrent.ThreadLocalRandom; import com.google.common.io.Files; import org.junit.After; +import org.junit.BeforeClass; import org.junit.Test; import junit.framework.Assert; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.compress.BufferType; import org.apache.cassandra.utils.concurrent.AbstractTransactionalTest; @@ -43,6 +45,12 @@ public class SequentialWriterTest extends AbstractTransactionalTest private final List<TestableSW> writers = new ArrayList<>(); + @BeforeClass + public static void setupDD() + { + DatabaseDescriptor.daemonInitialization(); + } + @After public void cleanup() { http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/locator/CloudstackSnitchTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/locator/CloudstackSnitchTest.java b/test/unit/org/apache/cassandra/locator/CloudstackSnitchTest.java index 5ac1b31..34f8204 100644 --- a/test/unit/org/apache/cassandra/locator/CloudstackSnitchTest.java +++ b/test/unit/org/apache/cassandra/locator/CloudstackSnitchTest.java @@ -28,6 +28,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.gms.ApplicationState; @@ -44,6 +45,7 @@ public class CloudstackSnitchTest @BeforeClass public static void setup() throws Exception { + DatabaseDescriptor.daemonInitialization(); SchemaLoader.mkdirs(); SchemaLoader.cleanup(); Keyspace.setInitialized(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java b/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java index a0b1863..1e8d2d8 100644 --- a/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java +++ b/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java @@ -22,8 +22,10 @@ import java.io.IOException; import java.net.InetAddress; import java.util.*; +import org.junit.BeforeClass; import org.junit.Test; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.FBUtilities; @@ -33,6 +35,12 @@ import static org.junit.Assert.assertEquals; public class DynamicEndpointSnitchTest { + @BeforeClass + public static void setupDD() + { + DatabaseDescriptor.daemonInitialization(); + } + private static void setScores(DynamicEndpointSnitch dsnitch, int rounds, List<InetAddress> hosts, Integer... scores) throws InterruptedException { for (int round = 0; round < rounds; round++) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/locator/EC2SnitchTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/locator/EC2SnitchTest.java b/test/unit/org/apache/cassandra/locator/EC2SnitchTest.java index ca6f359..5e99523 100644 --- a/test/unit/org/apache/cassandra/locator/EC2SnitchTest.java +++ b/test/unit/org/apache/cassandra/locator/EC2SnitchTest.java @@ -31,6 +31,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.gms.ApplicationState; @@ -49,6 +50,7 @@ public class EC2SnitchTest @BeforeClass public static void setup() throws Exception { + DatabaseDescriptor.daemonInitialization(); SchemaLoader.mkdirs(); SchemaLoader.cleanup(); Keyspace.setInitialized(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/locator/GoogleCloudSnitchTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/locator/GoogleCloudSnitchTest.java b/test/unit/org/apache/cassandra/locator/GoogleCloudSnitchTest.java index 04b4361..c63044c 100644 --- a/test/unit/org/apache/cassandra/locator/GoogleCloudSnitchTest.java +++ b/test/unit/org/apache/cassandra/locator/GoogleCloudSnitchTest.java @@ -29,6 +29,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.gms.ApplicationState; @@ -45,6 +46,7 @@ public class GoogleCloudSnitchTest @BeforeClass public static void setup() throws Exception { + DatabaseDescriptor.daemonInitialization(); SchemaLoader.mkdirs(); SchemaLoader.cleanup(); Keyspace.setInitialized(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/locator/GossipingPropertyFileSnitchTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/locator/GossipingPropertyFileSnitchTest.java b/test/unit/org/apache/cassandra/locator/GossipingPropertyFileSnitchTest.java index 61c179f..77734f7 100644 --- a/test/unit/org/apache/cassandra/locator/GossipingPropertyFileSnitchTest.java +++ b/test/unit/org/apache/cassandra/locator/GossipingPropertyFileSnitchTest.java @@ -21,8 +21,10 @@ package org.apache.cassandra.locator; import java.net.InetAddress; import com.google.common.net.InetAddresses; +import org.junit.BeforeClass; import org.junit.Test; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.utils.FBUtilities; import static org.junit.Assert.*; @@ -32,6 +34,13 @@ import static org.junit.Assert.*; */ public class GossipingPropertyFileSnitchTest { + + @BeforeClass + public static void setupDD() + { + DatabaseDescriptor.daemonInitialization(); + } + public static void checkEndpoint(final AbstractNetworkTopologySnitch snitch, final String endpointString, final String expectedDatacenter, final String expectedRack) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/locator/NetworkTopologyStrategyTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/locator/NetworkTopologyStrategyTest.java b/test/unit/org/apache/cassandra/locator/NetworkTopologyStrategyTest.java index 3cba328..f64b84a 100644 --- a/test/unit/org/apache/cassandra/locator/NetworkTopologyStrategyTest.java +++ b/test/unit/org/apache/cassandra/locator/NetworkTopologyStrategyTest.java @@ -29,6 +29,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Multimap; import org.junit.Assert; +import org.junit.BeforeClass; import org.junit.Test; import org.slf4j.Logger; @@ -47,6 +48,12 @@ public class NetworkTopologyStrategyTest private String keyspaceName = "Keyspace1"; private static final Logger logger = LoggerFactory.getLogger(NetworkTopologyStrategyTest.class); + @BeforeClass + public static void setupDD() + { + DatabaseDescriptor.daemonInitialization(); + } + @Test public void testProperties() throws IOException, ConfigurationException { http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/locator/OldNetworkTopologyStrategyTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/locator/OldNetworkTopologyStrategyTest.java b/test/unit/org/apache/cassandra/locator/OldNetworkTopologyStrategyTest.java index 6eb08c4..e6e17cd 100644 --- a/test/unit/org/apache/cassandra/locator/OldNetworkTopologyStrategyTest.java +++ b/test/unit/org/apache/cassandra/locator/OldNetworkTopologyStrategyTest.java @@ -29,8 +29,10 @@ import java.util.Map; import java.util.Set; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.RandomPartitioner.BigIntegerToken; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; @@ -45,6 +47,12 @@ public class OldNetworkTopologyStrategyTest private TokenMetadata tmd; private Map<String, ArrayList<InetAddress>> expectedResults; + @BeforeClass + public static void setupDD() + { + DatabaseDescriptor.daemonInitialization(); + } + @Before public void init() { http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/locator/PropertyFileSnitchTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/locator/PropertyFileSnitchTest.java b/test/unit/org/apache/cassandra/locator/PropertyFileSnitchTest.java index e9a307b..522b118 100644 --- a/test/unit/org/apache/cassandra/locator/PropertyFileSnitchTest.java +++ b/test/unit/org/apache/cassandra/locator/PropertyFileSnitchTest.java @@ -35,6 +35,7 @@ import java.util.UUID; import com.google.common.net.InetAddresses; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.RandomPartitioner; import org.apache.cassandra.dht.Token; @@ -46,6 +47,7 @@ import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.FBUtilities; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; import static org.junit.Assert.*; @@ -61,6 +63,12 @@ public class PropertyFileSnitchTest private VersionedValue.VersionedValueFactory valueFactory; private Map<InetAddress, Set<Token>> tokenMap; + @BeforeClass + public static void setupDD() + { + DatabaseDescriptor.daemonInitialization(); + } + @Before public void setup() throws ConfigurationException, IOException { http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/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 e7bb70a..91c83bd 100644 --- a/test/unit/org/apache/cassandra/locator/TokenMetadataTest.java +++ b/test/unit/org/apache/cassandra/locator/TokenMetadataTest.java @@ -53,6 +53,7 @@ public class TokenMetadataTest @BeforeClass public static void beforeClass() throws Throwable { + DatabaseDescriptor.daemonInitialization(); tmd = StorageService.instance.getTokenMetadata(); tmd.updateNormalToken(token(ONE), InetAddress.getByName("127.0.0.1")); tmd.updateNormalToken(token(SIX), InetAddress.getByName("127.0.0.6")); http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/metrics/HintedHandOffMetricsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/metrics/HintedHandOffMetricsTest.java b/test/unit/org/apache/cassandra/metrics/HintedHandOffMetricsTest.java index 6f76db4..84538c4 100644 --- a/test/unit/org/apache/cassandra/metrics/HintedHandOffMetricsTest.java +++ b/test/unit/org/apache/cassandra/metrics/HintedHandOffMetricsTest.java @@ -24,6 +24,7 @@ import java.net.InetAddress; import java.util.Map; import java.util.UUID; +import org.junit.BeforeClass; import org.junit.Test; import com.google.common.collect.Iterators; @@ -40,6 +41,12 @@ import static org.apache.cassandra.cql3.QueryProcessor.executeInternal; public class HintedHandOffMetricsTest { + @BeforeClass + public static void initDD() + { + DatabaseDescriptor.daemonInitialization(); + } + @Test public void testHintsMetrics() throws Exception { http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/net/MessagingServiceTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/net/MessagingServiceTest.java b/test/unit/org/apache/cassandra/net/MessagingServiceTest.java index ef51f30..0e0e4ba 100644 --- a/test/unit/org/apache/cassandra/net/MessagingServiceTest.java +++ b/test/unit/org/apache/cassandra/net/MessagingServiceTest.java @@ -35,12 +35,21 @@ import org.apache.cassandra.io.util.DataInputPlus.DataInputStreamPlus; import org.apache.cassandra.io.util.DataOutputStreamPlus; import org.apache.cassandra.io.util.WrappedDataOutputStreamPlus; import org.caffinitas.ohc.histo.EstimatedHistogram; +import org.junit.BeforeClass; import org.junit.Test; import static org.junit.Assert.*; +import org.apache.cassandra.config.DatabaseDescriptor; + public class MessagingServiceTest { + @BeforeClass + public static void initDD() + { + DatabaseDescriptor.daemonInitialization(); + } + private final MessagingService messagingService = MessagingService.test(); private final static long[] bucketOffsets = new EstimatedHistogram(160).getBucketOffsets(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/net/WriteCallbackInfoTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/net/WriteCallbackInfoTest.java b/test/unit/org/apache/cassandra/net/WriteCallbackInfoTest.java index a994a99..70e5add 100644 --- a/test/unit/org/apache/cassandra/net/WriteCallbackInfoTest.java +++ b/test/unit/org/apache/cassandra/net/WriteCallbackInfoTest.java @@ -21,10 +21,12 @@ package org.apache.cassandra.net; import java.net.InetAddress; import java.util.UUID; +import org.junit.BeforeClass; import org.junit.Test; import junit.framework.Assert; import org.apache.cassandra.MockSchema; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.BufferDecoratedKey; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.Mutation; @@ -37,6 +39,11 @@ import org.apache.cassandra.utils.ByteBufferUtil; public class WriteCallbackInfoTest { + @BeforeClass + public static void initDD() + { + DatabaseDescriptor.daemonInitialization(); + } @Test public void testShouldHint() throws Exception http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/repair/RepairSessionTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/repair/RepairSessionTest.java b/test/unit/org/apache/cassandra/repair/RepairSessionTest.java index 7b31c26..f65bedb 100644 --- a/test/unit/org/apache/cassandra/repair/RepairSessionTest.java +++ b/test/unit/org/apache/cassandra/repair/RepairSessionTest.java @@ -26,8 +26,10 @@ import java.util.UUID; import java.util.concurrent.ExecutionException; import com.google.common.collect.Sets; +import org.junit.BeforeClass; import org.junit.Test; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.dht.Range; @@ -42,6 +44,12 @@ import static org.junit.Assert.fail; public class RepairSessionTest { + @BeforeClass + public static void initDD() + { + DatabaseDescriptor.daemonInitialization(); + } + @Test public void testConviction() throws Exception { http://git-wip-us.apache.org/repos/asf/cassandra/blob/9797511c/test/unit/org/apache/cassandra/schema/LegacySchemaMigratorTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/schema/LegacySchemaMigratorTest.java b/test/unit/org/apache/cassandra/schema/LegacySchemaMigratorTest.java index 34136b0..239a90d 100644 --- a/test/unit/org/apache/cassandra/schema/LegacySchemaMigratorTest.java +++ b/test/unit/org/apache/cassandra/schema/LegacySchemaMigratorTest.java @@ -29,6 +29,7 @@ import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.ColumnDefinition; import org.apache.cassandra.config.Schema; +import org.apache.cassandra.config.SchemaConstants; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.FieldIdentifier; @@ -84,7 +85,7 @@ public class LegacySchemaMigratorTest // verify that nothing's left in the old schema tables for (CFMetaData table : LegacySchemaMigrator.LegacySchemaTables) { - String query = format("SELECT * FROM %s.%s", SystemKeyspace.NAME, table.cfName); + String query = format("SELECT * FROM %s.%s", SchemaConstants.SYSTEM_KEYSPACE_NAME, table.cfName); //noinspection ConstantConditions assertTrue(executeOnceInternal(query).isEmpty()); } @@ -105,7 +106,7 @@ public class LegacySchemaMigratorTest private static void loadLegacySchemaTables() { - KeyspaceMetadata systemKeyspace = Schema.instance.getKSMetaData(SystemKeyspace.NAME); + KeyspaceMetadata systemKeyspace = Schema.instance.getKSMetaData(SchemaConstants.SYSTEM_KEYSPACE_NAME); Tables systemTables = systemKeyspace.tables; for (CFMetaData table : LegacySchemaMigrator.LegacySchemaTables) @@ -573,7 +574,7 @@ public class LegacySchemaMigratorTest private static Mutation makeLegacyCreateKeyspaceMutation(KeyspaceMetadata keyspace, long timestamp) { - Mutation.SimpleBuilder builder = Mutation.simpleBuilder(SystemKeyspace.NAME, decorate(SystemKeyspace.LegacyKeyspaces, keyspace.name)) + Mutation.SimpleBuilder builder = Mutation.simpleBuilder(SchemaConstants.SYSTEM_KEYSPACE_NAME, decorate(SystemKeyspace.LegacyKeyspaces, keyspace.name)) .timestamp(timestamp); builder.update(SystemKeyspace.LegacyKeyspaces)
