Skip to content

Commit c010755

Browse files
author
emmanue1
committed
Update tests
1 parent ca0e165 commit c010755

File tree

1 file changed

+44
-0
lines changed

1 file changed

+44
-0
lines changed

‎src/test/java/org/jd/core/v1/ClassFileToJavaSourceTest.java‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ public void testJdk170Basic() throws Exception {
114114
assertTrue(source.indexOf("null = ") == -1);
115115
assertTrue(source.indexOf("NaND") == -1);
116116
assertTrue(source.indexOf("// Byte code:") == -1);
117+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
117118
assertTrue(source.indexOf("/* ") == -1);
118119
}
119120

@@ -159,6 +160,7 @@ public void testJdk170NoDebugBasic() throws Exception {
159160
assertTrue(source.indexOf("null = ") == -1);
160161
assertTrue(source.indexOf("NaND") == -1);
161162
assertTrue(source.indexOf("// Byte code:") == -1);
163+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
162164
assertTrue(source.indexOf("/* ") == -1);
163165
}
164166

@@ -195,6 +197,7 @@ public void testJdk170Constructors() throws Exception {
195197
assertTrue(source.matches(PatternMaker.make(": 39]", "this.short123 = 3;")));
196198

197199
assertTrue(source.indexOf("// Byte code:") == -1);
200+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
198201
assertTrue(source.indexOf("/* ") == -1);
199202
}
200203

@@ -253,6 +256,7 @@ public void testJdk170IfElse() throws Exception {
253256
assertTrue(source.matches(PatternMaker.make("[ 184: 184]", "if ((i == 1 && (i == 5 || i == 6 || i == 7) && i == 8 && (i == 9 || i == 10 || i == 11)) || (i == 4 && i % 200 > 50) || (i > 3 && i > 4))")));
254257

255258
assertTrue(source.indexOf("// Byte code:") == -1);
259+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
256260
assertTrue(source.indexOf("/* ") == -1);
257261
}
258262

@@ -281,6 +285,7 @@ public void testJdk170Interface() throws Exception {
281285
assertTrue(source.matches(PatternMaker.make("public interface Interface", "extends Serializable")));
282286

283287
assertTrue(source.indexOf("// Byte code:") == -1);
288+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
284289
assertTrue(source.indexOf("/* ") == -1);
285290
}
286291

@@ -325,6 +330,7 @@ public void testJdk170While() throws Exception {
325330
assertTrue(source.matches(PatternMaker.make("[ 431: 431]", "System.out.println(\"a\");")));
326331

327332
assertTrue(source.indexOf("// Byte code:") == -1);
333+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
328334
assertTrue(source.indexOf("/* ") == -1);
329335
}
330336

@@ -364,6 +370,7 @@ public void testJdk170DoWhile() throws Exception {
364370
assertTrue(source.indexOf("while ((i == 1 && (i == 5 || i == 6 || i == 7) && i == 8 && (i == 9 || i == 10 || i == 11)) || (i == 4 && i % 200 > 50) || (i > 3 && i > 4));") != -1);
365371

366372
assertTrue(source.indexOf("// Byte code:") == -1);
373+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
367374
assertTrue(source.indexOf("/* ") == -1);
368375
}
369376

@@ -422,6 +429,7 @@ public void testJdk170BreakContinue() throws Exception {
422429
assertTrue(source.matches(PatternMaker.make("[ 162: 0]", "break label16;")));
423430

424431
assertTrue(source.indexOf("// Byte code:") == -1);
432+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
425433
assertTrue(source.indexOf("/* ") == -1);
426434
}
427435

@@ -499,6 +507,7 @@ public void testJdk170For() throws Exception {
499507

500508
assertTrue(source.indexOf("[ 448: 448]") != -1);
501509
assertTrue(source.indexOf("// Byte code:") == -1);
510+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
502511
assertTrue(source.indexOf("/* ") == -1);
503512
}
504513

@@ -535,6 +544,7 @@ public void testJdk170NoDebugFor() throws Exception {
535544
assertTrue(source.matches(PatternMaker.make("for (String str : paramList)")));
536545

537546
assertTrue(source.indexOf("// Byte code:") == -1);
547+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
538548
assertTrue(source.indexOf("/* ") == -1);
539549
}
540550

