Skip to content

Commit f9f143d

Browse files
smowtonsmowton
authored
Merge pull request github#5347 from Marcono1234/marcono1234/simplify-tests
Java: Simplify tests using InlineExpectationsTest
2 parents e63f811 + 6cf15f4 commit f9f143d

19 files changed

+692
-692
lines changed

‎java/ql/test/library-tests/dataflow/fluent-methods/Test.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,31 +42,31 @@ public static void sink(String s) {}
4242
public static void test1() {
4343
Test t = new Test();
4444
t.fluentNoop().fluentSet(source()).fluentNoop();
45-
sink(t.get()); // $hasTaintFlow=y
45+
sink(t.get()); // $hasTaintFlow
4646
}
4747

4848
public static void test2() {
4949
Test t = new Test();
5050
Test.identity(t).fluentNoop().fluentSet(source()).fluentNoop();
51-
sink(t.get()); // $hasTaintFlow=y
51+
sink(t.get()); // $hasTaintFlow
5252
}
5353

5454
public static void test3() {
5555
Test t = new Test();
5656
t.indirectlyFluentNoop().fluentSet(source()).fluentNoop();
57-
sink(t.get()); // $hasTaintFlow=y
57+
sink(t.get()); // $hasTaintFlow
5858
}
5959

6060
public static void testModel1() {
6161
Test t = new Test();
6262
t.indirectlyFluentNoop().modelledFluentMethod().fluentSet(source()).fluentNoop();
63-
sink(t.get()); // $hasTaintFlow=y
63+
sink(t.get()); // $hasTaintFlow
6464
}
6565

6666
public static void testModel2() {
6767
Test t = new Test();
6868
Test.modelledIdentity(t).indirectlyFluentNoop().modelledFluentMethod().fluentSet(source()).fluentNoop();
69-
sink(t.get()); // $hasTaintFlow=y
69+
sink(t.get()); // $hasTaintFlow
7070
}
7171

7272
}

‎java/ql/test/library-tests/dataflow/fluent-methods/flow.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class HasFlowTest extends InlineExpectationsTest {
3535
exists(DataFlow::Node src, DataFlow::Node sink, Conf conf | conf.hasFlow(src, sink) |
3636
sink.getLocation() = location and
3737
element = sink.toString() and
38-
value = "y"
38+
value = ""
3939
)
4040
}
4141
}

‎java/ql/test/library-tests/frameworks/apache-commons-lang3/StrBuilderTest.java

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

‎java/ql/test/library-tests/frameworks/apache-commons-lang3/StrBuilderTextTest.java

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

‎java/ql/test/library-tests/frameworks/apache-commons-lang3/StrLookupTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ void test() throws Exception {
1111
Map<String, String> map = new HashMap<String, String>();
1212
map.put("key", taint());
1313
StrLookup<String> lookup = StrLookup.mapLookup(map);
14-
sink(lookup.lookup("key")); // $hasTaintFlow=y
14+
sink(lookup.lookup("key")); // $hasTaintFlow
1515
}
1616

17-
}
17+
}

