14 new test + Couple of bug fixes

1 files changed, 61 insertions, 0 deletions

diff --git a/src/test/scala/com/drivergrp/core/JsonTest.scala b/src/test/scala/com/drivergrp/core/JsonTest.scala
index a167762..125e97c 100644
--- a/src/test/scala/com/drivergrp/core/JsonTest.scala
+++ b/src/test/scala/com/drivergrp/core/JsonTest.scala
@@ -1,5 +1,7 @@
 package com.drivergrp.core
 
+import com.drivergrp.core.json.{EnumJsonFormat, ValueClassFormat}
+import com.drivergrp.core.revision.Revision
 import com.drivergrp.core.time.provider.SystemTimeProvider
 import org.scalatest.{FlatSpec, Matchers}
 
@@ -37,4 +39,63 @@ class JsonTest extends FlatSpec with Matchers {
     val parsedTime = com.drivergrp.core.json.timeFormat.read(writtenJson)
     parsedTime should be(referenceTime)
   }
+
+  "Json format for Revision" should "read and write correct JSON" in {
+
+    val referenceRevision = Revision[String]("037e2ec0-8901-44ac-8e53-6d39f6479db4")
+
+    val writtenJson = com.drivergrp.core.json.revisionFormat.write(referenceRevision)
+    writtenJson.prettyPrint should be("\"" + referenceRevision.id + "\"")
+
+    val parsedRevision = com.drivergrp.core.json.revisionFormat.read(writtenJson)
+    parsedRevision should be(referenceRevision)
+  }
+
+  "Json format for Enums" should "read and write correct JSON" in {
+
+    sealed trait EnumVal
+    case object Val1 extends EnumVal
+    case object Val2 extends EnumVal
+    case object Val3 extends EnumVal
+
+    val format = new EnumJsonFormat[EnumVal]("a" -> Val1, "b" -> Val2, "c" -> Val3)
+
+    val referenceEnumValue1 = Val2
+    val referenceEnumValue2 = Val3
+
+    val writtenJson1 = format.write(referenceEnumValue1)
+    writtenJson1.prettyPrint should be("\"b\"")
+
+    val writtenJson2 = format.write(referenceEnumValue2)
+    writtenJson2.prettyPrint should be("\"c\"")
+
+    val parsedEnumValue1 = format.read(writtenJson1)
+    val parsedEnumValue2 = format.read(writtenJson2)
+
+    parsedEnumValue1 should be(referenceEnumValue1)
+    parsedEnumValue2 should be(referenceEnumValue2)
+  }
+
+  // Should be defined outside of case to have a TypeTag
+  case class CustomWrapperClass(value: Int)
+
+  "Json format for Value classes" should "read and write correct JSON" in {
+
+    val format = new ValueClassFormat[CustomWrapperClass](v => BigDecimal(v.value), d => CustomWrapperClass(d.toInt))
+
+    val referenceValue1 = CustomWrapperClass(-2)
+    val referenceValue2 = CustomWrapperClass(10)
+
+    val writtenJson1 = format.write(referenceValue1)
+    writtenJson1.prettyPrint should be("-2")
+
+    val writtenJson2 = format.write(referenceValue2)
+    writtenJson2.prettyPrint should be("10")
+
+    val parsedValue1 = format.read(writtenJson1)
+    val parsedValue2 = format.read(writtenJson2)
+
+    parsedValue1 should be(referenceValue1)
+    parsedValue2 should be(referenceValue2)
+  }
 }