@@ -575,6 +585,7 @@ public void testJdk150For() throws Exception {
575585
assertTrue(source.matches(PatternMaker.make(": 423]", "for (byte b = 0; b < 3; b++)")));
576586

577587
assertTrue(source.indexOf("// Byte code:") == -1);
588+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
578589
assertTrue(source.indexOf("/* ") == -1);
579590
}
580591

@@ -615,6 +626,7 @@ public void testJdk160For() throws Exception {
615626
assertTrue(source.matches(PatternMaker.make(": 423]", "for (int i = 0; i < 3; i++)")));
616627

617628
assertTrue(source.indexOf("// Byte code:") == -1);
629+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
618630
assertTrue(source.indexOf("/* ") == -1);
619631
}
620632

@@ -654,6 +666,7 @@ public void testIbmJ9For() throws Exception {
654666
assertTrue(source.matches(PatternMaker.make(": 423]", "for (int i = 0; i < 3; i++)")));
655667

656668
assertTrue(source.indexOf("// Byte code:") == -1);
669+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
657670
assertTrue(source.indexOf("/* ") == -1);
658671
}
659672

@@ -699,6 +712,7 @@ public void testJdk170Array() throws Exception {
699712
assertTrue(source.matches(PatternMaker.make(": 73]", "testInt2(new int[][]", "{ { 1 } ,")));
700713

701714
assertTrue(source.indexOf("// Byte code:") == -1);
715+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
702716
assertTrue(source.indexOf("/* ") == -1);
703717
}
704718

@@ -740,6 +754,7 @@ public void testJdk150Array() throws Exception {
740754
assertTrue(source.matches(PatternMaker.make(": 75]", "testInt3(new int[][][] { { { 0, 1")));
741755

742756
assertTrue(source.indexOf("// Byte code:") == -1);
757+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
743758
assertTrue(source.indexOf("/* ") == -1);
744759
}
745760

@@ -777,6 +792,7 @@ public void testJdk170Assert() throws Exception {
777792
assertTrue(source.matches(PatternMaker.make("[ 41: 41]", "assert check() : \"boom\";")));
778793

779794
assertTrue(source.indexOf("// Byte code:") == -1);
795+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
780796
assertTrue(source.indexOf("/* ") == -1);
781797
}
782798

@@ -814,6 +830,7 @@ public void testJdk150Assert() throws Exception {
814830
assertTrue(source.matches(PatternMaker.make("[ 41: 41]", "assert check() : \"boom\";")));
815831

816832
assertTrue(source.indexOf("// Byte code:") == -1);
833+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
817834
assertTrue(source.indexOf("/* ") == -1);
818835
}
819836

@@ -858,6 +875,7 @@ public void testJdk150AnonymousClass() throws Exception {
858875
assertTrue(source.matches(PatternMaker.make(": 104]", "System.out.println(\"end\");")));
859876

860877
assertTrue(source.indexOf("// Byte code:") == -1);
878+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
861879
assertTrue(source.indexOf("/* ") == -1);
862880
}
863881

@@ -920,6 +938,7 @@ public void testJdk170Switch() throws Exception {
920938
assertTrue(source.matches(PatternMaker.make("[ 288: 0]", "default:")));
921939

922940
assertTrue(source.indexOf("// Byte code:") == -1);
941+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
923942
assertTrue(source.indexOf("/* ") == -1);
924943
}
925944

@@ -960,6 +979,7 @@ public void testJdk170AdvancedSwitch() throws Exception {
960979
assertTrue(source.matches(PatternMaker.make("[ 40: 40]", "System.out.println(1);")));
961980

962981
assertTrue(source.indexOf("// Byte code:") == -1);
982+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
963983
assertTrue(source.indexOf("/* ") == -1);
964984
}
965985

@@ -990,6 +1010,7 @@ public void testEclipseJavaCompiler321Switch() throws Exception {
9901010

9911011
assertTrue(source.indexOf("[ 239: 239]") != -1);
9921012
assertTrue(source.indexOf("// Byte code:") == -1);
1013+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
9931014
assertTrue(source.indexOf("/* ") == -1);
9941015
}
9951016

@@ -1020,6 +1041,7 @@ public void testEclipseJavaCompiler3130Switch() throws Exception {
10201041

10211042
assertTrue(source.indexOf("[ 239: 239]") != -1);
10221043
assertTrue(source.indexOf("// Byte code:") == -1);
1044+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
10231045
assertTrue(source.indexOf("/* ") == -1);
10241046
}
10251047

