natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migrate to JUnit 4.6. patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-162 

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@773940 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2009-05-12 15:26:38 +00:00
parent 8054e4e715
commit 97fc5cb8ef
25 changed files with 109 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build.xml
View File

@ -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 -->

BIN
lib/junit-4.6.jar Normal file
View File

Binary file not shown.

BIN
lib/testng-5.8-jdk15.jar
View File

Binary file not shown.

1
test/testng.xml
View File

@ -1 +0,0 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >

21
test/unit/org/apache/cassandra/ServerTest.java → test/unit/org/apache/cassandra/CleanupHelper.java
View File

@ -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 @@ public class ServerTest {
cleanUpFilesystem();
}
private void cleanUpFilesystem()
private static void cleanUpFilesystem()
{
String[] directoryNames = {
DatabaseDescriptor.getBootstrapFileLocation(),

6
test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java
View File

@ -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
{

4
test/unit/org/apache/cassandra/db/ColumnComparatorFactoryTest.java
View File

@ -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);

10
test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
View File

@ -9,16 +9,16 @@ import java.util.concurrent.Future;
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;

9
test/unit/org/apache/cassandra/db/ColumnFamilyTest.java
View File

@ -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

15
test/unit/org/apache/cassandra/db/CommitLogTest.java
View File

@ -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;
public class CommitLogTest extends ServerTest {
import org.apache.cassandra.CleanupHelper;
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

8
test/unit/org/apache/cassandra/db/DBManagerTest.java
View File

@ -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

21
test/unit/org/apache/cassandra/db/RangeFilterTest.java
View File

@ -20,9 +20,8 @@ package org.apache.cassandra.db;
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 @@ public class RangeFilterTest
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 @@ public class RangeFilterTest
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 @@ public class RangeFilterTest
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());
}
}

5
test/unit/org/apache/cassandra/db/ReadMessageTest.java
View File

@ -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
{

9
test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
View File

@ -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;
public class RecoveryManagerTest extends ServerTest {
import org.apache.cassandra.CleanupHelper;
public class RecoveryManagerTest extends CleanupHelper
{
@Test
public void testDoRecovery() throws IOException {
// TODO nothing to recover

5
test/unit/org/apache/cassandra/db/RowTest.java
View File

@ -2,8 +2,9 @@ package org.apache.cassandra.db;
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
{

7
test/unit/org/apache/cassandra/db/SuperColumnTest.java
View File

@ -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

12
test/unit/org/apache/cassandra/db/SystemTableTest.java
View File

@ -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"));

10
test/unit/org/apache/cassandra/db/TableTest.java
View File

@ -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";

2
test/unit/org/apache/cassandra/dht/RangeTest.java
View File

@ -1,6 +1,6 @@
package org.apache.cassandra.dht;
import org.testng.annotations.Test;
import org.junit.Test;
public class RangeTest {
@Test

5
test/unit/org/apache/cassandra/io/DataInputBufferTest.java
View File

@ -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 {

16
test/unit/org/apache/cassandra/io/SSTableTest.java
View File

@ -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", "");

5
test/org/apache/cassandra/locator/RackUnawareStrategyTest.java → test/unit/org/apache/cassandra/locator/RackUnawareStrategyTest.java
View File

@ -3,7 +3,7 @@ package org.apache.cassandra.locator;
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 @@ import org.apache.cassandra.net.EndPoint;
public class RackUnawareStrategyTest
{
// TODO fix these
/*
@Test
public void testBigIntegerStorageEndPoints()
{
@ -68,4 +70,5 @@ public class RackUnawareStrategyTest
}
}
}
*/
}

16
test/unit/org/apache/cassandra/service/CassandraServerTest.java
View File

@ -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 @@ public class CassandraServerTest extends ServerTest {
} finally {
server.shutdown();
}
*/
}
*/
}

6
test/unit/org/apache/cassandra/utils/BloomFilterTest.java
View File

@ -2,8 +2,8 @@ package org.apache.cassandra.utils;
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 @@ public class BloomFilterTest
assert bf != null;
}
@BeforeMethod
@Before
public void clear()
{
bf.clear();

7
test/unit/org/apache/cassandra/utils/FilterTest.java
View File

@ -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;