Skip to content

Commit 24c5259

Browse files
michaelnebelmichaelnebel
committed
C#: Update model generator expected output.
1 parent df7d58d commit 24c5259

File tree

5 files changed

+238
-238
lines changed

5 files changed

+238
-238
lines changed

‎csharp/ql/test/utils/modelgenerator/dataflow/CaptureNeutralModels.expected

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
| NoSummaries;BaseClass;M1;(System.String);generated |
2-
| NoSummaries;BaseClass;M2;(System.String);generated |
3-
| NoSummaries;CollectionFlow;ReturnSimpleTypeArray;(System.Int32[]);generated |
4-
| NoSummaries;CollectionFlow;ReturnSimpleTypeDictionary;(System.Collections.Generic.Dictionary<System.Int32,System.Int32>);generated |
5-
| NoSummaries;CollectionFlow;ReturnSimpleTypeList;(System.Collections.Generic.List<System.Int32>);generated |
6-
| NoSummaries;EquatableBound;Equals;(System.Object);generated |
7-
| NoSummaries;EquatableUnBound<>;Equals;(T);generated |
8-
| NoSummaries;SimpleTypes;M1;(System.Boolean);generated |
9-
| NoSummaries;SimpleTypes;M2;(System.Boolean);generated |
10-
| NoSummaries;SimpleTypes;M3;(System.Int32);generated |
11-
| NoSummaries;SimpleTypes;M4;(System.Int32);generated |
12-
| Sinks;NewSinks;WrapFieldResponseWriteFile;();generated |
13-
| Sinks;NewSinks;WrapPrivateFieldResponseWriteFile;();generated |
14-
| Sinks;NewSinks;WrapPrivatePropResponseWriteFile;();generated |
15-
| Sinks;NewSinks;WrapPropPrivateSetResponseWriteFile;();generated |
16-
| Sinks;NewSinks;WrapPropResponseWriteFile;();generated |
17-
| Sinks;NewSinks;WrapResponseWrite;(System.Object);generated |
18-
| Sinks;NewSinks;WrapResponseWriteFile;(System.String);generated |
19-
| Sinks;NewSinks;get_PrivateSetTaintedProp;();generated |
20-
| Sinks;NewSinks;get_TaintedProp;();generated |
21-
| Sinks;NewSinks;set_PrivateSetTaintedProp;(System.String);generated |
22-
| Sinks;NewSinks;set_TaintedProp;(System.String);generated |
23-
| Sources;NewSources;WrapConsoleReadKey;();generated |
24-
| Sources;NewSources;WrapConsoleReadLine;();generated |
25-
| Sources;NewSources;WrapConsoleReadLineAndProcees;(System.String);generated |
26-
| Summaries;EqualsGetHashCodeNoFlow;Equals;(System.Object);generated |
27-
| Summaries;EqualsGetHashCodeNoFlow;GetHashCode;();generated |
28-
| Summaries;OperatorFlow;op_Increment;(Summaries.OperatorFlow);generated |
1+
| NoSummaries;BaseClass;M1;(System.String);df-generated |
2+
| NoSummaries;BaseClass;M2;(System.String);df-generated |
3+
| NoSummaries;CollectionFlow;ReturnSimpleTypeArray;(System.Int32[]);df-generated |
4+
| NoSummaries;CollectionFlow;ReturnSimpleTypeDictionary;(System.Collections.Generic.Dictionary<System.Int32,System.Int32>);df-generated |
5+
| NoSummaries;CollectionFlow;ReturnSimpleTypeList;(System.Collections.Generic.List<System.Int32>);df-generated |
6+
| NoSummaries;EquatableBound;Equals;(System.Object);df-generated |
7+
| NoSummaries;EquatableUnBound<>;Equals;(T);df-generated |
8+
| NoSummaries;SimpleTypes;M1;(System.Boolean);df-generated |
9+
| NoSummaries;SimpleTypes;M2;(System.Boolean);df-generated |
10+
| NoSummaries;SimpleTypes;M3;(System.Int32);df-generated |
11+
| NoSummaries;SimpleTypes;M4;(System.Int32);df-generated |
12+
| Sinks;NewSinks;WrapFieldResponseWriteFile;();df-generated |
13+
| Sinks;NewSinks;WrapPrivateFieldResponseWriteFile;();df-generated |
14+
| Sinks;NewSinks;WrapPrivatePropResponseWriteFile;();df-generated |
15+
| Sinks;NewSinks;WrapPropPrivateSetResponseWriteFile;();df-generated |
16+
| Sinks;NewSinks;WrapPropResponseWriteFile;();df-generated |
17+
| Sinks;NewSinks;WrapResponseWrite;(System.Object);df-generated |
18+
| Sinks;NewSinks;WrapResponseWriteFile;(System.String);df-generated |
19+
| Sinks;NewSinks;get_PrivateSetTaintedProp;();df-generated |
20+
| Sinks;NewSinks;get_TaintedProp;();df-generated |
21+
| Sinks;NewSinks;set_PrivateSetTaintedProp;(System.String);df-generated |
22+
| Sinks;NewSinks;set_TaintedProp;(System.String);df-generated |
23+
| Sources;NewSources;WrapConsoleReadKey;();df-generated |
24+
| Sources;NewSources;WrapConsoleReadLine;();df-generated |
25+
| Sources;NewSources;WrapConsoleReadLineAndProcees;(System.String);df-generated |
26+
| Summaries;EqualsGetHashCodeNoFlow;Equals;(System.Object);df-generated |
27+
| Summaries;EqualsGetHashCodeNoFlow;GetHashCode;();df-generated |
28+
| Summaries;OperatorFlow;op_Increment;(Summaries.OperatorFlow);df-generated |