‎java/ql/test/library-tests/frameworks/apache-commons-lang3/StrSubstitutorTest.java

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -17,66 +17,66 @@ void test() throws Exception {
1717
StrLookup<String> taintedLookup = StrLookup.mapLookup(taintedMap);
1818

1919
// Test constructors:
20-
StrSubstitutor ss1 = new StrSubstitutor(); ss1.setVariableResolver(taintedLookup); sink(ss1.replace("input")); // $hasTaintFlow=y
21-
StrSubstitutor ss2 = new StrSubstitutor(taintedMap); sink(ss2.replace("input")); // $hasTaintFlow=y
22-
StrSubstitutor ss3 = new StrSubstitutor(taintedMap, "{", "}"); sink(ss3.replace("input")); // $hasTaintFlow=y
23-
StrSubstitutor ss4 = new StrSubstitutor(taintedMap, "{", "}", ' '); sink(ss4.replace("input")); // $hasTaintFlow=y
24-
StrSubstitutor ss5 = new StrSubstitutor(taintedMap, "{", "}", ' ', ","); sink(ss5.replace("input")); // $hasTaintFlow=y
25-
StrSubstitutor ss6 = new StrSubstitutor(taintedLookup); sink(ss6.replace("input")); // $hasTaintFlow=y
26-
StrSubstitutor ss7 = new StrSubstitutor(taintedLookup, "{", "}", ' '); sink(ss7.replace("input")); // $hasTaintFlow=y
27-
StrSubstitutor ss8 = new StrSubstitutor(taintedLookup, "{", "}", ' ', ","); sink(ss8.replace("input")); // $hasTaintFlow=y
28-
StrSubstitutor ss9 = new StrSubstitutor(taintedLookup, (StrMatcher)null, null, ' '); sink(ss9.replace("input")); // $hasTaintFlow=y
29-
StrSubstitutor ss10 = new StrSubstitutor(taintedLookup, (StrMatcher)null, null, ' ', null); sink(ss10.replace("input")); // $hasTaintFlow=y
20+
StrSubstitutor ss1 = new StrSubstitutor(); ss1.setVariableResolver(taintedLookup); sink(ss1.replace("input")); // $hasTaintFlow
21+
StrSubstitutor ss2 = new StrSubstitutor(taintedMap); sink(ss2.replace("input")); // $hasTaintFlow
22+
StrSubstitutor ss3 = new StrSubstitutor(taintedMap, "{", "}"); sink(ss3.replace("input")); // $hasTaintFlow
23+
StrSubstitutor ss4 = new StrSubstitutor(taintedMap, "{", "}", ' '); sink(ss4.replace("input")); // $hasTaintFlow
24+
StrSubstitutor ss5 = new StrSubstitutor(taintedMap, "{", "}", ' ', ","); sink(ss5.replace("input")); // $hasTaintFlow
25+
StrSubstitutor ss6 = new StrSubstitutor(taintedLookup); sink(ss6.replace("input")); // $hasTaintFlow
26+
StrSubstitutor ss7 = new StrSubstitutor(taintedLookup, "{", "}", ' '); sink(ss7.replace("input")); // $hasTaintFlow
27+
StrSubstitutor ss8 = new StrSubstitutor(taintedLookup, "{", "}", ' ', ","); sink(ss8.replace("input")); // $hasTaintFlow
28+
StrSubstitutor ss9 = new StrSubstitutor(taintedLookup, (StrMatcher)null, null, ' '); sink(ss9.replace("input")); // $hasTaintFlow
29+
StrSubstitutor ss10 = new StrSubstitutor(taintedLookup, (StrMatcher)null, null, ' ', null); sink(ss10.replace("input")); // $hasTaintFlow
3030

3131
// Test replace overloads (tainted substitution map):
3232
StrSubstitutor taintedSubst = ss2;
33-
sink(taintedSubst.replace((Object)"input")); // $hasTaintFlow=y
34-
sink(taintedSubst.replace("input")); // $hasTaintFlow=y
35-
sink(taintedSubst.replace("input", 0, 0)); // $hasTaintFlow=y
36-
sink(taintedSubst.replace("input".toCharArray())); // $hasTaintFlow=y
37-
sink(taintedSubst.replace("input".toCharArray(), 0, 0)); // $hasTaintFlow=y
38-
sink(taintedSubst.replace((CharSequence)"input")); // $hasTaintFlow=y
39-
sink(taintedSubst.replace((CharSequence)"input", 0, 0)); // $hasTaintFlow=y
40-
sink(taintedSubst.replace(new StrBuilder("input"))); // $hasTaintFlow=y
41-
sink(taintedSubst.replace(new StrBuilder("input"), 0, 0)); // $hasTaintFlow=y
42-
sink(taintedSubst.replace(new StringBuilder("input"))); // $hasTaintFlow=y
43-
sink(taintedSubst.replace(new StringBuilder("input"), 0, 0)); // $hasTaintFlow=y
44-
sink(taintedSubst.replace(new StringBuffer("input"))); // $hasTaintFlow=y
45-
sink(taintedSubst.replace(new StringBuffer("input"), 0, 0)); // $hasTaintFlow=y
33+
sink(taintedSubst.replace((Object)"input")); // $hasTaintFlow
34+
sink(taintedSubst.replace("input")); // $hasTaintFlow
35+
sink(taintedSubst.replace("input", 0, 0)); // $hasTaintFlow
36+
sink(taintedSubst.replace("input".toCharArray())); // $hasTaintFlow
37+
sink(taintedSubst.replace("input".toCharArray(), 0, 0)); // $hasTaintFlow
38+
sink(taintedSubst.replace((CharSequence)"input")); // $hasTaintFlow
39+
sink(taintedSubst.replace((CharSequence)"input", 0, 0)); // $hasTaintFlow
40+
sink(taintedSubst.replace(new StrBuilder("input"))); // $hasTaintFlow
41+
sink(taintedSubst.replace(new StrBuilder("input"), 0, 0)); // $hasTaintFlow
42+
sink(taintedSubst.replace(new StringBuilder("input"))); // $hasTaintFlow
43+
sink(taintedSubst.replace(new StringBuilder("input"), 0, 0)); // $hasTaintFlow
44+
sink(taintedSubst.replace(new StringBuffer("input"))); // $hasTaintFlow
45+
sink(taintedSubst.replace(new StringBuffer("input"), 0, 0)); // $hasTaintFlow
4646

4747
// Test replace overloads (tainted input):
4848
StrSubstitutor untaintedSubst = ss1;
49-
sink(untaintedSubst.replace((Object)taint())); // $hasTaintFlow=y
50-
sink(untaintedSubst.replace(taint())); // $hasTaintFlow=y
51-
sink(untaintedSubst.replace(taint(), 0, 0)); // $hasTaintFlow=y
52-
sink(untaintedSubst.replace(taint().toCharArray())); // $hasTaintFlow=y
53-
sink(untaintedSubst.replace(taint().toCharArray(), 0, 0)); // $hasTaintFlow=y
54-
sink(untaintedSubst.replace((CharSequence)taint())); // $hasTaintFlow=y
55-
sink(untaintedSubst.replace((CharSequence)taint(), 0, 0)); // $hasTaintFlow=y
56-
sink(untaintedSubst.replace(new StrBuilder(taint()))); // $hasTaintFlow=y
57-
sink(untaintedSubst.replace(new StrBuilder(taint()), 0, 0)); // $hasTaintFlow=y
58-
sink(untaintedSubst.replace(new StringBuilder(taint()))); // $hasTaintFlow=y
59-
sink(untaintedSubst.replace(new StringBuilder(taint()), 0, 0)); // $hasTaintFlow=y
60-
sink(untaintedSubst.replace(new StringBuffer(taint()))); // $hasTaintFlow=y
61-
sink(untaintedSubst.replace(new StringBuffer(taint()), 0, 0)); // $hasTaintFlow=y
49+
sink(untaintedSubst.replace((Object)taint())); // $hasTaintFlow
50+
sink(untaintedSubst.replace(taint())); // $hasTaintFlow
51+
sink(untaintedSubst.replace(taint(), 0, 0)); // $hasTaintFlow
52+
sink(untaintedSubst.replace(taint().toCharArray())); // $hasTaintFlow
53+
sink(untaintedSubst.replace(taint().toCharArray(), 0, 0)); // $hasTaintFlow
54+
sink(untaintedSubst.replace((CharSequence)taint())); // $hasTaintFlow
55+
sink(untaintedSubst.replace((CharSequence)taint(), 0, 0)); // $hasTaintFlow
56+
sink(untaintedSubst.replace(new StrBuilder(taint()))); // $hasTaintFlow
57+
sink(untaintedSubst.replace(new StrBuilder(taint()), 0, 0)); // $hasTaintFlow
58+
sink(untaintedSubst.replace(new StringBuilder(taint()))); // $hasTaintFlow
59+
sink(untaintedSubst.replace(new StringBuilder(taint()), 0, 0)); // $hasTaintFlow
60+
sink(untaintedSubst.replace(new StringBuffer(taint()))); // $hasTaintFlow
61+
sink(untaintedSubst.replace(new StringBuffer(taint()), 0, 0)); // $hasTaintFlow
6262

6363
// Test static replace methods:
64-
sink(StrSubstitutor.replace(taint(), new HashMap<String, String>())); // $hasTaintFlow=y
65-
sink(StrSubstitutor.replace(taint(), new HashMap<String, String>(), "{", "}")); // $hasTaintFlow=y
66-
sink(StrSubstitutor.replace("input", taintedMap)); // $hasTaintFlow=y
67-
sink(StrSubstitutor.replace("input", taintedMap, "{", "}")); // $hasTaintFlow=y
64+
sink(StrSubstitutor.replace(taint(), new HashMap<String, String>())); // $hasTaintFlow
65+
sink(StrSubstitutor.replace(taint(), new HashMap<String, String>(), "{", "}")); // $hasTaintFlow
66+
sink(StrSubstitutor.replace("input", taintedMap)); // $hasTaintFlow
67+
sink(StrSubstitutor.replace("input", taintedMap, "{", "}")); // $hasTaintFlow
6868
Properties taintedProps = new Properties();
6969
taintedProps.put("key", taint());
70-
sink(StrSubstitutor.replace(taint(), new Properties())); // $hasTaintFlow=y
71-
sink(StrSubstitutor.replace("input", taintedProps)); // $hasTaintFlow=y
70+
sink(StrSubstitutor.replace(taint(), new Properties())); // $hasTaintFlow
71+
sink(StrSubstitutor.replace("input", taintedProps)); // $hasTaintFlow
7272

7373
// Test replaceIn methods:
74-
StrBuilder strBuilder1 = new StrBuilder(); taintedSubst.replaceIn(strBuilder1); sink(strBuilder1.toString()); // $hasTaintFlow=y
75-
StrBuilder strBuilder2 = new StrBuilder(); taintedSubst.replaceIn(strBuilder2, 0, 0); sink(strBuilder2.toString()); // $hasTaintFlow=y
76-
StringBuilder stringBuilder1 = new StringBuilder(); taintedSubst.replaceIn(stringBuilder1); sink(stringBuilder1.toString()); // $hasTaintFlow=y
77-
StringBuilder stringBuilder2 = new StringBuilder(); taintedSubst.replaceIn(stringBuilder2, 0, 0); sink(stringBuilder2.toString()); // $hasTaintFlow=y
78-
StringBuffer stringBuffer1 = new StringBuffer(); taintedSubst.replaceIn(stringBuffer1); sink(stringBuffer1.toString()); // $hasTaintFlow=y
79-
StringBuffer stringBuffer2 = new StringBuffer(); taintedSubst.replaceIn(stringBuffer2, 0, 0); sink(stringBuffer2.toString()); // $hasTaintFlow=y
74+
StrBuilder strBuilder1 = new StrBuilder(); taintedSubst.replaceIn(strBuilder1); sink(strBuilder1.toString()); // $hasTaintFlow
75+
StrBuilder strBuilder2 = new StrBuilder(); taintedSubst.replaceIn(strBuilder2, 0, 0); sink(strBuilder2.toString()); // $hasTaintFlow
76+
StringBuilder stringBuilder1 = new StringBuilder(); taintedSubst.replaceIn(stringBuilder1); sink(stringBuilder1.toString()); // $hasTaintFlow
77+
StringBuilder stringBuilder2 = new StringBuilder(); taintedSubst.replaceIn(stringBuilder2, 0, 0); sink(stringBuilder2.toString()); // $hasTaintFlow
78+
StringBuffer stringBuffer1 = new StringBuffer(); taintedSubst.replaceIn(stringBuffer1); sink(stringBuffer1.toString()); // $hasTaintFlow
79+
StringBuffer stringBuffer2 = new StringBuffer(); taintedSubst.replaceIn(stringBuffer2, 0, 0); sink(stringBuffer2.toString()); // $hasTaintFlow
8080
}
8181

