Skip to content

Commit b156cea

Browse files
YaSuenagYaSuenag
committed
Refactoring annotations in testcodes
1 parent 969540f commit b156cea

File tree

5 files changed

+44
-41
lines changed

5 files changed

+44
-41
lines changed

‎src/test/java/com/yasuenag/ffmasm/test/amd64/AVXAsmTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class AVXAsmTest extends TestBase{
4444
* Tests MOVDQA A/B
4545
*/
4646
@Test
47-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS})
47+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
4848
public void testMOVDQA(){
4949
try(var seg = new CodeSegment()){
5050
var desc = FunctionDescriptor.ofVoid(
@@ -81,7 +81,7 @@ public void testMOVDQA(){
8181
* Tests MOVDQU A/B
8282
*/
8383
@Test
84-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS})
84+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
8585
public void testMOVDQU(){
8686
try(var arena = Arena.ofConfined();
8787
var seg = new CodeSegment();){
@@ -118,7 +118,7 @@ public void testMOVDQU(){
118118
* Tests PXOR
119119
*/
120120
@Test
121-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS})
121+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
122122
public void testPXOR(){
123123
try(var seg = new CodeSegment()){
124124
var desc = FunctionDescriptor.ofVoid(
@@ -157,7 +157,7 @@ public void testPXOR(){
157157
* Tests PADDD
158158
*/
159159
@Test
160-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS})
160+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
161161
public void testPADDD(){
162162
try(var seg = new CodeSegment()){
163163
var desc = FunctionDescriptor.ofVoid(
@@ -201,7 +201,7 @@ public void testPADDD(){
201201
* Tests PTEST
202202
*/
203203
@Test
204-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS})
204+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
205205
public void testPTEST(){
206206
try(var seg = new CodeSegment()){
207207
var desc = FunctionDescriptor.of(

‎src/test/java/com/yasuenag/ffmasm/test/amd64/AsmTest.java

+34-33
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,14 @@
3636
import com.yasuenag.ffmasm.amd64.Register;
3737

3838

39+
@EnabledOnOs(architectures = {"amd64"})
3940
public class AsmTest extends TestBase{
4041

4142
/**
4243
* Tests prologue (push, movMR), movMR, epilogue (leave, ret)
4344
*/
4445
@Test
45-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS}, architectures = {"amd64"})
46+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
4647
public void testBasicInstructions(){
4748
try(var seg = new CodeSegment()){
4849
var desc = FunctionDescriptor.of(
@@ -70,7 +71,7 @@ public void testBasicInstructions(){
7071
* Tests PUSH and POP
7172
*/
7273
@Test
73-
@EnabledOnOs(value = {OS.LINUX}, architectures = {"amd64"})
74+
@EnabledOnOs(OS.LINUX)
7475
public void testPUSHandPOP(){
7576
try(var seg = new CodeSegment()){
7677
var desc = FunctionDescriptor.ofVoid(
@@ -113,7 +114,7 @@ public void testPUSHandPOP(){
113114
* Tests LEA
114115
*/
115116
@Test
116-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS}, architectures = {"amd64"})
117+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
117118
public void testLEA(){
118119
try(var seg = new CodeSegment()){
119120
var desc = FunctionDescriptor.of(
@@ -140,7 +141,7 @@ public void testLEA(){
140141
* Tests AND
141142
*/
142143
@Test
143-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS}, architectures = {"amd64"})
144+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
144145
public void testAND(){
145146
try(var seg = new CodeSegment()){
146147
var desc = FunctionDescriptor.of(
@@ -169,7 +170,7 @@ public void testAND(){
169170
* Tests OR
170171
*/
171172
@Test
172-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS}, architectures = {"amd64"})
173+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
173174
public void testOR(){
174175
try(var seg = new CodeSegment()){
175176
var desc = FunctionDescriptor.of(
@@ -198,7 +199,7 @@ public void testOR(){
198199
* Tests XOR
199200
*/
200201
@Test
201-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS}, architectures = {"amd64"})
202+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
202203
public void testXOR(){
203204
try(var seg = new CodeSegment()){
204205
var desc = FunctionDescriptor.of(
@@ -226,7 +227,7 @@ public void testXOR(){
226227
* Tests CPUID and 32 bit movMR
227228
*/
228229
@Test
229-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS}, architectures = {"amd64"})
230+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
230231
public void testCPUID(){
231232
try(var seg = new CodeSegment()){
232233
var desc = FunctionDescriptor.of(
@@ -256,7 +257,7 @@ public void testCPUID(){
256257
* Test NOP
257258
*/
258259
@Test
259-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS}, architectures = {"amd64"})
260+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
260261
public void testNOP(){
261262
try(var seg = new CodeSegment()){
262263
var desc = FunctionDescriptor.of(
@@ -286,7 +287,7 @@ public void testNOP(){
286287
* Tests CMP, JL, and label
287288
*/
288289
@Test
289-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS}, architectures = {"amd64"})
290+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
290291
public void testCMPandJL(){
291292
try(var seg = new CodeSegment()){
292293
var desc = FunctionDescriptor.of(
@@ -320,7 +321,7 @@ public void testCMPandJL(){
320321
* Tests 16 bit CMP
321322
*/
322323
@Test
323-
@EnabledOnOs(value = {OS.LINUX}, architectures = {"amd64"})
324+
@EnabledOnOs(OS.LINUX)
324325
public void test16bitCMP(){
325326
try(var seg = new CodeSegment()){
326327
var desc = FunctionDescriptor.of(
@@ -354,7 +355,7 @@ public void test16bitCMP(){
354355
* Tests 8 bit CMP
355356
*/
356357
@Test
357-
@EnabledOnOs(value = {OS.LINUX}, architectures = {"amd64"})
358+
@EnabledOnOs(OS.LINUX)
358359
public void test8bitCMP(){
359360
try(var seg = new CodeSegment()){
360361
var desc = FunctionDescriptor.of(
@@ -390,7 +391,7 @@ public void test8bitCMP(){
390391
* Tests ADDs
391392
*/
392393
@Test
393-
@EnabledOnOs(value = {OS.LINUX}, architectures = {"amd64"})
394+
@EnabledOnOs(OS.LINUX)
394395
public void testADDs(){
395396
try(var seg = new CodeSegment()){
396397
var desc = FunctionDescriptor.of(
@@ -421,7 +422,7 @@ public void testADDs(){
421422
* Tests SUBs
422423
*/
423424
@Test
424-
@EnabledOnOs(value = {OS.LINUX}, architectures = {"amd64"})
425+
@EnabledOnOs(OS.LINUX)
425426
public void testSUBs(){
426427
try(var seg = new CodeSegment()){
427428
var desc = FunctionDescriptor.of(
@@ -452,7 +453,7 @@ public void testSUBs(){
452453
* Tests SHLs
453454
*/
454455
@Test
455-
@EnabledOnOs(value = {OS.LINUX}, architectures = {"amd64"})
456+
@EnabledOnOs(OS.LINUX)
456457
public void testSHLs(){
457458
try(var seg = new CodeSegment()){
458459
var desc = FunctionDescriptor.of(
@@ -483,7 +484,7 @@ public void testSHLs(){
483484
* Test JAE
484485
*/
485486
@Test
486-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS}, architectures = {"amd64"})
487+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
487488
public void testJAE(){
488489
try(var seg = new CodeSegment()){
489490
var desc = FunctionDescriptor.of(
@@ -517,7 +518,7 @@ public void testJAE(){
517518
* Test JE
518519
*/
519520
@Test
520-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS}, architectures = {"amd64"})
521+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
521522
public void testJE(){
522523
try(var seg = new CodeSegment()){
523524
var desc = FunctionDescriptor.of(
@@ -551,7 +552,7 @@ public void testJE(){
551552
* Test JZ
552553
*/
553554
@Test
554-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS}, architectures = {"amd64"})
555+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
555556
public void testJZ(){
556557
try(var seg = new CodeSegment()){
557558
var desc = FunctionDescriptor.of(
@@ -586,7 +587,7 @@ public void testJZ(){
586587
* Test JNE
587588
*/
588589
@Test
589-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS}, architectures = {"amd64"})
590+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
590591
public void testJNE(){
591592
try(var seg = new CodeSegment()){
592593
var desc = FunctionDescriptor.of(
@@ -620,7 +621,7 @@ public void testJNE(){
620621
* Tests forward & backward jump.
621622
*/
622623
@Test
623-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS}, architectures = {"amd64"})
624+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
624625
public void testFwdBackJMP(){
625626
try(var seg = new CodeSegment()){
626627
var desc = FunctionDescriptor.of(
@@ -656,7 +657,7 @@ public void testFwdBackJMP(){
656657
* Test JL with imm32
657658
*/
658659
@Test
659-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS}, architectures = {"amd64"})
660+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
660661
public void testJLwithImm32(){
661662
try(var seg = new CodeSegment()){
662663
var desc = FunctionDescriptor.of(
@@ -693,7 +694,7 @@ public void testJLwithImm32(){
693694
* Test JAE with imm32
694695
*/
695696
@Test
696-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS}, architectures = {"amd64"})
697+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
697698
public void testJAEwithImm32(){
698699
try(var seg = new CodeSegment()){
699700
var desc = FunctionDescriptor.of(
@@ -730,7 +731,7 @@ public void testJAEwithImm32(){
730731
* Test JNE with imm32
731732
*/
732733
@Test
733-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS}, architectures = {"amd64"})
734+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
734735
public void testJNEwithImm32(){
735736
try(var seg = new CodeSegment()){
736737
var desc = FunctionDescriptor.of(
@@ -767,7 +768,7 @@ public void testJNEwithImm32(){
767768
* Test JE with imm32
768769
*/
769770
@Test
770-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS}, architectures = {"amd64"})
771+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
771772
public void testJEwithImm32(){
772773
try(var seg = new CodeSegment()){
773774
var desc = FunctionDescriptor.of(
@@ -804,7 +805,7 @@ public void testJEwithImm32(){
804805
* Tests JMP with imm32
805806
*/
806807
@Test
807-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS}, architectures = {"amd64"})
808+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
808809
public void testJMPwithImm32(){
809810
try(var seg = new CodeSegment()){
810811
var desc = FunctionDescriptor.of(
@@ -841,7 +842,7 @@ public void testJMPwithImm32(){
841842
* when build() is called.
842843
*/
843844
@Test
844-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS}, architectures = {"amd64"})
845+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
845846
public void testUndefinedLabel(){
846847
try(var seg = new CodeSegment()){
847848
var desc = FunctionDescriptor.ofVoid();
@@ -860,7 +861,7 @@ public void testUndefinedLabel(){
860861
* Test RDRAND
861862
*/
862863
@Test
863-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS}, architectures = {"amd64"})
864+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
864865
public void testRDRAND(){
865866
try(var seg = new CodeSegment()){
866867
var desc = FunctionDescriptor.of(
@@ -890,7 +891,7 @@ public void testRDRAND(){
890891
* Test RDSEED
891892
*/
892893
@Test
893-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS}, architectures = {"amd64"})
894+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
894895
public void testRDSEED(){
895896
try(var seg = new CodeSegment()){
896897
var desc = FunctionDescriptor.of(
@@ -919,7 +920,7 @@ public void testRDSEED(){
919920
* Test RDTSC
920921
*/
921922
@Test
922-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS}, architectures = {"amd64"})
923+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
923924
public void testRDTSC(){
924925
try(var seg = new CodeSegment()){
925926
var desc = FunctionDescriptor.of(
@@ -944,7 +945,7 @@ public void testRDTSC(){
944945
* Test CALL
945946
*/
946947
@Test
947-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS}, architectures = {"amd64"})
948+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
948949
public void testCALL(){
949950
try(var arena = Arena.ofConfined();
950951
var seg = new CodeSegment();){
@@ -980,7 +981,7 @@ public void testCALL(){
980981
* Test address alignment
981982
*/
982983
@Test
983-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS}, architectures = {"amd64"})
984+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
984985
public void testAlignment(){
985986
try(var seg = new CodeSegment()){
986987
var byteBuf = seg.getTailOfMemorySegment()
@@ -1008,7 +1009,7 @@ public void testAlignment(){
10081009
* Test movRM
10091010
*/
10101011
@Test
1011-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS}, architectures = {"amd64"})
1012+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
10121013
public void testMOVRM(){
10131014
try(var seg = new CodeSegment()){
10141015
var desc = FunctionDescriptor.of(
@@ -1038,7 +1039,7 @@ public void testMOVRM(){
10381039
* Test movImm
10391040
*/
10401041
@Test
1041-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS}, architectures = {"amd64"})
1042+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
10421043
public void testMOVImm(){
10431044
try(var seg = new CodeSegment()){
10441045
var desc = FunctionDescriptor.of(
@@ -1094,7 +1095,7 @@ public void testSYSCALL(){
10941095
* Test BSWAP
10951096
*/
10961097
@Test
1097-
@EnabledOnOs(value = {OS.LINUX}, architectures = {"amd64"})
1098+
@EnabledOnOs(OS.LINUX)
10981099
public void testBSWAP(){
10991100
// test 64bit register
11001101
try(var seg = new CodeSegment()){

‎src/test/java/com/yasuenag/ffmasm/test/amd64/NativeRegisterTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,13 @@
3434
import com.yasuenag.ffmasm.amd64.Register;
3535

3636

37+
@EnabledOnOs(architectures = {"amd64"})
3738
public class NativeRegisterTest extends TestBase{
3839

3940
public native int test(int arg);
4041

4142
@Test
42-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS}, architectures = {"amd64"})
43+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
4344
public void testNativeRegister(){
4445
try(var seg = new CodeSegment()){
4546
var desc = FunctionDescriptor.of(

‎src/test/java/com/yasuenag/ffmasm/test/amd64/PinningTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@
2828
import com.yasuenag.ffmasm.Pinning;
2929

3030

31+
@EnabledOnOs(architectures = {"amd64"})
3132
public class PinningTest{
3233

3334
@Test
34-
@EnabledOnOs(value = {OS.LINUX, OS.WINDOWS}, architectures = {"amd64"})
35+
@EnabledOnOs({OS.LINUX, OS.WINDOWS})
3536
public void testPinning() throws Throwable{
3637
int[] array = new int[]{1, 2, 3, 4};
3738
int[] expected = new int[]{5, 6, 7, 8};

‎src/test/java/com/yasuenag/ffmasm/test/linux/CodeSegmentTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import com.yasuenag.ffmasm.UnsupportedPlatformException;
3535

3636

37-
@EnabledOnOs({OS.LINUX})
37+
@EnabledOnOs(OS.LINUX)
3838
public class CodeSegmentTest{
3939

4040
private String[] findMemorySegmentFromMaps(long startAddr, long endAddr) throws IOException{

0 commit comments

Comments
 (0)