git commit: Fix unit tests in trunk that didn't define their own schemas
Repository: cassandra
Updated Branches:
refs/heads/trunk 231ad7a4e - b6ce0a6bb
Fix unit tests in trunk that didn't define their own schemas
Patch by Lyuben Todorov; reviewed by tjake for CASSANDRA-7760
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b6ce0a6b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b6ce0a6b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b6ce0a6b
Branch: refs/heads/trunk
Commit: b6ce0a6bbbadfeba5dc5a0fd9ddfe227aa0ac5fd
Parents: 231ad7a
Author: Jake Luciani j...@apache.org
Authored: Wed Aug 13 11:13:55 2014 -0400
Committer: Jake Luciani j...@apache.org
Committed: Wed Aug 13 11:13:55 2014 -0400
--
.../db/index/PerRowSecondaryIndexTest.java | 6 +++---
.../cassandra/tools/SSTableExportTest.java | 21 ++--
.../cassandra/tools/SSTableImportTest.java | 11 +-
3 files changed, 20 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6ce0a6b/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
--
diff --git
a/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
b/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
index dfacfe2..b2cc1a4 100644
--- a/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
+++ b/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
@@ -147,18 +147,18 @@ public class PerRowSecondaryIndexTest
public void testInvalidSearch() throws IOException
{
Mutation rm;
-rm = new Mutation(PerRowSecondaryIndex, ByteBufferUtil.bytes(k4));
+rm = new Mutation(KEYSPACE1, ByteBufferUtil.bytes(k4));
rm.add(Indexed1, Util.cellname(indexed),
ByteBufferUtil.bytes(foo), 1);
rm.apply();
// test we can search:
-UntypedResultSet result = QueryProcessor.executeInternal(SELECT *
FROM \PerRowSecondaryIndex\.\Indexed1\ WHERE indexed = 'foo');
+UntypedResultSet result =
QueryProcessor.executeInternal(String.format(SELECT * FROM \%s\.\Indexed1\
WHERE indexed = 'foo', KEYSPACE1));
assertEquals(1, result.size());
// test we can't search if the searcher doesn't validate the
expression:
try
{
-QueryProcessor.executeInternal(SELECT * FROM
\PerRowSecondaryIndex\.\Indexed1\ WHERE indexed = 'invalid');
+QueryProcessor.executeInternal(String.format(SELECT * FROM
\%s\.\Indexed1\ WHERE indexed = 'invalid', KEYSPACE1));
fail(Query should have been invalid!);
}
catch (Exception e)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6ce0a6b/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
--
diff --git a/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
b/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
index f1b7564..2009c0c 100644
--- a/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
+++ b/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
@@ -83,7 +83,8 @@ public class SSTableExportTest
SchemaLoader.standardCFMD(KEYSPACE1,
CF_STANDARD),
CFMetaData.denseCFMetaData(KEYSPACE1,
CF_COUNTER, BytesType.instance).defaultValidator(CounterColumnType.instance),
SchemaLoader.standardCFMD(KEYSPACE1,
CF_UUID).keyValidator(UUIDType.instance),
-CFMetaData.denseCFMetaData(KEYSPACE1,
CF_VALSWITHQUOTES, BytesType.instance).defaultValidator(UTF8Type.instance));
+CFMetaData.denseCFMetaData(KEYSPACE1,
CF_VALSWITHQUOTES, BytesType.instance).defaultValidator(UTF8Type.instance),
+SchemaLoader.standardCFMD(KEYSPACE1,
AsciiKeys).keyValidator(AsciiType.instance));
}
public String asHex(String str)
@@ -157,7 +158,7 @@ public class SSTableExportTest
// Export to JSON and verify
File tempJson = File.createTempFile(Standard1, .json);
SSTableExport.export(reader, new PrintStream(tempJson.getPath()), new
String[]{asHex(rowExclude)},
-CFMetaData.sparseCFMetaData(Keyspace1, Standard1,
BytesType.instance));
+CFMetaData.sparseCFMetaData(KEYSPACE1, Standard1,
BytesType.instance));
JSONArray json = (JSONArray)JSONValue.parseWithException(new
FileReader(tempJson));
assertEquals(unexpected number of rows, 2, json.size());
@@ -207,7 +208,7 @@ public class SSTableExportTest
// Export to JSON and verify
File tempJson =
git commit: Fix unit tests
Updated Branches:
refs/heads/trunk 663bdfbd6 - 20c0baf08
Fix unit tests
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/20c0baf0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/20c0baf0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/20c0baf0
Branch: refs/heads/trunk
Commit: 20c0baf08565fbae1b6fb52f80155039a847f93a
Parents: 663bdfb
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Jul 15 09:45:54 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Jul 15 09:45:54 2013 +0200
--
src/java/org/apache/cassandra/serializers/TimeUUIDSerializer.java | 2 ++
test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java | 2 +-
.../org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/20c0baf0/src/java/org/apache/cassandra/serializers/TimeUUIDSerializer.java
--
diff --git a/src/java/org/apache/cassandra/serializers/TimeUUIDSerializer.java
b/src/java/org/apache/cassandra/serializers/TimeUUIDSerializer.java
index 22750be..dc5dad0 100644
--- a/src/java/org/apache/cassandra/serializers/TimeUUIDSerializer.java
+++ b/src/java/org/apache/cassandra/serializers/TimeUUIDSerializer.java
@@ -22,6 +22,8 @@ import java.nio.ByteBuffer;
public class TimeUUIDSerializer extends UUIDSerializer
{
+public static final TimeUUIDSerializer instance = new TimeUUIDSerializer();
+
@Override
public void validate(ByteBuffer bytes) throws MarshalException
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/20c0baf0/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java
b/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java
index afb3913..1039fb6 100644
--- a/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java
+++ b/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java
@@ -145,7 +145,7 @@ public class CompositeTypeTest extends SchemaLoader
}
catch (MarshalException e)
{
-assert e.toString().contains(TimeUUID should be 16 or 0 bytes);
+assert e.toString().contains(should be 16 or 0 bytes);
}
key = createCompositeKey(test1, UUID.randomUUID(), 42, false);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/20c0baf0/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
--
diff --git
a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
index e959b5f..f8e2fb6 100644
--- a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
+++ b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
@@ -144,7 +144,7 @@ public class DynamicCompositeTypeTest extends SchemaLoader
}
catch (MarshalException e)
{
-assert e.toString().contains(TimeUUID should be 16 or 0 bytes);
+assert e.toString().contains(should be 16 or 0 bytes);
}
key = createDynamicCompositeKey(test1, UUID.randomUUID(), 42, false);
[17/17] git commit: Fix unit tests on java7 Patch by Marcus Eriksson, reviewed by brandonwilliams for CASSANDRA-5315
Updated Branches:
refs/heads/cassandra-1.1 2b87bfe55 - 54601f192
refs/heads/cassandra-1.2 62b1ee40b - c58f596ea
refs/heads/trunk 66e6f2969 - ec921a9ff
Fix unit tests on java7
Patch by Marcus Eriksson, reviewed by brandonwilliams for CASSANDRA-5315
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ec921a9f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ec921a9f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ec921a9f
Branch: refs/heads/trunk
Commit: ec921a9ff8af1531dcc7ae5cb2bd8d60b265d50f
Parents: a146f4e
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Mar 6 16:25:06 2013 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Mar 6 16:25:06 2013 -0600
--
.../org/apache/cassandra/MethodComparator.java | 146 +++
.../apache/cassandra/OrderedJUnit4ClassRunner.java | 34
.../cassandra/config/DatabaseDescriptorTest.java |4 +
.../unit/org/apache/cassandra/config/DefsTest.java |3 +
.../apache/cassandra/db/ColumnFamilyStoreTest.java |3 +
.../cassandra/db/compaction/CompactionsTest.java |3 +
.../compaction/LeveledCompactionStrategyTest.java |3 +
.../org/apache/cassandra/dht/BootStrapperTest.java |3 +
.../cassandra/io/sstable/SSTableReaderTest.java|3 +
.../service/StorageServiceServerTest.java |3 +
.../cassandra/streaming/StreamingTransferTest.java |3 +
11 files changed, 208 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ec921a9f/test/unit/org/apache/cassandra/MethodComparator.java
--
diff --git a/test/unit/org/apache/cassandra/MethodComparator.java
b/test/unit/org/apache/cassandra/MethodComparator.java
new file mode 100644
index 000..690ae57
--- /dev/null
+++ b/test/unit/org/apache/cassandra/MethodComparator.java
@@ -0,0 +1,146 @@
+package org.apache.cassandra;
+
+import org.junit.Ignore;
+import org.junit.runners.model.FrameworkMethod;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
+import java.lang.reflect.Method;
+import java.util.Comparator;
+
+public class MethodComparatorT implements ComparatorT
+{
+private static final char[] METHOD_SEPARATORS = {1, 7};
+
+private MethodComparator()
+{
+}
+
+public static MethodComparatorFrameworkMethod
getFrameworkMethodComparatorForJUnit4()
+{
+return new MethodComparatorFrameworkMethod();
+}
+
+@Override
+public int compare(T o1, T o2)
+{
+final MethodPosition methodPosition1 =
this.getIndexOfMethodPosition(o1);
+final MethodPosition methodPosition2 =
this.getIndexOfMethodPosition(o2);
+return methodPosition1.compareTo(methodPosition2);
+}
+
+private MethodPosition getIndexOfMethodPosition(final Object method)
+{
+if (method instanceof FrameworkMethod)
+{
+return this.getIndexOfMethodPosition((FrameworkMethod) method);
+}
+else if (method instanceof Method)
+{
+return this.getIndexOfMethodPosition((Method) method);
+}
+else
+{
+return new NullMethodPosition();
+}
+}
+
+private MethodPosition getIndexOfMethodPosition(final FrameworkMethod
frameworkMethod)
+{
+return getIndexOfMethodPosition(frameworkMethod.getMethod());
+}
+
+private MethodPosition getIndexOfMethodPosition(final Method method)
+{
+final Class aClass = method.getDeclaringClass();
+if (method.getAnnotation(Ignore.class) == null)
+{
+return getIndexOfMethodPosition(aClass, method.getName());
+}
+else
+{
+return new NullMethodPosition();
+}
+}
+
+private MethodPosition getIndexOfMethodPosition(final Class aClass, final
String methodName)
+{
+MethodPosition methodPosition;
+for (final char methodSeparator : METHOD_SEPARATORS)
+{
+methodPosition = getIndexOfMethodPosition(aClass, methodName,
methodSeparator);
+if (!(methodPosition instanceof NullMethodPosition))
+{
+return methodPosition;
+}
+}
+return new NullMethodPosition();
+}
+
+private MethodPosition getIndexOfMethodPosition(final Class aClass, final
String methodName, final char methodSeparator)
+{
+final InputStream inputStream =
aClass.getResourceAsStream(aClass.getSimpleName() + .class);
+final LineNumberReader lineNumberReader = new LineNumberReader(new
InputStreamReader(inputStream));
+final String methodNameWithSeparator =
[8/17] git commit: Fix unit tests on java7 Patch by Marcus Eriksson, reviewed by brandonwilliams for CASSANDRA-5315
Fix unit tests on java7
Patch by Marcus Eriksson, reviewed by brandonwilliams for CASSANDRA-5315
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/018e82b5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/018e82b5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/018e82b5
Branch: refs/heads/trunk
Commit: 018e82b5eff17b50301a01069664ef37a4ae142f
Parents: 8517539
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Mar 6 16:21:38 2013 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Mar 6 16:21:38 2013 -0600
--
.../cassandra/config/DatabaseDescriptorTest.java |3 +++
.../unit/org/apache/cassandra/config/DefsTest.java |3 +++
.../apache/cassandra/db/ColumnFamilyStoreTest.java |3 +++
.../cassandra/db/compaction/CompactionsTest.java |3 +++
.../compaction/LeveledCompactionStrategyTest.java |3 +++
.../org/apache/cassandra/dht/BootStrapperTest.java |3 +++
.../cassandra/io/sstable/SSTableReaderTest.java|3 +++
.../service/StorageServiceServerTest.java |3 +++
.../cassandra/streaming/StreamingTransferTest.java |3 +++
9 files changed, 27 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/018e82b5/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java
--
diff --git a/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java
b/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java
index 4273662..87f1a66 100644
--- a/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java
+++ b/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java
@@ -18,6 +18,7 @@
*/
package org.apache.cassandra.config;
+import org.apache.cassandra.OrderedJUnit4ClassRunner;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.exceptions.InvalidRequestException;
@@ -26,9 +27,11 @@ import org.apache.cassandra.locator.SimpleStrategy;
import org.apache.cassandra.service.MigrationManager;
import org.junit.Test;
+import org.junit.runner.RunWith;
import java.io.IOException;
+@RunWith(OrderedJUnit4ClassRunner.class)
public class DatabaseDescriptorTest
{
@Test
http://git-wip-us.apache.org/repos/asf/cassandra/blob/018e82b5/test/unit/org/apache/cassandra/config/DefsTest.java
--
diff --git a/test/unit/org/apache/cassandra/config/DefsTest.java
b/test/unit/org/apache/cassandra/config/DefsTest.java
index 5bb16a0..87c53d4 100644
--- a/test/unit/org/apache/cassandra/config/DefsTest.java
+++ b/test/unit/org/apache/cassandra/config/DefsTest.java
@@ -24,6 +24,7 @@ import java.nio.ByteBuffer;
import java.util.*;
import java.util.concurrent.ExecutionException;
+import org.apache.cassandra.OrderedJUnit4ClassRunner;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
import org.apache.cassandra.db.*;
@@ -43,7 +44,9 @@ import org.apache.cassandra.thrift.IndexType;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.junit.Test;
+import org.junit.runner.RunWith;
+@RunWith(OrderedJUnit4ClassRunner.class)
public class DefsTest extends SchemaLoader
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/018e82b5/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
index 8318f0d..eab9772 100644
--- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
@@ -32,6 +32,7 @@ import com.google.common.collect.Sets;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.junit.Test;
+import org.junit.runner.RunWith;
import static org.junit.Assert.assertNull;
import static junit.framework.Assert.assertEquals;
@@ -45,6 +46,7 @@ import static org.apache.cassandra.db.TableTest.assertColumns;
import static org.apache.cassandra.utils.ByteBufferUtil.bytes;
import static org.apache.commons.lang.ArrayUtils.EMPTY_BYTE_ARRAY;
+import org.apache.cassandra.OrderedJUnit4ClassRunner;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
import org.apache.cassandra.config.CFMetaData;
@@ -68,6 +70,7 @@ import org.apache.cassandra.thrift.*;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.WrappedRunnable;
+@RunWith(OrderedJUnit4ClassRunner.class)
public class ColumnFamilyStoreTest extends
git commit: Fix unit tests (DefsTest, SSTableImportTest, CompositeTypeTest)
Updated Branches:
refs/heads/cassandra-1.1 651bf3575 - 58202a8ef
Fix unit tests (DefsTest, SSTableImportTest, CompositeTypeTest)
patch by slebresne; reviewed by jbellis for CASSANDRA-3864
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/58202a8e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58202a8e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58202a8e
Branch: refs/heads/cassandra-1.1
Commit: 58202a8ef364c7e1b35eedd1270c5e72d305e23c
Parents: 651bf35
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Feb 6 17:15:36 2012 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Feb 7 17:06:08 2012 +0100
--
.../apache/cassandra/db/marshal/CompositeType.java |5 +
.../org/apache/cassandra/tools/SSTableImport.java |4 ++--
test/unit/org/apache/cassandra/db/DefsTest.java|5 +++--
3 files changed, 10 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/58202a8e/src/java/org/apache/cassandra/db/marshal/CompositeType.java
--
diff --git a/src/java/org/apache/cassandra/db/marshal/CompositeType.java
b/src/java/org/apache/cassandra/db/marshal/CompositeType.java
index c9e866e..a3e9e98 100644
--- a/src/java/org/apache/cassandra/db/marshal/CompositeType.java
+++ b/src/java/org/apache/cassandra/db/marshal/CompositeType.java
@@ -57,6 +57,11 @@ public class CompositeType extends AbstractCompositeType
// interning instances
private static final MapListAbstractType?, CompositeType instances =
new HashMapListAbstractType?, CompositeType();
+public static CompositeType getInstance(TypeParser parser) throws
ConfigurationException
+{
+return getInstance(parser.getTypeParameters());
+}
+
public static synchronized CompositeType getInstance(ListAbstractType?
types)
{
assert types != null !types.isEmpty();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/58202a8e/src/java/org/apache/cassandra/tools/SSTableImport.java
--
diff --git a/src/java/org/apache/cassandra/tools/SSTableImport.java
b/src/java/org/apache/cassandra/tools/SSTableImport.java
index cbe9dd6..2d97ae5 100644
--- a/src/java/org/apache/cassandra/tools/SSTableImport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableImport.java
@@ -116,7 +116,7 @@ public class SSTableImport
{
kind = e;
ttl = (Integer) fields.get(4);
-localExpirationTime = (int) (long) ((Long)
fields.get(5));
+localExpirationTime = (Integer) fields.get(5);
}
else
{
@@ -129,7 +129,7 @@ public class SSTableImport
if (isExpiring())
{
ttl = (Integer) fields.get(4);
-localExpirationTime = (int) (long) ((Long)
fields.get(5));
+localExpirationTime = (Integer) fields.get(5);
}
else if (isCounter())
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/58202a8e/test/unit/org/apache/cassandra/db/DefsTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/DefsTest.java
b/test/unit/org/apache/cassandra/db/DefsTest.java
index fbbf01b..01ab532 100644
--- a/test/unit/org/apache/cassandra/db/DefsTest.java
+++ b/test/unit/org/apache/cassandra/db/DefsTest.java
@@ -31,6 +31,7 @@ import org.apache.cassandra.db.filter.QueryFilter;
import org.apache.cassandra.db.filter.QueryPath;
import org.apache.cassandra.db.marshal.BytesType;
import org.apache.cassandra.db.marshal.UTF8Type;
+import org.apache.cassandra.db.marshal.TimeUUIDType;
import org.apache.cassandra.db.migration.AddColumnFamily;
import org.apache.cassandra.db.migration.AddKeyspace;
import org.apache.cassandra.db.migration.DropColumnFamily;
@@ -534,7 +535,7 @@ public class DefsTest extends CleanupHelper
oldStr = cf_def.comparator_type;
try
{
-cf_def.comparator_type = BytesType.class.getSimpleName();
+cf_def.comparator_type = TimeUUIDType.class.getSimpleName();
cf.apply(cf_def);
throw new AssertionError(Should have blown up when you used a
different comparator.);
}
@@ -605,4 +606,4 @@ public class DefsTest extends CleanupHelper
return newCFMD;
}
-}
\ No newline at end of file
+}
