Skip to content

Commit 4bea334

Browse files
joefarebrotherjoefarebrother
committed
Rename test labels for more clarity
1 parent 1a06c13 commit 4bea334

File tree

4 files changed

+165
-165
lines changed

4 files changed

+165
-165
lines changed

‎java/ql/test/library-tests/frameworks/android/taint-database/FlowSteps.java

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -27,159 +27,159 @@ private static abstract class MySQLiteQueryBuilder extends SQLiteQueryBuilder {
2727
}
2828

2929
public static String[] appendSelectionArgs() {
30-
String[] originalValues = {taint()}; // $hasTaintFlowStep
31-
String[] newValues = {taint()}; // $hasTaintFlowStep
30+
String[] originalValues = {taint()}; // $taintReachesReturn
31+
String[] newValues = {taint()}; // $taintReachesReturn
3232
return DatabaseUtils.appendSelectionArgs(originalValues, newValues);
3333
}
3434

3535
public static String concatenateWhere() {
36-
String a = taint(); // $hasTaintFlowStep
37-
String b = taint(); // $hasTaintFlowStep
36+
String a = taint(); // $taintReachesReturn
37+
String b = taint(); // $taintReachesReturn
3838
return DatabaseUtils.concatenateWhere(a, b);
3939
}
4040

4141
public static String buildQueryString(MySQLiteQueryBuilder target) {
4242
target = taint();
4343
boolean distinct = taint();
44-
String tables = taint(); // $hasTaintFlowStep
45-
String[] columns = {taint()}; // $hasTaintFlowStep
46-
String where = taint(); // $hasTaintFlowStep
47-
String groupBy = taint(); // $hasTaintFlowStep
48-
String having = taint(); // $hasTaintFlowStep
49-
String orderBy = taint(); // $hasTaintFlowStep
50-
String limit = taint(); // $hasTaintFlowStep
44+
String tables = taint(); // $taintReachesReturn
45+
String[] columns = {taint()}; // $taintReachesReturn
46+
String where = taint(); // $taintReachesReturn
47+
String groupBy = taint(); // $taintReachesReturn
48+
String having = taint(); // $taintReachesReturn
49+
String orderBy = taint(); // $taintReachesReturn
50+
String limit = taint(); // $taintReachesReturn
5151
return SQLiteQueryBuilder.buildQueryString(distinct, tables, columns, where, groupBy, having, orderBy, limit);
5252
}
5353

5454
public static String buildQuery(MySQLiteQueryBuilder target) {
55-
target = taint(); // $hasTaintFlowStep
56-
String[] projectionIn = {taint()};// $hasTaintFlowStep
57-
String selection = taint(); // $hasTaintFlowStep
58-
String groupBy = taint(); // $hasTaintFlowStep
59-
String having = taint(); // $hasTaintFlowStep
60-
String sortOrder = taint(); // $hasTaintFlowStep
61-
String limit = taint(); // $hasTaintFlowStep
55+
target = taint(); // $taintReachesReturn
56+
String[] projectionIn = {taint()};// $taintReachesReturn
57+
String selection = taint(); // $taintReachesReturn
58+
String groupBy = taint(); // $taintReachesReturn
59+
String having = taint(); // $taintReachesReturn
60+
String sortOrder = taint(); // $taintReachesReturn
61+
String limit = taint(); // $taintReachesReturn
6262
return target.buildQuery(projectionIn, selection, groupBy, having, sortOrder, limit);
6363
}
6464

6565
public static String buildQuery2(MySQLiteQueryBuilder target) {
66-
target = taint(); // $hasTaintFlowStep
67-
String[] projectionIn = {taint()}; // $hasTaintFlowStep
68-
String selection = taint(); // $hasTaintFlowStep
69-
String[] selectionArgs = {taint()}; // $hasTaintFlowStep
70-
String groupBy = taint(); // $hasTaintFlowStep
71-
String having = taint(); // $hasTaintFlowStep
72-
String sortOrder = taint(); // $hasTaintFlowStep
73-
String limit = taint(); // $hasTaintFlowStep
66+
target = taint(); // $taintReachesReturn
67+
String[] projectionIn = {taint()}; // $taintReachesReturn
68+
String selection = taint(); // $taintReachesReturn
69+
String[] selectionArgs = {taint()}; // $taintReachesReturn
70+
String groupBy = taint(); // $taintReachesReturn
71+
String having = taint(); // $taintReachesReturn
72+
String sortOrder = taint(); // $taintReachesReturn
73+
String limit = taint(); // $taintReachesReturn
7474
return target.buildQuery(projectionIn, selection, selectionArgs, groupBy, having, sortOrder, limit);
7575
}
7676

