Skip to content

Commit 51e7f3b

Browse files
michaelnebelmichaelnebel
committed
Java: Rename MaD to summary.
1 parent a33393d commit 51e7f3b

18 files changed

Lines changed: 412 additions & 421 deletions

‎java/ql/test/TestUtilities/InlineMadTest.qll‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,22 @@ signature module InlineMadTestConfigSig {
1111
}
1212

1313
module InlineMadTest<InlineMadTestConfigSig Input> {
14-
private string expects() {
15-
Input::getComment().regexpCapture(" *(SPURIOUS-)?MaD=(.*)", 2) = result
14+
bindingset[kind]
15+
private string expects(string kind) {
16+
Input::getComment().regexpCapture(" *(SPURIOUS-)?" + kind + "=(.*)", 2) = result
1617
}
1718

1819
query predicate unexpectedSummary(string msg) {
1920
exists(string flow |
2021
flow = Input::getCapturedSummary() and
21-
not flow = expects() and
22+
not flow = expects("summary") and
2223
msg = "Unexpected summary found: " + flow
2324
)
2425
}
2526

2627
query predicate expectedSummary(string msg) {
2728
exists(string e |
28-
e = expects() and
29+
e = expects("summary") and
2930
not e = Input::getCapturedSummary() and
3031
msg = "Expected summary missing: " + e
3132
)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ public final class Factory {
66

77
private int intValue;
88

9-
// MaD=p;Factory;false;create;(String,int);;Argument[0];ReturnValue;taint;df-generated
9+
// summary=p;Factory;false;create;(String,int);;Argument[0];ReturnValue;taint;df-generated
1010
public static Factory create(String value, int foo) {
1111
return new Factory(value, foo);
1212
}
1313

14-
// MaD=p;Factory;false;create;(String);;Argument[0];ReturnValue;taint;df-generated
14+
// summary=p;Factory;false;create;(String);;Argument[0];ReturnValue;taint;df-generated
1515
public static Factory create(String value) {
1616
return new Factory(value, 0);
1717
}
@@ -21,7 +21,7 @@ private Factory(String value, int intValue) {
2121
this.intValue = intValue;
2222
}
2323

24-
// MaD=p;Factory;false;getValue;();;Argument[this];ReturnValue;taint;df-generated
24+
// summary=p;Factory;false;getValue;();;Argument[this];ReturnValue;taint;df-generated
2525
public String getValue() {
2626
return value;
2727
}

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

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

55
private static final String C = "constant";
66

7-
// MaD=p;FinalClass;false;returnsInput;(String);;Argument[0];ReturnValue;taint;df-generated
7+
// summary=p;FinalClass;false;returnsInput;(String);;Argument[0];ReturnValue;taint;df-generated
88
public String returnsInput(String input) {
99
return input;
1010
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
public final class FluentAPI {
44

5-
// MaD=p;FluentAPI;false;returnsThis;(String);;Argument[this];ReturnValue;value;df-generated
5+
// summary=p;FluentAPI;false;returnsThis;(String);;Argument[this];ReturnValue;value;df-generated
66
public FluentAPI returnsThis(String input) {
77
return this;
88
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ public final class ImmutablePojo {
66

77
private final long x;
88

9-
// MaD=p;ImmutablePojo;false;ImmutablePojo;(String,int);;Argument[0];Argument[this];taint;df-generated
9+
// summary=p;ImmutablePojo;false;ImmutablePojo;(String,int);;Argument[0];Argument[this];taint;df-generated
1010
public ImmutablePojo(String value, int x) {
1111
this.value = value;
1212
this.x = x;
1313
}
1414

15-
// MaD=p;ImmutablePojo;false;getValue;();;Argument[this];ReturnValue;taint;df-generated
15+
// summary=p;ImmutablePojo;false;getValue;();;Argument[this];ReturnValue;taint;df-generated
1616
public String getValue() {
1717
return value;
1818
}
@@ -21,8 +21,8 @@ public long getX() {
2121
return x;
2222
}
2323

24-
// MaD=p;ImmutablePojo;false;or;(String);;Argument[0];ReturnValue;taint;df-generated
25-
// MaD=p;ImmutablePojo;false;or;(String);;Argument[this];ReturnValue;taint;df-generated
24+
// summary=p;ImmutablePojo;false;or;(String);;Argument[0];ReturnValue;taint;df-generated
25+
// summary=p;ImmutablePojo;false;or;(String);;Argument[this];ReturnValue;taint;df-generated
2626
public String or(String defaultValue) {
2727
return value != null ? value : defaultValue;
2828
}

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

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

1111
public class CaptureMe {
12-
// MaD=p;InnerClasses$CaptureMe;true;yesCm;(String);;Argument[0];ReturnValue;taint;df-generated
12+
// summary=p;InnerClasses$CaptureMe;true;yesCm;(String);;Argument[0];ReturnValue;taint;df-generated
1313
public String yesCm(String input) {
1414
return input;
1515
}
1616
}
1717

18-
// MaD=p;InnerClasses;true;yes;(String);;Argument[0];ReturnValue;taint;df-generated
18+
// summary=p;InnerClasses;true;yes;(String);;Argument[0];ReturnValue;taint;df-generated
1919
public String yes(String input) {
2020
return input;
2121
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@ public String getValue() {
1818

1919
private StringBuilder sb = new StringBuilder();
2020

21-
// MaD=p;InnerHolder;false;setContext;(String);;Argument[0];Argument[this];taint;df-generated
21+
// summary=p;InnerHolder;false;setContext;(String);;Argument[0];Argument[this];taint;df-generated
2222
public void setContext(String value) {
2323
context = new Context(value);
2424
}
2525

26-
// MaD=p;InnerHolder;false;explicitSetContext;(String);;Argument[0];Argument[this];taint;df-generated
26+
// summary=p;InnerHolder;false;explicitSetContext;(String);;Argument[0];Argument[this];taint;df-generated
2727
public void explicitSetContext(String value) {
2828
this.context = new Context(value);
2929
}
3030

31-
// MaD=p;InnerHolder;false;append;(String);;Argument[0];Argument[this];taint;df-generated
31+
// summary=p;InnerHolder;false;append;(String);;Argument[0];Argument[this];taint;df-generated
3232
public void append(String value) {
3333
sb.append(value);
3434
}
3535

36-
// MaD=p;InnerHolder;false;getValue;();;Argument[this];ReturnValue;taint;df-generated
36+
// summary=p;InnerHolder;false;getValue;();;Argument[this];ReturnValue;taint;df-generated
3737
public String getValue() {
3838
return context.getValue();
3939
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ public final class Joiner {
1212
private int len;
1313
private String emptyValue;
1414

15-
// MaD=p;Joiner;false;Joiner;(CharSequence);;Argument[0];Argument[this];taint;df-generated
15+
// summary=p;Joiner;false;Joiner;(CharSequence);;Argument[0];Argument[this];taint;df-generated
1616
public Joiner(CharSequence delimiter) {
1717
this(delimiter, "", "");
1818
}
1919

20-
// MaD=p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[0];Argument[this];taint;df-generated
21-
// MaD=p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[1];Argument[this];taint;df-generated
22-
// MaD=p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[2];Argument[this];taint;df-generated
20+
// summary=p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[0];Argument[this];taint;df-generated
21+
// summary=p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[1];Argument[this];taint;df-generated
22+
// summary=p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[2];Argument[this];taint;df-generated
2323
public Joiner(CharSequence delimiter, CharSequence prefix, CharSequence suffix) {
2424
Objects.requireNonNull(prefix, "The prefix must not be null");
2525
Objects.requireNonNull(delimiter, "The delimiter must not be null");
@@ -30,8 +30,8 @@ public Joiner(CharSequence delimiter, CharSequence prefix, CharSequence suffix)
3030
checkAddLength(0, 0);
3131
}
3232

33-
// MaD=p;Joiner;false;setEmptyValue;(CharSequence);;Argument[0];Argument[this];taint;df-generated
34-
// MaD=p;Joiner;false;setEmptyValue;(CharSequence);;Argument[this];ReturnValue;value;df-generated
33+
// summary=p;Joiner;false;setEmptyValue;(CharSequence);;Argument[0];Argument[this];taint;df-generated
34+
// summary=p;Joiner;false;setEmptyValue;(CharSequence);;Argument[this];ReturnValue;value;df-generated
3535
public Joiner setEmptyValue(CharSequence emptyValue) {
3636
this.emptyValue =
3737
Objects.requireNonNull(emptyValue, "The empty value must not be null").toString();
@@ -70,7 +70,7 @@ public String toString() {
7070
return new String(chars);
7171
}
7272

73-
// MaD=p;Joiner;false;add;(CharSequence);;Argument[this];ReturnValue;value;df-generated
73+
// summary=p;Joiner;false;add;(CharSequence);;Argument[this];ReturnValue;value;df-generated
7474
public Joiner add(CharSequence newElement) {
7575
final String elt = String.valueOf(newElement);
7676
if (elts == null) {
@@ -93,7 +93,7 @@ private int checkAddLength(int oldLen, int inc) {
9393
return (int) newLen;
9494
}
9595

96-
// MaD=p;Joiner;false;merge;(Joiner);;Argument[this];ReturnValue;value;df-generated
96+
// summary=p;Joiner;false;merge;(Joiner);;Argument[this];ReturnValue;value;df-generated
9797
public Joiner merge(Joiner other) {
9898
Objects.requireNonNull(other);
9999
if (other.elts == null) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class MultipleImpl2 {
66
// This is used to test that we only generate a summary model and
77
// not neutral summary model for `IInterface.m`.
88
public interface IInterface {
9-
// MaD=p;MultipleImpl2$IInterface;true;m;(Object);;Argument[0];ReturnValue;taint;df-generated
9+
// summary=p;MultipleImpl2$IInterface;true;m;(Object);;Argument[0];ReturnValue;taint;df-generated
1010
Object m(Object value);
1111
}
1212

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
public class MultipleImpls {
66

77
public static interface Strategy {
8-
// MaD=p;MultipleImpls$Strategy;true;doSomething;(String);;Argument[0];Argument[this];taint;df-generated
9-
// MaD=p;MultipleImpls$Strategy;true;doSomething;(String);;Argument[0];ReturnValue;taint;df-generated
8+
// summary=p;MultipleImpls$Strategy;true;doSomething;(String);;Argument[0];Argument[this];taint;df-generated
9+
// summary=p;MultipleImpls$Strategy;true;doSomething;(String);;Argument[0];ReturnValue;taint;df-generated
1010
String doSomething(String value);
1111
}
1212

@@ -33,7 +33,7 @@ public String doSomething(String value) {
3333
return "none";
3434
}
3535

36-
// MaD=p;MultipleImpls$Strat2;true;getValue;();;Argument[this];ReturnValue;taint;df-generated
36+
// summary=p;MultipleImpls$Strat2;true;getValue;();;Argument[this];ReturnValue;taint;df-generated
3737
public String getValue() {
3838
return this.foo;
3939
}

0 commit comments

Comments
 (0)