82-
}
82+
}

‎java/ql/test/library-tests/frameworks/apache-commons-lang3/StrTokenizerTest.java

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,38 +9,38 @@ void sink(Object o) {}
99
void test() throws Exception {
1010

1111
// Test constructors:
12-
sink((new StrTokenizer(taint().toCharArray())).toString()); // $hasTaintFlow=y
13-
sink((new StrTokenizer(taint().toCharArray(), ',')).toString()); // $hasTaintFlow=y
14-
sink((new StrTokenizer(taint().toCharArray(), ',', '"')).toString()); // $hasTaintFlow=y
15-
sink((new StrTokenizer(taint().toCharArray(), ",")).toString()); // $hasTaintFlow=y
16-
sink((new StrTokenizer(taint().toCharArray(), (StrMatcher)null)).toString()); // $hasTaintFlow=y
17-
sink((new StrTokenizer(taint().toCharArray(), (StrMatcher)null, (StrMatcher)null)).toString()); // $hasTaintFlow=y
18-
sink((new StrTokenizer(taint())).toString()); // $hasTaintFlow=y
19-
sink((new StrTokenizer(taint(), ',')).toString()); // $hasTaintFlow=y
20-
sink((new StrTokenizer(taint(), ',', '"')).toString()); // $hasTaintFlow=y
21-
sink((new StrTokenizer(taint(), ",")).toString()); // $hasTaintFlow=y
22-
sink((new StrTokenizer(taint(), (StrMatcher)null)).toString()); // $hasTaintFlow=y
23-
sink((new StrTokenizer(taint(), (StrMatcher)null, (StrMatcher)null)).toString()); // $hasTaintFlow=y
12+
sink((new StrTokenizer(taint().toCharArray())).toString()); // $hasTaintFlow
13+
sink((new StrTokenizer(taint().toCharArray(), ',')).toString()); // $hasTaintFlow
14+
sink((new StrTokenizer(taint().toCharArray(), ',', '"')).toString()); // $hasTaintFlow
15+
sink((new StrTokenizer(taint().toCharArray(), ",")).toString()); // $hasTaintFlow
16+
sink((new StrTokenizer(taint().toCharArray(), (StrMatcher)null)).toString()); // $hasTaintFlow
17+
sink((new StrTokenizer(taint().toCharArray(), (StrMatcher)null, (StrMatcher)null)).toString()); // $hasTaintFlow
18+
sink((new StrTokenizer(taint())).toString()); // $hasTaintFlow
19+
sink((new StrTokenizer(taint(), ',')).toString()); // $hasTaintFlow
20+
sink((new StrTokenizer(taint(), ',', '"')).toString()); // $hasTaintFlow
21+
sink((new StrTokenizer(taint(), ",")).toString()); // $hasTaintFlow
22+
sink((new StrTokenizer(taint(), (StrMatcher)null)).toString()); // $hasTaintFlow
23+
sink((new StrTokenizer(taint(), (StrMatcher)null, (StrMatcher)null)).toString()); // $hasTaintFlow
2424

2525
// Test constructing static methods:
26-
sink(StrTokenizer.getCSVInstance(taint().toCharArray()).toString()); // $hasTaintFlow=y
27-
sink(StrTokenizer.getCSVInstance(taint()).toString()); // $hasTaintFlow=y
28-
sink(StrTokenizer.getTSVInstance(taint().toCharArray()).toString()); // $hasTaintFlow=y
29-
sink(StrTokenizer.getTSVInstance(taint()).toString()); // $hasTaintFlow=y
26+
sink(StrTokenizer.getCSVInstance(taint().toCharArray()).toString()); // $hasTaintFlow
27+
sink(StrTokenizer.getCSVInstance(taint()).toString()); // $hasTaintFlow
28+
sink(StrTokenizer.getTSVInstance(taint().toCharArray()).toString()); // $hasTaintFlow
29+
sink(StrTokenizer.getTSVInstance(taint()).toString()); // $hasTaintFlow
3030

3131
// Test accessors:
32-
sink((new StrTokenizer(taint())).clone()); // $hasTaintFlow=y
33-
sink((new StrTokenizer(taint())).getContent()); // $hasTaintFlow=y
34-
sink((new StrTokenizer(taint())).getTokenArray()); // $hasTaintFlow=y
35-
sink((new StrTokenizer(taint())).getTokenList()); // $hasTaintFlow=y
36-
sink((new StrTokenizer(taint())).next()); // $hasTaintFlow=y
37-
sink((new StrTokenizer(taint())).nextToken()); // $hasTaintFlow=y
38-
sink((new StrTokenizer(taint())).previous()); // $hasTaintFlow=y
39-
sink((new StrTokenizer(taint())).previousToken()); // $hasTaintFlow=y
32+
sink((new StrTokenizer(taint())).clone()); // $hasTaintFlow
33+
sink((new StrTokenizer(taint())).getContent()); // $hasTaintFlow
34+
sink((new StrTokenizer(taint())).getTokenArray()); // $hasTaintFlow
35+
sink((new StrTokenizer(taint())).getTokenList()); // $hasTaintFlow
36+
sink((new StrTokenizer(taint())).next()); // $hasTaintFlow
37+
sink((new StrTokenizer(taint())).nextToken()); // $hasTaintFlow
38+
sink((new StrTokenizer(taint())).previous()); // $hasTaintFlow
39+
sink((new StrTokenizer(taint())).previousToken()); // $hasTaintFlow
4040

4141
// Test mutators:
42-
sink((new StrTokenizer()).reset(taint().toCharArray()).toString()); // $hasTaintFlow=y
43-
sink((new StrTokenizer()).reset(taint()).toString()); // $hasTaintFlow=y
42+
sink((new StrTokenizer()).reset(taint().toCharArray()).toString()); // $hasTaintFlow
43+
sink((new StrTokenizer()).reset(taint()).toString()); // $hasTaintFlow
4444

4545
}
46-
}
46+
}

0 commit comments

Comments
 (0)