@@ -1062,6 +1084,7 @@ public void testJdk118TernaryOperator() throws Exception {
10621084
assertTrue(source.matches(PatternMaker.make(": 157]", "return Short.toString((short)((this == null) ? 1 : 2));")));
10631085

10641086
assertTrue(source.indexOf("// Byte code:") == -1);
1087+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
10651088
assertTrue(source.indexOf("/* ") == -1);
10661089
}
10671090

@@ -1101,6 +1124,7 @@ public void testJdk170TernaryOperator() throws Exception {
11011124
assertTrue(source.matches(PatternMaker.make(": 157]", "return Short.toString((short)((this == null) ? 1 : 2));")));
11021125

11031126
assertTrue(source.indexOf("// Byte code:") == -1);
1127+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
11041128
assertTrue(source.indexOf("/* ") == -1);
11051129
}
11061130

@@ -1151,6 +1175,7 @@ public void testJdk170TryWithResources() throws Exception {
11511175

11521176
assertTrue(source.indexOf("[ 162: 162]") != -1);
11531177
assertTrue(source.indexOf("// Byte code:") == -1);
1178+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
11541179
assertTrue(source.indexOf("/* ") == -1);
11551180
}
11561181

@@ -1201,6 +1226,7 @@ public void testJdk180TryWithResources() throws Exception {
12011226

12021227
assertTrue(source.indexOf("[ 162: 162]") != -1);
12031228
assertTrue(source.indexOf("// Byte code:") == -1);
1229+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
12041230
assertTrue(source.indexOf("/* ") == -1);
12051231
}
12061232

@@ -1247,6 +1273,7 @@ public void testJdk170Synchronised() throws Exception {
12471273
assertTrue(source.matches(PatternMaker.make(": 97]", "return subContentEquals(s);")));
12481274

12491275
assertTrue(source.indexOf("// Byte code:") == -1);
1276+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
12501277
assertTrue(source.indexOf("/* ") == -1);
12511278
}
12521279

@@ -1290,6 +1317,7 @@ public void testEclipseJavaCompiler321TryCatchFinally() throws Exception {
12901317
assertTrue(source.indexOf("Exception exception8;") == -1);
12911318

12921319
assertTrue(source.indexOf("// Byte code:") == -1);
1320+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
12931321
assertTrue(source.indexOf("/* ") == -1);
12941322
}
12951323

@@ -1347,6 +1375,7 @@ public void testEclipseJavaCompiler370TryCatchFinally() throws Exception {
13471375
assertTrue(source.indexOf("Exception exception8;") == -1);
13481376

13491377
assertTrue(source.indexOf("// Byte code:") == -1);
1378+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
13501379
assertTrue(source.indexOf("/* ") == -1);
13511380
}
13521381

@@ -1403,6 +1432,7 @@ public void testEclipseJavaCompiler3130TryCatchFinally() throws Exception {
14031432
assertTrue(source.indexOf("Exception exception8;") == -1);
14041433

14051434
assertTrue(source.indexOf("// Byte code:") == -1);
1435+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
14061436
assertTrue(source.indexOf("/* ") == -1);
14071437
}
14081438

@@ -1459,6 +1489,7 @@ public void testJdk118TryCatchFinally() throws Exception {
14591489
assertTrue(source.indexOf("Exception exception8;") == -1);
14601490

14611491
assertTrue(source.indexOf("// Byte code:") == -1);
1492+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
14621493
assertTrue(source.indexOf("/* ") == -1);
14631494
}
14641495

@@ -1511,6 +1542,7 @@ public void testJdk131TryCatchFinally() throws Exception {
15111542
assertTrue(source.indexOf("Exception exception8;") == -1);
15121543

15131544
assertTrue(source.indexOf("// Byte code:") == -1);
1545+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
15141546
assertTrue(source.indexOf("/* ") == -1);
15151547
}
15161548

@@ -1568,7 +1600,9 @@ public void testJdk170TryCatchFinally() throws Exception {
15681600
assertTrue(source.indexOf("Object object;") == -1);
15691601
assertTrue(source.indexOf("RuntimeException runtimeexception4;") == -1);
15701602
assertTrue(source.indexOf("Exception exception8;") == -1);
1603+
15711604
assertTrue(source.indexOf("// Byte code:") == -1);
1605+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
15721606
assertTrue(source.indexOf("/* ") == -1);
15731607
}
15741608

