From 111311fd935d9bd271c673cf10c0babe54bde8a6 Mon Sep 17 00:00:00 2001
From: vlad <vlad@driver.xyz>
Date: Fri, 16 Jun 2017 11:12:52 -0700
Subject: Update PDS UI common code to be up to date

---
 .../BridgeUploadQueueRepositoryAdapterSuite.scala  |  6 ++++-
 .../xyz/driver/pdsuicommon/utils/DiffUtils.scala   | 27 ++++++++++++++++++++++
 .../xyz/driver/pdsuidomain/DocumentSuite.scala     | 21 +++++++++--------
 3 files changed, 43 insertions(+), 11 deletions(-)

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

diff --git a/src/test/scala/xyz/driver/pdsuicommon/concurrent/BridgeUploadQueueRepositoryAdapterSuite.scala b/src/test/scala/xyz/driver/pdsuicommon/concurrent/BridgeUploadQueueRepositoryAdapterSuite.scala
index 48a4eaf..d0dbb04 100644
--- a/src/test/scala/xyz/driver/pdsuicommon/concurrent/BridgeUploadQueueRepositoryAdapterSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuicommon/concurrent/BridgeUploadQueueRepositoryAdapterSuite.scala
@@ -19,7 +19,7 @@ class BridgeUploadQueueRepositoryAdapterSuite extends BaseSuite {
 
   "Strategy" - {
     "LimitExponential" - {
-      "calculateNextInterval" - {
+      "on" - {
         val strategy = Strategy.LimitExponential(
           startInterval = 10.seconds,
           intervalFactor = 1.4,
@@ -40,6 +40,10 @@ class BridgeUploadQueueRepositoryAdapterSuite extends BaseSuite {
         "should limit intervals" in {
           assert(strategy.on(20) == OnAttempt.Continue(strategy.maxInterval))
         }
+
+        "should not fail, if there is many attempts" in {
+          assert(strategy.on(1000) == OnAttempt.Continue(strategy.maxInterval))
+        }
       }
     }
   }
diff --git a/src/test/scala/xyz/driver/pdsuicommon/utils/DiffUtils.scala b/src/test/scala/xyz/driver/pdsuicommon/utils/DiffUtils.scala
index 5338173..cc2ef0a 100644
--- a/src/test/scala/xyz/driver/pdsuicommon/utils/DiffUtils.scala
+++ b/src/test/scala/xyz/driver/pdsuicommon/utils/DiffUtils.scala
@@ -6,6 +6,7 @@ import java.time.{LocalDate, LocalDateTime}
 import ai.x.diff._
 import org.scalatest.Assertions
 import xyz.driver.pdsuicommon.domain.PasswordHash
+import xyz.driver.pdsuidomain.entities.{Document, ExtractedData, MedicalRecord}
 
 import scala.io.AnsiColor
 
@@ -47,4 +48,30 @@ trait DiffUtils { this: Assertions =>
       else Different(showChange(left, right))
     }
   }
+
+  implicit def metaDiffShow: DiffShow[MedicalRecord.Meta] = new DiffShow[MedicalRecord.Meta] {
+    def show(x: MedicalRecord.Meta): String = s"MedicalRecord.Meta($x)"
+    def diff(left: MedicalRecord.Meta, right: MedicalRecord.Meta): Comparison = {
+      if (left.equals(right)) Identical(show(left))
+      else Different(showChange(left, right))
+    }
+  }
+
+  implicit def extractedDataMetaDiffShow: DiffShow[ExtractedData.Meta] = new DiffShow[ExtractedData.Meta] {
+    def show(x: ExtractedData.Meta): String = s"ExtractedData.Meta($x)"
+    def diff(left: ExtractedData.Meta, right: ExtractedData.Meta): Comparison = {
+      if (left.equals(right)) Identical(show(left))
+      else Different(showChange(left, right))
+    }
+  }
+
+  implicit def documentDiffShow: DiffShow[Document] = new DiffShow[Document] {
+    def show(x: Document): String = s"Document($x)"
+
+    def diff(left: Document, right: Document): Comparison = {
+      if (left == right) Identical(show(left))
+      else Different(showChange(left, right))
+    }
+  }
+
 }
diff --git a/src/test/scala/xyz/driver/pdsuidomain/DocumentSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/DocumentSuite.scala
index 78edc10..3955667 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/DocumentSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/DocumentSuite.scala
@@ -13,21 +13,22 @@ class DocumentSuite extends BaseSuite {
     "can't submit invalid data" - {
       val base = sampleDocument
 
-      val now = LocalDate.now()
-      val past1 = now.minus(2, ChronoUnit.DAYS)
-      val past2 = past1.plus(1, ChronoUnit.DAYS)
+      val now     = LocalDate.now()
+      val past1   = now.minus(2, ChronoUnit.DAYS)
+      val past2   = past1.plus(1, ChronoUnit.DAYS)
       val future1 = now.plus(1, ChronoUnit.DAYS)
       val future2 = future1.plus(1, ChronoUnit.DAYS)
 
       Seq(
-        "startDate should be non-empty" -> base.copy(startDate = None),
-        "startDate should be greater, than endDate" -> base.copy(startDate = Some(past2), endDate = Some(past1)),
+        "startDate should be non-empty"               -> base.copy(startDate = None),
+        "startDate should be greater, than endDate"   -> base.copy(startDate = Some(past2), endDate = Some(past1)),
         "startDate and endDate should be in the past" -> base.copy(startDate = Some(future1), endDate = Some(future2))
-      ).foreach { case (title, orig) =>
-        s"$title" in {
-          val r = Document.validator(orig)
-          assert(r.isLeft, s"should fail, but: ${r.right}")
-        }
+      ).foreach {
+        case (title, orig) =>
+          s"$title" in {
+            val r = Document.validator(orig)
+            assert(r.isLeft, s"should fail, but: ${r.right}")
+          }
       }
     }
   }
-- 
cgit v1.2.3