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

Skip to content

Commit 32b69d3

Browse files
michaelnebelmichaelnebel
committed
C#: Update external models tests.
1 parent d6fa7db commit 32b69d3

4 files changed

Lines changed: 57 additions & 57 deletions

File tree

‎csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.ql‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,31 @@ class SummaryModelTest extends SummaryModelCsv {
1111
override predicate row(string row) {
1212
row =
1313
[
14-
//"namespace;type;overrides;name;signature;ext;inputspec;outputspec;kind",
15-
"My.Qltest;D;false;StepArgRes;(System.Object);;Argument[0];ReturnValue;taint",
16-
"My.Qltest;D;false;StepArgArg;(System.Object,System.Object);;Argument[0];Argument[1];taint",
17-
"My.Qltest;D;false;StepArgQual;(System.Object);;Argument[0];Argument[Qualifier];taint",
18-
"My.Qltest;D;false;StepFieldGetter;();;Argument[Qualifier].Field[My.Qltest.D.Field];ReturnValue;value",
19-
"My.Qltest;D;false;StepFieldSetter;(System.Object);;Argument[0];Argument[Qualifier].Field[My.Qltest.D.Field];value",
20-
"My.Qltest;D;false;StepFieldSetter;(System.Object);;Argument[Qualifier];ReturnValue.Field[My.Qltest.D.Field2];value",
21-
"My.Qltest;D;false;StepPropertyGetter;();;Argument[Qualifier].Property[My.Qltest.D.Property];ReturnValue;value",
22-
"My.Qltest;D;false;StepPropertySetter;(System.Object);;Argument[0];Argument[Qualifier].Property[My.Qltest.D.Property];value",
23-
"My.Qltest;D;false;StepElementGetter;();;Argument[Qualifier].Element;ReturnValue;value",
24-
"My.Qltest;D;false;StepElementSetter;(System.Object);;Argument[0];Argument[Qualifier].Element;value",
25-
"My.Qltest;D;false;Apply<,>;(System.Func<S,T>,S);;Argument[1];Argument[0].Parameter[0];value",
26-
"My.Qltest;D;false;Apply<,>;(System.Func<S,T>,S);;Argument[0].ReturnValue;ReturnValue;value",
27-
"My.Qltest;D;false;Apply2<>;(System.Action<S>,S,S);;Argument[1].Field[My.Qltest.D.Field];Argument[0].Parameter[0];value",
28-
"My.Qltest;D;false;Apply2<>;(System.Action<S>,S,S);;Argument[2].Field[My.Qltest.D.Field2];Argument[0].Parameter[0];value",
29-
"My.Qltest;D;false;Map<,>;(S[],System.Func<S,T>);;Argument[0].Element;Argument[1].Parameter[0];value",
30-
"My.Qltest;D;false;Map<,>;(S[],System.Func<S,T>);;Argument[1].ReturnValue;ReturnValue.Element;value",
31-
"My.Qltest;D;false;Parse;(System.String,System.Int32);;Argument[0];Argument[1];taint",
32-
"My.Qltest;E;true;get_MyProp;();;Argument[Qualifier].Field[My.Qltest.E.MyField];ReturnValue;value",
33-
"My.Qltest;E;true;set_MyProp;(System.Object);;Argument[0];Argument[Qualifier].Field[My.Qltest.E.MyField];value",
14+
//"namespace;type;overrides;name;signature;ext;inputspec;outputspec;kind;provenance",
15+
"My.Qltest;D;false;StepArgRes;(System.Object);;Argument[0];ReturnValue;taint;manual",
16+
"My.Qltest;D;false;StepArgArg;(System.Object,System.Object);;Argument[0];Argument[1];taint;manual",
17+
"My.Qltest;D;false;StepArgQual;(System.Object);;Argument[0];Argument[Qualifier];taint;manual",
18+
"My.Qltest;D;false;StepFieldGetter;();;Argument[Qualifier].Field[My.Qltest.D.Field];ReturnValue;value;manual",
19+
"My.Qltest;D;false;StepFieldSetter;(System.Object);;Argument[0];Argument[Qualifier].Field[My.Qltest.D.Field];value;manual",
20+
"My.Qltest;D;false;StepFieldSetter;(System.Object);;Argument[Qualifier];ReturnValue.Field[My.Qltest.D.Field2];value;manual",
21+
"My.Qltest;D;false;StepPropertyGetter;();;Argument[Qualifier].Property[My.Qltest.D.Property];ReturnValue;value;manual",
22+
"My.Qltest;D;false;StepPropertySetter;(System.Object);;Argument[0];Argument[Qualifier].Property[My.Qltest.D.Property];value;manual",
23+
"My.Qltest;D;false;StepElementGetter;();;Argument[Qualifier].Element;ReturnValue;value;manual",
24+
"My.Qltest;D;false;StepElementSetter;(System.Object);;Argument[0];Argument[Qualifier].Element;value;manual",
25+
"My.Qltest;D;false;Apply<,>;(System.Func<S,T>,S);;Argument[1];Argument[0].Parameter[0];value;manual",
26+
"My.Qltest;D;false;Apply<,>;(System.Func<S,T>,S);;Argument[0].ReturnValue;ReturnValue;value;manual",
27+
"My.Qltest;D;false;Apply2<>;(System.Action<S>,S,S);;Argument[1].Field[My.Qltest.D.Field];Argument[0].Parameter[0];value;manual",
28+
"My.Qltest;D;false;Apply2<>;(System.Action<S>,S,S);;Argument[2].Field[My.Qltest.D.Field2];Argument[0].Parameter[0];value;manual",
29+
"My.Qltest;D;false;Map<,>;(S[],System.Func<S,T>);;Argument[0].Element;Argument[1].Parameter[0];value;manual",
30+
"My.Qltest;D;false;Map<,>;(S[],System.Func<S,T>);;Argument[1].ReturnValue;ReturnValue.Element;value;manual",
31+
"My.Qltest;D;false;Parse;(System.String,System.Int32);;Argument[0];Argument[1];taint;manual",
32+
"My.Qltest;E;true;get_MyProp;();;Argument[Qualifier].Field[My.Qltest.E.MyField];ReturnValue;value;manual",
33+
"My.Qltest;E;true;set_MyProp;(System.Object);;Argument[0];Argument[Qualifier].Field[My.Qltest.E.MyField];value;manual",
3434
"My.Qltest;G;false;GeneratedFlow;(System.Object);;Argument[0];ReturnValue;value;generated",
3535
"My.Qltest;G;false;GeneratedFlowArgs;(System.Object,System.Object);;Argument[0];ReturnValue;value;generated",
3636
"My.Qltest;G;false;GeneratedFlowArgs;(System.Object,System.Object);;Argument[1];ReturnValue;value;generated",
3737
"My.Qltest;G;false;MixedFlowArgs;(System.Object,System.Object);;Argument[0];ReturnValue;value;generated",
38-
"My.Qltest;G;false;MixedFlowArgs;(System.Object,System.Object);;Argument[1];ReturnValue;value",
38+
"My.Qltest;G;false;MixedFlowArgs;(System.Object,System.Object);;Argument[1];ReturnValue;value;manual",
3939
]
4040
}
4141
}

