hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 03:05:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adjust test expectations

Browse Source 
These all just refer to re-adding empty blocks for classes whose constructors have no initializer statements for simplicity's sake.
This commit is contained in:
Chris Smowton
2022-03-17 12:08:16 +00:00
committed by Ian Lynagh
parent 35d213afc0
commit 2ea1a6c1f0
4 changed files with 61 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
java/ql/test/kotlin/library-tests/classes/PrintAst.expected
View File

@@ -9,6 +9,7 @@ classes.kt:
# 2| 1: [Constructor] ClassOne
# 2| 5: [BlockStmt] { ... }
# 2| 0: [SuperConstructorInvocationStmt] super(...)
# 2| 1: [BlockStmt] { ... }
# 4| 3: [Class] ClassTwo
# 4| 1: [Constructor] ClassTwo
#-----| 4: (Parameters)
@@ -42,6 +43,7 @@ classes.kt:
# 8| 1: [Constructor] ClassThree
# 8| 5: [BlockStmt] { ... }
# 8| 0: [SuperConstructorInvocationStmt] super(...)
# 8| 1: [BlockStmt] { ... }
# 9| 2: [Method] foo
#-----| 4: (Parameters)
# 9| 0: [Parameter] arg
@@ -49,6 +51,7 @@ classes.kt:
# 12| 1: [Constructor] ClassFour
# 12| 5: [BlockStmt] { ... }
# 12| 0: [SuperConstructorInvocationStmt] super(...)
# 12| 1: [BlockStmt] { ... }
# 13| 2: [Method] foo
#-----| 4: (Parameters)
# 13| 0: [Parameter] arg
@@ -57,6 +60,7 @@ classes.kt:
# 17| 1: [Constructor] ClassFive
# 17| 5: [BlockStmt] { ... }
# 17| 0: [SuperConstructorInvocationStmt] super(...)
# 17| 1: [BlockStmt] { ... }
# 20| 7: [Interface] IF1
# 21| 1: [Method] funIF1
# 21| 5: [BlockStmt] { ... }
@@ -67,6 +71,7 @@ classes.kt:
# 28| 1: [Constructor] ClassSix
# 28| 5: [BlockStmt] { ... }
# 28| 0: [SuperConstructorInvocationStmt] super(...)
# 28| 1: [BlockStmt] { ... }
# 29| 2: [Constructor] ClassSix
#-----| 4: (Parameters)
# 29| 0: [Parameter] i
@@ -110,6 +115,7 @@ classes.kt:
# 49| 0: [ClassInstanceExpr] new Enum(...)
# 49| -3: [TypeAccess] Unit
# 49| 0: [TypeAccess] Direction
# 49| 1: [BlockStmt] { ... }
# 53| 12: [Class] Color
# 0| 1: [Method] values
# 0| 1: [Method] valueOf
@@ -144,6 +150,7 @@ classes.kt:
# 63| 1: [Constructor] Class1
# 63| 5: [BlockStmt] { ... }
# 63| 0: [SuperConstructorInvocationStmt] super(...)
# 63| 1: [BlockStmt] { ... }
# 64| 2: [Method] getObject1
#-----| 4: (Parameters)
# 64| 0: [Parameter] b
@@ -160,6 +167,7 @@ classes.kt:
# 66| 1: [Constructor]
# 66| 5: [BlockStmt] { ... }
# 66| 0: [SuperConstructorInvocationStmt] super(...)
# 66| 1: [BlockStmt] { ... }
# 66| 1: [ExprStmt] <Expr>;
# 66| 0: [ClassInstanceExpr] new (...)
# 66| -3: [TypeAccess] Object
@@ -173,6 +181,7 @@ classes.kt:
# 68| 1: [Constructor]
# 68| 5: [BlockStmt] { ... }
# 68| 0: [SuperConstructorInvocationStmt] super(...)
# 68| 1: [BlockStmt] { ... }
# 68| 1: [ExprStmt] <Expr>;
# 68| 0: [ClassInstanceExpr] new (...)
# 68| -3: [TypeAccess] Object
@@ -208,6 +217,7 @@ classes.kt:
# 75| 1: [Constructor]
# 75| 5: [BlockStmt] { ... }
# 75| 0: [SuperConstructorInvocationStmt] super(...)
# 75| 1: [BlockStmt] { ... }
# 75| 1: [ExprStmt] <Expr>;
# 75| 0: [ClassInstanceExpr] new (...)
# 75| -3: [TypeAccess] Object
@@ -224,6 +234,7 @@ classes.kt:
# 81| 1: [Constructor]
# 81| 5: [BlockStmt] { ... }
# 81| 0: [SuperConstructorInvocationStmt] super(...)
# 81| 1: [BlockStmt] { ... }
# 81| 1: [ExprStmt] <Expr>;
# 81| 0: [ClassInstanceExpr] new (...)
# 81| -3: [TypeAccess] Interface1
@@ -237,6 +248,7 @@ classes.kt:
# 85| 1: [Constructor]
# 85| 5: [BlockStmt] { ... }
# 85| 0: [SuperConstructorInvocationStmt] super(...)
# 85| 1: [BlockStmt] { ... }
# 85| 1: [ExprStmt] <Expr>;
# 85| 0: [ClassInstanceExpr] new (...)
# 85| -3: [TypeAccess] Object
@@ -250,6 +262,7 @@ classes.kt:
# 89| 1: [Constructor]
# 89| 5: [BlockStmt] { ... }
# 89| 0: [SuperConstructorInvocationStmt] super(...)
# 89| 1: [BlockStmt] { ... }
# 89| 1: [ExprStmt] <Expr>;
# 89| 0: [ClassInstanceExpr] new (...)
# 89| -3: [TypeAccess] Interface3<Integer>
@@ -257,54 +270,67 @@ classes.kt:
# 93| 1: [Constructor] pulicClass
# 93| 5: [BlockStmt] { ... }
# 93| 0: [SuperConstructorInvocationStmt] super(...)
# 93| 1: [BlockStmt] { ... }
# 94| 20: [Class] privateClass
# 94| 1: [Constructor] privateClass
# 94| 5: [BlockStmt] { ... }
# 94| 0: [SuperConstructorInvocationStmt] super(...)
# 94| 1: [BlockStmt] { ... }
# 95| 21: [Class] internalClass
# 95| 1: [Constructor] internalClass
# 95| 5: [BlockStmt] { ... }
# 95| 0: [SuperConstructorInvocationStmt] super(...)
# 95| 1: [BlockStmt] { ... }
# 96| 22: [Class] noExplicitVisibilityClass
# 96| 1: [Constructor] noExplicitVisibilityClass
# 96| 5: [BlockStmt] { ... }
# 96| 0: [SuperConstructorInvocationStmt] super(...)
# 96| 1: [BlockStmt] { ... }
# 98| 23: [Class] nestedClassVisibilities
# 98| 1: [Constructor] nestedClassVisibilities
# 98| 5: [BlockStmt] { ... }
# 98| 0: [SuperConstructorInvocationStmt] super(...)
# 98| 1: [BlockStmt] { ... }
# 99| 2: [Class] pulicNestedClass
# 99| 1: [Constructor] pulicNestedClass
# 99| 5: [BlockStmt] { ... }
# 99| 0: [SuperConstructorInvocationStmt] super(...)
# 99| 1: [BlockStmt] { ... }
# 100| 3: [Class] protectedNestedClass
# 100| 1: [Constructor] protectedNestedClass
# 100| 5: [BlockStmt] { ... }
# 100| 0: [SuperConstructorInvocationStmt] super(...)
# 100| 1: [BlockStmt] { ... }
# 101| 4: [Class] privateNestedClass
# 101| 1: [Constructor] privateNestedClass
# 101| 5: [BlockStmt] { ... }
# 101| 0: [SuperConstructorInvocationStmt] super(...)
# 101| 1: [BlockStmt] { ... }
# 102| 5: [Class] internalNestedClass
# 102| 1: [Constructor] internalNestedClass
# 102| 5: [BlockStmt] { ... }
# 102| 0: [SuperConstructorInvocationStmt] super(...)
# 102| 1: [BlockStmt] { ... }
# 103| 6: [Class] noExplicitVisibilityNestedClass
# 103| 1: [Constructor] noExplicitVisibilityNestedClass
# 103| 5: [BlockStmt] { ... }
# 103| 0: [SuperConstructorInvocationStmt] super(...)
# 103| 1: [BlockStmt] { ... }
# 106| 24: [Class] sealedClass
# 106| 1: [Constructor] sealedClass
# 106| 5: [BlockStmt] { ... }
# 106| 0: [SuperConstructorInvocationStmt] super(...)
# 106| 1: [BlockStmt] { ... }
# 107| 25: [Class] openClass
# 107| 1: [Constructor] openClass
# 107| 5: [BlockStmt] { ... }
# 107| 0: [SuperConstructorInvocationStmt] super(...)
# 107| 1: [BlockStmt] { ... }
# 109| 26: [Class] C1
# 109| 1: [Constructor] C1
# 109| 5: [BlockStmt] { ... }
# 109| 0: [SuperConstructorInvocationStmt] super(...)
# 109| 1: [BlockStmt] { ... }
# 110| 2: [Method] fn1
#-----| 4: (Parameters)
# 110| 0: [Parameter] p
@@ -316,6 +342,7 @@ classes.kt:
# 111| 1: [Constructor] Local1
# 111| 5: [BlockStmt] { ... }
# 111| 0: [SuperConstructorInvocationStmt] super(...)
# 111| 1: [BlockStmt] { ... }
# 112| 2: [Method] foo
#-----| 4: (Parameters)
# 112| 0: [Parameter] p
@@ -344,6 +371,7 @@ classes.kt:
# 119| 1: [Constructor] Local2
# 119| 5: [BlockStmt] { ... }
# 119| 0: [SuperConstructorInvocationStmt] super(...)
# 119| 1: [BlockStmt] { ... }
# 120| 2: [Method] foo
#-----| 4: (Parameters)
# 120| 0: [Parameter] p
@@ -366,6 +394,7 @@ classes.kt:
# 127| 1: [Constructor]
# 127| 5: [BlockStmt] { ... }
# 127| 0: [SuperConstructorInvocationStmt] super(...)
# 127| 1: [BlockStmt] { ... }
# 128| 2: [Method] fn
# 128| 5: [BlockStmt] { ... }
# 129| 0: [LocalTypeDeclStmt] class ...
@@ -375,6 +404,7 @@ classes.kt:
# 129| 1: [Constructor] Local3
# 129| 5: [BlockStmt] { ... }
# 129| 0: [SuperConstructorInvocationStmt] super(...)
# 129| 1: [BlockStmt] { ... }
# 130| 2: [Method] foo
#-----| 4: (Parameters)
# 130| 0: [Parameter] p
@@ -394,6 +424,7 @@ local_anonymous.kt:
# 3| 1: [Constructor] Class1
# 3| 5: [BlockStmt] { ... }
# 3| 0: [SuperConstructorInvocationStmt] super(...)
# 3| 1: [BlockStmt] { ... }
# 4| 2: [Method] fn1
# 4| 5: [BlockStmt] { ... }
# 5| 0: [ReturnStmt] return ...
@@ -404,6 +435,7 @@ local_anonymous.kt:
# 5| 1: [Constructor]
# 5| 5: [BlockStmt] { ... }
# 5| 0: [SuperConstructorInvocationStmt] super(...)
# 5| 1: [BlockStmt] { ... }
# 6| 2: [Method] fn
# 6| 5: [BlockStmt] { ... }
# 5| 1: [ExprStmt] <Expr>;
@@ -490,6 +522,7 @@ local_anonymous.kt:
# 25| 1: [Constructor] LocalClass
# 25| 5: [BlockStmt] { ... }
# 25| 0: [SuperConstructorInvocationStmt] super(...)
# 25| 1: [BlockStmt] { ... }
# 26| 1: [ExprStmt] <Expr>;
# 26| 0: [ImplicitCoercionToUnitExpr] <implicit coercion to unit>
# 26| 0: [TypeAccess] Unit
@@ -504,6 +537,7 @@ superChain.kt:
# 1| 1: [Constructor] SuperChain1
# 1| 5: [BlockStmt] { ... }
# 1| 0: [SuperConstructorInvocationStmt] super(...)
# 1| 1: [BlockStmt] { ... }
# 2| 4: [Class,GenericType,ParameterizedType] SuperChain2
#-----| -2: (Generic Parameters)
# 2| 0: [TypeVariable] T3
@@ -511,6 +545,7 @@ superChain.kt:
# 2| 1: [Constructor] SuperChain2
# 2| 5: [BlockStmt] { ... }
# 2| 0: [SuperConstructorInvocationStmt] super(...)
# 2| 1: [BlockStmt] { ... }
# 3| 6: [Class,GenericType,ParameterizedType] SuperChain3
#-----| -2: (Generic Parameters)
# 3| 0: [TypeVariable] T5
@@ -518,3 +553,4 @@ superChain.kt:
# 3| 1: [Constructor] SuperChain3
# 3| 5: [BlockStmt] { ... }
# 3| 0: [SuperConstructorInvocationStmt] super(...)
# 3| 1: [BlockStmt] { ... }