7777
public static String buildUnionQuery(MySQLiteQueryBuilder target) {
78-
target = taint(); // $hasTaintFlowStep
79-
String[] subQueries = {taint()}; // $hasTaintFlowStep
80-
String sortOrder = taint(); // $hasTaintFlowStep
81-
String limit = taint(); // $hasTaintFlowStep
78+
target = taint(); // $taintReachesReturn
79+
String[] subQueries = {taint()}; // $taintReachesReturn
80+
String sortOrder = taint(); // $taintReachesReturn
81+
String limit = taint(); // $taintReachesReturn
8282
return target.buildUnionQuery(subQueries, sortOrder, limit);
8383
}
8484

8585
public static String buildUnionSubQuery2(MySQLiteQueryBuilder target) {
86-
target = taint(); // $hasTaintFlowStep
87-
String typeDiscriminatorColumn = taint(); // $hasTaintFlowStep
88-
String[] unionColumns = {taint()}; // $hasTaintFlowStep
89-
Set<String> columnsPresentInTable = taint(); // $hasTaintFlowStep
86+
target = taint(); // $taintReachesReturn
87+
String typeDiscriminatorColumn = taint(); // $taintReachesReturn
88+
String[] unionColumns = {taint()}; // $taintReachesReturn
89+
Set<String> columnsPresentInTable = taint(); // $taintReachesReturn
9090
int computedColumnsOffset = taint();
91-
String typeDiscriminatorValue = taint(); // $hasTaintFlowStep
92-
String selection = taint(); // $hasTaintFlowStep
93-
String[] selectionArgs = {taint()}; // $hasTaintFlowStep
94-
String groupBy = taint(); // $hasTaintFlowStep
95-
String having = taint(); // $hasTaintFlowStep
91+
String typeDiscriminatorValue = taint(); // $taintReachesReturn
92+
String selection = taint(); // $taintReachesReturn
93+
String[] selectionArgs = {taint()}; // $taintReachesReturn
94+
String groupBy = taint(); // $taintReachesReturn
95+
String having = taint(); // $taintReachesReturn
9696
return target.buildUnionSubQuery(typeDiscriminatorColumn, unionColumns, columnsPresentInTable,
9797
computedColumnsOffset, typeDiscriminatorValue, selection, selectionArgs, groupBy, having);
9898
}
9999

100100
public static String buildUnionSubQuery3(MySQLiteQueryBuilder target) {
101-
target = taint(); // $hasTaintFlowStep
102-
String typeDiscriminatorColumn = taint(); // $hasTaintFlowStep
103-
String[] unionColumns = {taint()}; // $hasTaintFlowStep
104-
Set<String> columnsPresentInTable = taint(); // $hasTaintFlowStep
101+
target = taint(); // $taintReachesReturn
102+
String typeDiscriminatorColumn = taint(); // $taintReachesReturn
103+
String[] unionColumns = {taint()}; // $taintReachesReturn
104+
Set<String> columnsPresentInTable = taint(); // $taintReachesReturn
105105
int computedColumnsOffset = taint();
106-
String typeDiscriminatorValue = taint(); // $hasTaintFlowStep
107-
String selection = taint(); // $hasTaintFlowStep
108-
String groupBy = taint(); // $hasTaintFlowStep
109-
String having = taint(); // $hasTaintFlowStep
106+
String typeDiscriminatorValue = taint(); // $taintReachesReturn
107+
String selection = taint(); // $taintReachesReturn
108+
String groupBy = taint(); // $taintReachesReturn
109+
String having = taint(); // $taintReachesReturn
110110
return target.buildUnionSubQuery(typeDiscriminatorColumn, unionColumns, columnsPresentInTable, computedColumnsOffset,
111111
typeDiscriminatorValue, selection, groupBy, having);
112112
}
113113

