Skip to content

Commit 7456f37

Browse files
michaelnebelmichaelnebel
authored
Merge pull request github#11432 from michaelnebel/java/flowtestgeneratortools
Java: Flow test case generator
2 parents 5a0cce2 + 24e830f commit 7456f37

File tree

6 files changed

+167
-5
lines changed

6 files changed

+167
-5
lines changed

‎java/ql/src/utils/flowtestcasegenerator/FlowTestCaseSupportMethods.qll

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ private class DefaultGetMethod extends GetMethod {
164164

165165
override string getCsvModel() {
166166
result =
167-
"generatedtest;Test;false;" + this.getName() + ";(Object);;" +
168-
getComponentSpec(SummaryComponent::content(c)) + "Argument[0].;ReturnValue;value;manual"
167+
"generatedtest;Test;false;" + this.getName() + ";(Object);;Argument[0]." +
168+
getComponentSpec(SummaryComponent::content(c)) + ";ReturnValue;value;manual"
169169
}
170170
}
171171

@@ -360,8 +360,8 @@ private class DefaultGenMethod extends GenMethod {
360360

361361
override string getCsvModel() {
362362
result =
363-
"generatedtest;Test;false;" + this.getName() + ";(Object);;Argument[0];" +
364-
getComponentSpec(SummaryComponent::content(c)) + "ReturnValue.;value;manual"
363+
"generatedtest;Test;false;" + this.getName() + ";(Object);;Argument[0];ReturnValue." +
364+
getComponentSpec(SummaryComponent::content(c)) + ";value;manual"
365365
}
366366
}
367367

