Author: gdusbabek
Date: Tue Apr 20 16:02:29 2010
New Revision: 935973
URL: http://svn.apache.org/viewvc?rev=935973&view=rev
Log:
Use RackUnawareStrategy in unit tests because it doesn't conflict with
SimpleEndpointSnitch. Patch by Gary Dusbabek, reviewed by Jonathan Ellis.
CASSANDRA-995
Added:
cassandra/trunk/test_conf.iml
Modified:
cassandra/trunk/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java
cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java
Modified:
cassandra/trunk/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java?rev=935973&r1=935972&r2=935973&view=diff
==============================================================================
---
cassandra/trunk/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java
(original)
+++
cassandra/trunk/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java
Tue Apr 20 16:02:29 2010
@@ -20,10 +20,9 @@ package org.apache.cassandra.config;
import static org.junit.Assert.assertNotNull;
-import org.apache.cassandra.db.DefsTable;
+import org.apache.cassandra.CleanupHelper;
import org.apache.cassandra.db.migration.AddKeyspace;
-import org.apache.cassandra.db.migration.Migration;
-import org.apache.cassandra.locator.RackAwareStrategy;
+import org.apache.cassandra.locator.RackUnawareStrategy;
import org.junit.Test;
import java.io.ByteArrayInputStream;
@@ -71,13 +70,14 @@ public class DatabaseDescriptorTest
@Test
public void testTransKsMigration() throws IOException,
ConfigurationException
{
+ CleanupHelper.cleanupAndLeaveDirs();
DatabaseDescriptor.loadSchemas();
assert DatabaseDescriptor.getNonSystemTables().size() == 0;
// add a few.
- AddKeyspace ks0 = new AddKeyspace(new KSMetaData("ks0",
RackAwareStrategy.class, 3));
+ AddKeyspace ks0 = new AddKeyspace(new KSMetaData("ks0",
RackUnawareStrategy.class, 3));
ks0.apply();
- AddKeyspace ks1 = new AddKeyspace(new KSMetaData("ks1",
RackAwareStrategy.class, 3));
+ AddKeyspace ks1 = new AddKeyspace(new KSMetaData("ks1",
RackUnawareStrategy.class, 3));
ks1.apply();
assert DatabaseDescriptor.getTableDefinition("ks0") != null;
Modified: cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java?rev=935973&r1=935972&r2=935973&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java (original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java Tue Apr 20
16:02:29 2010
@@ -36,7 +36,7 @@ import org.apache.cassandra.db.migration
import org.apache.cassandra.db.migration.Migration;
import org.apache.cassandra.db.migration.RenameColumnFamily;
import org.apache.cassandra.db.migration.RenameKeyspace;
-import org.apache.cassandra.locator.RackAwareStrategy;
+import org.apache.cassandra.locator.RackUnawareStrategy;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.db.marshal.UTF8Type;
import org.apache.cassandra.utils.UUIDGen;
@@ -280,7 +280,7 @@ public class DefsTest extends CleanupHel
{
DecoratedKey dk = Util.dk("key0");
CFMetaData newCf = new CFMetaData("NewKeyspace1", "AddedStandard1",
"Standard", new UTF8Type(), null, "A new cf for a new ks", 0, 0);
- KSMetaData newKs = new KSMetaData(newCf.tableName,
RackAwareStrategy.class, 5, newCf);
+ KSMetaData newKs = new KSMetaData(newCf.tableName,
RackUnawareStrategy.class, 5, newCf);
int segmentCount = CommitLog.instance().getSegmentCount();
new AddKeyspace(newKs).apply();
Added: cassandra/trunk/test_conf.iml
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test_conf.iml?rev=935973&view=auto
==============================================================================
--- cassandra/trunk/test_conf.iml (added)
+++ cassandra/trunk/test_conf.iml Tue Apr 20 16:02:29 2010
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$/test/conf">
+ <sourceFolder url="file://$MODULE_DIR$/test/conf" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="core" />
+ <orderEntry type="module" module-name="gen-thrift" />
+ <orderEntry type="module" module-name="tests" />
+ </component>
+</module>
+
