From 4cff0dd0c9eb67a08336a7f784c6f9ae773820e6 Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Fri, 24 May 2019 07:52:36 +0100
Subject: [PATCH] fix up tests to handle new stream return types

---
 .../s3thorp/ActionGeneratorSuite.scala        |  2 +-
 .../s3thorp/S3MetaDataEnricherSuite.scala     | 24 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/test/scala/net/kemitix/s3thorp/ActionGeneratorSuite.scala b/src/test/scala/net/kemitix/s3thorp/ActionGeneratorSuite.scala
index 17680ea..853192d 100644
--- a/src/test/scala/net/kemitix/s3thorp/ActionGeneratorSuite.scala
+++ b/src/test/scala/net/kemitix/s3thorp/ActionGeneratorSuite.scala
@@ -27,7 +27,7 @@ class ActionGeneratorSuite
           matchByKey = Some(theRemoteMetadata) // remote exists
           )
         it("do nothing") {
-          val expected = List.empty // do nothing
+          val expected = List(DoNothing(theFile.remoteKey))
           val result = invoke(input)
           assertResult(expected)(result)
         }
diff --git a/src/test/scala/net/kemitix/s3thorp/S3MetaDataEnricherSuite.scala b/src/test/scala/net/kemitix/s3thorp/S3MetaDataEnricherSuite.scala
index 37d1ea7..1f88a75 100644
--- a/src/test/scala/net/kemitix/s3thorp/S3MetaDataEnricherSuite.scala
+++ b/src/test/scala/net/kemitix/s3thorp/S3MetaDataEnricherSuite.scala
@@ -27,9 +27,9 @@ class S3MetaDataEnricherSuite
         )
         val theRemoteMetadata = RemoteMetaData(theRemoteKey, theHash, lastModified)
         it("generates valid metadata") {
-          val expected = S3MetaData(theFile,
+          val expected = Stream(S3MetaData(theFile,
             matchByHash = Set(theRemoteMetadata),
-            matchByKey = Some(theRemoteMetadata))
+            matchByKey = Some(theRemoteMetadata)))
           val result = getMetadata(theFile)
           assertResult(expected)(result)
         }
@@ -44,9 +44,9 @@ class S3MetaDataEnricherSuite
         )
         val theRemoteMetadata = RemoteMetaData(theRemoteKey, theHash, lastModified)
         it("generates valid metadata") {
-          val expected = S3MetaData(theFile,
+          val expected = Stream(S3MetaData(theFile,
             matchByHash = Set(theRemoteMetadata),
-            matchByKey = Some(theRemoteMetadata))
+            matchByKey = Some(theRemoteMetadata)))
           val result = getMetadata(theFile)
           assertResult(expected)(result)
         }
@@ -61,9 +61,9 @@ class S3MetaDataEnricherSuite
         )
         val otherRemoteMetadata = RemoteMetaData(otherRemoteKey, theHash, lastModified)
         it("generates valid metadata") {
-          val expected = S3MetaData(theFile,
+          val expected = Stream(S3MetaData(theFile,
             matchByHash = Set(otherRemoteMetadata),
-            matchByKey = None)
+            matchByKey = None))
           val result = getMetadata(theFile)
           assertResult(expected)(result)
         }
@@ -76,9 +76,9 @@ class S3MetaDataEnricherSuite
           byKey = Map()
         )
         it("generates valid metadata") {
-          val expected = S3MetaData(theFile,
+          val expected = Stream(S3MetaData(theFile,
             matchByHash = Set.empty,
-            matchByKey = None)
+            matchByKey = None))
           val result = getMetadata(theFile)
           assertResult(expected)(result)
         }
@@ -101,9 +101,9 @@ class S3MetaDataEnricherSuite
         val theRemoteMetadata = RemoteMetaData(theRemoteKey, oldHash, lastModified)
         val otherRemoteMetadata = RemoteMetaData(otherRemoteKey, theHash, lastModified)
         it("generates valid metadata") {
-          val expected = S3MetaData(theFile,
+          val expected = Stream(S3MetaData(theFile,
             matchByHash = Set(otherRemoteMetadata),
-            matchByKey = Some(theRemoteMetadata))
+            matchByKey = Some(theRemoteMetadata)))
           val result = getMetadata(theFile)
           assertResult(expected)(result)
         }
@@ -123,9 +123,9 @@ class S3MetaDataEnricherSuite
         )
         val theRemoteMetadata = RemoteMetaData(theRemoteKey, oldHash, lastModified)
         it("generates valid metadata") {
-          val expected = S3MetaData(theFile,
+          val expected = Stream(S3MetaData(theFile,
             matchByHash = Set.empty,
-            matchByKey = Some(theRemoteMetadata))
+            matchByKey = Some(theRemoteMetadata)))
           val result = getMetadata(theFile)
           assertResult(expected)(result)
         }