Removing duplicate merge mistakes

joaquincasares · joaquincasares · commit a4fc06e46ec7 · 2013-03-29T18:20:34.000-05:00
diff --git a/driver-core/src/test/java/com/datastax/driver/core/PreparedStatementTest.java b/driver-core/src/test/java/com/datastax/driver/core/PreparedStatementTest.java
@@ -137,24 +137,6 @@ public void preparedNativeTest2() {
         }
     }
 
-    @Test
-    public void preparedNativeTest2() {
-        // Test preparing/bounding for all native types
-        for (DataType type : DataType.allPrimitiveTypes()) {
-            // This must be handled separatly
-            if (exclude(type))
-                continue;
-
-            String name = "c_" + type;
-            PreparedStatement ps = session.prepare(String.format("INSERT INTO %s(k, %s) VALUES ('prepared_native', ?)", ALL_NATIVE_TABLE, name));
-            BoundStatement bs = ps.bind();
-            session.execute(setBoundValue(bs, name, type, getFixedValue2(type)));
-
-            Row row = session.execute(String.format("SELECT %s FROM %s WHERE k='prepared_native'", name, ALL_NATIVE_TABLE)).one();
-            assertEquals("For type " + type, getFixedValue2(type), getValue(row, name, type));
-        }
-    }
-
     @Test(groups = "integration")
     public void prepareListTest() {
         // Test preparing/bounding for all possible list types
@@ -198,26 +180,6 @@ public void prepareListTest2() {
         }
     }
 
-    @Test
-    public void prepareListTest2() {
-        // Test preparing/bounding for all possible list types
-        for (DataType rawType : DataType.allPrimitiveTypes()) {
-            // This must be handled separatly
-            if (exclude(rawType))
-                continue;
-
-            String name = "c_list_" + rawType;
-            DataType type = DataType.list(rawType);
-            List value = (List)getFixedValue2(type);;
-            PreparedStatement ps = session.prepare(String.format("INSERT INTO %s(k, %s) VALUES ('prepared_list', ?)", ALL_LIST_TABLE, name));
-            BoundStatement bs = ps.bind();
-            session.execute(setBoundValue(bs, name, type, value));
-
-            Row row = session.execute(String.format("SELECT %s FROM %s WHERE k='prepared_list'", name, ALL_LIST_TABLE)).one();
-            assertEquals("For type " + type, value, getValue(row, name, type));
-        }
-    }
-
     @Test(groups = "integration")
     public void prepareSetTest() {
         // Test preparing/bounding for all possible set types
@@ -261,26 +223,6 @@ public void prepareSetTest2() {
         }
     }
 
-    @Test
-    public void prepareSetTest2() {
-        // Test preparing/bounding for all possible set types
-        for (DataType rawType : DataType.allPrimitiveTypes()) {
-            // This must be handled separatly
-            if (exclude(rawType))
-                continue;
-
-            String name = "c_set_" + rawType;
-            DataType type = DataType.set(rawType);
-            Set value = (Set)getFixedValue2(type);;
-            PreparedStatement ps = session.prepare(String.format("INSERT INTO %s(k, %s) VALUES ('prepared_set', ?)", ALL_SET_TABLE, name));
-            BoundStatement bs = ps.bind();
-            session.execute(setBoundValue(bs, name, type, value));
-
-            Row row = session.execute(String.format("SELECT %s FROM %s WHERE k='prepared_set'", name, ALL_SET_TABLE)).one();
-            assertEquals("For type " + type, value, getValue(row, name, type));
-        }
-    }
-
     @Test(groups = "integration")
     public void prepareMapTest() {
         // Test preparing/bounding for all possible map types
@@ -336,35 +278,6 @@ public void prepareMapTest2() {
         }
     }
 
-    /**
-     * Almost the same as prepareMapTest, but it uses getFixedValue2() instead.
-     */
-    @Test
-    public void prepareMapTest2() {
-        // Test preparing/bounding for all possible map types
-        for (DataType rawKeyType : DataType.allPrimitiveTypes()) {
-            // This must be handled separatly
-            if (exclude(rawKeyType))
-                continue;
-
-            for (DataType rawValueType : DataType.allPrimitiveTypes()) {
-                // This must be handled separatly
-                if (exclude(rawValueType))
-                    continue;
-
-                String name = "c_map_" + rawKeyType + "_" + rawValueType;
-                DataType type = DataType.map(rawKeyType, rawValueType);
-                Map value = (Map)getFixedValue2(type);;
-                PreparedStatement ps = session.prepare(String.format("INSERT INTO %s(k, %s) VALUES ('prepared_map', ?)", ALL_MAP_TABLE, name));
-                BoundStatement bs = ps.bind();
-                session.execute(setBoundValue(bs, name, type, value));
-
-                Row row = session.execute(String.format("SELECT %s FROM %s WHERE k='prepared_map'", name, ALL_MAP_TABLE)).one();
-                assertEquals("For type " + type, value, getValue(row, name, type));
-            }
-        }
-    }
-
     private void reprepareOnNewlyUpNodeTest(String ks, Session session) throws Exception {
 
         ks = ks == null ? "" : ks + ".";