‎csharp/ql/test/library-tests/dataflow/external-models/sinks.ql‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ class SinkModelTest extends SinkModelCsv {
88
override predicate row(string row) {
99
row =
1010
[
11-
//"namespace;type;overrides;name;signature;ext;spec;kind",
12-
"My.Qltest;B;false;Sink1;(System.Object);;Argument[0];code",
13-
"My.Qltest;B;false;SinkMethod;();;ReturnValue;xss",
14-
"My.Qltest;SinkAttribute;false;;;Attribute;ReturnValue;html",
15-
"My.Qltest;SinkAttribute;false;;;Attribute;Argument;remote",
16-
"My.Qltest;SinkAttribute;false;;;Attribute;;sql"
11+
//"namespace;type;overrides;name;signature;ext;spec;kind;provenance",
12+
"My.Qltest;B;false;Sink1;(System.Object);;Argument[0];code;manual",
13+
"My.Qltest;B;false;SinkMethod;();;ReturnValue;xss;manual",
14+
"My.Qltest;SinkAttribute;false;;;Attribute;ReturnValue;html;manual",
15+
"My.Qltest;SinkAttribute;false;;;Attribute;Argument;remote;manual",
16+
"My.Qltest;SinkAttribute;false;;;Attribute;;sql;manual"
1717
]
1818
}
1919
}

