Compare commits

...

8 Commits

Author SHA1 Message Date
Mikhail Zelenyy
7e74992601 Fixed merge error 2019-11-19 18:43:14 +03:00
Mikhail Zelenyy
0cf060e93d Merge remote-tracking branch 'remotes/origin/dev' into dev-zelenyy-2 2019-11-19 18:05:34 +03:00
Mikhail Zelenyy
1dd2b689ca Commit before merge, two test failed 2019-11-19 18:05:23 +03:00
Mikhail Zelenyy
6c4430a5a4 Merge remote-tracking branch 'remotes/origin/dev' into dev-zelenyy-2 2019-11-13 18:11:45 +03:00
Mikhail Zelenyy
31526c90e1 Minor fix 2019-11-06 16:23:33 +03:00
Mikhail Zelenyy
b36ce57290 Add test for checking data size in DF02 and DF03 2019-11-06 16:10:43 +03:00
Mikhail Zelenyy
9f1cf2fcc3 Fix flush in Tagless format 2019-11-06 16:09:29 +03:00
Mikhail Zelenyy
17fe2f1b66 Split test for Tagged and Tagless format. Tagless test failed. 2019-11-06 16:08:21 +03:00
2 changed files with 91 additions and 6 deletions

View File

@ -4,6 +4,7 @@ import hep.dataforge.context.Global
import java.nio.file.Files import java.nio.file.Files
import kotlin.test.Test import kotlin.test.Test
import kotlin.test.assertEquals import kotlin.test.assertEquals
import kotlin.test.assertTrue
class FileBinaryTest { class FileBinaryTest {
val envelope = Envelope { val envelope = Envelope {
@ -53,4 +54,30 @@ class FileBinaryTest {
assertEquals(binary.size.toInt(), binary.toBytes().size) assertEquals(binary.size.toInt(), binary.toBytes().size)
} }
@Test
fun testMultyPartFileData() {
val envelopeList = (0..5).map {
val dataFile = Files.createTempFile("dataforge_test_bin_$it", ".bin")
dataFile.toFile().writeText(DoubleArray(80000) { it.toDouble() }.joinToString())
val envelopeFromFile = Envelope {
meta {
"a" put "AAA"
"b" put 22.2
}
dataType = "hep.dataforge.satellite"
dataID = "cellDepositTest$it" // добавил только что
data = dataFile.asBinary()
}
envelopeFromFile
}
val envelope = Envelope {
multipart(TaggedEnvelopeFormat, envelopeList)
}
println(envelopeList.map { it.data?.size }.joinToString(" "))
println(envelope.data?.size)
assertTrue { envelope.data!!.size > envelopeList.map { it.data!!.size }.sum() }
}
} }

View File

@ -1,9 +1,13 @@
package hep.dataforge.io package hep.dataforge.io
import hep.dataforge.context.Global import hep.dataforge.context.Global
import java.nio.ByteBuffer
import java.nio.file.Files import java.nio.file.Files
import java.util.*
import kotlin.test.Test import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.test.assertTrue import kotlin.test.assertTrue
import kotlin.test.fail
class FileEnvelopeTest { class FileEnvelopeTest {
@ -32,13 +36,67 @@ class FileEnvelopeTest {
} }
@Test @Test
fun testFileWriteReadTagless() { fun testFileWriteTagged() {
Global.io.run { val tmpPath = Files.createTempFile("dataforge_test", ".df")
val tmpPath = Files.createTempFile("dataforge_test_tagless", ".df") Global.io.writeEnvelopeFile(tmpPath, envelope)
writeEnvelopeFile(tmpPath, envelope, envelopeFormat = TaglessEnvelopeFormat) assertTrue { tmpPath.toFile().length() > 0 }
}
@Test
fun testFileWriteReadTagged() {
val tmpPath = Files.createTempFile("dataforge_test", ".df")
Global.io.writeEnvelopeFile(tmpPath, envelope)
println(tmpPath.toUri()) println(tmpPath.toUri())
val restored: Envelope = readEnvelopeFile(tmpPath)!! val restored: Envelope = Global.io.readEnvelopeFile(tmpPath)!!
assertTrue { envelope.contentEquals(restored) } assertTrue { envelope.contentEquals(restored) }
} }
@Test
fun testFileWriteTagless() {
val tmpPath = Files.createTempFile("dataforge_test", ".df")
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, envelopeFormat = TaglessEnvelopeFormat)
println(tmpPath.toUri())
val restored: Envelope = Global.io.readEnvelopeFile(tmpPath)!!
assertTrue { envelope.contentEquals(restored) }
}
@Test
fun testDataSize() {
val tmpPath = Files.createTempFile("dataforge_test", ".df")
Global.io.writeEnvelopeFile(tmpPath, envelope)
println(tmpPath.toUri())
val scan = Scanner(tmpPath.toFile().inputStream()).useDelimiter("\n").nextLine()
println(scan)
val format = scan.slice(2..5)
when (format) {
"DF03" -> {
val buff = ByteBuffer.allocate(4)
buff.put(scan.slice(12..19).toByteArray())
buff.flip()
val size = buff.long
println(size)
assertEquals(8, size)
}
"DF02" -> {
val buff = ByteBuffer.allocate(4)
buff.put(scan.slice(12..15).toByteArray())
buff.flip()
val size = buff.int
println(size)
assertEquals(8, size)
}
else -> {
fail("Format $format don't have test")
} }
} }
}
}