test: revert changes from map types test

Two previous commits fixed the issues that forced us to modify
the logic for collection types.

Since the issues are fixed, we can revert these changes.

Author: muzarski

tests/src/integration/tests/test_cassandra_types.cpp

@@ -488,29 +488,8 @@ CASSANDRA_INTEGRATION_TYPED_TEST_P(CassandraTypesTests, List) {
     }
     Result result = this->session_.execute(select_statement);
     ASSERT_EQ(1u, result.row_count());
-//    List<TypeParam> result_list(result.first_row().next().as<List<TypeParam> >());
-//    ASSERT_EQ(list.value(), result_list.value());
-    const CassValue *result_list(result.first_row().next().get_value());
-
-    bool is_collection = cass_value_is_collection(result_list);
-    EXPECT_TRUE(is_collection);
-
-    size_t collection_size = cass_value_item_count(result_list);
-    ASSERT_EQ(list.size(), collection_size);
-
-    CassIterator* collection_iterator = cass_iterator_from_collection(result_list);
-    std::vector<TypeParam> list_vector = list.value();
-
-    for (size_t j = 0; j < collection_size; ++j) {
-      if (cass_iterator_next(collection_iterator)) {
-        TypeParam value = TypeParam(cass_iterator_get_value(collection_iterator));
-        ASSERT_EQ(value, list_vector[j]);
-      } else {
-        throw Exception("No more values available");
-      }
-    }
-
-    cass_iterator_free(collection_iterator);
+    List<TypeParam> result_list(result.first_row().next().as<List<TypeParam> >());
+    ASSERT_EQ(list.value(), result_list.value());
   }
 }
 
@@ -563,29 +542,8 @@ CASSANDRA_INTEGRATION_TYPED_TEST_P(CassandraTypesTests, Set) {
     }
     Result result = this->session_.execute(select_statement);
     ASSERT_EQ(1u, result.row_count());
-//    Set<TypeParam> result_set = result.first_row().next().as<Set<TypeParam> >();
-//    ASSERT_EQ(set.value(), result_set.value());
-    const CassValue *result_set(result.first_row().next().get_value());
-
-    bool is_collection = cass_value_is_collection(result_set);
-    EXPECT_TRUE(is_collection);
-
-    size_t collection_size = cass_value_item_count(result_set);
-    ASSERT_EQ(set.size(), collection_size);
-
-    CassIterator* collection_iterator = cass_iterator_from_collection(result_set);
-    std::set<TypeParam> set_elems = set.value();
-
-    for (size_t j = 0; j < collection_size; ++j) {
-      if (cass_iterator_next(collection_iterator)) {
-        TypeParam value = TypeParam(cass_iterator_get_value(collection_iterator));
-        EXPECT_TRUE(set_elems.find(value) != set_elems.end());
-      } else {
-        throw Exception("No more values available");
-      }
-    }
-
-    cass_iterator_free(collection_iterator);
+    Set<TypeParam> result_set = result.first_row().next().as<Set<TypeParam> >();
+    ASSERT_EQ(set.value(), result_set.value());
   }
 }
 
@@ -636,30 +594,9 @@ CASSANDRA_INTEGRATION_TYPED_TEST_P(CassandraTypesTests, Map) {
       select_statement.bind<Map<TypeParam, TypeParam> >(0, map);
       Result result = this->session_.execute(select_statement);
       ASSERT_EQ(1u, result.row_count());
-//    Map<TypeParam, TypeParam> result_map(column.as<Map<TypeParam, TypeParam> >());
-//    ASSERT_EQ(map_values, result_map.value());
-      const CassValue *result_map = result.first_row().next().get_value();
-
-      bool is_collection = cass_value_is_collection(result_map);
-      EXPECT_TRUE(is_collection);
-
-      size_t collection_size = cass_value_item_count(result_map);
-      ASSERT_EQ(map.size(), collection_size);
-
-      CassIterator* collection_iterator = cass_iterator_from_collection(result_map);
-      std::map<TypeParam, TypeParam> map_entries = map.value();
-
-      for (size_t j = 0; j < collection_size; ++j) {
-        if (cass_iterator_next(collection_iterator)) {
-          TypeParam key = TypeParam(cass_iterator_get_map_key(collection_iterator));
-          TypeParam value = TypeParam(cass_iterator_get_map_value(collection_iterator));
-          ASSERT_EQ(value, map_entries[key]);
-        } else {
-          throw Exception("No more values available");
-        }
-      }
-
-      cass_iterator_free(collection_iterator);
+      Column column = result.first_row().next();
+      Map<TypeParam, TypeParam> result_map(column.as<Map<TypeParam, TypeParam> >());
+      ASSERT_EQ(map_values, result_map.value());
     }
   } else {
     // Initialize the table and assign the values for the map
@@ -754,25 +691,8 @@ CASSANDRA_INTEGRATION_TYPED_TEST_P(CassandraTypesTests, Tuple) {
     }
     Result result = this->session_.execute(select_statement);
     ASSERT_EQ(1u, result.row_count());
-//    Tuple result_tuple(result.first_row().next().as<Tuple>());
-//    ASSERT_EQ(values, result_tuple.values<TypeParam>());
-    const CassValue *result_tuple(result.first_row().next().get_value());
-
-    size_t collection_size = cass_value_item_count(result_tuple);
-    ASSERT_EQ(tuple.size(), collection_size);
-
-    CassIterator* collection_iterator = cass_iterator_from_tuple(result_tuple);
-
-    for (size_t j = 0; j < collection_size; ++j) {
-      if (cass_iterator_next(collection_iterator)) {
-        TypeParam value = TypeParam(cass_iterator_get_value(collection_iterator));
-        ASSERT_EQ(value, values[j]);
-      } else {
-        throw Exception("No more values available");
-      }
-    }
-
-    cass_iterator_free(collection_iterator);
+    Tuple result_tuple(result.first_row().next().as<Tuple>());
+    ASSERT_EQ(values, result_tuple.values<TypeParam>());
   }
 }