‎csharp/ql/test/library-tests/dataflow/external-models/srcs.ql‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@ class SourceModelTest extends SourceModelCsv {
88
override predicate row(string row) {
99
row =
1010
[
11-
//"namespace;type;overrides;name;signature;ext;spec;kind",
12-
"My.Qltest;A;false;Src1;();;ReturnValue;local",
13-
"My.Qltest;A;false;Src1;(System.String);;ReturnValue;local",
14-
"My.Qltest;A;false;Src1;;;ReturnValue;local",
15-
"My.Qltest;A;false;Src2;();;ReturnValue;local",
16-
"My.Qltest;A;false;Src3;();;ReturnValue;local",
17-
"My.Qltest;A;true;Src2;();;ReturnValue;local",
18-
"My.Qltest;A;true;Src3;();;ReturnValue;local",
19-
"My.Qltest;A;false;SrcArg;(System.Object);;Argument[0];local",
20-
"My.Qltest;A;false;SrcArg;(System.Object);;Argument;local",
21-
"My.Qltest;A;true;SrcParam;(System.Object);;Parameter[0];local",
22-
"My.Qltest;SourceAttribute;false;;;Attribute;ReturnValue;local",
23-
"My.Qltest;SourceAttribute;false;;;Attribute;Parameter;local",
24-
"My.Qltest;SourceAttribute;false;;;Attribute;;local",
25-
"My.Qltest;A;false;SrcTwoArg;(System.String,System.String);;ReturnValue;local"
11+
//"namespace;type;overrides;name;signature;ext;spec;kind;provenance",
12+
"My.Qltest;A;false;Src1;();;ReturnValue;local;manual",
13+
"My.Qltest;A;false;Src1;(System.String);;ReturnValue;local;manual",
14+
"My.Qltest;A;false;Src1;;;ReturnValue;local;manual",
15+
"My.Qltest;A;false;Src2;();;ReturnValue;local;manual",
16+
"My.Qltest;A;false;Src3;();;ReturnValue;local;manual",
17+
"My.Qltest;A;true;Src2;();;ReturnValue;local;manual",
18+
"My.Qltest;A;true;Src3;();;ReturnValue;local;manual",
19+
"My.Qltest;A;false;SrcArg;(System.Object);;Argument[0];local;manual",
20+
"My.Qltest;A;false;SrcArg;(System.Object);;Argument;local;manual",
21+
"My.Qltest;A;true;SrcParam;(System.Object);;Parameter[0];local;manual",
22+
"My.Qltest;SourceAttribute;false;;;Attribute;ReturnValue;local;manual",
23+
"My.Qltest;SourceAttribute;false;;;Attribute;Parameter;local;manual",
24+
"My.Qltest;SourceAttribute;false;;;Attribute;;local;manual",
25+
"My.Qltest;A;false;SrcTwoArg;(System.String,System.String);;ReturnValue;local;manual"
2626
]
2727
}
2828
}

