Skip to content

Commit 9a923d6

Browse files
michaelnebelmichaelnebel
committed
C#/Java: Updated expected test output.
1 parent e70297a commit 9a923d6

17 files changed

+147
-147
lines changed

‎csharp/ql/test/utils/modelgenerator/dataflow/Summaries.cs

Lines changed: 75 additions & 75 deletions
Large diffs are not rendered by default.

‎java/ql/test/utils/modelgenerator/dataflow/p/Factory.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ public final class Factory {
77
private int intValue;
88

99
// summary=p;Factory;false;create;(String,int);;Argument[0];ReturnValue;taint;df-generated
10-
// contentbased-summary=p;Factory;false;create;(String,int);;Argument[0];ReturnValue.Field[p.Factory.value];value;df-generated
10+
// contentbased-summary=p;Factory;false;create;(String,int);;Argument[0];ReturnValue.Field[p.Factory.value];value;dfc-generated
1111
public static Factory create(String value, int foo) {
1212
return new Factory(value, foo);
1313
}
1414

1515
// summary=p;Factory;false;create;(String);;Argument[0];ReturnValue;taint;df-generated
16-
// contentbased-summary=p;Factory;false;create;(String);;Argument[0];ReturnValue.Field[p.Factory.value];value;df-generated
16+
// contentbased-summary=p;Factory;false;create;(String);;Argument[0];ReturnValue.Field[p.Factory.value];value;dfc-generated
1717
public static Factory create(String value) {
1818
return new Factory(value, 0);
1919
}
@@ -24,7 +24,7 @@ private Factory(String value, int intValue) {
2424
}
2525

2626
// summary=p;Factory;false;getValue;();;Argument[this];ReturnValue;taint;df-generated
27-
// contentbased-summary=p;Factory;false;getValue;();;Argument[this].Field[p.Factory.value];ReturnValue;value;df-generated
27+
// contentbased-summary=p;Factory;false;getValue;();;Argument[this].Field[p.Factory.value];ReturnValue;value;dfc-generated
2828
public String getValue() {
2929
return value;
3030
}

‎java/ql/test/utils/modelgenerator/dataflow/p/Fanout.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class Impl1 implements I1 {
1111
public String v;
1212

1313
// summary=p;Fanout$I1;true;getValue;();;Argument[this];ReturnValue;taint;df-generated
14-
// contentbased-summary=p;Fanout$Impl1;true;getValue;();;Argument[this].Field[p.Fanout$Impl1.v];ReturnValue;value;df-generated
14+
// contentbased-summary=p;Fanout$Impl1;true;getValue;();;Argument[this].Field[p.Fanout$Impl1.v];ReturnValue;value;dfc-generated
1515
public String getValue() {
1616
return v;
1717
}
@@ -21,7 +21,7 @@ public class Impl2 implements I2 {
2121
public String v;
2222

2323
// summary=p;Fanout$I1;true;getValue;();;Argument[this];ReturnValue;taint;df-generated
24-
// contentbased-summary=p;Fanout$Impl2;true;getValue;();;Argument[this].Field[p.Fanout$Impl2.v];ReturnValue;value;df-generated
24+
// contentbased-summary=p;Fanout$Impl2;true;getValue;();;Argument[this].Field[p.Fanout$Impl2.v];ReturnValue;value;dfc-generated
2525
public String getValue() {
2626
return v;
2727
}
@@ -31,7 +31,7 @@ public class Impl3 implements I2 {
3131
public String v;
3232

3333
// summary=p;Fanout$I1;true;getValue;();;Argument[this];ReturnValue;taint;df-generated
34-
// contentbased-summary=p;Fanout$Impl3;true;getValue;();;Argument[this].Field[p.Fanout$Impl3.v];ReturnValue;value;df-generated
34+
// contentbased-summary=p;Fanout$Impl3;true;getValue;();;Argument[this].Field[p.Fanout$Impl3.v];ReturnValue;value;dfc-generated
3535
public String getValue() {
3636
return v;
3737
}
@@ -41,7 +41,7 @@ public class Impl4 implements I2 {
4141
public String v;
4242

4343
// summary=p;Fanout$I1;true;getValue;();;Argument[this];ReturnValue;taint;df-generated
44-
// contentbased-summary=p;Fanout$Impl4;true;getValue;();;Argument[this].Field[p.Fanout$Impl4.v];ReturnValue;value;df-generated
44+
// contentbased-summary=p;Fanout$Impl4;true;getValue;();;Argument[this].Field[p.Fanout$Impl4.v];ReturnValue;value;dfc-generated
4545
public String getValue() {
4646
return v;
4747
}
@@ -51,17 +51,17 @@ public String getValue() {
5151
// summary=p;Fanout;true;concatGetValueOnI1;(String,Fanout$I1);;Argument[1];ReturnValue;taint;df-generated
5252
// No content based summaries are expected for this method on parameter `i`
5353
// as the fanout (number of content flows) exceeds the limit of 3.
54-
// contentbased-summary=p;Fanout;true;concatGetValueOnI1;(String,Fanout$I1);;Argument[0];ReturnValue;taint;df-generated
54+
// contentbased-summary=p;Fanout;true;concatGetValueOnI1;(String,Fanout$I1);;Argument[0];ReturnValue;taint;dfc-generated
5555
public String concatGetValueOnI1(String other, I1 i) {
5656
return other + i.getValue();
5757
}
5858

5959
// summary=p;Fanout;true;concatGetValueOnI2;(String,Fanout$I2);;Argument[0];ReturnValue;taint;df-generated
6060
// summary=p;Fanout;true;concatGetValueOnI2;(String,Fanout$I2);;Argument[1];ReturnValue;taint;df-generated
61-
// contentbased-summary=p;Fanout;true;concatGetValueOnI2;(String,Fanout$I2);;Argument[0];ReturnValue;taint;df-generated
62-
// contentbased-summary=p;Fanout;true;concatGetValueOnI2;(String,Fanout$I2);;Argument[1].Field[p.Fanout$Impl2.v];ReturnValue;taint;df-generated
63-
// contentbased-summary=p;Fanout;true;concatGetValueOnI2;(String,Fanout$I2);;Argument[1].Field[p.Fanout$Impl3.v];ReturnValue;taint;df-generated
64-
// contentbased-summary=p;Fanout;true;concatGetValueOnI2;(String,Fanout$I2);;Argument[1].Field[p.Fanout$Impl4.v];ReturnValue;taint;df-generated
61+
// contentbased-summary=p;Fanout;true;concatGetValueOnI2;(String,Fanout$I2);;Argument[0];ReturnValue;taint;dfc-generated
62+
// contentbased-summary=p;Fanout;true;concatGetValueOnI2;(String,Fanout$I2);;Argument[1].Field[p.Fanout$Impl2.v];ReturnValue;taint;dfc-generated
63+
// contentbased-summary=p;Fanout;true;concatGetValueOnI2;(String,Fanout$I2);;Argument[1].Field[p.Fanout$Impl3.v];ReturnValue;taint;dfc-generated
64+
// contentbased-summary=p;Fanout;true;concatGetValueOnI2;(String,Fanout$I2);;Argument[1].Field[p.Fanout$Impl4.v];ReturnValue;taint;dfc-generated
6565
public String concatGetValueOnI2(String other, I2 i) {
6666
return other + i.getValue();
6767
}

‎java/ql/test/utils/modelgenerator/dataflow/p/FinalClass.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ public final class FinalClass {
55
private static final String C = "constant";
66

77
// summary=p;FinalClass;false;returnsInput;(String);;Argument[0];ReturnValue;taint;df-generated
8-
// contentbased-summary=p;FinalClass;false;returnsInput;(String);;Argument[0];ReturnValue;value;df-generated
8+
// contentbased-summary=p;FinalClass;false;returnsInput;(String);;Argument[0];ReturnValue;value;dfc-generated
99
public String returnsInput(String input) {
1010
return input;
1111
}

‎java/ql/test/utils/modelgenerator/dataflow/p/FluentAPI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
public final class FluentAPI {
44

55
// summary=p;FluentAPI;false;returnsThis;(String);;Argument[this];ReturnValue;value;df-generated
6-
// contentbased-summary=p;FluentAPI;false;returnsThis;(String);;Argument[this];ReturnValue;value;df-generated
6+
// contentbased-summary=p;FluentAPI;false;returnsThis;(String);;Argument[this];ReturnValue;value;dfc-generated
77
public FluentAPI returnsThis(String input) {
88
return this;
99
}

‎java/ql/test/utils/modelgenerator/dataflow/p/ImmutablePojo.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ public final class ImmutablePojo {
77
private final long x;
88

99
// summary=p;ImmutablePojo;false;ImmutablePojo;(String,int);;Argument[0];Argument[this];taint;df-generated
10-
// contentbased-summary=p;ImmutablePojo;false;ImmutablePojo;(String,int);;Argument[0];Argument[this].SyntheticField[p.ImmutablePojo.value];value;df-generated
10+
// contentbased-summary=p;ImmutablePojo;false;ImmutablePojo;(String,int);;Argument[0];Argument[this].SyntheticField[p.ImmutablePojo.value];value;dfc-generated
1111
public ImmutablePojo(String value, int x) {
1212
this.value = value;
1313
this.x = x;
1414
}
1515

1616
// summary=p;ImmutablePojo;false;getValue;();;Argument[this];ReturnValue;taint;df-generated
17-
// contentbased-summary=p;ImmutablePojo;false;getValue;();;Argument[this].SyntheticField[p.ImmutablePojo.value];ReturnValue;value;df-generated
17+
// contentbased-summary=p;ImmutablePojo;false;getValue;();;Argument[this].SyntheticField[p.ImmutablePojo.value];ReturnValue;value;dfc-generated
1818
public String getValue() {
1919
return value;
2020
}
@@ -26,8 +26,8 @@ public long getX() {
2626

2727
// summary=p;ImmutablePojo;false;or;(String);;Argument[0];ReturnValue;taint;df-generated
2828
// summary=p;ImmutablePojo;false;or;(String);;Argument[this];ReturnValue;taint;df-generated
29-
// contentbased-summary=p;ImmutablePojo;false;or;(String);;Argument[0];ReturnValue;value;df-generated
30-
// contentbased-summary=p;ImmutablePojo;false;or;(String);;Argument[this].SyntheticField[p.ImmutablePojo.value];ReturnValue;value;df-generated
29+
// contentbased-summary=p;ImmutablePojo;false;or;(String);;Argument[0];ReturnValue;value;dfc-generated
30+
// contentbased-summary=p;ImmutablePojo;false;or;(String);;Argument[this].SyntheticField[p.ImmutablePojo.value];ReturnValue;value;dfc-generated
3131
public String or(String defaultValue) {
3232
return value != null ? value : defaultValue;
3333
}

‎java/ql/test/utils/modelgenerator/dataflow/p/Inheritance.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public abstract class BasePublic {
1111

1212
public class AImplBasePrivateImpl extends BasePrivate {
1313
// summary=p;Inheritance$AImplBasePrivateImpl;true;id;(String);;Argument[0];ReturnValue;taint;df-generated
14-
// contentbased-summary=p;Inheritance$AImplBasePrivateImpl;true;id;(String);;Argument[0];ReturnValue;value;df-generated
14+
// contentbased-summary=p;Inheritance$AImplBasePrivateImpl;true;id;(String);;Argument[0];ReturnValue;value;dfc-generated
1515
@Override
1616
public String id(String s) {
1717
return s;
@@ -20,7 +20,7 @@ public String id(String s) {
2020

2121
public class AImplBasePublic extends BasePublic {
2222
// summary=p;Inheritance$BasePublic;true;id;(String);;Argument[0];ReturnValue;taint;df-generated
23-
// contentbased-summary=p;Inheritance$BasePublic;true;id;(String);;Argument[0];ReturnValue;value;df-generated
23+
// contentbased-summary=p;Inheritance$BasePublic;true;id;(String);;Argument[0];ReturnValue;value;dfc-generated
2424
@Override
2525
public String id(String s) {
2626
return s;
@@ -61,7 +61,7 @@ private abstract class E implements IPrivate2 {
6161

6262
public class BImpl extends B {
6363
// summary=p;Inheritance$IPublic1;true;id;(String);;Argument[0];ReturnValue;taint;df-generated
64-
// contentbased-summary=p;Inheritance$IPublic1;true;id;(String);;Argument[0];ReturnValue;value;df-generated
64+
// contentbased-summary=p;Inheritance$IPublic1;true;id;(String);;Argument[0];ReturnValue;value;dfc-generated
6565
@Override
6666
public String id(String s) {
6767
return s;
@@ -70,7 +70,7 @@ public String id(String s) {
7070

7171
public class CImpl extends C {
7272
// summary=p;Inheritance$C;true;id;(String);;Argument[0];ReturnValue;taint;df-generated
73-
// contentbased-summary=p;Inheritance$C;true;id;(String);;Argument[0];ReturnValue;value;df-generated
73+
// contentbased-summary=p;Inheritance$C;true;id;(String);;Argument[0];ReturnValue;value;dfc-generated
7474
@Override
7575
public String id(String s) {
7676
return s;
@@ -79,7 +79,7 @@ public String id(String s) {
7979

8080
public class DImpl extends D {
8181
// summary=p;Inheritance$IPublic2;true;id;(String);;Argument[0];ReturnValue;taint;df-generated
82-
// contentbased-summary=p;Inheritance$IPublic2;true;id;(String);;Argument[0];ReturnValue;value;df-generated
82+
// contentbased-summary=p;Inheritance$IPublic2;true;id;(String);;Argument[0];ReturnValue;value;dfc-generated
8383
@Override
8484
public String id(String s) {
8585
return s;
@@ -88,7 +88,7 @@ public String id(String s) {
8888

8989
public class EImpl extends E {
9090
// summary=p;Inheritance$EImpl;true;id;(String);;Argument[0];ReturnValue;taint;df-generated
91-
// contentbased-summary=p;Inheritance$EImpl;true;id;(String);;Argument[0];ReturnValue;value;df-generated
91+
// contentbased-summary=p;Inheritance$EImpl;true;id;(String);;Argument[0];ReturnValue;value;dfc-generated
9292
@Override
9393
public String id(String s) {
9494
return s;

‎java/ql/test/utils/modelgenerator/dataflow/p/InnerClasses.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ public String no(String input) {
1010

1111
public class CaptureMe {
1212
// summary=p;InnerClasses$CaptureMe;true;yesCm;(String);;Argument[0];ReturnValue;taint;df-generated
13-
// contentbased-summary=p;InnerClasses$CaptureMe;true;yesCm;(String);;Argument[0];ReturnValue;value;df-generated
13+
// contentbased-summary=p;InnerClasses$CaptureMe;true;yesCm;(String);;Argument[0];ReturnValue;value;dfc-generated
1414
public String yesCm(String input) {
1515
return input;
1616
}
1717
}
1818

1919
// summary=p;InnerClasses;true;yes;(String);;Argument[0];ReturnValue;taint;df-generated
20-
// contentbased-summary=p;InnerClasses;true;yes;(String);;Argument[0];ReturnValue;value;df-generated
20+
// contentbased-summary=p;InnerClasses;true;yes;(String);;Argument[0];ReturnValue;value;dfc-generated
2121
public String yes(String input) {
2222
return input;
2323
}

‎java/ql/test/utils/modelgenerator/dataflow/p/InnerHolder.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,31 +19,31 @@ public String getValue() {
1919
private StringBuilder sb = new StringBuilder();
2020

2121
// summary=p;InnerHolder;false;setContext;(String);;Argument[0];Argument[this];taint;df-generated
22-
// contentbased-summary=p;InnerHolder;false;setContext;(String);;Argument[0];Argument[this].SyntheticField[p.InnerHolder.context].SyntheticField[p.InnerHolder$Context.value];value;df-generated
22+
// contentbased-summary=p;InnerHolder;false;setContext;(String);;Argument[0];Argument[this].SyntheticField[p.InnerHolder.context].SyntheticField[p.InnerHolder$Context.value];value;dfc-generated
2323
public void setContext(String value) {
2424
context = new Context(value);
2525
}
2626

2727
// summary=p;InnerHolder;false;explicitSetContext;(String);;Argument[0];Argument[this];taint;df-generated
28-
// contentbased-summary=p;InnerHolder;false;explicitSetContext;(String);;Argument[0];Argument[this].SyntheticField[p.InnerHolder.context].SyntheticField[p.InnerHolder$Context.value];value;df-generated
28+
// contentbased-summary=p;InnerHolder;false;explicitSetContext;(String);;Argument[0];Argument[this].SyntheticField[p.InnerHolder.context].SyntheticField[p.InnerHolder$Context.value];value;dfc-generated
2929
public void explicitSetContext(String value) {
3030
this.context = new Context(value);
3131
}
3232

3333
// summary=p;InnerHolder;false;append;(String);;Argument[0];Argument[this];taint;df-generated
34-
// contentbased-summary=p;InnerHolder;false;append;(String);;Argument[0];Argument[this].SyntheticField[p.InnerHolder.sb];taint;df-generated
34+
// contentbased-summary=p;InnerHolder;false;append;(String);;Argument[0];Argument[this].SyntheticField[p.InnerHolder.sb];taint;dfc-generated
3535
public void append(String value) {
3636
sb.append(value);
3737
}
3838

3939
// summary=p;InnerHolder;false;getValue;();;Argument[this];ReturnValue;taint;df-generated
40-
// contentbased-summary=p;InnerHolder;false;getValue;();;Argument[this].SyntheticField[p.InnerHolder.sb];ReturnValue;taint;df-generated
40+
// contentbased-summary=p;InnerHolder;false;getValue;();;Argument[this].SyntheticField[p.InnerHolder.sb];ReturnValue;taint;dfc-generated
4141
public String getValue() {
4242
return sb.toString();
4343
}
4444

4545
// summary=p;InnerHolder;false;getContextValue;();;Argument[this];ReturnValue;taint;df-generated
46-
// contentbased-summary=p;InnerHolder;false;getContextValue;();;Argument[this].SyntheticField[p.InnerHolder.context].SyntheticField[p.InnerHolder$Context.value];ReturnValue;value;df-generated
46+
// contentbased-summary=p;InnerHolder;false;getContextValue;();;Argument[this].SyntheticField[p.InnerHolder.context].SyntheticField[p.InnerHolder$Context.value];ReturnValue;value;dfc-generated
4747
public String getContextValue() {
4848
return context.getValue();
4949
}

‎java/ql/test/utils/modelgenerator/dataflow/p/Joiner.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ public final class Joiner {
1313
private String emptyValue;
1414

1515
// summary=p;Joiner;false;Joiner;(CharSequence);;Argument[0];Argument[this];taint;df-generated
16-
// contentbased-summary=p;Joiner;false;Joiner;(CharSequence);;Argument[0];Argument[this].SyntheticField[p.Joiner.delimiter];taint;df-generated
16+
// contentbased-summary=p;Joiner;false;Joiner;(CharSequence);;Argument[0];Argument[this].SyntheticField[p.Joiner.delimiter];taint;dfc-generated
1717
public Joiner(CharSequence delimiter) {
1818
this(delimiter, "", "");
1919
}
2020

2121
// summary=p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[0];Argument[this];taint;df-generated
2222
// summary=p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[1];Argument[this];taint;df-generated
2323
// summary=p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[2];Argument[this];taint;df-generated
24-
// contentbased-summary=p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[0];Argument[this].SyntheticField[p.Joiner.delimiter];taint;df-generated
24+
// contentbased-summary=p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[0];Argument[this].SyntheticField[p.Joiner.delimiter];taint;dfc-generated
2525
// No content based summaries for prefix and suffix as they are "dead" synthetic fields.
2626
public Joiner(CharSequence delimiter, CharSequence prefix, CharSequence suffix) {
2727
Objects.requireNonNull(prefix, "The prefix must not be null");
@@ -36,15 +36,15 @@ public Joiner(CharSequence delimiter, CharSequence prefix, CharSequence suffix)
3636
// summary=p;Joiner;false;setEmptyValue;(CharSequence);;Argument[0];Argument[this];taint;df-generated
3737
// summary=p;Joiner;false;setEmptyValue;(CharSequence);;Argument[this];ReturnValue;value;df-generated
3838
// No content based summary as emptyValue is "dead" (synthetic)field.
39-
// contentbased-summary=p;Joiner;false;setEmptyValue;(CharSequence);;Argument[this];ReturnValue;value;df-generated
39+
// contentbased-summary=p;Joiner;false;setEmptyValue;(CharSequence);;Argument[this];ReturnValue;value;dfc-generated
4040
public Joiner setEmptyValue(CharSequence emptyValue) {
4141
this.emptyValue =
4242
Objects.requireNonNull(emptyValue, "The empty value must not be null").toString();
4343
return this;
4444
}
4545

4646
// summary=p;Joiner;false;getDelimiter;();;Argument[this];ReturnValue;taint;df-generated
47-
// contentbased-summary=p;Joiner;false;getDelimiter;();;Argument[this].SyntheticField[p.Joiner.delimiter];ReturnValue;value;df-generated
47+
// contentbased-summary=p;Joiner;false;getDelimiter;();;Argument[this].SyntheticField[p.Joiner.delimiter];ReturnValue;value;dfc-generated
4848
public String getDelimiter() {
4949
return delimiter;
5050
}
@@ -82,7 +82,7 @@ public String toString() {
8282
}
8383

8484
// summary=p;Joiner;false;add;(CharSequence);;Argument[this];ReturnValue;value;df-generated
85-
// contentbased-summary=p;Joiner;false;add;(CharSequence);;Argument[this];ReturnValue;value;df-generated
85+
// contentbased-summary=p;Joiner;false;add;(CharSequence);;Argument[this];ReturnValue;value;dfc-generated
8686
// MISSING content based summaries for "elts". This could be a synthetic field.
8787
public Joiner add(CharSequence newElement) {
8888
final String elt = String.valueOf(newElement);
@@ -107,7 +107,7 @@ private int checkAddLength(int oldLen, int inc) {
107107
}
108108

109109
// summary=p;Joiner;false;merge;(Joiner);;Argument[this];ReturnValue;value;df-generated
110-
// contentbased-summary=p;Joiner;false;merge;(Joiner);;Argument[this];ReturnValue;value;df-generated
110+
// contentbased-summary=p;Joiner;false;merge;(Joiner);;Argument[this];ReturnValue;value;dfc-generated
111111
// MISSING content based summaries for "elts". This could be a synthetic field.
112112
public Joiner merge(Joiner other) {
113113
Objects.requireNonNull(other);

0 commit comments

Comments
 (0)