‎csharp/ql/test/utils/modelgenerator/dataflow/CaptureSinkModels.expected

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
| Sinks;NewSinks;false;WrapFieldResponseWriteFile;();;Argument[this];html;generated |
2-
| Sinks;NewSinks;false;WrapPropResponseWriteFile;();;Argument[this];html;generated |
3-
| Sinks;NewSinks;false;WrapResponseWrite;(System.Object);;Argument[0];html;generated |
4-
| Sinks;NewSinks;false;WrapResponseWriteFile;(System.String);;Argument[0];html;generated |
1+
| Sinks;NewSinks;false;WrapFieldResponseWriteFile;();;Argument[this];html;df-generated |
2+
| Sinks;NewSinks;false;WrapPropResponseWriteFile;();;Argument[this];html;df-generated |
3+
| Sinks;NewSinks;false;WrapResponseWrite;(System.Object);;Argument[0];html;df-generated |
4+
| Sinks;NewSinks;false;WrapResponseWriteFile;(System.String);;Argument[0];html;df-generated |

‎csharp/ql/test/utils/modelgenerator/dataflow/CaptureSourceModels.expected

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
| Sources;NewSources;false;WrapConsoleReadKey;();;ReturnValue;local;generated |
2-
| Sources;NewSources;false;WrapConsoleReadLine;();;ReturnValue;local;generated |
3-
| Sources;NewSources;false;WrapConsoleReadLineAndProcees;(System.String);;ReturnValue;local;generated |
1+
| Sources;NewSources;false;WrapConsoleReadKey;();;ReturnValue;local;df-generated |
2+
| Sources;NewSources;false;WrapConsoleReadLine;();;ReturnValue;local;df-generated |
3+
| Sources;NewSources;false;WrapConsoleReadLineAndProcees;(System.String);;ReturnValue;local;df-generated |

