Skip to content

Commit 2d81e30

Browse files
committed
Fix addsTo.pack references
This change is a prerequisite for a CLI change where there will be strict testing of the `addsTo.pack` values. It must resolve to a pack reference that is a transitive dependency of the current query's pack.
1 parent 5bc844c commit 2d81e30

File tree

21 files changed

+22
-23
lines changed

21 files changed

+22
-23
lines changed

java/ql/lib/ext/org.apache.hc.core5.http.impl.bootstrap.model.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-tests
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["org.apache.hc.core5.http.impl.bootstrap", "HttpAsyncRequester", True, "connect", "(HttpHost,Timeout)", "", "Argument[0]", "open-url", "hq-manual"]

java/ql/src/utils/flowtestcasegenerator/GenerateFlowTestCase.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
This generates test cases exercising function model specifications found in specsToTest
1919
producing files Test.java, test.ql, test.ext.yml and test.expected in outdir.
2020
21-
specsToTest should either be a .csv file, a .yml file, or a directory of .yml files, containing the
21+
specsToTest should either be a .csv file, a .yml file, or a directory of .yml files, containing the
2222
model specifications to test.
2323
2424
projectPom.xml should be a Maven pom sufficient to resolve the classes named in specsToTest.csv.
@@ -276,7 +276,7 @@ def copyfile(fromName, toFileHandle):
276276
modelSpecRow[0].strip() for modelSpecRow in supportModelRows)
277277
dataextensions = f"""extensions:
278278
- addsTo:
279-
pack: codeql/java-tests
279+
pack: codeql/java-all
280280
extensible: summaryModel
281281
data:
282282
{models}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-tests
3+
pack: codeql/java-all
44
extensible: summaryModel
55
data:
66
- ["generatedtest", "Test", False, "newWithMapValueDefault", "(Object)", "", "Argument[0]", "ReturnValue.MapValue", "value", "manual"]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-tests
3+
pack: codeql/java-all
44
extensible: summaryModel
55
data:
66
- ["", "Uri", False, "getQueryParameter", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-tests
3+
pack: codeql/java-all
44
extensible: summaryModel
55
data:
66
- ["", "Uri", False, "getQueryParameter", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]

java/ql/test/library-tests/dataflow/callback-dispatch/test.ext.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-tests
3+
pack: codeql/java-all
44
extensible: summaryModel
55
data:
66
- ["my.callback.qltest", "A", False, "applyConsumer1", "(Object,Consumer1)", "", "Argument[0]", "Argument[1].Parameter[0]", "value", "manual"]
@@ -15,4 +15,3 @@ extensions:
1515
- ["my.callback.qltest", "A", False, "produceConsume", "(Producer1,Consumer3)", "", "Argument[1].Parameter[0]", "ReturnValue", "value", "manual"]
1616
- ["my.callback.qltest", "A", False, "applyConverter1", "(Object,Converter1)", "", "Argument[0]", "Argument[1].Parameter[0]", "value", "manual"]
1717
- ["my.callback.qltest", "A", False, "applyConverter1", "(Object,Converter1)", "", "Argument[1].ReturnValue", "ReturnValue", "value", "manual"]
18-

java/ql/test/library-tests/dataflow/collections/containerflow.ext.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-tests
3+
pack: codeql/java-all
44
extensible: summaryModel
55
data:
66
- ["", "B", False, "readElement", "(Spliterator)", "", "Argument[0].Element", "ReturnValue", "value", "manual"]

java/ql/test/library-tests/dataflow/external-models/sinks.ext.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-tests
3+
pack: codeql/java-all
44
extensible: sinkModel
55
data:
66
- ["my.qltest", "B", False, "sink1", "(Object)", "", "Argument[0]", "qltest", "manual"]

java/ql/test/library-tests/dataflow/external-models/srcs.ext.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-tests
3+
pack: codeql/java-all
44
extensible: sourceModel
55
data:
66
- ["my.qltest", "A", False, "src1", "()", "", "ReturnValue", "qltest", "manual"]

java/ql/test/library-tests/dataflow/external-models/steps.ext.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/java-tests
3+
pack: codeql/java-all
44
extensible: summaryModel
55
data:
66
- ["my.qltest", "C", False, "stepArgRes", "(Object)", "", "Argument[0]", "ReturnValue", "taint", "manual"]

0 commit comments

Comments
 (0)