From e86469ee058fb73acebbae5f0ff64e5eae55e613 Mon Sep 17 00:00:00 2001
From: Brandon Williams <brandonwilliams@apache.org>
Date: Thu, 19 Jan 2012 17:34:44 -0600
Subject: [PATCH] Fix test compilation after 3689

---
 test/unit/org/apache/cassandra/SchemaLoader.java            | 6 +++---
 .../org/apache/cassandra/db/marshal/CompositeTypeTest.java  | 2 +-
 .../cassandra/db/marshal/DynamicCompositeTypeTest.java      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/unit/org/apache/cassandra/SchemaLoader.java b/test/unit/org/apache/cassandra/SchemaLoader.java
index 198cb5f3c4..59c8ac5bfd 100644
--- a/test/unit/org/apache/cassandra/SchemaLoader.java
+++ b/test/unit/org/apache/cassandra/SchemaLoader.java
@@ -92,11 +92,11 @@ public class SchemaLoader
         ColumnFamilyType su = ColumnFamilyType.Super;
         AbstractType bytes = BytesType.instance;
 
-        AbstractType composite = CompositeType.getInstance(Arrays.asList(new AbstractType[]{BytesType.instance, TimeUUIDType.instance, IntegerType.instance}));
-        Map<Byte, AbstractType> aliases = new HashMap<Byte, AbstractType>();
+        AbstractType<?> composite = CompositeType.getInstance(Arrays.asList(new AbstractType<?>[]{BytesType.instance, TimeUUIDType.instance, IntegerType.instance}));
+        Map<Byte, AbstractType<?>> aliases = new HashMap<Byte, AbstractType<?>>();
         aliases.put((byte)'b', BytesType.instance);
         aliases.put((byte)'t', TimeUUIDType.instance);
-        AbstractType dynamicComposite = DynamicCompositeType.getInstance(aliases);
+        AbstractType<?> dynamicComposite = DynamicCompositeType.getInstance(aliases);
       
         // these column definitions will will be applied to the jdbc utf and integer column familes respectively.
         Map<ByteBuffer, ColumnDefinition> integerColumn = new HashMap<ByteBuffer, ColumnDefinition>();
diff --git a/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java
index 284c98d744..fa2e876e99 100644
--- a/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java
+++ b/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java
@@ -42,7 +42,7 @@ public class CompositeTypeTest extends CleanupHelper
     private static final CompositeType comparator;
     static
     {
-        List<AbstractType> subComparators = new ArrayList<AbstractType>();
+        List<AbstractType<?>> subComparators = new ArrayList<AbstractType<?>>();
         subComparators.add(BytesType.instance);
         subComparators.add(TimeUUIDType.instance);
         subComparators.add(IntegerType.instance);
diff --git a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
index e453705f57..f3b0ec7733 100644
--- a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
+++ b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
@@ -42,7 +42,7 @@ public class DynamicCompositeTypeTest extends CleanupHelper
     private static final DynamicCompositeType comparator;
     static
     {
-        Map<Byte, AbstractType> aliases = new HashMap<Byte, AbstractType>();
+        Map<Byte, AbstractType<?>> aliases = new HashMap<Byte, AbstractType<?>>();
         aliases.put((byte)'b', BytesType.instance);
         aliases.put((byte)'t', TimeUUIDType.instance);
         comparator = DynamicCompositeType.getInstance(aliases);