‎csharp/ql/test/utils/modelgenerator/dataflow/CaptureSummaryModels.expected

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
| NoSummaries;PublicClassFlow;false;PublicReturn;(System.Object);;Argument[0];ReturnValue;taint;generated |
2-
| Summaries;BaseClassFlow;true;ReturnParam;(System.Object);;Argument[0];ReturnValue;taint;generated |
3-
| Summaries;BasicFlow;false;ReturnField;();;Argument[this];ReturnValue;taint;generated |
4-
| Summaries;BasicFlow;false;ReturnParam0;(System.String,System.Object);;Argument[0];ReturnValue;taint;generated |
5-
| Summaries;BasicFlow;false;ReturnParam1;(System.String,System.Object);;Argument[1];ReturnValue;taint;generated |
6-
| Summaries;BasicFlow;false;ReturnParamMultiple;(System.Object,System.Object);;Argument[0];ReturnValue;taint;generated |
7-
| Summaries;BasicFlow;false;ReturnParamMultiple;(System.Object,System.Object);;Argument[1];ReturnValue;taint;generated |
8-
| Summaries;BasicFlow;false;ReturnSubstring;(System.String);;Argument[0];ReturnValue;taint;generated |
9-
| Summaries;BasicFlow;false;ReturnThis;(System.Object);;Argument[this];ReturnValue;value;generated |
10-
| Summaries;BasicFlow;false;SetField;(System.String);;Argument[0];Argument[this];taint;generated |
11-
| Summaries;CollectionFlow;false;AddFieldToList;(System.Collections.Generic.List<System.String>);;Argument[this];Argument[0].Element;taint;generated |
12-
| Summaries;CollectionFlow;false;AddToList;(System.Collections.Generic.List<System.Object>,System.Object);;Argument[1];Argument[0].Element;taint;generated |
13-
| Summaries;CollectionFlow;false;AssignFieldToArray;(System.Object[]);;Argument[this];Argument[0].Element;taint;generated |
14-
| Summaries;CollectionFlow;false;AssignToArray;(System.Object,System.Object[]);;Argument[0];Argument[1].Element;taint;generated |
15-
| Summaries;CollectionFlow;false;ReturnArrayElement;(System.Object[]);;Argument[0].Element;ReturnValue;taint;generated |
16-
| Summaries;CollectionFlow;false;ReturnBulkTypeList;(System.Collections.Generic.List<System.Byte>);;Argument[0].Element;ReturnValue;taint;generated |
17-
| Summaries;CollectionFlow;false;ReturnComplexTypeArray;(System.String[]);;Argument[0].Element;ReturnValue;taint;generated |
18-
| Summaries;CollectionFlow;false;ReturnComplexTypeDictionary;(System.Collections.Generic.Dictionary<System.Int32,System.String>);;Argument[0].Element;ReturnValue;taint;generated |
19-
| Summaries;CollectionFlow;false;ReturnFieldInAList;();;Argument[this];ReturnValue;taint;generated |
20-
| Summaries;CollectionFlow;false;ReturnListElement;(System.Collections.Generic.List<System.Object>);;Argument[0].Element;ReturnValue;taint;generated |
21-
| Summaries;CollectionFlow;false;ReturnUntypedArray;(System.Array);;Argument[0].Element;ReturnValue;taint;generated |
22-
| Summaries;CollectionFlow;false;ReturnUntypedList;(System.Collections.IList);;Argument[0].Element;ReturnValue;taint;generated |
23-
| Summaries;DerivedClass1Flow;false;ReturnParam1;(System.String,System.String);;Argument[1];ReturnValue;taint;generated |
24-
| Summaries;DerivedClass2Flow;false;ReturnParam0;(System.String,System.Int32);;Argument[0];ReturnValue;taint;generated |
25-
| Summaries;DerivedClass2Flow;false;ReturnParam;(System.Object);;Argument[0];ReturnValue;taint;generated |
26-
| Summaries;EqualsGetHashCodeNoFlow;false;Equals;(System.String);;Argument[0];ReturnValue;taint;generated |
27-
| Summaries;GenericFlow<>;false;AddFieldToGenericList;(System.Collections.Generic.List<T>);;Argument[this];Argument[0].Element;taint;generated |
28-
| Summaries;GenericFlow<>;false;AddToGenericList<>;(System.Collections.Generic.List<S>,S);;Argument[1];Argument[0].Element;taint;generated |
29-
| Summaries;GenericFlow<>;false;ReturnFieldInGenericList;();;Argument[this];ReturnValue;taint;generated |
30-
| Summaries;GenericFlow<>;false;ReturnGenericElement<>;(System.Collections.Generic.List<S>);;Argument[0].Element;ReturnValue;taint;generated |
31-
| Summaries;GenericFlow<>;false;ReturnGenericField;();;Argument[this];ReturnValue;taint;generated |
32-
| Summaries;GenericFlow<>;false;ReturnGenericParam<>;(S);;Argument[0];ReturnValue;taint;generated |
33-
| Summaries;GenericFlow<>;false;SetGenericField;(T);;Argument[0];Argument[this];taint;generated |
34-
| Summaries;IEnumerableFlow;false;ReturnFieldInIEnumerable;();;Argument[this];ReturnValue;taint;generated |
35-
| Summaries;IEnumerableFlow;false;ReturnIEnumerable;(System.Collections.Generic.IEnumerable<System.String>);;Argument[0].Element;ReturnValue;taint;generated |
36-
| Summaries;IEnumerableFlow;false;ReturnIEnumerableElement;(System.Collections.Generic.IEnumerable<System.Object>);;Argument[0].Element;ReturnValue;taint;generated |
37-
| Summaries;OperatorFlow;false;OperatorFlow;(System.Object);;Argument[0];Argument[this];taint;generated |
38-
| Summaries;OperatorFlow;false;op_Addition;(Summaries.OperatorFlow,Summaries.OperatorFlow);;Argument[0];ReturnValue;taint;generated |
1+
| NoSummaries;PublicClassFlow;false;PublicReturn;(System.Object);;Argument[0];ReturnValue;taint;df-generated |
2+
| Summaries;BaseClassFlow;true;ReturnParam;(System.Object);;Argument[0];ReturnValue;taint;df-generated |
3+
| Summaries;BasicFlow;false;ReturnField;();;Argument[this];ReturnValue;taint;df-generated |
4+
| Summaries;BasicFlow;false;ReturnParam0;(System.String,System.Object);;Argument[0];ReturnValue;taint;df-generated |
5+
| Summaries;BasicFlow;false;ReturnParam1;(System.String,System.Object);;Argument[1];ReturnValue;taint;df-generated |
6+
| Summaries;BasicFlow;false;ReturnParamMultiple;(System.Object,System.Object);;Argument[0];ReturnValue;taint;df-generated |
7+
| Summaries;BasicFlow;false;ReturnParamMultiple;(System.Object,System.Object);;Argument[1];ReturnValue;taint;df-generated |
8+
| Summaries;BasicFlow;false;ReturnSubstring;(System.String);;Argument[0];ReturnValue;taint;df-generated |
9+
| Summaries;BasicFlow;false;ReturnThis;(System.Object);;Argument[this];ReturnValue;value;df-generated |
10+
| Summaries;BasicFlow;false;SetField;(System.String);;Argument[0];Argument[this];taint;df-generated |
11+
| Summaries;CollectionFlow;false;AddFieldToList;(System.Collections.Generic.List<System.String>);;Argument[this];Argument[0].Element;taint;df-generated |
12+
| Summaries;CollectionFlow;false;AddToList;(System.Collections.Generic.List<System.Object>,System.Object);;Argument[1];Argument[0].Element;taint;df-generated |
13+
| Summaries;CollectionFlow;false;AssignFieldToArray;(System.Object[]);;Argument[this];Argument[0].Element;taint;df-generated |
14+
| Summaries;CollectionFlow;false;AssignToArray;(System.Object,System.Object[]);;Argument[0];Argument[1].Element;taint;df-generated |
15+
| Summaries;CollectionFlow;false;ReturnArrayElement;(System.Object[]);;Argument[0].Element;ReturnValue;taint;df-generated |
16+
| Summaries;CollectionFlow;false;ReturnBulkTypeList;(System.Collections.Generic.List<System.Byte>);;Argument[0].Element;ReturnValue;taint;df-generated |
17+
| Summaries;CollectionFlow;false;ReturnComplexTypeArray;(System.String[]);;Argument[0].Element;ReturnValue;taint;df-generated |
18+
| Summaries;CollectionFlow;false;ReturnComplexTypeDictionary;(System.Collections.Generic.Dictionary<System.Int32,System.String>);;Argument[0].Element;ReturnValue;taint;df-generated |
19+
| Summaries;CollectionFlow;false;ReturnFieldInAList;();;Argument[this];ReturnValue;taint;df-generated |
20+
| Summaries;CollectionFlow;false;ReturnListElement;(System.Collections.Generic.List<System.Object>);;Argument[0].Element;ReturnValue;taint;df-generated |
21+
| Summaries;CollectionFlow;false;ReturnUntypedArray;(System.Array);;Argument[0].Element;ReturnValue;taint;df-generated |
22+
| Summaries;CollectionFlow;false;ReturnUntypedList;(System.Collections.IList);;Argument[0].Element;ReturnValue;taint;df-generated |
23+
| Summaries;DerivedClass1Flow;false;ReturnParam1;(System.String,System.String);;Argument[1];ReturnValue;taint;df-generated |
24+
| Summaries;DerivedClass2Flow;false;ReturnParam0;(System.String,System.Int32);;Argument[0];ReturnValue;taint;df-generated |
25+
| Summaries;DerivedClass2Flow;false;ReturnParam;(System.Object);;Argument[0];ReturnValue;taint;df-generated |
26+
| Summaries;EqualsGetHashCodeNoFlow;false;Equals;(System.String);;Argument[0];ReturnValue;taint;df-generated |
27+
| Summaries;GenericFlow<>;false;AddFieldToGenericList;(System.Collections.Generic.List<T>);;Argument[this];Argument[0].Element;taint;df-generated |
28+
| Summaries;GenericFlow<>;false;AddToGenericList<>;(System.Collections.Generic.List<S>,S);;Argument[1];Argument[0].Element;taint;df-generated |
29+
| Summaries;GenericFlow<>;false;ReturnFieldInGenericList;();;Argument[this];ReturnValue;taint;df-generated |
30+
| Summaries;GenericFlow<>;false;ReturnGenericElement<>;(System.Collections.Generic.List<S>);;Argument[0].Element;ReturnValue;taint;df-generated |
31+
| Summaries;GenericFlow<>;false;ReturnGenericField;();;Argument[this];ReturnValue;taint;df-generated |
32+
| Summaries;GenericFlow<>;false;ReturnGenericParam<>;(S);;Argument[0];ReturnValue;taint;df-generated |
33+
| Summaries;GenericFlow<>;false;SetGenericField;(T);;Argument[0];Argument[this];taint;df-generated |
34+
| Summaries;IEnumerableFlow;false;ReturnFieldInIEnumerable;();;Argument[this];ReturnValue;taint;df-generated |
35+
| Summaries;IEnumerableFlow;false;ReturnIEnumerable;(System.Collections.Generic.IEnumerable<System.String>);;Argument[0].Element;ReturnValue;taint;df-generated |
36+
| Summaries;IEnumerableFlow;false;ReturnIEnumerableElement;(System.Collections.Generic.IEnumerable<System.Object>);;Argument[0].Element;ReturnValue;taint;df-generated |
37+
| Summaries;OperatorFlow;false;OperatorFlow;(System.Object);;Argument[0];Argument[this];taint;df-generated |
38+
| Summaries;OperatorFlow;false;op_Addition;(Summaries.OperatorFlow,Summaries.OperatorFlow);;Argument[0];ReturnValue;taint;df-generated |

0 commit comments

Comments
 (0)