@@ -1610,6 +1644,7 @@ public void testJdk170AnnotatedClass() throws Exception {
16101644
assertTrue(source.indexOf("public void ping(@Deprecated Writer writer, @Deprecated @Value(str = \"localhost\") String host, long timeout)") != -1);
16111645

16121646
assertTrue(source.indexOf("// Byte code:") == -1);
1647+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
16131648
assertTrue(source.indexOf("/* ") == -1);
16141649
}
16151650

@@ -1662,6 +1697,7 @@ public void testJdk170AnonymousClass() throws Exception {
16621697

16631698
assertTrue(source.indexOf("} ;") == -1);
16641699
assertTrue(source.indexOf("// Byte code:") == -1);
1700+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
16651701
assertTrue(source.indexOf("/* ") == -1);
16661702
}
16671703

@@ -1708,6 +1744,7 @@ public void testJdk170GenericClass() throws Exception {
17081744

17091745
assertTrue(source.indexOf("[ 104: 104]") != -1);
17101746
assertTrue(source.indexOf("// Byte code:") == -1);
1747+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
17111748
assertTrue(source.indexOf("/* ") == -1);
17121749
}
17131750

@@ -1739,6 +1776,7 @@ public void testJdk170AnnotationAuthor() throws Exception {
17391776
assertTrue(source.matches(PatternMaker.make("[ 6: 0]", "Name[] contributors() default {};")));
17401777

17411778
assertTrue(source.indexOf("// Byte code:") == -1);
1779+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
17421780
assertTrue(source.indexOf("/* ") == -1);
17431781
}
17441782

@@ -1774,6 +1812,7 @@ public void testJdk170AnnotationValue() throws Exception {
17741812
assertTrue(source.matches(PatternMaker.make("[ 27: 0]", "Class clazz() default Object.class;")));
17751813

17761814
assertTrue(source.indexOf("// Byte code:") == -1);
1815+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
17771816
assertTrue(source.indexOf("/* ") == -1);
17781817
}
17791818

@@ -1856,6 +1895,7 @@ public void testJdk170OuterClass() throws Exception {
18561895
assertTrue(source.matches(PatternMaker.make("public class InnerInnerClass", "{", "}")));
18571896

18581897
assertTrue(source.indexOf("// Byte code:") == -1);
1898+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
18591899
assertTrue(source.indexOf("/* ") == -1);
18601900
}
18611901

@@ -1901,6 +1941,7 @@ public void testJdk170Enum() throws Exception {
19011941

19021942
assertTrue(source.indexOf("public static final enum") == -1);
19031943
assertTrue(source.indexOf("// Byte code:") == -1);
1944+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
19041945
assertTrue(source.indexOf("/* ") == -1);
19051946
}
19061947

@@ -1937,6 +1978,7 @@ public void testJdk118Basic() throws Exception {
19371978
assertTrue(source.matches(PatternMaker.make("[ 174: 174]", "return str;")));
19381979

19391980
assertTrue(source.indexOf("// Byte code:") == -1);
1981+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
19401982
assertTrue(source.indexOf("/* ") == -1);
19411983
}
19421984

@@ -1975,6 +2017,7 @@ public void testJdk142Basic() throws Exception {
19752017
assertTrue(source.matches(PatternMaker.make("[ 183: 183]", "return ((Basic)objects[index]).int78;")));
19762018

19772019
assertTrue(source.indexOf("// Byte code:") == -1);
2020+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
19782021
assertTrue(source.indexOf("/* ") == -1);
19792022
}
19802023

@@ -2019,6 +2062,7 @@ public void testJdk180Lambda() throws Exception {
20192062
assertTrue(source.matches(PatternMaker.make(": 67]", "MethodType mtStringComparator = MethodType.methodType(int[].class, String.class, new Class[]", "{ String.class")));
20202063

20212064
assertTrue(source.indexOf("// Byte code:") == -1);
2065+
assertTrue(source.indexOf(".null.") == -1 && source.indexOf(".null ") == -1);
20222066
assertTrue(source.indexOf("/* ") == -1);
20232067
}
20242068

0 commit comments

Comments
 (0)