JAVA-1415: UserType.toString should only include 'frozen<>' when frozen

tolbertam · tolbertam · commit f5db4e092542 · 2017-03-15T16:03:31.000-05:00
diff --git a/driver-core/src/main/java/com/datastax/driver/core/UserType.java b/driver-core/src/main/java/com/datastax/driver/core/UserType.java
@@ -291,7 +291,10 @@ private String asCQLQuery(boolean formatted) {
 
     @Override
     public String toString() {
-        return "frozen<" + Metadata.escapeId(getKeyspace()) + '.' + Metadata.escapeId(getTypeName()) + ">";
+        String str = Metadata.escapeId(getKeyspace()) + "." + Metadata.escapeId(getTypeName());
+        return isFrozen() ?
+                "frozen<" + str + ">" :
+                str;
     }
 
     @Override
diff --git a/driver-core/src/test/java/com/datastax/driver/core/UserTypesTest.java b/driver-core/src/test/java/com/datastax/driver/core/UserTypesTest.java
@@ -480,8 +480,9 @@ public void should_indicate_user_type_is_frozen() {
         assertThat(keyspaceMetadata.getUserType("type_for_frozen_test"))
                 .isNotFrozen();
 
-        assertThat(keyspaceMetadata.getTable("frozen_table").getColumn("v").getType())
-                .isFrozen();
+        DataType userType = keyspaceMetadata.getTable("frozen_table").getColumn("v").getType();
+        assertThat(userType).isFrozen();
+        assertThat(userType.toString()).isEqualTo("frozen<" + keyspace + ".type_for_frozen_test>");
 
         // The frozen flag is not set for result set definitions (the protocol does not provide
         // that information and it's not really useful in that situation). We always return false.
@@ -505,8 +506,9 @@ public void should_indicate_user_type_is_not_frozen() {
         assertThat(keyspaceMetadata.getUserType("type_for_frozen_test"))
                 .isNotFrozen();
 
-        assertThat(keyspaceMetadata.getTable("not_frozen_table").getColumn("v").getType())
-                .isNotFrozen();
+        DataType userType = keyspaceMetadata.getTable("not_frozen_table").getColumn("v").getType();
+        assertThat(userType).isNotFrozen();
+        assertThat(userType.toString()).isEqualTo(keyspace + ".type_for_frozen_test");
 
         ResultSet rs = session().execute("SELECT v FROM not_frozen_table WHERE k = 1");
         assertThat(rs.getColumnDefinitions().getType(0))
