Skip to content

Commit 865477d

Browse files
joefarebrotherjoefarebrother
committed
Convert android tests to inline expectations
1 parent 95d8018 commit 865477d

File tree

6 files changed

+221
-333
lines changed

6 files changed

+221
-333
lines changed

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

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

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

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

4141
public static String buildQueryString(MySQLiteQueryBuilder target) {
4242
target = taint();
43-
boolean distinct = taint();
44-
String tables = taint();
45-
String[] columns = taint();
46-
String where = taint();
47-
String groupBy = taint();
48-
String having = taint();
49-
String orderBy = taint();
50-
String limit = taint();
43+
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
5151
return SQLiteQueryBuilder.buildQueryString(distinct, tables, columns, where, groupBy, having, orderBy, limit);
5252
}
5353

5454
public static String buildQuery(MySQLiteQueryBuilder target) {
55-
target = taint();
56-
String[] projectionIn = taint();
57-
String selection = taint();
58-
String groupBy = taint();
59-
String having = taint();
60-
String sortOrder = taint();
61-
String limit = taint();
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
6262
return target.buildQuery(projectionIn, selection, groupBy, having, sortOrder, limit);
6363
}
6464

6565
public static String buildQuery2(MySQLiteQueryBuilder target) {
66-
target = taint();
67-
String[] projectionIn = taint();
68-
String selection = taint();
69-
String[] selectionArgs = taint();
70-
String groupBy = taint();
71-
String having = taint();
72-
String sortOrder = taint();
73-
String limit = taint();
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
7474
return target.buildQuery(projectionIn, selection, selectionArgs, groupBy, having, sortOrder, limit);
7575
}
7676

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

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

100-
public static void buildUnionSubQuery3(MySQLiteQueryBuilder target) {
101-
target = taint();
102-
String typeDiscriminatorColumn = taint();
103-
String[] unionColumns = taint();
104-
Set<String> columnsPresentInTable = taint();
100+
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
105105
int computedColumnsOffset = taint();
106-
String typeDiscriminatorValue = taint();
107-
String selection = taint();
108-
String groupBy = taint();
109-
String having = taint();
110-
target.buildUnionSubQuery(typeDiscriminatorColumn, unionColumns, columnsPresentInTable, computedColumnsOffset,
106+
String typeDiscriminatorValue = taint(); // $hasTaintFlowStep
107+
String selection = taint(); // $hasTaintFlowStep
108+
String groupBy = taint(); // $hasTaintFlowStep
109+
String having = taint(); // $hasTaintFlowStep
110+
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();
115+
Uri uri = taint(); // $hasTaintFlowStep
116116
String[] projection = taint();
117-
String selection = taint();
117+
String selection = taint(); // $hasTaintFlowSink
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();
125+
Uri uri = taint(); // $hasTaintFlowStep
126126
String[] projection = taint();
127-
String selection = taint();
127+
String selection = taint(); // $hasTaintFlowSink
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();
135+
Uri uri = taint(); // $hasTaintFlowStep
136136
String[] projection = taint();
137-
String selection = taint();
137+
String selection = taint(); // $hasTaintFlowSink
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();
144+
Uri uri = taint(); // $hasTaintFlowStep
145145
String[] projection = taint();
146-
String selection = taint();
146+
String selection = taint(); // $hasTaintFlowSink
147147
String[] selectionArgs = taint();
148148
String sortOrder = taint();
149149
return target.query(uri, projection, selection, selectionArgs, sortOrder);
150150
}
151151

152-
public static void appendColumns() {
153-
StringBuilder s = taint();
154-
String[] columns = taint();
152+
public static StringBuilder appendColumns() {
153+
StringBuilder s = taint(); // $hasTaintFlowStep
154+
String[] columns = taint(); // $hasTaintFlowStep
155155
SQLiteQueryBuilder.appendColumns(s, columns);
156+
return s;
156157
}
157158

158-
public static void setProjectionMap(MySQLiteQueryBuilder target) {
159-
target = taint();
160-
Map<String, String> columnMap = taint();
159+
public static SQLiteQueryBuilder setProjectionMap(MySQLiteQueryBuilder target) {
160+
target = taint(); // $hasTaintFlowStep
161+
Map<String, String> columnMap = taint(); // $hasTaintFlowStep
161162
target.setProjectionMap(columnMap);
163+
return target;
162164
}
163165

164-
public static void setTables(MySQLiteQueryBuilder target) {
165-
target = taint();
166-
String inTables = taint();
166+
public static SQLiteQueryBuilder setTables(MySQLiteQueryBuilder target) {
167+
target = taint(); // $hasTaintFlowStep
168+
String inTables = taint(); // $hasTaintFlowStep
167169
target.setTables(inTables);
170+
return target;
168171
}
169172

170-
public static void appendWhere(MySQLiteQueryBuilder target) {
171-
target = taint();
172-
CharSequence inWhere = taint();
173+
public static SQLiteQueryBuilder appendWhere(MySQLiteQueryBuilder target) {
174+
target = taint(); // $hasTaintFlowStep
175+
CharSequence inWhere = taint(); // $hasTaintFlowStep
173176
target.appendWhere(inWhere);
177+
return target;
174178
}
175179

176-
public static void appendWhereStandalone(MySQLiteQueryBuilder target) {
177-
target = taint();
178-
CharSequence inWhere = taint();
180+
public static SQLiteQueryBuilder appendWhereStandalone(MySQLiteQueryBuilder target) {
181+
target = taint(); // $hasTaintFlowStep
182+
CharSequence inWhere = taint(); // $hasTaintFlowStep
179183
target.appendWhereStandalone(inWhere);
184+
return target;
180185
}
181186
}

0 commit comments

Comments
 (0)