Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b876ee9

Browse files
igfooigfoo
committed
Kotlin: Tweak the superTypes test
1 parent 90d7c2b commit b876ee9

2 files changed

Lines changed: 37 additions & 27 deletions

File tree

‎java/ql/test/kotlin/library-tests/classes/superTypes.expected‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
| classes.kt:2:1:2:18 | ClassOne | Object | Object.class | 0 | 0 | 0 | 0 |
2-
| classes.kt:4:1:6:1 | ClassTwo | Object | Object.class | 0 | 0 | 0 | 0 |
3-
| classes.kt:8:1:10:1 | ClassThree | Object | Object.class | 0 | 0 | 0 | 0 |
4-
| classes.kt:12:1:15:1 | ClassFour | ClassThree | classes.kt | 8 | 1 | 10 | 1 |
5-
| classes.kt:17:1:18:1 | ClassFive | ClassFour | classes.kt | 12 | 1 | 15 | 1 |
6-
| classes.kt:28:1:30:1 | ClassSix | ClassFour | classes.kt | 12 | 1 | 15 | 1 |
7-
| classes.kt:28:1:30:1 | ClassSix | IF1 | classes.kt | 20 | 1 | 22 | 1 |
8-
| classes.kt:28:1:30:1 | ClassSix | IF2 | classes.kt | 24 | 1 | 26 | 1 |
9-
| classes.kt:34:1:47:1 | ClassSeven | Object | Object.class | 0 | 0 | 0 | 0 |
10-
| classes.kt:49:1:51:1 | Direction | Enum<Direction> | Enum.class | 0 | 0 | 0 | 0 |
11-
| classes.kt:53:1:57:1 | Color | Enum<Color> | Enum.class | 0 | 0 | 0 | 0 |
12-
| classes.kt:63:1:91:1 | Class1 | Object | Object.class | 0 | 0 | 0 | 0 |
13-
| classes.kt:66:20:66:54 | new Object(...) { ... } | Interface1 | classes.kt | 59 | 1 | 59 | 23 |
14-
| classes.kt:66:20:66:54 | new Object(...) { ... } | Interface2 | classes.kt | 60 | 1 | 60 | 23 |
15-
| classes.kt:68:20:68:74 | new Object(...) { ... } | Interface1 | classes.kt | 59 | 1 | 59 | 23 |
16-
| classes.kt:68:20:68:74 | new Object(...) { ... } | Interface2 | classes.kt | 60 | 1 | 60 | 23 |
17-
| classes.kt:68:20:68:74 | new Object(...) { ... } | Interface3<String> | classes.kt | 61 | 1 | 61 | 26 |
18-
| classes.kt:72:16:77:10 | new Object(...) { ... } | Interface1 | classes.kt | 59 | 1 | 59 | 23 |
19-
| classes.kt:72:16:77:10 | new Object(...) { ... } | Interface2 | classes.kt | 60 | 1 | 60 | 23 |
20-
| classes.kt:75:24:75:33 | new Object(...) { ... } | Object | Object.class | 0 | 0 | 0 | 0 |
21-
| classes.kt:81:16:81:38 | new Interface1(...) { ... } | Interface1 | classes.kt | 59 | 1 | 59 | 23 |
22-
| classes.kt:85:16:85:25 | new Object(...) { ... } | Object | Object.class | 0 | 0 | 0 | 0 |
23-
| classes.kt:89:16:89:44 | new Interface3<Integer>(...) { ... } | Interface3<Integer> | classes.kt | 61 | 1 | 61 | 26 |
1+
| classes.kt:2:1:2:18 | ClassOne | file://<external>/Object.class:0:0:0:0 | Object |
2+
| classes.kt:4:1:6:1 | ClassTwo | file://<external>/Object.class:0:0:0:0 | Object |
3+
| classes.kt:8:1:10:1 | ClassThree | file://<external>/Object.class:0:0:0:0 | Object |
4+
| classes.kt:12:1:15:1 | ClassFour | classes.kt:8:1:10:1 | ClassThree |
5+
| classes.kt:17:1:18:1 | ClassFive | classes.kt:12:1:15:1 | ClassFour |
6+
| classes.kt:28:1:30:1 | ClassSix | classes.kt:12:1:15:1 | ClassFour |
7+
| classes.kt:28:1:30:1 | ClassSix | classes.kt:20:1:22:1 | IF1 |
8+
| classes.kt:28:1:30:1 | ClassSix | classes.kt:24:1:26:1 | IF2 |
9+
| classes.kt:34:1:47:1 | ClassSeven | file://<external>/Object.class:0:0:0:0 | Object |
10+
| classes.kt:49:1:51:1 | Direction | file://<external>/Enum.class:0:0:0:0 | Enum<Direction> |
11+
| classes.kt:53:1:57:1 | Color | file://<external>/Enum.class:0:0:0:0 | Enum<Color> |
12+
| classes.kt:63:1:91:1 | Class1 | file://<external>/Object.class:0:0:0:0 | Object |
13+
| classes.kt:66:20:66:54 | new Object(...) { ... } | classes.kt:59:1:59:23 | Interface1 |
14+
| classes.kt:66:20:66:54 | new Object(...) { ... } | classes.kt:60:1:60:23 | Interface2 |
15+
| classes.kt:68:20:68:74 | new Object(...) { ... } | classes.kt:59:1:59:23 | Interface1 |
16+
| classes.kt:68:20:68:74 | new Object(...) { ... } | classes.kt:60:1:60:23 | Interface2 |
17+
| classes.kt:68:20:68:74 | new Object(...) { ... } | classes.kt:61:1:61:26 | Interface3<String> |
18+
| classes.kt:72:16:77:10 | new Object(...) { ... } | classes.kt:59:1:59:23 | Interface1 |
19+
| classes.kt:72:16:77:10 | new Object(...) { ... } | classes.kt:60:1:60:23 | Interface2 |
20+
| classes.kt:75:24:75:33 | new Object(...) { ... } | file://<external>/Object.class:0:0:0:0 | Object |
21+
| classes.kt:81:16:81:38 | new Interface1(...) { ... } | classes.kt:59:1:59:23 | Interface1 |
22+
| classes.kt:85:16:85:25 | new Object(...) { ... } | file://<external>/Object.class:0:0:0:0 | Object |
23+
| classes.kt:89:16:89:44 | new Interface3<Integer>(...) { ... } | classes.kt:61:1:61:26 | Interface3<Integer> |

‎java/ql/test/kotlin/library-tests/classes/superTypes.ql‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
import java
22

3-
from Class c, Type superType, Location stLocation
3+
// Stop external filepaths from appearing in the results
4+
class ClassLocation extends Class {
5+
override predicate hasLocationInfo(string path, int sl, int sc, int el, int ec) {
6+
exists(string fullPath |
7+
super.hasLocationInfo(fullPath, sl, sc, el, ec) |
8+
if this.fromSource()
9+
then path = fullPath
10+
else path = fullPath.regexpReplaceAll(".*/", "<external>/"))
11+
}
12+
}
13+
14+
from Class c, Type superType
415
where c.fromSource() and
5-
superType = c.getASupertype() and
6-
stLocation = superType.getLocation()
7-
select c, superType.toString(), stLocation.getFile().getBaseName(), stLocation.getStartLine(), stLocation.getStartColumn(), stLocation.getEndLine(), stLocation.getEndColumn()
16+
superType = c.getASupertype()
17+
select c, superType
818

0 commit comments

Comments
 (0)