114114
public static Cursor query(MyContentResolver target) {
115-
Uri uri = taint(); // $hasTaintFlowStep
115+
Uri uri = taint(); // $taintReachesReturn
116116
String[] projection = {taint()};
117-
String selection = taint(); // $hasTaintFlowSink
117+
String selection = taint(); // $taintReachesSink
118118
String[] selectionArgs = {taint()};
119119
String sortOrder = taint();
120120
CancellationSignal cancellationSignal = taint();
121121
return target.query(uri, projection, selection, selectionArgs, sortOrder, cancellationSignal);
122122
}
123123

124124
public static Cursor query(MyContentProvider target) {
125-
Uri uri = taint(); // $hasTaintFlowStep
125+
Uri uri = taint(); // $taintReachesReturn
126126
String[] projection = {taint()};
127-
String selection = taint(); // $hasTaintFlowSink
127+
String selection = taint(); // $taintReachesSink
128128
String[] selectionArgs = {taint()};
129129
String sortOrder = taint();
130130
CancellationSignal cancellationSignal = taint();
131131
return target.query(uri, projection, selection, selectionArgs, sortOrder, cancellationSignal);
132132
}
133133

134134
public static Cursor query2(MyContentResolver target) {
135-
Uri uri = taint(); // $hasTaintFlowStep
135+
Uri uri = taint(); // $taintReachesReturn
136136
String[] projection = {taint()};
137-
String selection = taint(); // $hasTaintFlowSink
137+
String selection = taint(); // $taintReachesSink
138138
String[] selectionArgs = {taint()};
139139
String sortOrder = taint();
140140
return target.query(uri, projection, selection, selectionArgs, sortOrder);
141141
}
142142

143143
public static Cursor query2(MyContentProvider target) {
144-
Uri uri = taint(); // $hasTaintFlowStep
144+
Uri uri = taint(); // $taintReachesReturn
145145
String[] projection = {taint()};
146-
String selection = taint(); // $hasTaintFlowSink
146+
String selection = taint(); // $taintReachesSink
147147
String[] selectionArgs = {taint()};
148148
String sortOrder = taint();
149149
return target.query(uri, projection, selection, selectionArgs, sortOrder);
150150
}
151151

152152
public static StringBuilder appendColumns() {
153-
StringBuilder s = taint(); // $hasTaintFlowStep
154-
String[] columns = {taint()}; // $hasTaintFlowStep
153+
StringBuilder s = taint(); // $taintReachesReturn
154+
String[] columns = {taint()}; // $taintReachesReturn
155155
SQLiteQueryBuilder.appendColumns(s, columns);
156156
return s;
157157
}
158158

159159
public static SQLiteQueryBuilder setProjectionMap(MySQLiteQueryBuilder target) {
160-
target = taint(); // $hasTaintFlowStep
161-
Map<String, String> columnMap = taint(); // $hasTaintFlowStep
160+
target = taint(); // $taintReachesReturn
161+
Map<String, String> columnMap = taint(); // $taintReachesReturn
162162
target.setProjectionMap(columnMap);
163163
return target;
164164
}
165165

166166
public static SQLiteQueryBuilder setTables(MySQLiteQueryBuilder target) {
167-
target = taint(); // $hasTaintFlowStep
168-
String inTables = taint(); // $hasTaintFlowStep
167+
target = taint(); // $taintReachesReturn
168+
String inTables = taint(); // $taintReachesReturn
169169
target.setTables(inTables);
170170
return target;
171171
}
172172

173173
public static SQLiteQueryBuilder appendWhere(MySQLiteQueryBuilder target) {
174-
target = taint(); // $hasTaintFlowStep
175-
CharSequence inWhere = taint(); // $hasTaintFlowStep
174+
target = taint(); // $taintReachesReturn
175+
CharSequence inWhere = taint(); // $taintReachesReturn
176176
target.appendWhere(inWhere);
177177
return target;
178178
}
179179

180180
public static SQLiteQueryBuilder appendWhereStandalone(MySQLiteQueryBuilder target) {
181-
target = taint(); // $hasTaintFlowStep
182-
CharSequence inWhere = taint(); // $hasTaintFlowStep
181+
target = taint(); // $taintReachesReturn
182+
CharSequence inWhere = taint(); // $taintReachesReturn
183183
target.appendWhereStandalone(inWhere);
184184
return target;
185185
}

0 commit comments

Comments
 (0)