16
java/ql/test/kotlin/library-tests/exprs/PrintAst.expected
View File

@@ -111,6 +111,7 @@ delegatedProperties.kt:
# 4| 1: [Constructor] ClassProp1
# 4| 5: [BlockStmt] { ... }
# 4| 0: [SuperConstructorInvocationStmt] super(...)
# 4| 1: [BlockStmt] { ... }
# 5| 2: [Method] fn
# 5| 5: [BlockStmt] { ... }
# 6| 0: [BlockStmt] { ... }
@@ -174,6 +175,7 @@ delegatedProperties.kt:
# 15| 1: [Constructor] Resource
# 15| 5: [BlockStmt] { ... }
# 15| 0: [SuperConstructorInvocationStmt] super(...)
# 15| 1: [BlockStmt] { ... }
# 17| 4: [Class] Owner
# 17| 1: [Constructor] Owner
# 17| 5: [BlockStmt] { ... }
@@ -566,6 +568,7 @@ delegatedProperties.kt:
# 45| 1: [Constructor] ResourceDelegate
# 45| 5: [BlockStmt] { ... }
# 45| 0: [SuperConstructorInvocationStmt] super(...)
# 45| 1: [BlockStmt] { ... }
# 46| 2: [Method] getValue
#-----| 4: (Parameters)
# 46| 0: [Parameter] thisRef
@@ -583,6 +586,7 @@ delegatedProperties.kt:
# 53| 1: [Constructor] DelegateProvider
# 53| 5: [BlockStmt] { ... }
# 53| 0: [SuperConstructorInvocationStmt] super(...)
# 53| 1: [BlockStmt] { ... }
# 54| 2: [Method] provideDelegate
#-----| 4: (Parameters)
# 54| 0: [Parameter] thisRef
@@ -2421,14 +2425,17 @@ exprs.kt:
# 146| 1: [Constructor] Root
# 146| 5: [BlockStmt] { ... }
# 146| 0: [SuperConstructorInvocationStmt] super(...)
# 146| 1: [BlockStmt] { ... }
# 147| 4: [Class] Subclass1
# 147| 1: [Constructor] Subclass1
# 147| 5: [BlockStmt] { ... }
# 147| 0: [SuperConstructorInvocationStmt] super(...)
# 147| 1: [BlockStmt] { ... }
# 148| 5: [Class] Subclass2
# 148| 1: [Constructor] Subclass2
# 148| 5: [BlockStmt] { ... }
# 148| 0: [SuperConstructorInvocationStmt] super(...)
# 148| 1: [BlockStmt] { ... }
# 168| 6: [Class] Direction
# 0| 1: [Method] values
# 0| 1: [Method] valueOf
@@ -2440,6 +2447,7 @@ exprs.kt:
# 168| 0: [ClassInstanceExpr] new Enum(...)
# 168| -3: [TypeAccess] Unit
# 168| 0: [TypeAccess] Direction
# 168| 1: [BlockStmt] { ... }
# 172| 7: [Class] Color
# 0| 1: [Method] values
# 0| 1: [Method] valueOf
@@ -2518,6 +2526,7 @@ exprs.kt:
# 199| 1: [Constructor] Class2
# 199| 5: [BlockStmt] { ... }
# 199| 0: [SuperConstructorInvocationStmt] super(...)
# 199| 1: [BlockStmt] { ... }
# 200| 2: [Method] x
#-----| 4: (Parameters)
# 200| 0: [Parameter] aa
@@ -2573,6 +2582,7 @@ exprs.kt:
# 218| 1: [Constructor] SomeClass1
# 218| 5: [BlockStmt] { ... }
# 218| 0: [SuperConstructorInvocationStmt] super(...)
# 218| 1: [BlockStmt] { ... }
funcExprs.kt:
# 0| [CompilationUnit] funcExprs
# 0| 1: [Class] FuncExprsKt
@@ -3641,6 +3651,7 @@ funcExprs.kt:
# 48| 1: [Constructor] MyLambda
# 48| 5: [BlockStmt] { ... }
# 48| 0: [SuperConstructorInvocationStmt] super(...)
# 48| 1: [BlockStmt] { ... }
# 49| 2: [Method] invoke
#-----| 4: (Parameters)
# 49| 0: [Parameter] x
@@ -3651,10 +3662,12 @@ funcExprs.kt:
# 55| 1: [Constructor] FuncRef
# 55| 5: [BlockStmt] { ... }
# 55| 0: [SuperConstructorInvocationStmt] super(...)
# 55| 1: [BlockStmt] { ... }
# 56| 2: [Class] Companion
# 56| 1: [Constructor] Companion
# 56| 5: [BlockStmt] { ... }
# 56| 0: [SuperConstructorInvocationStmt] super(...)
# 56| 1: [BlockStmt] { ... }
# 57| 2: [Method] f0
# 57| 5: [BlockStmt] { ... }
# 57| 0: [ReturnStmt] return ...
@@ -3726,6 +3739,7 @@ funcExprs.kt:
# 67| 1: [Constructor] Class3
# 67| 5: [BlockStmt] { ... }
# 67| 0: [SuperConstructorInvocationStmt] super(...)
# 67| 1: [BlockStmt] { ... }
# 68| 2: [Method] call
# 68| 5: [BlockStmt] { ... }
# 69| 0: [ExprStmt] <Expr>;
@@ -3757,6 +3771,7 @@ funcExprs.kt:
# 73| 1: [Constructor] Generic
# 73| 5: [BlockStmt] { ... }
# 73| 0: [SuperConstructorInvocationStmt] super(...)
# 73| 1: [BlockStmt] { ... }
localFunctionCalls.kt:
# 0| [CompilationUnit] localFunctionCalls
# 0| 1: [Class] LocalFunctionCallsKt
@@ -3838,6 +3853,7 @@ localFunctionCalls.kt:
# 14| 1: [Constructor] C1
# 14| 5: [BlockStmt] { ... }
# 14| 0: [SuperConstructorInvocationStmt] super(...)
# 14| 1: [BlockStmt] { ... }
samConversion.kt:
# 0| [CompilationUnit] samConversion
# 0| 1: [Class] SamConversionKt

