kemitix/thorp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix up tests to handle new stream return types

Browse source
This commit is contained in:
Paul Campbell 2019-05-24 07:52:36 +01:00
parent a5311fec72
commit 4cff0dd0c9
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/test/scala/net/kemitix/s3thorp/ActionGeneratorSuite.scala
View file

@ -27,7 +27,7 @@ class ActionGeneratorSuite
matchByKey = Some(theRemoteMetadata) // remote exists matchByKey = Some(theRemoteMetadata) // remote exists
) )
it("do nothing") { it("do nothing") {
val expected = List.empty // do nothing val expected = List(DoNothing(theFile.remoteKey))
val result = invoke(input) val result = invoke(input)
assertResult(expected)(result) assertResult(expected)(result)
} }

24
src/test/scala/net/kemitix/s3thorp/S3MetaDataEnricherSuite.scala
View file

@ -27,9 +27,9 @@ class S3MetaDataEnricherSuite
) )
val theRemoteMetadata = RemoteMetaData(theRemoteKey, theHash, lastModified) val theRemoteMetadata = RemoteMetaData(theRemoteKey, theHash, lastModified)
it("generates valid metadata") { it("generates valid metadata") {
val expected = S3MetaData(theFile, val expected = Stream(S3MetaData(theFile,
matchByHash = Set(theRemoteMetadata), matchByHash = Set(theRemoteMetadata),
matchByKey = Some(theRemoteMetadata)) matchByKey = Some(theRemoteMetadata)))
val result = getMetadata(theFile) val result = getMetadata(theFile)
assertResult(expected)(result) assertResult(expected)(result)
} }
@ -44,9 +44,9 @@ class S3MetaDataEnricherSuite
) )
val theRemoteMetadata = RemoteMetaData(theRemoteKey, theHash, lastModified) val theRemoteMetadata = RemoteMetaData(theRemoteKey, theHash, lastModified)
it("generates valid metadata") { it("generates valid metadata") {
val expected = S3MetaData(theFile, val expected = Stream(S3MetaData(theFile,
matchByHash = Set(theRemoteMetadata), matchByHash = Set(theRemoteMetadata),
matchByKey = Some(theRemoteMetadata)) matchByKey = Some(theRemoteMetadata)))
val result = getMetadata(theFile) val result = getMetadata(theFile)
assertResult(expected)(result) assertResult(expected)(result)
} }
@ -61,9 +61,9 @@ class S3MetaDataEnricherSuite
) )
val otherRemoteMetadata = RemoteMetaData(otherRemoteKey, theHash, lastModified) val otherRemoteMetadata = RemoteMetaData(otherRemoteKey, theHash, lastModified)
it("generates valid metadata") { it("generates valid metadata") {
val expected = S3MetaData(theFile, val expected = Stream(S3MetaData(theFile,
matchByHash = Set(otherRemoteMetadata), matchByHash = Set(otherRemoteMetadata),
matchByKey = None) matchByKey = None))
val result = getMetadata(theFile) val result = getMetadata(theFile)
assertResult(expected)(result) assertResult(expected)(result)
} }
@ -76,9 +76,9 @@ class S3MetaDataEnricherSuite
byKey = Map() byKey = Map()
) )
it("generates valid metadata") { it("generates valid metadata") {
val expected = S3MetaData(theFile, val expected = Stream(S3MetaData(theFile,
matchByHash = Set.empty, matchByHash = Set.empty,
matchByKey = None) matchByKey = None))
val result = getMetadata(theFile) val result = getMetadata(theFile)
assertResult(expected)(result) assertResult(expected)(result)
} }
@ -101,9 +101,9 @@ class S3MetaDataEnricherSuite
val theRemoteMetadata = RemoteMetaData(theRemoteKey, oldHash, lastModified) val theRemoteMetadata = RemoteMetaData(theRemoteKey, oldHash, lastModified)
val otherRemoteMetadata = RemoteMetaData(otherRemoteKey, theHash, lastModified) val otherRemoteMetadata = RemoteMetaData(otherRemoteKey, theHash, lastModified)
it("generates valid metadata") { it("generates valid metadata") {
val expected = S3MetaData(theFile, val expected = Stream(S3MetaData(theFile,
matchByHash = Set(otherRemoteMetadata), matchByHash = Set(otherRemoteMetadata),
matchByKey = Some(theRemoteMetadata)) matchByKey = Some(theRemoteMetadata)))
val result = getMetadata(theFile) val result = getMetadata(theFile)
assertResult(expected)(result) assertResult(expected)(result)
} }
@ -123,9 +123,9 @@ class S3MetaDataEnricherSuite
) )
val theRemoteMetadata = RemoteMetaData(theRemoteKey, oldHash, lastModified) val theRemoteMetadata = RemoteMetaData(theRemoteKey, oldHash, lastModified)
it("generates valid metadata") { it("generates valid metadata") {
val expected = S3MetaData(theFile, val expected = Stream(S3MetaData(theFile,
matchByHash = Set.empty, matchByHash = Set.empty,
matchByKey = Some(theRemoteMetadata)) matchByKey = Some(theRemoteMetadata)))
val result = getMetadata(theFile) val result = getMetadata(theFile)
assertResult(expected)(result) assertResult(expected)(result)
} }