Changeset 3119

Timestamp:

02/02/12 22:19:17 (4 months ago)

Author:

kasper

Message:

Fixed generics issue with mock input column

Location:

AnalyzerBeans/trunk

Files:

• components/json/src/test/java/org/eobjects/analyzer/beans/CreateJsonTransformerTest.java (modified) (3 diffs)
• core/src/main/java/org/eobjects/analyzer/data/MockInputColumn.java (modified) (2 diffs)
• core/src/test/java/org/eobjects/analyzer/beans/datastructures/ReadFromMapTransformerTest.java (modified) (1 diff)
• core/src/test/java/org/eobjects/analyzer/beans/datastructures/SelectFromListTransformerTest.java (modified) (1 diff)

AnalyzerBeans/trunk/components/json/src/test/java/org/eobjects/analyzer/beans/CreateJsonTransformerTest.java

@@ -67 +67 @@
                 map.put("country", "India");
 
-                InputColumn<Map<?, ?>> col = new MockInputColumn<Map<?, ?>>("map",
-                                MockInputColumn.MAP_CLASS);
+                InputColumn<Map<?, ?>> col = new MockInputColumn<Map<?, ?>>("map");
                 CreateJsonTransformer jsonTransformer = new CreateJsonTransformer(col);
                 assertEquals(1, jsonTransformer.getOutputColumns().getColumnCount());
@@ -85 +84 @@
                 list.add("world");
 
-                InputColumn<List<?>> col = new MockInputColumn<List<?>>("list",
-                                MockInputColumn.LIST_CLASS);
+                InputColumn<List<?>> col = new MockInputColumn<List<?>>("list");
 
                 CreateJsonTransformer jsonTransformer = new CreateJsonTransformer(col);
@@ -123 +121 @@
                 map.put("country", "India");
 
-                InputColumn<Map<?, ?>> col = new MockInputColumn<Map<?, ?>>("name",
-                                MockInputColumn.MAP_CLASS);
+                InputColumn<Map<?, ?>> col = new MockInputColumn<Map<?, ?>>("name");
                 CreateJsonTransformer jsonTransformer = new CreateJsonTransformer(col);
                 assertEquals(1, jsonTransformer.getOutputColumns().getColumnCount());

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/data/MockInputColumn.java

@@ -20 +20 @@
 package org.eobjects.analyzer.data;
 
-import java.util.List;
-import java.util.Map;
-
 import org.eobjects.metamodel.schema.Column;
 
@@ -37 +34 @@
         private static final long serialVersionUID = 1L;
 
-        @SuppressWarnings("unchecked")
-        public static final Class<? extends Map<String, ?>> MAP_CLASS = (Class<? extends Map<String, ?>>) Map.class;
-        
-        @SuppressWarnings("unchecked")
-        public static final Class<? extends List<?>> LIST_CLASS = (Class<? extends List<?>>) List.class;
-
         private String _name;
         private Class<? extends E> _clazz;
+        
+        public MockInputColumn(String name) {
+                this(name, null);
+        }
 
         public MockInputColumn(String name, Class<? extends E> clazz) {

AnalyzerBeans/trunk/core/src/test/java/org/eobjects/analyzer/beans/datastructures/ReadFromMapTransformerTest.java

@@ -38 +38 @@
                 final List<Object[]> result = new ArrayList<Object[]>();
                 final ReadFromMapTransformer trans = new ReadFromMapTransformer();
-                final InputColumn<Map<String, ?>> col = new MockInputColumn<Map<String, ?>>("foo", MockInputColumn.MAP_CLASS);
+                final InputColumn<Map<String, ?>> col = new MockInputColumn<Map<String, ?>>("foo");
                 trans.mapColumn = col;
                 trans.valueType = Integer.class;

AnalyzerBeans/trunk/core/src/test/java/org/eobjects/analyzer/beans/datastructures/SelectFromListTransformerTest.java

@@ -34 +34 @@
         public void testTransform() throws Exception {
                 final SelectFromListTransformer trans = new SelectFromListTransformer();
-                final InputColumn<List<?>> col = new MockInputColumn<List<?>>("foo", MockInputColumn.LIST_CLASS);
+                final InputColumn<List<?>> col = new MockInputColumn<List<?>>("foo");
                 trans.listColumn = col;
                 trans.indices = new Number[] { 0, 3, 50, 1, -1 };