From e45e981634c1bdccd02bae4e37fac1c1e654cdfe Mon Sep 17 00:00:00 2001
From: vlad <vlad@drivergrp.com>
Date: Mon, 25 Jul 2016 15:00:39 -0400
Subject: Some more JSON formatters and json,rest packages rearranged

---
 src/test/scala/com/drivergrp/core/JsonTest.scala | 40 ++++++++++++++++++++++++
 src/test/scala/com/drivergrp/core/RestTest.scala | 40 ------------------------
 2 files changed, 40 insertions(+), 40 deletions(-)
 create mode 100644 src/test/scala/com/drivergrp/core/JsonTest.scala
 delete mode 100644 src/test/scala/com/drivergrp/core/RestTest.scala

(limited to 'src/test/scala/com')

diff --git a/src/test/scala/com/drivergrp/core/JsonTest.scala b/src/test/scala/com/drivergrp/core/JsonTest.scala
new file mode 100644
index 0000000..201f05f
--- /dev/null
+++ b/src/test/scala/com/drivergrp/core/JsonTest.scala
@@ -0,0 +1,40 @@
+package com.drivergrp.core
+
+import com.drivergrp.core.time.provider.SystemTimeProvider
+import org.scalatest.{FlatSpec, Matchers}
+
+class JsonTest extends FlatSpec with Matchers {
+
+  "Json format for Id" should "read and write correct JSON" in {
+
+    val referenceId = Id[String](1312L)
+
+    val writtenJson = com.drivergrp.core.json.basicFormats.idFormat.write(referenceId)
+    writtenJson.prettyPrint should be("1312")
+
+    val parsedId = com.drivergrp.core.json.basicFormats.idFormat.read(writtenJson)
+    parsedId should be(referenceId)
+  }
+
+  "Json format for Name" should "read and write correct JSON" in {
+
+    val referenceName = Name[String]("Homer")
+
+    val writtenJson = com.drivergrp.core.json.basicFormats.nameFormat.write(referenceName)
+    writtenJson.prettyPrint should be("\"Homer\"")
+
+    val parsedName = com.drivergrp.core.json.basicFormats.nameFormat.read(writtenJson)
+    parsedName should be(referenceName)
+  }
+
+  "Json format for Time" should "read and write correct JSON" in {
+
+    val referenceTime = new SystemTimeProvider().currentTime()
+
+    val writtenJson = com.drivergrp.core.json.basicFormats.timeFormat.write(referenceTime)
+    writtenJson.prettyPrint should be("{\n  \"timestamp\": " + referenceTime.millis + "\n}")
+
+    val parsedTime = com.drivergrp.core.json.basicFormats.timeFormat.read(writtenJson)
+    parsedTime should be(referenceTime)
+  }
+}
diff --git a/src/test/scala/com/drivergrp/core/RestTest.scala b/src/test/scala/com/drivergrp/core/RestTest.scala
deleted file mode 100644
index 68be55c..0000000
--- a/src/test/scala/com/drivergrp/core/RestTest.scala
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.drivergrp.core
-
-import com.drivergrp.core.time.provider.SystemTimeProvider
-import org.scalatest.{FlatSpec, Matchers}
-
-class RestTest extends FlatSpec with Matchers {
-
-  "Json format for Id" should "read and write correct JSON" in {
-
-    val referenceId = Id[String](1312L)
-
-    val writtenJson = com.drivergrp.core.rest.basicFormats.idFormat.write(referenceId)
-    writtenJson.prettyPrint should be("1312")
-
-    val parsedId = com.drivergrp.core.rest.basicFormats.idFormat.read(writtenJson)
-    parsedId should be(referenceId)
-  }
-
-  "Json format for Name" should "read and write correct JSON" in {
-
-    val referenceName = Name[String]("Homer")
-
-    val writtenJson = com.drivergrp.core.rest.basicFormats.nameFormat.write(referenceName)
-    writtenJson.prettyPrint should be("\"Homer\"")
-
-    val parsedName = com.drivergrp.core.rest.basicFormats.nameFormat.read(writtenJson)
-    parsedName should be(referenceName)
-  }
-
-  "Json format for Time" should "read and write correct JSON" in {
-
-    val referenceTime = new SystemTimeProvider().currentTime()
-
-    val writtenJson = com.drivergrp.core.rest.basicFormats.timeFormat.write(referenceTime)
-    writtenJson.prettyPrint should be("{\n  \"timestamp\": " + referenceTime.millis + "\n}")
-
-    val parsedTime = com.drivergrp.core.rest.basicFormats.timeFormat.read(writtenJson)
-    parsedTime should be(referenceTime)
-  }
-}
-- 
cgit v1.2.3