JAVA-589 Expand @Enumerated Parameter test to test for STRING storage.

tolbertam · tolbertam · commit 568d658b6619 · 2015-06-18T16:19:42.000-05:00
diff --git a/driver-mapping/src/test/java/com/datastax/driver/mapping/MapperAccessorParamsTest.java b/driver-mapping/src/test/java/com/datastax/driver/mapping/MapperAccessorParamsTest.java
@@ -17,6 +17,7 @@
 
 import java.util.Collection;
 
+import com.datastax.driver.core.ResultSet;
 import com.google.common.collect.Lists;
 import org.testng.annotations.Test;
 
@@ -28,22 +29,41 @@
 public class MapperAccessorParamsTest extends CCMBridge.PerClassSingleNodeCluster {
     @Override
     protected Collection<String> getTableDefinitions() {
-        return Lists.newArrayList("CREATE TABLE user ( key int primary key, gender int)",
-            "CREATE INDEX on user(gender)");
-
+        return Lists.newArrayList(
+                "CREATE TABLE user ( key int primary key, gender int)",
+                "CREATE INDEX on user(gender)",
+                "CREATE TABLE user_str ( key int primary key, gender text)",
+                "CREATE INDEX on user_str(gender)");
     }
 
     @Test(groups = "short")
-    void should_include_enumtype_in_accessor() {
-        Mapper<User> userMapper = new MappingManager(session).mapper(User.class);
-        userMapper.save(new User(1, 0));
-        userMapper.save(new User(2, 1));
-
+    void should_include_enumtype_in_accessor_ordinal() {
         UserAccessor accessor = new MappingManager(session)
-            .createAccessor(UserAccessor.class);
-        assertThat(accessor.getUser(Enum.MALE).one().getGender()).isEqualTo(0);
+                .createAccessor(UserAccessor.class);
+
+        accessor.addUser(0, Enum.FEMALE);
+        accessor.addUser(1, Enum.MALE);
+
+        assertThat(accessor.getUser(Enum.MALE).one().getGender()).isEqualTo(Enum.MALE);
         assertThat(accessor.getUser(Enum.MALE).one().getKey()).isEqualTo(1);
 
+        assertThat(accessor.getUser(Enum.FEMALE).one().getGender()).isEqualTo(Enum.FEMALE);
+        assertThat(accessor.getUser(Enum.FEMALE).one().getKey()).isEqualTo(0);
+    }
+
+    @Test(groups = "short")
+    void should_include_enumtype_in_accessor_string() {
+        UserAccessor accessor = new MappingManager(session)
+                .createAccessor(UserAccessor.class);
+
+        accessor.addUserStr(0, Enum.FEMALE);
+        accessor.addUserStr(1, Enum.MALE);
+
+        assertThat(accessor.getUserStr(Enum.MALE).one().getGender()).isEqualTo(Enum.MALE);
+        assertThat(accessor.getUserStr(Enum.MALE).one().getKey()).isEqualTo(1);
+
+        assertThat(accessor.getUserStr(Enum.FEMALE).one().getGender()).isEqualTo(Enum.FEMALE);
+        assertThat(accessor.getUserStr(Enum.FEMALE).one().getKey()).isEqualTo(0);
     }
 
     enum Enum {
@@ -52,21 +72,63 @@ enum Enum {
 
     @Accessor
     public interface UserAccessor {
-        @Query("select * from user where gender=:val")
-        Result<User> getUser(@Param("val") @Enumerated(EnumType.ORDINAL) Enum value);
+        @Query("select * from user where gender=?")
+        Result<User> getUser(@Enumerated(EnumType.ORDINAL) Enum value);
+
+        @Query("select * from user_str where gender=?")
+        Result<UserStr> getUserStr(@Enumerated(EnumType.STRING) Enum value);
+
+        @Query("insert into user (key, gender) values (?,?)")
+        ResultSet addUser(int key, @Enumerated(EnumType.ORDINAL) Enum value);
+
+        @Query("insert into user_str (key, gender) values (?,?)")
+        ResultSet addUserStr(int key, @Enumerated(EnumType.STRING) Enum value);
     }
 
     @Table(name = "user")
     public static class User {
         @PartitionKey
         private int key;
 
-        private int gender;
+        @Enumerated(EnumType.ORDINAL)
+        private Enum gender;
 
         public User() {
         }
 
-        public User(int k, int val) {
+        public User(int k, Enum val) {
+            this.key = k;
+            this.gender = val;
+        }
+
+        public int getKey() {
+            return this.key;
+        }
+
+        public void setKey(int pk) {
+            this.key = pk;
+        }
+
+        public Enum getGender() {
+            return this.gender;
+        }
+
+        public void setGender(Enum val) {
+            this.gender = val;
+        }
+    }
+
+    @Table(name = "user")
+    public static class UserStr {
+        @PartitionKey
+        private int key;
+
+        private Enum gender;
+
+        public UserStr() {
+        }
+
+        public UserStr(int k, Enum val) {
             this.key = k;
             this.gender = val;
         }
@@ -79,11 +141,11 @@ public void setKey(int pk) {
             this.key = pk;
         }
 
-        public int getGender() {
+        public Enum getGender() {
             return this.gender;
         }
 
-        public void setGender(int val) {
+        public void setGender(Enum val) {
             this.gender = val;
         }
     }