‎java/ql/src/utils/flowtestcasegenerator/testModelsHeader.qlfrag

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ class SummaryModelTest extends SummaryModelCsv {
22
override predicate row(string row) {
33
row =
44
[
5-
//"package;type;overrides;name;signature;ext;inputspec;outputspec;kind",
5+
//"package;type;overrides;name;signature;ext;inputspec;outputspec;kind;provenance"

‎java/ql/test/utils/flowtestcasegenerator/options

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
//semmle-extractor-options: --javac-args -cp ${testdir}/../../stubs/apache-commons-collections4-4.4:${testdir}/../../stubs/apache-log4j-2.14.1:${testdir}/../../stubs/slf4j-2.0.0

‎java/ql/test/utils/flowtestcasegenerator/pom.xml

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
2+
http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<groupId>com.semmle</groupId>
6+
<artifactId>parent</artifactId>
7+
<version>1.0</version>
8+
<repositories>
9+
<repository>
10+
<id>google</id>
11+
<name>Google Maven</name>
12+
<url>https://maven.google.com/</url>
13+
</repository>
14+
</repositories>
15+
<properties>
16+
<android.platform>31</android.platform>
17+
<maven.compiler.source>1.8</maven.compiler.source>
18+
<maven.compiler.target>1.8</maven.compiler.target>
19+
</properties>
20+
<dependencies>
21+
<dependency>
22+
<groupId>org.apache.logging.log4j</groupId>
23+
<artifactId>log4j-api</artifactId>
24+
<version>2.14.1</version>
25+
</dependency>
26+
<dependency>
27+
<groupId>org.apache.logging.log4j</groupId>
28+
<artifactId>log4j-core</artifactId>
29+
<version>2.14.1</version>
30+
</dependency>
31+
<dependency>
32+
<groupId>org.slf4j</groupId>
33+
<artifactId>slf4j-api</artifactId>
34+
<version>2.0.0-alpha5</version>
35+
</dependency>
36+
<dependency>
37+
<groupId>org.jboss.logging</groupId>
38+
<artifactId>jboss-logging</artifactId>
39+
<version>3.4.2.Final</version>
40+
</dependency>
41+
<dependency>
42+
<groupId>org.springframework.ldap</groupId>
43+
<artifactId>spring-ldap</artifactId>
44+
<version>1.3.1.RELEASE</version>
45+
<type>pom</type>
46+
</dependency>
47+
<dependency>
48+
<groupId>org.springframework.ldap</groupId>
49+
<artifactId>spring-ldap-core</artifactId>
50+
<version>2.3.5.RELEASE</version>
51+
</dependency>
52+
<dependency>
53+
<groupId>org.springframework</groupId>
54+
<artifactId>spring-web</artifactId>
55+
<version>5.3.18</version>
56+
</dependency>
57+
<dependency>
58+
<groupId>org.springframework</groupId>
59+
<artifactId>spring-context</artifactId>
60+
<version>5.3.18</version>
61+
</dependency>
62+
<dependency>
63+
<groupId>org.springframework</groupId>
64+
<artifactId>spring-webmvc</artifactId>
65+
<version>5.3.18</version>
66+
</dependency>
67+
<dependency>
68+
<groupId>org.springframework.data</groupId>
69+
<artifactId>spring-data-commons</artifactId>
70+
<version>2.6.3</version>
71+
</dependency>
72+
<dependency>
73+
<groupId>org.apache.shiro</groupId>
74+
<artifactId>shiro-core</artifactId>
75+
<version>1.8.0</version>
76+
</dependency>
77+
<dependency>
78+
<groupId>org.apache.directory.api</groupId>
79+
<artifactId>api-ldap-client-all</artifactId>
80+
<version>2.1.0</version>
81+
</dependency>
82+
<dependency>
83+
<groupId>org.owasp.esapi</groupId>
84+
<artifactId>esapi</artifactId>
85+
<version>2.2.3.1</version>
86+
</dependency>
87+
<dependency>
88+
<groupId>com.unboundid</groupId>
89+
<artifactId>unboundid-ldapsdk</artifactId>
90+
<version>6.0.3</version>
91+
</dependency>
92+
<dependency>
93+
<groupId>javax.servlet</groupId>
94+
<artifactId>javax.servlet-api</artifactId>
95+
<version>4.0.1</version>
96+
</dependency>
97+
<dependency>
98+
<groupId>com.squareup.retrofit2</groupId>
99+
<artifactId>retrofit</artifactId>
100+
<version>2.9.0</version>
101+
</dependency>
102+
<dependency>
103+
<groupId>com.squareup.okhttp3</groupId>
104+
<artifactId>okhttp</artifactId>
105+
<version>4.9.3</version>
106+
</dependency>
107+
<dependency>
108+
<groupId>org.freemarker</groupId>
109+
<artifactId>freemarker</artifactId>
110+
<version>2.3.31</version>
111+
</dependency>
112+
<dependency>
113+
<groupId>org.thymeleaf</groupId>
114+
<artifactId>thymeleaf</artifactId>
115+
<version>3.0.15.RELEASE</version>
116+
</dependency>
117+
<dependency>
118+
<groupId>com.hubspot.jinjava</groupId>
119+
<artifactId>jinjava</artifactId>
120+
<version>2.6.0</version>
121+
</dependency>
122+
<dependency>
123+
<groupId>io.pebbletemplates</groupId>
124+
<artifactId>pebble</artifactId>
125+
<version>3.1.5</version>
126+
</dependency>
127+
<dependency>
128+
<groupId>org.apache.velocity</groupId>
129+
<artifactId>velocity-engine-core</artifactId>
130+
<version>2.3</version>
131+
</dependency>
132+
</dependencies>
133+
</project>

‎java/ql/test/utils/flowtestcasegenerator/specs.csv

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
org.apache.logging.log4j;Logger;true;traceEntry;(Message);;Argument[0];ReturnValue;taint;manual
2+
org.apache.logging.log4j;Logger;true;traceEntry;(String,Object[]);;Argument[0..1];ReturnValue;taint;manual
3+
org.apache.logging.log4j;Logger;true;traceEntry;(String,Supplier[]);;Argument[0..1];ReturnValue;taint;manual
4+
org.apache.logging.log4j;Logger;true;traceEntry;(Supplier[]);;Argument[0];ReturnValue;taint;manual
5+
org.apache.logging.log4j;Logger;true;traceExit;(EntryMessage,Object);;Argument[1];ReturnValue;value;manual
6+
org.apache.logging.log4j;Logger;true;traceExit;(Message,Object);;Argument[1];ReturnValue;value;manual
7+
org.apache.logging.log4j;Logger;true;traceExit;(Object);;Argument[0];ReturnValue;value;manual
8+
org.apache.logging.log4j;Logger;true;traceExit;(String,Object);;Argument[1];ReturnValue;value;manual
9+
org.apache.commons.collections4;MapUtils;true;predicatedMap;;;Argument[0].MapValue;ReturnValue.MapValue;value;manual
10+
org.apache.commons.collections4;MapUtils;true;toMap;;;Argument[0].MapKey;ReturnValue.MapKey;value;manual
11+
org.apache.commons.collections4;MapUtils;true;toMap;;;Argument[0].MapValue;ReturnValue.MapValue;value;manual

‎java/ql/test/utils/flowtestcasegenerator/test.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# This script is for debugging purposes for the flow test case generator.
2+
# Some dummy tests are created and executed.
3+
# It requites that `--search-path /path/to/semmle-code/ql` is added to `~/.config/codeql/config`
4+
5+
# Usage: python3 test.py
6+
7+
import subprocess
8+
9+
# Generate test cases
10+
print('Generating test cases...')
11+
if subprocess.check_call(["../../../src/utils/flowtestcasegenerator/GenerateFlowTestCase.py", "specs.csv", "pom.xml", "--force", "."]):
12+
print("Failed to generate test cases.")
13+
exit(1)
14+
15+
# Run test cases.
16+
print('Running test cases...')
17+
subprocess.call(["codeql", "test", "run", "test.ql"])

0 commit comments

Comments
 (0)