Fixed merge error

This commit is contained in:
Mikhail Zelenyy 2019-11-19 18:43:14 +03:00
parent 0cf060e93d
commit 7e74992601

View File

@ -35,17 +35,6 @@ class FileEnvelopeTest {
} }
} }
@Test
fun testFileWriteReadTagless() {
Global.io.run {
val tmpPath = Files.createTempFile("dataforge_test_tagless", ".df")
writeEnvelopeFile(tmpPath, envelope, envelopeFormat = TaglessEnvelopeFormat)
println(tmpPath.toUri())
val restored: Envelope = readEnvelopeFile(tmpPath)!!
assertTrue { envelope.contentEquals(restored) }
}
}
@Test @Test
fun testFileWriteTagged() { fun testFileWriteTagged() {
val tmpPath = Files.createTempFile("dataforge_test", ".df") val tmpPath = Files.createTempFile("dataforge_test", ".df")
@ -65,14 +54,14 @@ class FileEnvelopeTest {
@Test @Test
fun testFileWriteTagless() { fun testFileWriteTagless() {
val tmpPath = Files.createTempFile("dataforge_test", ".df") val tmpPath = Files.createTempFile("dataforge_test", ".df")
Global.io.writeEnvelopeFile(tmpPath, envelope, format = TaglessEnvelopeFormat) Global.io.writeEnvelopeFile(tmpPath, envelope, envelopeFormat = TaglessEnvelopeFormat)
assertTrue { tmpPath.toFile().length() > 0 } assertTrue { tmpPath.toFile().length() > 0 }
} }
@Test @Test
fun testFileWriteReadTagless() { fun testFileWriteReadTagless() {
val tmpPath = Files.createTempFile("dataforge_test", ".df") val tmpPath = Files.createTempFile("dataforge_test", ".df")
Global.io.writeEnvelopeFile(tmpPath, envelope, format = TaglessEnvelopeFormat) Global.io.writeEnvelopeFile(tmpPath, envelope, envelopeFormat = TaglessEnvelopeFormat)
println(tmpPath.toUri()) println(tmpPath.toUri())
val restored: Envelope = Global.io.readEnvelopeFile(tmpPath)!! val restored: Envelope = Global.io.readEnvelopeFile(tmpPath)!!
assertTrue { envelope.contentEquals(restored) } assertTrue { envelope.contentEquals(restored) }