‎csharp/ql/test/library-tests/dataflow/external-models/steps.ql‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@ private class SummaryModelTest extends SummaryModelCsv {
1010
override predicate row(string row) {
1111
row =
1212
[
13-
//"namespace;type;overrides;name;signature;ext;inputspec;outputspec;kind",
14-
"My.Qltest;C;false;StepArgRes;(System.Object);;Argument[0];ReturnValue;taint",
15-
"My.Qltest;C;false;StepArgArg;(System.Object,System.Object);;Argument[0];Argument[1];taint",
16-
"My.Qltest;C;false;StepArgQual;(System.Object);;Argument[0];Argument[Qualifier];taint",
17-
"My.Qltest;C;false;StepQualRes;();;Argument[Qualifier];ReturnValue;taint",
18-
"My.Qltest;C;false;StepQualArg;(System.Object);;Argument[Qualifier];Argument[0];taint",
19-
"My.Qltest;C;false;StepFieldGetter;();;Argument[Qualifier].Field[My.Qltest.C.Field];ReturnValue;value",
20-
"My.Qltest;C;false;StepFieldSetter;(System.Int32);;Argument[0];Argument[Qualifier].Field[My.Qltest.C.Field];value",
21-
"My.Qltest;C;false;StepPropertyGetter;();;Argument[Qualifier].Property[My.Qltest.C.Property];ReturnValue;value",
22-
"My.Qltest;C;false;StepPropertySetter;(System.Int32);;Argument[0];Argument[Qualifier].Property[My.Qltest.C.Property];value",
23-
"My.Qltest;C;false;StepElementGetter;();;Argument[Qualifier].Element;ReturnValue;value",
24-
"My.Qltest;C;false;StepElementSetter;(System.Int32);;Argument[0];Argument[Qualifier].Element;value",
25-
"My.Qltest;C+Generic<,>;false;StepGeneric;(T);;Argument[0];ReturnValue;value",
26-
"My.Qltest;C+Generic<,>;false;StepGeneric2<>;(S);;Argument[0];ReturnValue;value",
27-
"My.Qltest;C+Base<>;true;StepOverride;(T);;Argument[0];ReturnValue;value"
13+
//"namespace;type;overrides;name;signature;ext;inputspec;outputspec;kind;provenance",
14+
"My.Qltest;C;false;StepArgRes;(System.Object);;Argument[0];ReturnValue;taint;manual",
15+
"My.Qltest;C;false;StepArgArg;(System.Object,System.Object);;Argument[0];Argument[1];taint;manual",
16+
"My.Qltest;C;false;StepArgQual;(System.Object);;Argument[0];Argument[Qualifier];taint;manual",
17+
"My.Qltest;C;false;StepQualRes;();;Argument[Qualifier];ReturnValue;taint;manual",
18+
"My.Qltest;C;false;StepQualArg;(System.Object);;Argument[Qualifier];Argument[0];taint;manual",
19+
"My.Qltest;C;false;StepFieldGetter;();;Argument[Qualifier].Field[My.Qltest.C.Field];ReturnValue;value;manual",
20+
"My.Qltest;C;false;StepFieldSetter;(System.Int32);;Argument[0];Argument[Qualifier].Field[My.Qltest.C.Field];value;manual",
21+
"My.Qltest;C;false;StepPropertyGetter;();;Argument[Qualifier].Property[My.Qltest.C.Property];ReturnValue;value;manual",
22+
"My.Qltest;C;false;StepPropertySetter;(System.Int32);;Argument[0];Argument[Qualifier].Property[My.Qltest.C.Property];value;manual",
23+
"My.Qltest;C;false;StepElementGetter;();;Argument[Qualifier].Element;ReturnValue;value;manual",
24+
"My.Qltest;C;false;StepElementSetter;(System.Int32);;Argument[0];Argument[Qualifier].Element;value;manual",
25+
"My.Qltest;C+Generic<,>;false;StepGeneric;(T);;Argument[0];ReturnValue;value;manual",
26+
"My.Qltest;C+Generic<,>;false;StepGeneric2<>;(S);;Argument[0];ReturnValue;value;manual",
27+
"My.Qltest;C+Base<>;true;StepOverride;(T);;Argument[0];ReturnValue;value;manual"
2828
]
2929
}
3030
}

0 commit comments

Comments
 (0)