Adapt testApfInstructionsEncoding for klint compliance
Modified testApfInstructionsEncoding() to adhere to the latest klint
linting rules.
Test: TH
Change-Id: I88fa1fce4a1df206c0aa29864a7332cc945fca41
diff --git a/tests/unit/src/android/net/apf/ApfV5Test.kt b/tests/unit/src/android/net/apf/ApfV5Test.kt
index 123fc0a..6f24099 100644
--- a/tests/unit/src/android/net/apf/ApfV5Test.kt
+++ b/tests/unit/src/android/net/apf/ApfV5Test.kt
@@ -239,64 +239,91 @@
var program = v4gen.generate()
// encoding PASS opcode: opcode=0, imm_len=0, R=0
assertContentEquals(
- byteArrayOf(encodeInstruction(opcode = 0, immLength = 0, register = 0)), program)
+ byteArrayOf(encodeInstruction(opcode = 0, immLength = 0, register = 0)),
+ program
+ )
assertContentEquals(
- listOf("0: pass"),
- ApfJniUtils.disassembleApf(program).map { it.trim() } )
+ listOf("0: pass"),
+ ApfJniUtils.disassembleApf(program).map { it.trim() }
+ )
var gen = ApfV6Generator()
gen.addDrop()
program = gen.generate()
// encoding DROP opcode: opcode=0, imm_len=0, R=1
assertContentEquals(
- byteArrayOf(encodeInstruction(opcode = 0, immLength = 0, register = 1)), program)
+ byteArrayOf(encodeInstruction(opcode = 0, immLength = 0, register = 1)),
+ program
+ )
assertContentEquals(
- listOf("0: drop"),
- ApfJniUtils.disassembleApf(program).map { it.trim() } )
+ listOf("0: drop"),
+ ApfJniUtils.disassembleApf(program).map { it.trim() }
+ )
gen = ApfV6Generator()
gen.addCountAndPass(129)
program = gen.generate()
// encoding COUNT(PASS) opcode: opcode=0, imm_len=size_of(imm), R=0, imm=counterNumber
assertContentEquals(
- byteArrayOf(encodeInstruction(opcode = 0, immLength = 1, register = 0),
- 0x81.toByte()), program)
+ byteArrayOf(
+ encodeInstruction(opcode = 0, immLength = 1, register = 0),
+ 0x81.toByte()
+ ),
+ program
+ )
assertContentEquals(
listOf("0: pass 129"),
- ApfJniUtils.disassembleApf(program).map { it.trim() } )
+ ApfJniUtils.disassembleApf(program).map { it.trim() }
+ )
gen = ApfV6Generator()
gen.addCountAndDrop(1000)
program = gen.generate()
// encoding COUNT(DROP) opcode: opcode=0, imm_len=size_of(imm), R=1, imm=counterNumber
assertContentEquals(
- byteArrayOf(encodeInstruction(opcode = 0, immLength = 2, register = 1),
- 0x03, 0xe8.toByte()), program)
+ byteArrayOf(
+ encodeInstruction(opcode = 0, immLength = 2, register = 1),
+ 0x03,
+ 0xe8.toByte()
+ ),
+ program
+ )
assertContentEquals(
listOf("0: drop 1000"),
- ApfJniUtils.disassembleApf(program).map { it.trim() } )
+ ApfJniUtils.disassembleApf(program).map { it.trim() }
+ )
gen = ApfV6Generator()
gen.addCountAndPass(Counter.TOTAL_PACKETS)
program = gen.generate()
// encoding COUNT(PASS) opcode: opcode=0, imm_len=size_of(imm), R=0, imm=counterNumber
assertContentEquals(
- byteArrayOf(encodeInstruction(opcode = 0, immLength = 1, register = 0),
- 0x02), program)
+ byteArrayOf(
+ encodeInstruction(opcode = 0, immLength = 1, register = 0),
+ 0x02
+ ),
+ program
+ )
assertContentEquals(
- listOf("0: pass 2"),
- ApfJniUtils.disassembleApf(program).map { it.trim() } )
+ listOf("0: pass 2"),
+ ApfJniUtils.disassembleApf(program).map { it.trim() }
+ )
gen = ApfV6Generator()
gen.addCountAndDrop(Counter.PASSED_ALLOCATE_FAILURE)
program = gen.generate()
// encoding COUNT(DROP) opcode: opcode=0, imm_len=size_of(imm), R=1, imm=counterNumber
assertContentEquals(
- byteArrayOf(encodeInstruction(opcode = 0, immLength = 1, register = 1),
- 0x03), program)
+ byteArrayOf(
+ encodeInstruction(opcode = 0, immLength = 1, register = 1),
+ 0x03
+ ),
+ program
+ )
assertContentEquals(
- listOf("0: drop 3"),
- ApfJniUtils.disassembleApf(program).map { it.trim() } )
+ listOf("0: drop 3"),
+ ApfJniUtils.disassembleApf(program).map { it.trim() }
+ )
gen = ApfV6Generator()
gen.addAllocateR0()
@@ -304,13 +331,21 @@
program = gen.generate()
// encoding ALLOC opcode: opcode=21(EXT opcode number), imm=36(TRANS opcode number).
// R=0 means length stored in R0. R=1 means the length stored in imm1.
- assertContentEquals(byteArrayOf(
- encodeInstruction(opcode = 21, immLength = 1, register = 0), 36,
- encodeInstruction(opcode = 21, immLength = 1, register = 1), 36, 0x05,
- 0xDC.toByte()),
- program)
- assertContentEquals(listOf("0: allocate r0", "2: allocate 1500"),
- ApfJniUtils.disassembleApf(program).map { it.trim() })
+ assertContentEquals(
+ byteArrayOf(
+ encodeInstruction(opcode = 21, immLength = 1, register = 0),
+ 36,
+ encodeInstruction(opcode = 21, immLength = 1, register = 1),
+ 36,
+ 0x05,
+ 0xDC.toByte()
+ ),
+ program
+ )
+ assertContentEquals(listOf(
+ "0: allocate r0",
+ "2: allocate 1500"
+ ), ApfJniUtils.disassembleApf(program).map { it.trim() })
gen = ApfV6Generator()
gen.addTransmitWithoutChecksum()
@@ -323,21 +358,28 @@
37, 255.toByte(), 255.toByte(),
encodeInstruction(opcode = 21, immLength = 1, register = 1), 37, 30, 40, 50, 1, 0
), program)
- assertContentEquals(listOf(
- "0: transmit ip_ofs=255",
- "4: transmitudp ip_ofs=30, csum_ofs=40, csum_start=50, partial_csum=0x0100",
- ), ApfJniUtils.disassembleApf(program).map { it.trim() })
+ assertContentEquals(listOf(
+ "0: transmit ip_ofs=255",
+ "4: transmitudp ip_ofs=30, csum_ofs=40, csum_start=50, partial_csum=0x0100",
+ ), ApfJniUtils.disassembleApf(program).map { it.trim() })
gen = ApfV6Generator()
val largeByteArray = ByteArray(256) { 0x01 }
gen.addData(largeByteArray)
program = gen.generate()
// encoding DATA opcode: opcode=14(JMP), R=1
- assertContentEquals(byteArrayOf(
- encodeInstruction(opcode = 14, immLength = 2, register = 1), 0x01, 0x00) +
- largeByteArray, program)
- assertContentEquals(listOf("0: data 256, " + "01".repeat(256) ),
- ApfJniUtils.disassembleApf(program).map { it.trim() })
+ assertContentEquals(
+ byteArrayOf(
+ encodeInstruction(opcode = 14, immLength = 2, register = 1),
+ 0x01,
+ 0x00
+ ) + largeByteArray,
+ program
+ )
+ assertContentEquals(
+ listOf("0: data 256, " + "01".repeat(256) ),
+ ApfJniUtils.disassembleApf(program).map { it.trim() }
+ )
gen = ApfV6Generator()
gen.addWriteU8(0x01)
@@ -362,17 +404,16 @@
encodeInstruction(24, 4, 0), 0x80.toByte(), 0x00, 0x00,
0x00), program)
assertContentEquals(listOf(
- "0: write 0x01",
- "2: write 0x0102",
- "5: write 0x01020304",
- "10: write 0x00",
- "12: write 0x80",
- "14: write 0x0000",
- "17: write 0x8000",
- "20: write 0x00000000",
- "25: write 0x80000000"
- ),
- ApfJniUtils.disassembleApf(program).map { it.trim() })
+ "0: write 0x01",
+ "2: write 0x0102",
+ "5: write 0x01020304",
+ "10: write 0x00",
+ "12: write 0x80",
+ "14: write 0x0000",
+ "17: write 0x8000",
+ "20: write 0x00000000",
+ "25: write 0x80000000"
+ ), ApfJniUtils.disassembleApf(program).map { it.trim() })
gen = ApfV6Generator()
gen.addWriteU8(R0)
@@ -396,7 +437,8 @@
"4: ewrite4 r0",
"6: ewrite1 r1",
"8: ewrite2 r1",
- "10: ewrite4 r1"), ApfJniUtils.disassembleApf(program).map { it.trim() })
+ "10: ewrite4 r1"
+ ), ApfJniUtils.disassembleApf(program).map { it.trim() })
gen = ApfV6Generator()
gen.addDataCopy(0, 10)
@@ -413,8 +455,7 @@
"0: datacopy src=0, len=10",
"2: datacopy src=1, len=5",
"5: pktcopy src=1000, len=255"
- ),
- ApfJniUtils.disassembleApf(program).map { it.trim() })
+ ), ApfJniUtils.disassembleApf(program).map { it.trim() })
gen = ApfV6Generator()
gen.addDataCopyFromR0(5)
@@ -429,20 +470,24 @@
encodeInstruction(21, 1, 0), 42,
), program)
assertContentEquals(listOf(
- "0: edatacopy src=r0, len=5",
- "3: epktcopy src=r0, len=5",
- "6: edatacopy src=r0, len=r1",
- "8: epktcopy src=r0, len=r1"), ApfJniUtils.disassembleApf(program).map{ it.trim() })
+ "0: edatacopy src=r0, len=5",
+ "3: epktcopy src=r0, len=5",
+ "6: edatacopy src=r0, len=r1",
+ "8: epktcopy src=r0, len=r1"
+ ), ApfJniUtils.disassembleApf(program).map{ it.trim() })
gen = ApfV6Generator()
gen.addJumpIfBytesAtR0Equal(byteArrayOf('a'.code.toByte()), ApfV4Generator.DROP_LABEL)
program = gen.generate()
- assertContentEquals(
- byteArrayOf(encodeInstruction(opcode = 20, immLength = 1, register = 1),
- 1, 1, 'a'.code.toByte()), program)
+ assertContentEquals(byteArrayOf(
+ encodeInstruction(opcode = 20, immLength = 1, register = 1),
+ 1,
+ 1,
+ 'a'.code.toByte()
+ ), program)
assertContentEquals(listOf(
- "0: jbseq r0, 0x1, DROP, 61"),
- ApfJniUtils.disassembleApf(program).map{ it.trim() })
+ "0: jbseq r0, 0x1, DROP, 61"
+ ), ApfJniUtils.disassembleApf(program).map{ it.trim() })
val qnames = byteArrayOf(1, 'A'.code.toByte(), 1, 'B'.code.toByte(), 0, 0)
gen = ApfV6Generator()
@@ -455,9 +500,9 @@
encodeInstruction(21, 1, 1), 43, 1, 0x0c.toByte(),
) + qnames, program)
assertContentEquals(listOf(
- "0: jdnsqne r0, DROP, 12, (1)A(1)B(0)(0)",
- "10: jdnsqeq r0, DROP, 12, (1)A(1)B(0)(0)"),
- ApfJniUtils.disassembleApf(program).map{ it.trim() })
+ "0: jdnsqne r0, DROP, 12, (1)A(1)B(0)(0)",
+ "10: jdnsqeq r0, DROP, 12, (1)A(1)B(0)(0)"
+ ), ApfJniUtils.disassembleApf(program).map{ it.trim() })
gen = ApfV6Generator()
gen.addJumpIfPktAtR0DoesNotContainDnsQSafe(qnames, 0x0c, ApfV4Generator.DROP_LABEL)
@@ -470,8 +515,8 @@
) + qnames, program)
assertContentEquals(listOf(
"0: jdnsqnesafe r0, DROP, 12, (1)A(1)B(0)(0)",
- "10: jdnsqeqsafe r0, DROP, 12, (1)A(1)B(0)(0)"),
- ApfJniUtils.disassembleApf(program).map{ it.trim() })
+ "10: jdnsqeqsafe r0, DROP, 12, (1)A(1)B(0)(0)"
+ ), ApfJniUtils.disassembleApf(program).map{ it.trim() })
gen = ApfV6Generator()
gen.addJumpIfPktAtR0DoesNotContainDnsA(qnames, ApfV4Generator.DROP_LABEL)
@@ -483,9 +528,9 @@
encodeInstruction(21, 1, 1), 44, 1,
) + qnames, program)
assertContentEquals(listOf(
- "0: jdnsane r0, DROP, (1)A(1)B(0)(0)",
- "9: jdnsaeq r0, DROP, (1)A(1)B(0)(0)"),
- ApfJniUtils.disassembleApf(program).map{ it.trim() })
+ "0: jdnsane r0, DROP, (1)A(1)B(0)(0)",
+ "9: jdnsaeq r0, DROP, (1)A(1)B(0)(0)"
+ ), ApfJniUtils.disassembleApf(program).map{ it.trim() })
gen = ApfV6Generator()
gen.addJumpIfPktAtR0DoesNotContainDnsASafe(qnames, ApfV4Generator.DROP_LABEL)
@@ -498,8 +543,8 @@
) + qnames, program)
assertContentEquals(listOf(
"0: jdnsanesafe r0, DROP, (1)A(1)B(0)(0)",
- "9: jdnsaeqsafe r0, DROP, (1)A(1)B(0)(0)"),
- ApfJniUtils.disassembleApf(program).map{ it.trim() })
+ "9: jdnsaeqsafe r0, DROP, (1)A(1)B(0)(0)"
+ ), ApfJniUtils.disassembleApf(program).map{ it.trim() })
}
@Test