From 7e749926019b4c34e6c191350773aace9d0aabc9 Mon Sep 17 00:00:00 2001 From: Mikhail Zelenyy Date: Tue, 19 Nov 2019 18:43:14 +0300 Subject: [PATCH] Fixed merge error --- .../kotlin/hep/dataforge/io/FileEnvelopeTest.kt | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/dataforge-io/src/jvmTest/kotlin/hep/dataforge/io/FileEnvelopeTest.kt b/dataforge-io/src/jvmTest/kotlin/hep/dataforge/io/FileEnvelopeTest.kt index ccd9fb60..f77e4903 100644 --- a/dataforge-io/src/jvmTest/kotlin/hep/dataforge/io/FileEnvelopeTest.kt +++ b/dataforge-io/src/jvmTest/kotlin/hep/dataforge/io/FileEnvelopeTest.kt @@ -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 fun testFileWriteTagged() { val tmpPath = Files.createTempFile("dataforge_test", ".df") @@ -65,14 +54,14 @@ class FileEnvelopeTest { @Test fun testFileWriteTagless() { 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 } } @Test fun testFileWriteReadTagless() { val tmpPath = Files.createTempFile("dataforge_test", ".df") - Global.io.writeEnvelopeFile(tmpPath, envelope, format = TaglessEnvelopeFormat) + Global.io.writeEnvelopeFile(tmpPath, envelope, envelopeFormat = TaglessEnvelopeFormat) println(tmpPath.toUri()) val restored: Envelope = Global.io.readEnvelopeFile(tmpPath)!! assertTrue { envelope.contentEquals(restored) }