1
java/ql/test/kotlin/library-tests/extensions_recursion/element.expected
View File

@@ -11,6 +11,7 @@
| test.kt:6:1:10:1 | Foo | Constructor |
| test.kt:6:1:10:1 | super(...) | SuperConstructorInvocationStmt |
| test.kt:6:1:10:1 | { ... } | BlockStmt |
| test.kt:6:1:10:1 | { ... } | BlockStmt |
| test.kt:6:11:6:11 | T | TypeVariable |
| test.kt:7:5:9:5 | foo | Method |
| test.kt:7:24:9:5 | { ... } | BlockStmt |

8
java/ql/test/kotlin/library-tests/generics/PrintAst.expected
View File

@@ -75,6 +75,7 @@ generics.kt:
# 11| 1: [Constructor] C0
# 11| 5: [BlockStmt] { ... }
# 11| 0: [SuperConstructorInvocationStmt] super(...)
# 11| 1: [BlockStmt] { ... }
# 13| 9: [Class,GenericType,ParameterizedType] C1
#-----| -2: (Generic Parameters)
# 13| 0: [TypeVariable] T
@@ -116,6 +117,7 @@ generics.kt:
# 20| 1: [Constructor] C2
# 20| 5: [BlockStmt] { ... }
# 20| 0: [SuperConstructorInvocationStmt] super(...)
# 20| 1: [BlockStmt] { ... }
# 21| 2: [Method] f4
#-----| 2: (Generic Parameters)
# 21| 0: [TypeVariable] P
@@ -129,6 +131,7 @@ generics.kt:
# 36| 1: [Constructor] BoundedTest
# 36| 5: [BlockStmt] { ... }
# 36| 0: [SuperConstructorInvocationStmt] super(...)
# 36| 1: [BlockStmt] { ... }
# 38| 2: [Method] m
#-----| 4: (Parameters)
# 38| 0: [Parameter] s
@@ -141,6 +144,7 @@ generics.kt:
# 42| 1: [Constructor] Outer
# 42| 5: [BlockStmt] { ... }
# 42| 0: [SuperConstructorInvocationStmt] super(...)
# 42| 1: [BlockStmt] { ... }
# 43| 2: [Class,GenericType,ParameterizedType] Inner1
#-----| -2: (Generic Parameters)
# 43| 0: [TypeVariable] T3
@@ -148,6 +152,7 @@ generics.kt:
# 43| 1: [Constructor] Inner1
# 43| 5: [BlockStmt] { ... }
# 43| 0: [SuperConstructorInvocationStmt] super(...)
# 43| 1: [BlockStmt] { ... }
# 44| 2: [Method] fn1
#-----| 4: (Parameters)
# 44| 0: [Parameter] t1
@@ -170,6 +175,7 @@ generics.kt:
# 49| 1: [Constructor] Nested1
# 49| 5: [BlockStmt] { ... }
# 49| 0: [SuperConstructorInvocationStmt] super(...)
# 49| 1: [BlockStmt] { ... }
# 50| 2: [Method] fn2
#-----| 4: (Parameters)
# 50| 0: [Parameter] t3
@@ -187,6 +193,7 @@ generics.kt:
# 56| 1: [Constructor] Class1
# 56| 5: [BlockStmt] { ... }
# 56| 0: [SuperConstructorInvocationStmt] super(...)
# 56| 1: [BlockStmt] { ... }
# 57| 2: [Method] fn1
#-----| 2: (Generic Parameters)
# 57| 0: [TypeVariable] T2
@@ -200,6 +207,7 @@ generics.kt:
# 58| 1: [Constructor] Local
# 58| 5: [BlockStmt] { ... }
# 58| 0: [SuperConstructorInvocationStmt] super(...)
# 58| 1: [BlockStmt] { ... }
# 59| 2: [Method] fn2
#-----| 2: (Generic Parameters)
# 59| 0: [TypeVariable] T4