azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Protobuf. Revamped tests logic: now testing correctness of Kotlin <-> Kotlin (de)serialization instead of using 3rd party JS-protobuf library

Browse Source
This commit is contained in:
dsavvinov
2016-08-17 11:38:30 +03:00
parent 6e3d96364d
commit 09df7a7676
5 changed files with 119 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_js_tests/src/tests/BaseExtendedTests.kt
+54 -54
View File
@@ -87,42 +87,42 @@
// .build()
// }
//
// fun compareBases(kt: Base, jv: BaseMessage.Base): Boolean {
// return kt.flag == jv.flag &&
// kt.int == jv.int &&
// Util.compareArrays(kt.arr.asIterable(), jv.arrList)
// fun compareBases(kt1: Base, jv: BaseMessage.Base): Boolean {
// return kt1.flag == jv.flag &&
// kt1.int == jv.int &&
// Util.compareArrays(kt1.arr.asIterable(), jv.arrList)
// }
//
// fun compareExtended(kt: Extended, jv: ExtendedMessage.Extended): Boolean {
// return kt.flag == jv.flag &&
// kt.int == jv.int &&
// Util.compareArrays(kt.arr.asIterable(), jv.arrList) &&
// Util.compareArrays(kt.arr_longs.asIterable(), jv.arrLongsList) &&
// kt.long == jv.long
// fun compareExtended(kt1: Extended, jv: ExtendedMessage.Extended): Boolean {
// return kt1.flag == jv.flag &&
// kt1.int == jv.int &&
// Util.compareArrays(kt1.arr.asIterable(), jv.arrList) &&
// Util.compareArrays(kt1.arr_longs.asIterable(), jv.arrLongsList) &&
// kt1.long == jv.long
// }
//
// fun compareBaseKtToJavaExtended(kt: Base, jv: ExtendedMessage.Extended): Boolean {
// return kt.flag == jv.flag &&
// kt.int == jv.int &&
// Util.compareArrays(kt.arr.asIterable(), jv.arrList)
// fun compareBaseKtToJavaExtended(kt1: Base, jv: ExtendedMessage.Extended): Boolean {
// return kt1.flag == jv.flag &&
// kt1.int == jv.int &&
// Util.compareArrays(kt1.arr.asIterable(), jv.arrList)
// }
//
// fun compareExtendedKtToJavaBase(kt: Extended, jv: BaseMessage.Base): Boolean {
// return kt.flag == jv.flag &&
// kt.int == jv.int &&
// Util.compareArrays(kt.arr.asIterable(), jv.arrList)
// fun compareExtendedKtToJavaBase(kt1: Extended, jv: BaseMessage.Base): Boolean {
// return kt1.flag == jv.flag &&
// kt1.int == jv.int &&
// Util.compareArrays(kt1.arr.asIterable(), jv.arrList)
// }
//
// fun baseKtToBaseJavaOnce() {
// val kt = generateKtBaseMessage()
// val outs = Util.getKtOutputStream(kt.getSizeNoTag())
// kt.writeTo(outs)
// val kt1 = generateKtBaseMessage()
// val outs = Util.getKtOutputStream(kt1.getSizeNoTag())
// kt1.writeTo(outs)
//
// val ins = Util.KtOutputStreamToInputStream(outs)
// val jv = BaseMessage.Base.parseFrom(ins)
//
// Util.assert(kt.errorCode == 0)
// Util.assert(compareBases(kt, jv))
// Util.assert(kt1.errorCode == 0)
// Util.assert(compareBases(kt1, jv))
// }
//
// fun baseJavaToBaseKtOnce() {
@@ -131,23 +131,23 @@
// val jv = generateJvBaseMessage()
// jv.writeTo(outs)
// val ins = CodedInputStream(outs.toByteArray())
// val kt = Base.BuilderBase(LongArray(0), false, 0).build()
// kt.mergeFrom(ins)
// val kt1 = Base.BuilderBase(LongArray(0), false, 0).build()
// kt1.mergeFrom(ins)
//
// Util.assert(kt.errorCode == 0)
// Util.assert(compareBases(kt, jv))
// Util.assert(kt1.errorCode == 0)
// Util.assert(compareBases(kt1, jv))
// }
//
// fun baseKtToExtendedJavaOnce() {
// val kt = generateKtBaseMessage()
// val outs = Util.getKtOutputStream(kt.getSizeNoTag())
// kt.writeTo(outs)
// val kt1 = generateKtBaseMessage()
// val outs = Util.getKtOutputStream(kt1.getSizeNoTag())
// kt1.writeTo(outs)
//
// val ins = Util.KtOutputStreamToInputStream(outs)
// val jv = ExtendedMessage.Extended.parseFrom(ins)
//
// Util.assert(kt.errorCode == 0)
// Util.assert(compareBaseKtToJavaExtended(kt, jv))
// Util.assert(kt1.errorCode == 0)
// Util.assert(compareBaseKtToJavaExtended(kt1, jv))
// }
//
// fun extendedJavaToBaseKtOnce() {
@@ -158,23 +158,23 @@
//
// val ins = CodedInputStream(outs.toByteArray())
//
// val kt = Base.BuilderBase(LongArray(0), false, 0).build()
// kt.mergeFrom(ins)
// val kt1 = Base.BuilderBase(LongArray(0), false, 0).build()
// kt1.mergeFrom(ins)
//
// Util.assert(kt.errorCode == 0)
// Util.assert(compareBaseKtToJavaExtended(kt, jv))
// Util.assert(kt1.errorCode == 0)
// Util.assert(compareBaseKtToJavaExtended(kt1, jv))
// }
//
// fun extendedKtToBaseJavaOnce() {
// val kt = generateKtExtendedMessage()
// val outs = Util.getKtOutputStream(kt.getSizeNoTag())
// kt.writeTo(outs)
// val kt1 = generateKtExtendedMessage()
// val outs = Util.getKtOutputStream(kt1.getSizeNoTag())
// kt1.writeTo(outs)
//
// val ins = Util.KtOutputStreamToInputStream(outs)
// val jv = BaseMessage.Base.parseFrom(ins)
//
// Util.assert(kt.errorCode == 0)
// Util.assert(compareExtendedKtToJavaBase(kt, jv))
// Util.assert(kt1.errorCode == 0)
// Util.assert(compareExtendedKtToJavaBase(kt1, jv))
// }
//
// fun baseJavaToExtendedKtOnce() {
@@ -185,23 +185,23 @@
//
// val ins = CodedInputStream(outs.toByteArray())
//
// val kt = Extended.BuilderExtended(LongArray(0), LongArray(0), false, 0L, 0).build()
// kt.mergeFrom(ins)
// val kt1 = Extended.BuilderExtended(LongArray(0), LongArray(0), false, 0L, 0).build()
// kt1.mergeFrom(ins)
//
// Util.assert(kt.errorCode == 0)
// Util.assert(compareExtendedKtToJavaBase(kt, jv))
// Util.assert(kt1.errorCode == 0)
// Util.assert(compareExtendedKtToJavaBase(kt1, jv))
// }
//
// fun extendedKtToExtendedJavaOnce() {
// val kt = generateKtExtendedMessage()
// val outs = Util.getKtOutputStream(kt.getSizeNoTag())
// kt.writeTo(outs)
// val kt1 = generateKtExtendedMessage()
// val outs = Util.getKtOutputStream(kt1.getSizeNoTag())
// kt1.writeTo(outs)
//
// val ins = Util.KtOutputStreamToInputStream(outs)
// val jv = ExtendedMessage.Extended.parseFrom(ins)
//
// Util.assert(kt.errorCode == 0)
// Util.assert(compareExtended(kt, jv))
// Util.assert(kt1.errorCode == 0)
// Util.assert(compareExtended(kt1, jv))
// }
//
// fun extendedJavaToExtendedKtOnce() {
@@ -210,11 +210,11 @@
// val jv = generateJvExtendedMessage()
// jv.writeTo(outs)
// val ins = CodedInputStream(outs.toByteArray())
// val kt = Extended.BuilderExtended(LongArray(0), LongArray(0), false, 0L, 0).build()
// kt.mergeFrom(ins)
// val kt1 = Extended.BuilderExtended(LongArray(0), LongArray(0), false, 0L, 0).build()
// kt1.mergeFrom(ins)
//
// Util.assert(kt.errorCode == 0)
// Util.assert(compareExtended(kt, jv))
// Util.assert(kt1.errorCode == 0)
// Util.assert(compareExtended(kt1, jv))
// }
//
// val testRuns = 1000
proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_js_tests/src/tests/RepeatedVarintsTest.kt
+22 -55
View File
@@ -4,9 +4,6 @@ import CodedInputStream
import MessageRepeatedVarints
object RepeatedVarintsTest {
val builder = protoBuf.loadProtoFile("./js_messages/repeated_varints.proto")
val JSMessageRepeatedVarints= builder.build("MessageRepeatedVarints")
fun generateKtRepeatedVarints(): MessageRepeatedVarints {
val int = Util.generateIntArray()
val long = Util.generateLongArray()
@@ -21,65 +18,35 @@ object RepeatedVarintsTest {
).build()
}
fun generateJSRepeatedVarints(): dynamic {
val int = Util.generateIntArray()
val long = Util.generateIntArray()
val sint = Util.generateIntArray()
val slong = Util.generateIntArray()
val bool = Util.generateBoolArray()
val uint = Util.generateIntArray()
val ulong = Util.generateIntArray()
val MessageClass = JSMessageRepeatedVarints
return js("new MessageClass(int, long, sint, slong, bool, uint, ulong)")
fun compareRepeatedVarints(kt1: MessageRepeatedVarints, kt2: MessageRepeatedVarints): Boolean {
return Util.compareArrays(kt1.int.asIterable(), kt2.int.asIterable()) &&
Util.compareArrays(kt1.long.asIterable(), kt2.long.asIterable()) &&
Util.compareArrays(kt1.sint.asIterable(), kt2.sint.asIterable()) &&
Util.compareArrays(kt1.slong.asIterable(), kt2.slong.asIterable()) &&
Util.compareArrays(kt1.bl.asIterable(), kt2.bl.asIterable()) &&
Util.compareArrays(kt1.uint.asIterable(), kt2.uint.asIterable()) &&
Util.compareArrays(kt1.ulong.asIterable(), kt2.ulong.asIterable())
}
fun compareRepeatedVarints(kt: MessageRepeatedVarints, jvs: dynamic): Boolean {
return Util.compareArrays(kt.int, jvs.int) &&
Util.compareArrays(kt.long, jvs.long) &&
Util.compareArrays(kt.sint, jvs.sint) &&
Util.compareArrays(kt.slong, jvs.slong) &&
Util.compareArrays(kt.bl, jvs.bl) &&
Util.compareUIntArrays(kt.uint, jvs.uint) &&
Util.compareULongArrays(kt.ulong, jvs.ulong)
fun ktToKtOnce() {
val msg = generateKtRepeatedVarints()
val outs = Util.getKtOutputStream(msg.getSizeNoTag())
msg.writeTo(outs)
val ins = CodedInputStream(outs.buffer)
val readMsg = MessageRepeatedVarints.BuilderMessageRepeatedVarints(
IntArray(0), LongArray(0), IntArray(0), LongArray(0), BooleanArray(0), IntArray(0), LongArray(0)
).parseFrom(ins).build()
Util.assert(readMsg.errorCode == 0)
Util.assert(compareRepeatedVarints(msg, readMsg))
}
fun ktToJsOnce() {
val kt = generateKtRepeatedVarints()
val outs = Util.getKtOutputStream(kt.getSizeNoTag())
kt.writeTo(outs)
val jvs = JSMessageRepeatedVarints.decode(outs.buffer)
Util.assert(kt.errorCode == 0)
Util.assert(compareRepeatedVarints(kt, jvs))
}
fun jsToKtOnce() {
val jvs = generateJSRepeatedVarints()
val byteBuffer = jvs.toBuffer()
val ins = CodedInputStream(Util.JSBufferToByteArray(byteBuffer))
val kt = MessageRepeatedVarints.BuilderMessageRepeatedVarints(
IntArray(0), LongArray(0), IntArray(0), LongArray(0), BooleanArray(0), IntArray(0), LongArray(0)
).parseFrom(ins).build()
js("debugger")
Util.assert(kt.errorCode == 0)
Util.assert(compareRepeatedVarints(kt, jvs))
}
val testRuns = 1
val testRuns = 1000
fun runTests() {
for (i in 0..testRuns) {
println("JavaScript -> Kotlin")
jsToKtOnce()
println()
println("Kotlin -> JavaScript")
ktToJsOnce()
ktToKtOnce()
}
}
}
proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_js_tests/src/tests/Util.kt
+11 -75
View File
@@ -23,17 +23,16 @@ object Util {
return nextInt(Int.MIN_VALUE, Int.MAX_VALUE)
}
// Despite the name, functions below returns Ints instead of Longs.
// JS doesn't support fair 64-bits ints, so both Kotlin and ProtobufJS
// emulates them via additional classes.
// Of course, there is no easy way to convert Kotlin-Long to ProtobufJS-Long,
// so this part of Protobuf library left uncovered.
fun nextLong(): Int {
return nextInt()
fun nextLong(min_val: Long, max_val: Long): Long {
return nextInt().toLong()
}
fun nextLong(min_val: Long, max_val: Long): Int {
return nextInt(min_val.toInt(), max_val.toInt())
fun nextLong(max_val: Long): Long {
return nextLong(0L, max_val)
}
fun nextLong(): Long {
return nextLong(Long.MIN_VALUE, Long.MAX_VALUE)
}
fun nextBoolean(): Boolean {
@@ -53,24 +52,6 @@ object Util {
}
}
fun JSBufferToByteArray(buffer: dynamic): ByteArray {
val size = buffer.length
val byteArray = ByteArray(size)
for (i in 0..(size - 1)) {
byteArray[i] = buffer[i]
}
return byteArray
}
fun compareUints(kt: Int, jvs: dynamic): Boolean {
val fairUInt: Long = kt.toLong() and (-1L ushr 32)
return fairUInt.toString() == jvs.toString()
}
fun compareUlongs(kt: Long, jvs: dynamic): Boolean {
return kt.toString() == jvs.toString()
}
fun generateIntArray(): IntArray {
val size = nextInt(ARRAY_MAX_SIZE)
val arr = IntArray(size)
@@ -80,49 +61,15 @@ object Util {
return arr
}
fun compareArrays(kt: dynamic, jvs: dynamic): Boolean {
if (kt.length != jvs.length) {
return false
}
for (i in 0..(kt.length - 1)) {
if (kt[i].toString() != jvs[i].toString()) {
return false
}
}
return true
}
fun compareUIntArrays(kt: dynamic, jvs: dynamic): Boolean {
if (kt.length != jvs.length) {
return false
}
for (i in 0..(kt.length - 1)) {
if (!compareUints(kt[i], jvs[i])) {
println("elements ${kt[i].toString()} and ${jvs[i].toString()} differs")
return false
}
}
return true
}
fun compareULongArrays(kt: dynamic, jvs: dynamic): Boolean {
if (kt.length != jvs.length) {
return false
}
for (i in 0..(kt.length - 1)) {
if (!compareUlongs(kt[i], jvs[i])) {
println("elements ${kt[i].toString()} and ${jvs[i].toString()} differs")
return false
}
}
return true
fun <T> compareArrays (lhs: Iterable<T>, rhs: Iterable<T>): Boolean {
return lhs.count() == rhs.count() && lhs.filter { !rhs.contains(it) }.isEmpty()
}
fun generateLongArray(): LongArray {
val size = nextInt(ARRAY_MAX_SIZE)
val arr = LongArray(size)
for (i in 0..(size - 1)) {
arr[i] = nextLong().toLong()
arr[i] = nextLong()
}
return arr
}
@@ -135,15 +82,4 @@ object Util {
}
return arr
}
fun KotlinArrToJS(arr: dynamic): dynamic {
// note that even we know that arr is in fact Kotlin array that should have size() method,
// during translation it's type (and all it's methods) are lost
val size = arr.length
var jsArr: dynamic = js("[]")
for (i in 0..(size - 1)) {
jsArr.push(arr[i])
}
return jsArr
}
}
proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_js_tests/src/tests/VarintsTest.kt
+20 -74
View File
@@ -3,10 +3,6 @@ import MessageVarints
import CodedInputStream
object VarintsTest {
val builder = protoBuf.loadProtoFile("./js_messages/varints.proto")
val JSMessageVarints = builder.build("MessageVarints")
val JSTestEnum = JSMessageVarints.TestEnum
fun generateKtVarint(): MessageVarints {
val int = Util.nextInt()
val long = Util.nextLong()
@@ -18,89 +14,39 @@ object VarintsTest {
val enum = MessageVarints.TestEnum.firstVal
return MessageVarints.BuilderMessageVarints(
int, long.toLong(), sint, slong.toLong(), bl, enum, uint, ulong.toLong()
int, long, sint, slong, bl, enum, uint, ulong
).build()
}
fun generateJsVarint(): dynamic {
val int = Util.nextInt()
val long = Util.nextLong()
val sint = Util.nextInt()
val slong = Util.nextLong()
val bl = Util.nextBoolean()
val uint = Util.nextInt(0, Int.MAX_VALUE)
val ulong = Util.nextLong(0, Long.MAX_VALUE)
val enm = JSTestEnum.firstVal
val MessageClass = JSMessageVarints
return js("new MessageClass(int, long, sint, slong, bl, uint, ulong, enm)")
fun compareVarints(kt1: MessageVarints, kt2: MessageVarints): Boolean {
return kt1.int == kt2.int //&&
// kt1.long.toString() == kt2.long.toString() &&
// kt1.sint == kt2.sint &&
// kt1.slong.toString() == kt2.slong.toString() &&
// kt1.bl == kt2.bl &&
// kt1.uint == kt2.uint &&
// kt1.ulong.toString() == kt2.ulong.toString() &&
// kt1.enumField.id == kt2.enumField.id
}
fun compareVarints(kt: MessageVarints, jvs: dynamic): Boolean {
// println("Kotlin message:")
// printMessage(kt)
// println()
//
// println("JS Message:")
// printMessage(jvs)
// println()
fun ktToKtOnce() {
val msg = generateKtVarint()
val outs = Util.getKtOutputStream(msg.getSizeNoTag())
msg.writeTo(outs)
return kt.int == jvs.int &&
kt.long.toString() == jvs.long.toString() &&
kt.sint == jvs.sint &&
kt.slong.toString() == jvs.slong.toString() &&
kt.bl == jvs.bl &&
Util.compareUints(kt.uint, jvs.uint) &&
Util.compareUlongs(kt.ulong, jvs.ulong) &&
kt.enumField.id == jvs.enumField
}
val ins = CodedInputStream(outs.buffer)
val readMsg = MessageVarints.BuilderMessageVarints(0, 0L, 0, 0L, false, MessageVarints.TestEnum.firstVal, 0, 0L)
.parseFrom(ins).build()
fun printMessage(msg: dynamic) {
println("int = ${msg.int}\n" +
"long = ${msg.long}\n" +
"sint = ${msg.sint}\n" +
"slong = ${msg.slong}\n" +
"bl = ${msg.bl}\n" +
"uint = ${msg.uint}\n" +
"ulong = ${msg.ulong}\n" +
"enumField = ${msg.enumField}\n")
}
fun ktToJsOnce() {
val kt = generateKtVarint()
val outs = Util.getKtOutputStream(kt.getSizeNoTag())
kt.writeTo(outs)
val jvs = JSMessageVarints.decode(outs.buffer)
Util.assert(kt.errorCode == 0)
Util.assert(compareVarints(kt, jvs))
}
fun jsToKtOnce() {
val jvs = generateJsVarint()
val byteBuffer = jvs.toBuffer()
val ins = CodedInputStream(Util.JSBufferToByteArray(byteBuffer))
val kt = MessageVarints.BuilderMessageVarints(
0, 0, 0, 0, false, MessageVarints.TestEnum.firstVal, 0, 0
).parseFrom(ins).build()
// println("Checking error in Kotlin message")
Util.assert(kt.errorCode == 0)
// println("Checking identity of serialization/deserialization")
Util.assert(compareVarints(kt, jvs))
Util.assert(readMsg.errorCode == 0)
Util.assert(compareVarints(msg, readMsg))
}
val testRuns = 1000
fun runTests() {
for (i in 0..testRuns) {
// println("Kotlin -> JavaScript")
ktToJsOnce()
// println()
// println("JavaScript -> Kotlin")
jsToKtOnce()
ktToKtOnce()
}
}
}
proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_js_tests/src/tests/ZigZagTest.kt
+12 -42
View File
@@ -13,58 +13,28 @@ object ZigZagTest {
return MessageZigZag.BuilderMessageZigZag(int, long.toLong()).build()
}
fun generateJsZigZag(): dynamic {
val int = Util.nextInt()
val long = Util.nextLong()
val MessageClass = JSMessageZigZag
return js("new MessageClass(int, long)")
fun compareZigZags(kt1: MessageZigZag, kt2: MessageZigZag): Boolean {
return kt1.int == kt2.int &&
kt1.long == kt2.long
}
fun compareZigZags(kt: MessageZigZag, jvs: dynamic): Boolean {
// println("Kotlin message:")
// printMessage(kt)
// println()
//
// println("JS Message:")
// printMessage(jvs)
// println()
fun ktToKtOnce() {
val msg = generateKtZigZag()
val outs = Util.getKtOutputStream(msg.getSizeNoTag())
msg.writeTo(outs)
return kt.int == jvs.int &&
kt.long.toString() == jvs.long.toString()
}
val ins = CodedInputStream(outs.buffer)
val readMsg = MessageZigZag.BuilderMessageZigZag(0, 0L).parseFrom(ins).build()
fun ktToJsOnce() {
val kt = generateKtZigZag()
val outs = Util.getKtOutputStream(kt.getSizeNoTag())
kt.writeTo(outs)
val jvs = JSMessageZigZag.decode(outs.buffer)
Util.assert(kt.errorCode == 0)
Util.assert(compareZigZags(kt, jvs))
}
fun jsToKtOnce() {
val jvs = generateJsZigZag()
val byteBuffer = jvs.toBuffer()
val ins = CodedInputStream(Util.JSBufferToByteArray(byteBuffer))
val kt = MessageZigZag.BuilderMessageZigZag(0, 0).parseFrom(ins).build()
Util.assert(kt.errorCode == 0)
Util.assert(compareZigZags(kt, jvs))
Util.assert(readMsg.errorCode == 0)
Util.assert(compareZigZags(msg, readMsg))
}
val testRuns = 1000
fun runTests() {
for (i in 0..testRuns) {
// println("Kotlin -> JavaScript")
ktToJsOnce()
// println()
// println("JavaScript -> Kotlin")
jsToKtOnce()
ktToKtOnce()
}
}
}