tests: default fields

Author: lavkesh

src/main/java/io/odpf/depot/message/field/FieldUtils.java

@@ -10,7 +10,7 @@
 public class FieldUtils {
     private static final Gson GSON = new GsonBuilder().create();
 
-    public static String convertToString(Object value, Function<Object, String> toStringFunc) {
+    public static String convertToStringForMessageTypes(Object value, Function<Object, String> toStringFunc) {
         if (value instanceof Collection<?>) {
             return "[" + ((Collection<?>) value)
                     .stream()
@@ -22,7 +22,7 @@ public static String convertToString(Object value, Function<Object, String> toSt
 
     /**
      * This method is used to convert default types which string formats are not in json.
-     * for example: a list of doubles value or list of string etc
+     * for example: a list of doubles, strings, enum etc.
      */
     public static String convertToString(Object value) {
         if (value instanceof Collection<?>) {
@@ -32,7 +32,7 @@ public static String convertToString(Object value) {
         }
     }
 
-    public static String convertToStringWithQuotes(Object value, Function<Object, String> toStringFunc) {
+    public static String convertToStringForSpecialTypes(Object value, Function<Object, String> toStringFunc) {
         if (value instanceof Collection<?>) {
             return "[" + ((Collection<?>) value)
                     .stream()

src/main/java/io/odpf/depot/message/field/proto/DurationField.java

@@ -16,7 +16,7 @@ public DurationField(Object value) {
 
     @Override
     public String getString() {
-        return FieldUtils.convertToStringWithQuotes(value, this::getDurationString);
+        return FieldUtils.convertToStringForSpecialTypes(value, this::getDurationString);
     }
 
     private String getDurationString(Object field) {

src/main/java/io/odpf/depot/message/field/proto/MessageField.java

@@ -20,7 +20,7 @@ public MessageField(Object value) {
 
     @Override
     public String getString() {
-        return FieldUtils.convertToString(value, this::getMessageString);
+        return FieldUtils.convertToStringForMessageTypes(value, this::getMessageString);
     }
 
     private String getMessageString(Object ob) {

src/main/java/io/odpf/depot/message/field/proto/StructField.java

@@ -14,6 +14,6 @@ public StructField(Object value) {
     @Override
     public String getString() {
         // This Struct is already converted into strings, so we just need to concat it.
-        return FieldUtils.convertToString(value, Object::toString);
+        return FieldUtils.convertToStringForMessageTypes(value, Object::toString);
     }
 }

src/main/java/io/odpf/depot/message/field/proto/TimeStampField.java

@@ -22,6 +22,6 @@ public static Instant getInstant(Object field) {
 
     @Override
     public String getString() {
-        return FieldUtils.convertToStringWithQuotes(value, Object::toString);
+        return FieldUtils.convertToStringForSpecialTypes(value, Object::toString);
     }
 }

src/test/java/io/odpf/depot/message/field/proto/DefaultFieldTest.java

@@ -1,5 +1,6 @@
 package io.odpf.depot.message.field.proto;
 
+import io.odpf.depot.message.field.GenericField;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -10,8 +11,8 @@
 public class DefaultFieldTest {
 
     @Test
-    public void shouldReturnDefaultStringField() {
-        DefaultField f = new DefaultField("test");
+    public void shouldReturnDefaultPrimitiveFields() {
+        GenericField f = new DefaultField("test");
         Assert.assertEquals("test", f.getString());
         List<String> strings = new ArrayList<>();
         strings.add("test1");
@@ -30,7 +31,35 @@ public void shouldReturnDefaultStringField() {
         tss.add(Instant.ofEpochSecond(1000121010));
         tss.add(Instant.ofEpochSecond(1002121010));
         tss.add(Instant.ofEpochSecond(1003121010));
-        TimeStampField tsf = new TimeStampField(tss);
-        Assert.assertEquals("[\"2001-09-10T11:23:30Z\",\"2001-10-03T14:56:50Z\",\"2001-10-15T04:43:30Z\"]", tsf.getString());
+        f = new TimeStampField(tss);
+        Assert.assertEquals("[\"2001-09-10T11:23:30Z\",\"2001-10-03T14:56:50Z\",\"2001-10-15T04:43:30Z\"]", f.getString());
+
+        List<Boolean> booleanList = new ArrayList<>();
+        booleanList.add(true);
+        booleanList.add(false);
+        booleanList.add(true);
+        f = new DefaultField(booleanList);
+        Assert.assertEquals("[true,false,true]", f.getString());
+
+        List<Double> doubles = new ArrayList<>();
+        doubles.add(123.93);
+        doubles.add(13.0);
+        doubles.add(23.0);
+        f = new DefaultField(doubles);
+        Assert.assertEquals("[123.93,13.0,23.0]", f.getString());
+
+        List<TestEnum> enums = new ArrayList<>();
+        enums.add(TestEnum.INACTIVE);
+        enums.add(TestEnum.COMPLETED);
+        enums.add(TestEnum.RUNNING);
+        f = new DefaultField(enums);
+        Assert.assertEquals("[\"INACTIVE\",\"COMPLETED\",\"RUNNING\"]", f.getString());
+
+    }
+
+    private enum TestEnum {
+        COMPLETED,
+        RUNNING,
+        INACTIVE
     }
 }

src/test/java/io/odpf/depot/message/proto/ProtoOdpfParsedMessageTest.java

@@ -417,7 +417,9 @@ public void shouldGetRepeatableStructField() throws IOException {
 
         Parser protoParser = StencilClientFactory.getClient().getParser(TestMessageBQ.class.getName());
         OdpfMessageSchema odpfMessageSchema = odpfMessageParser.getSchema("io.odpf.depot.TestMessageBQ", descriptorsMap);
-        List<?> attributes = (List<?>) ((ProtoField) (new ProtoOdpfParsedMessage(protoParser.parse(message.toByteArray())).getFieldByName("attributes", odpfMessageSchema))).getValue();
+        ProtoOdpfParsedMessage protoOdpfParsedMessage = new ProtoOdpfParsedMessage(protoParser.parse(message.toByteArray()));
+        List<?> attributes = (List<?>) ((ProtoField) (protoOdpfParsedMessage.getFieldByName("attributes", odpfMessageSchema))).getValue();
+        protoOdpfParsedMessage.getMapping(odpfMessageSchema);
         JSONArray expectedArray = new JSONArray();
         JSONArray actualArray = new JSONArray();
         for (int ii = 0; ii < message.getAttributesCount(); ii++) {