You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2009/05/12 17:26:53 UTC
svn commit: r773940 - in /incubator/cassandra/trunk: ./ lib/ test/
test/org/apache/cassandra/locator/ test/unit/org/apache/cassandra/
test/unit/org/apache/cassandra/config/ test/unit/org/apache/cassandra/db/
test/unit/org/apache/cassandra/dht/ test/uni...
Author: jbellis
Date: Tue May 12 15:26:38 2009
New Revision: 773940
URL: http://svn.apache.org/viewvc?rev=773940&view=rev
Log:
migrate to JUnit 4.6. patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-162
Added:
incubator/cassandra/trunk/lib/junit-4.6.jar
incubator/cassandra/trunk/test/unit/org/apache/cassandra/CleanupHelper.java
- copied, changed from r773730, incubator/cassandra/trunk/test/unit/org/apache/cassandra/ServerTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/locator/
incubator/cassandra/trunk/test/unit/org/apache/cassandra/locator/RackUnawareStrategyTest.java
- copied, changed from r773730, incubator/cassandra/trunk/test/org/apache/cassandra/locator/RackUnawareStrategyTest.java
Removed:
incubator/cassandra/trunk/lib/testng-5.8-jdk15.jar
incubator/cassandra/trunk/test/org/apache/cassandra/locator/RackUnawareStrategyTest.java
incubator/cassandra/trunk/test/testng.xml
incubator/cassandra/trunk/test/unit/org/apache/cassandra/ServerTest.java
Modified:
incubator/cassandra/trunk/build.xml
incubator/cassandra/trunk/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnComparatorFactoryTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/CommitLogTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/DBManagerTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RangeFilterTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ReadMessageTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RowTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/SuperColumnTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/SystemTableTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/TableTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/dht/RangeTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/io/DataInputBufferTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/io/SSTableTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/service/CassandraServerTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/utils/BloomFilterTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/utils/FilterTest.java
Modified: incubator/cassandra/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/build.xml?rev=773940&r1=773939&r2=773940&view=diff
==============================================================================
--- incubator/cassandra/trunk/build.xml (original)
+++ incubator/cassandra/trunk/build.xml Tue May 12 15:26:38 2009
@@ -16,7 +16,7 @@
<property name="test.dir" value="${basedir}/test"/>
<property name="test.classes" value="${build.dir}/test/classes"/>
<property name="test.conf" value="${test.dir}/conf"/>
- <property name="test.name" value="*"/>
+ <property name="test.name" value="*Test"/>
<property name="test.unit.src" value="${test.dir}/unit"/>
<property name="dist.dir" value="${build.dir}/dist"/>
<property name="version" value="0.3.0-dev"/>
@@ -186,15 +186,11 @@
</javac>
</target>
- <taskdef resource="testngtasks" classpath="lib/testng-5.8-jdk15.jar"/>
- <target name="test" depends="build-test">
+ <target name="test" depends="build-test">
<echo message="running tests"/>
<mkdir dir="${build.test.dir}/cassandra"/>
- <testng outputDir="${build.dir}/test/output"
- haltOnFailure="true"
- listeners="org.uncommons.reportng.JUnitXMLReporter"
- verbose="2">
- <sysproperty key="net.sourceforge.cobertura.datafile" file="${cobertura.datafile}"/>
+ <junit fork="yes">
+ <formatter type="brief" usefile="false"/>
<jvmarg value="-Dstorage-config=${test.conf}"/>
<jvmarg value="-ea"/>
<classpath>
@@ -204,8 +200,10 @@
<pathelement location="${cobertura.dir}/cobertura.jar"/>
<pathelement location="${test.conf}"/>
</classpath>
- <classfileset dir="${test.classes}" includes="**/${test.name}.class" />
- </testng>
+ <batchtest todir="${build.dir}/test/output">
+ <fileset dir="${test.classes}" includes="**/${test.name}.class" />
+ </batchtest>
+ </junit>
</target>
<!-- instruments the classes to later create code coverage reports -->
Added: incubator/cassandra/trunk/lib/junit-4.6.jar
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/lib/junit-4.6.jar?rev=773940&view=auto
==============================================================================
Files incubator/cassandra/trunk/lib/junit-4.6.jar (added) and incubator/cassandra/trunk/lib/junit-4.6.jar Tue May 12 15:26:38 2009 differ
Copied: incubator/cassandra/trunk/test/unit/org/apache/cassandra/CleanupHelper.java (from r773730, incubator/cassandra/trunk/test/unit/org/apache/cassandra/ServerTest.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/CleanupHelper.java?p2=incubator/cassandra/trunk/test/unit/org/apache/cassandra/CleanupHelper.java&p1=incubator/cassandra/trunk/test/unit/org/apache/cassandra/ServerTest.java&r1=773730&r2=773940&rev=773940&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/ServerTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/CleanupHelper.java Tue May 12 15:26:38 2009
@@ -1,19 +1,18 @@
package org.apache.cassandra;
-import org.testng.annotations.Test;
-import org.testng.annotations.BeforeMethod;
+import java.io.File;
+
+import org.junit.BeforeClass;
+
import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.db.Table;
import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.CommitLog;
+import org.apache.cassandra.db.Table;
-import java.io.File;
-import java.io.IOException;
-
-@Test(groups={"serial"})
-public class ServerTest {
- @BeforeMethod
- public void cleanup()
+public class CleanupHelper
+{
+ @BeforeClass
+ public static void cleanup()
{
// we clean the fs twice, once to start with (so old data files don't get stored by anything static if this is the first run)
// and once after flushing stuff (to try to clean things out if it is not.) part #2 seems to be less than perfect.
@@ -38,7 +37,7 @@
cleanUpFilesystem();
}
- private void cleanUpFilesystem()
+ private static void cleanUpFilesystem()
{
String[] directoryNames = {
DatabaseDescriptor.getBootstrapFileLocation(),
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java?rev=773940&r1=773939&r2=773940&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java Tue May 12 15:26:38 2009
@@ -1,7 +1,7 @@
package org.apache.cassandra.config;
-import static org.testng.Assert.assertNotNull;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+
+import static org.junit.Assert.assertNotNull;
+import org.junit.Test;
public class DatabaseDescriptorTest
{
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnComparatorFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnComparatorFactoryTest.java?rev=773940&r1=773939&r2=773940&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnComparatorFactoryTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnComparatorFactoryTest.java Tue May 12 15:26:38 2009
@@ -1,9 +1,9 @@
package org.apache.cassandra.db;
-import org.testng.annotations.Test;
-
import java.util.Comparator;
+import org.junit.Test;
+
public class ColumnComparatorFactoryTest {
public Comparator<IColumn> nameComparator = ColumnComparatorFactory.getComparator(ColumnComparatorFactory.ComparatorType.NAME);
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java?rev=773940&r1=773939&r2=773940&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java Tue May 12 15:26:38 2009
@@ -9,16 +9,16 @@
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
+import static org.junit.Assert.assertNull;
+import org.junit.Test;
-import org.apache.cassandra.ServerTest;
+import static junit.framework.Assert.assertEquals;
+import org.apache.cassandra.CleanupHelper;
import org.apache.cassandra.io.DataInputBuffer;
import org.apache.cassandra.io.SSTable;
import org.apache.cassandra.service.StorageService;
-import org.testng.annotations.Test;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-public class ColumnFamilyStoreTest extends ServerTest
+public class ColumnFamilyStoreTest extends CleanupHelper
{
static byte[] bytes1, bytes2;
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java?rev=773940&r1=773939&r2=773940&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java Tue May 12 15:26:38 2009
@@ -1,15 +1,16 @@
package org.apache.cassandra.db;
-import org.apache.cassandra.io.DataInputBuffer;
-import org.apache.cassandra.io.DataOutputBuffer;
-import org.testng.annotations.Test;
-
import java.io.IOException;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Random;
import java.util.TreeMap;
+import org.junit.Test;
+
+import org.apache.cassandra.io.DataInputBuffer;
+import org.apache.cassandra.io.DataOutputBuffer;
+
public class ColumnFamilyTest
{
// TODO test SuperColumns
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/CommitLogTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/CommitLogTest.java?rev=773940&r1=773939&r2=773940&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/CommitLogTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/CommitLogTest.java Tue May 12 15:26:38 2009
@@ -1,18 +1,13 @@
package org.apache.cassandra.db;
-import org.testng.annotations.Test;
-
-import java.util.Set;
-import java.util.Map;
-import java.util.Arrays;
-import java.io.File;
import java.io.IOException;
-import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.io.DataInputBuffer;
-import org.apache.cassandra.ServerTest;
+import org.junit.Test;
+
+import org.apache.cassandra.CleanupHelper;
-public class CommitLogTest extends ServerTest {
+public class CommitLogTest extends CleanupHelper
+{
@Test
public void testMain() throws IOException {
// TODO this is useless, since it assumes we have a working set of commit logs to parse
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/DBManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/DBManagerTest.java?rev=773940&r1=773939&r2=773940&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/DBManagerTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/DBManagerTest.java Tue May 12 15:26:38 2009
@@ -1,9 +1,11 @@
package org.apache.cassandra.db;
-import org.testng.annotations.Test;
-import org.apache.cassandra.ServerTest;
+import org.junit.Test;
-public class DBManagerTest extends ServerTest {
+import org.apache.cassandra.CleanupHelper;
+
+public class DBManagerTest extends CleanupHelper
+{
@Test
public void testMain() throws Throwable {
// TODO clean up old detritus
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RangeFilterTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RangeFilterTest.java?rev=773940&r1=773939&r2=773940&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RangeFilterTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RangeFilterTest.java Tue May 12 15:26:38 2009
@@ -20,9 +20,8 @@
import java.io.IOException;
-
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import static org.junit.Assert.*;
+import org.junit.Test;
public class RangeFilterTest
@@ -41,8 +40,8 @@
IFilter f = new RangeFilter("b", "d");
ColumnFamily filteredCf = f.filter(cf.name(), cf);
- Assert.assertEquals(filteredCf.getColumnCount(),3);
- Assert.assertFalse(f.isDone());
+ assertEquals(filteredCf.getColumnCount(),3);
+ assertFalse(f.isDone());
}
@Test
@@ -59,8 +58,8 @@
IFilter f = new RangeFilter("b", "d", 2);
ColumnFamily filteredCf = f.filter(cf.name(), cf);
- Assert.assertEquals(filteredCf.getColumnCount(),2);
- Assert.assertTrue(f.isDone());
+ assertEquals(filteredCf.getColumnCount(),2);
+ assertTrue(f.isDone());
}
@Test
@@ -94,14 +93,14 @@
ColumnFamily filteredCf = f.filter(cf.name(), cf);
IColumn col = filteredCf.getColumn("a");
- Assert.assertNull(col);
+ assertNull(col);
col = filteredCf.getColumn("e");
- Assert.assertNull(col);
+ assertNull(col);
col = filteredCf.getColumn("c");
- Assert.assertNotNull(col);
- Assert.assertFalse(f.isDone());
+ assertNotNull(col);
+ assertFalse(f.isDone());
}
}
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ReadMessageTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ReadMessageTest.java?rev=773940&r1=773939&r2=773940&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ReadMessageTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ReadMessageTest.java Tue May 12 15:26:38 2009
@@ -1,14 +1,13 @@
package org.apache.cassandra.db;
-import static org.testng.Assert.assertNull;
-
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
+import org.junit.Test;
+
import org.apache.cassandra.io.DataInputBuffer;
import org.apache.cassandra.io.DataOutputBuffer;
-import org.testng.annotations.Test;
public class ReadMessageTest
{
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java?rev=773940&r1=773939&r2=773940&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java Tue May 12 15:26:38 2009
@@ -1,12 +1,13 @@
package org.apache.cassandra.db;
-import org.testng.annotations.Test;
-
import java.io.IOException;
-import org.apache.cassandra.ServerTest;
+import org.junit.Test;
+
+import org.apache.cassandra.CleanupHelper;
-public class RecoveryManagerTest extends ServerTest {
+public class RecoveryManagerTest extends CleanupHelper
+{
@Test
public void testDoRecovery() throws IOException {
// TODO nothing to recover
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RowTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RowTest.java?rev=773940&r1=773939&r2=773940&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RowTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RowTest.java Tue May 12 15:26:38 2009
@@ -2,8 +2,9 @@
import java.util.Arrays;
-import org.testng.annotations.Test;
-import static org.testng.Assert.assertEquals;
+import org.junit.Test;
+
+import static junit.framework.Assert.assertEquals;
public class RowTest
{
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/SuperColumnTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/SuperColumnTest.java?rev=773940&r1=773939&r2=773940&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/SuperColumnTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/SuperColumnTest.java Tue May 12 15:26:38 2009
@@ -1,9 +1,10 @@
package org.apache.cassandra.db;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
+import org.junit.Test;
+
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertNull;
-import org.testng.annotations.Test;
public class SuperColumnTest
{
@Test
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/SystemTableTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/SystemTableTest.java?rev=773940&r1=773939&r2=773940&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/SystemTableTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/SystemTableTest.java Tue May 12 15:26:38 2009
@@ -1,12 +1,14 @@
package org.apache.cassandra.db;
-import org.apache.cassandra.ServerTest;
-import org.apache.cassandra.service.StorageService;
-import org.testng.annotations.Test;
-
import java.io.IOException;
-public class SystemTableTest extends ServerTest {
+import org.junit.Test;
+
+import org.apache.cassandra.CleanupHelper;
+import org.apache.cassandra.service.StorageService;
+
+public class SystemTableTest extends CleanupHelper
+{
@Test
public void testMain() throws IOException {
SystemTable.openSystemTable(SystemTable.cfName_).updateToken(StorageService.getPartitioner().getInitialToken("503545744:0"));
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/TableTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/TableTest.java?rev=773940&r1=773939&r2=773940&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/TableTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/TableTest.java Tue May 12 15:26:38 2009
@@ -18,11 +18,13 @@
package org.apache.cassandra.db;
-import org.apache.cassandra.ServerTest;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import org.junit.Test;
-public class TableTest extends ServerTest{
+import static junit.framework.Assert.*;
+import org.apache.cassandra.CleanupHelper;
+
+public class TableTest extends CleanupHelper
+{
private static final String KEY2 = "key2";
private static final String TEST_KEY = "key1";
private static final String TABLE_NAME = "Table1";
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/dht/RangeTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/dht/RangeTest.java?rev=773940&r1=773939&r2=773940&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/dht/RangeTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/dht/RangeTest.java Tue May 12 15:26:38 2009
@@ -1,6 +1,6 @@
package org.apache.cassandra.dht;
-import org.testng.annotations.Test;
+import org.junit.Test;
public class RangeTest {
@Test
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/io/DataInputBufferTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/io/DataInputBufferTest.java?rev=773940&r1=773939&r2=773940&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/io/DataInputBufferTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/io/DataInputBufferTest.java Tue May 12 15:26:38 2009
@@ -1,10 +1,9 @@
package org.apache.cassandra.io;
-import org.testng.annotations.Test;
-
-import java.util.Random;
import java.io.IOException;
+import org.junit.Test;
+
public class DataInputBufferTest {
@Test
public void testSmall() throws IOException {
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/io/SSTableTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/io/SSTableTest.java?rev=773940&r1=773939&r2=773940&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/io/SSTableTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/io/SSTableTest.java Tue May 12 15:26:38 2009
@@ -1,16 +1,18 @@
package org.apache.cassandra.io;
-import org.apache.cassandra.ServerTest;
-import org.apache.cassandra.dht.OrderPreservingPartitioner;
-import org.apache.cassandra.db.FileStruct;
-import org.apache.cassandra.utils.BloomFilter;
-import org.testng.annotations.Test;
-
import java.io.File;
import java.io.IOException;
import java.util.*;
-public class SSTableTest extends ServerTest {
+import org.junit.Test;
+
+import org.apache.cassandra.CleanupHelper;
+import org.apache.cassandra.db.FileStruct;
+import org.apache.cassandra.dht.OrderPreservingPartitioner;
+import org.apache.cassandra.utils.BloomFilter;
+
+public class SSTableTest extends CleanupHelper
+{
@Test
public void testSingleWrite() throws IOException {
File f = File.createTempFile("sstable", "");
Copied: incubator/cassandra/trunk/test/unit/org/apache/cassandra/locator/RackUnawareStrategyTest.java (from r773730, incubator/cassandra/trunk/test/org/apache/cassandra/locator/RackUnawareStrategyTest.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/locator/RackUnawareStrategyTest.java?p2=incubator/cassandra/trunk/test/unit/org/apache/cassandra/locator/RackUnawareStrategyTest.java&p1=incubator/cassandra/trunk/test/org/apache/cassandra/locator/RackUnawareStrategyTest.java&r1=773730&r2=773940&rev=773940&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/org/apache/cassandra/locator/RackUnawareStrategyTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/locator/RackUnawareStrategyTest.java Tue May 12 15:26:38 2009
@@ -3,7 +3,7 @@
import java.util.List;
import java.util.ArrayList;
-import org.testng.annotations.Test;
+import org.junit.Test;
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.dht.RandomPartitioner;
import org.apache.cassandra.dht.BigIntegerToken;
@@ -14,6 +14,8 @@
public class RackUnawareStrategyTest
{
+ // TODO fix these
+ /*
@Test
public void testBigIntegerStorageEndPoints()
{
@@ -68,4 +70,5 @@
}
}
}
+ */
}
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/service/CassandraServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/service/CassandraServerTest.java?rev=773940&r1=773939&r2=773940&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/service/CassandraServerTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/service/CassandraServerTest.java Tue May 12 15:26:38 2009
@@ -1,18 +1,14 @@
package org.apache.cassandra.service;
-import org.apache.cassandra.ServerTest;
-import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.IteratorUtils;
-import org.testng.annotations.Test;
+import org.junit.Test;
-import java.io.IOException;
-import java.util.*;
+import org.apache.cassandra.CleanupHelper;
-public class CassandraServerTest extends ServerTest {
- /*
+public class CassandraServerTest extends CleanupHelper
+{
@Test
public void test_get_column() throws Throwable {
+ /*
CassandraServer server = new CassandraServer();
server.start();
@@ -41,6 +37,6 @@
} finally {
server.shutdown();
}
+ */
}
- */
}
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/utils/BloomFilterTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/utils/BloomFilterTest.java?rev=773940&r1=773939&r2=773940&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/utils/BloomFilterTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/utils/BloomFilterTest.java Tue May 12 15:26:38 2009
@@ -2,8 +2,8 @@
import java.io.IOException;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.Before;
+import org.junit.Test;
public class BloomFilterTest
{
@@ -17,7 +17,7 @@
assert bf != null;
}
- @BeforeMethod
+ @Before
public void clear()
{
bf.clear();
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/utils/FilterTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/utils/FilterTest.java?rev=773940&r1=773939&r2=773940&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/utils/FilterTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/utils/FilterTest.java Tue May 12 15:26:38 2009
@@ -1,11 +1,12 @@
package org.apache.cassandra.utils;
+import java.io.IOException;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import java.util.HashSet;
-import java.io.IOException;
-import org.testng.annotations.Test;
+import org.junit.Test;
+
import org.apache.cassandra.io.DataInputBuffer;
import org.apache.cassandra.io.DataOutputBuffer;