Skip to content

Commit a08341e

Browse files
tonyofrancistonyofrancis
committed
removed streams for unit test
1 parent f0bbc16 commit a08341e

File tree

4 files changed

+106
-68
lines changed

4 files changed

+106
-68
lines changed

‎.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ android:
1616
# The SDK version used to compile your project
1717
- android-27
1818
- android-26
19-
- android-24
19+
- android-21
2020
# Additional components
2121
- extra-android-m2repository
2222
- add-on
2323
- extra
2424
# Specify at least one system image,
2525
# if you need to run emulator(s) during your tests
26-
- sys-img-armeabi-v7a-android-24
26+
- sys-img-armeabi-v7a-android-21
2727
licenses:
2828
- 'android-sdk-preview-license-52d11cd2'
2929
- 'android-sdk-preview-license-.+'
@@ -40,7 +40,7 @@ install: ./gradlew clean assemble test assembleAndroidTest --stacktrace
4040

4141
# Emulator Management: Create, Start and Wait
4242
before_script:
43-
- echo no | android create avd --force -n test -t android-24 --abi armeabi-v7a
43+
- echo no | android create avd --force -n test -t android-21 --abi armeabi-v7a
4444
- emulator -avd test -no-window &
4545
- android-wait-for-emulator
4646
- adb shell input keyevent 82 &

‎fetch2/src/androidTest/java/com/tonyodev/fetch2/DatabaseInstrumentedTest.java

Lines changed: 69 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import java.util.ArrayList;
1919
import java.util.List;
20-
import java.util.stream.Collectors;
2120

2221
import kotlin.Pair;
2322

@@ -61,9 +60,11 @@ public void clear() throws Exception {
6160
final Request request = new Request(url, file);
6261
requestList.add(request);
6362
}
64-
final List<DownloadInfo> downloadInfoList =
65-
requestList.stream().map(FetchTypeConverterExtensions::toDownloadInfo)
66-
.collect(Collectors.toList());
63+
final List<DownloadInfo> downloadInfoList = new ArrayList<>();
64+
for (Request request : requestList) {
65+
final DownloadInfo downloadInfo = FetchTypeConverterExtensions.toDownloadInfo(request);
66+
downloadInfoList.add(downloadInfo);
67+
}
6768
databaseManager.insert(downloadInfoList);
6869
databaseManager.deleteAll();
6970
final List<DownloadInfo> downloads = databaseManager.get();
@@ -91,13 +92,15 @@ public void multiInsert() throws Exception {
9192
final Request request = new Request(url, file);
9293
requestList.add(request);
9394
}
94-
final List<DownloadInfo> downloadInfoList =
95-
requestList.stream().map(FetchTypeConverterExtensions::toDownloadInfo)
96-
.collect(Collectors.toList());
95+
final List<DownloadInfo> downloadInfoList = new ArrayList<>();
96+
for (Request request : requestList) {
97+
final DownloadInfo downloadInfo = FetchTypeConverterExtensions.toDownloadInfo(request);
98+
downloadInfoList.add(downloadInfo);
99+
}
97100
final List<Pair<DownloadInfo, Boolean>> insertedList = databaseManager.insert(downloadInfoList);
98-
final boolean anyFailed = insertedList.stream()
99-
.anyMatch(integerBooleanPair -> !integerBooleanPair.getSecond());
100-
assertTrue(!anyFailed);
101+
for (Pair<DownloadInfo, Boolean> downloadInfoBooleanPair : insertedList) {
102+
assertTrue(downloadInfoBooleanPair.getSecond());
103+
}
101104
}
102105

103106
@Test
@@ -122,14 +125,17 @@ public void deleteMulti() throws Exception {
122125
final Request request = new Request(url, file);
123126
requestList.add(request);
124127
}
125-
final List<DownloadInfo> downloadInfoList =
126-
requestList.stream().map(FetchTypeConverterExtensions::toDownloadInfo)
127-
.collect(Collectors.toList());
128+
final List<DownloadInfo> downloadInfoList = new ArrayList<>();
129+
for (Request request : requestList) {
130+
final DownloadInfo downloadInfo = FetchTypeConverterExtensions.toDownloadInfo(request);
131+
downloadInfoList.add(downloadInfo);
132+
}
128133
databaseManager.insert(downloadInfoList);
129134
databaseManager.delete(downloadInfoList);
130-
final List<Integer> ids = downloadInfoList.stream()
131-
.mapToInt(Download::getId)
132-
.boxed().collect(Collectors.toList());
135+
final List<Integer> ids = new ArrayList<>();
136+
for(DownloadInfo downloadInfo : downloadInfoList) {
137+
ids.add(downloadInfo.getId());
138+
}
133139
final List<DownloadInfo> queryList = databaseManager.get(ids);
134140
assertEquals(0, queryList.size());
135141
}
@@ -165,9 +171,11 @@ public void updateMulti() throws Exception {
165171
final Request request = new Request(url, file);
166172
requestList.add(request);
167173
}
168-
final List<DownloadInfo> downloadInfoList =
169-
requestList.stream().map(FetchTypeConverterExtensions::toDownloadInfo)
170-
.collect(Collectors.toList());
174+
final List<DownloadInfo> downloadInfoList = new ArrayList<>();
175+
for (Request request : requestList) {
176+
final DownloadInfo downloadInfo = FetchTypeConverterExtensions.toDownloadInfo(request);
177+
downloadInfoList.add(downloadInfo);
178+
}
171179
databaseManager.insert(downloadInfoList);
172180
final int groupId = 2;
173181
final Priority priority = Priority.HIGH;
@@ -179,9 +187,10 @@ public void updateMulti() throws Exception {
179187
downloadInfo.setStatus(status);
180188
}
181189
databaseManager.update(downloadInfoList);
182-
final List<Integer> ids = downloadInfoList.stream()
183-
.mapToInt(Download::getId)
184-
.boxed().collect(Collectors.toList());
190+
final List<Integer> ids = new ArrayList<>();
191+
for(DownloadInfo downloadInfo : downloadInfoList) {
192+
ids.add(downloadInfo.getId());
193+
}
185194
final List<DownloadInfo> queryList = databaseManager.get(ids);
186195
assertNotNull(queryList);
187196
assertEquals(ids.size(), queryList.size());
@@ -204,9 +213,11 @@ public void get() throws Exception {
204213
final Request request = new Request(url, file);
205214
requestList.add(request);
206215
}
207-
final List<DownloadInfo> downloadInfoList =
208-
requestList.stream().map(FetchTypeConverterExtensions::toDownloadInfo)
209-
.collect(Collectors.toList());
216+
final List<DownloadInfo> downloadInfoList = new ArrayList<>();
217+
for (Request request : requestList) {
218+
final DownloadInfo downloadInfo = FetchTypeConverterExtensions.toDownloadInfo(request);
219+
downloadInfoList.add(downloadInfo);
220+
}
210221
databaseManager.insert(downloadInfoList);
211222
final List<DownloadInfo> queryList = databaseManager.get();
212223
assertNotNull(queryList);
@@ -236,13 +247,16 @@ public void getIds() throws Exception {
236247
final Request request = new Request(url, file);
237248
requestList.add(request);
238249
}
239-
final List<DownloadInfo> downloadInfoList =
240-
requestList.stream().map(FetchTypeConverterExtensions::toDownloadInfo)
241-
.collect(Collectors.toList());
250+
final List<DownloadInfo> downloadInfoList = new ArrayList<>();
251+
for (Request request : requestList) {
252+
final DownloadInfo downloadInfo = FetchTypeConverterExtensions.toDownloadInfo(request);
253+
downloadInfoList.add(downloadInfo);
254+
}
242255
databaseManager.insert(downloadInfoList);
243-
final List<Integer> ids = downloadInfoList.stream()
244-
.mapToInt(Download::getId)
245-
.boxed().collect(Collectors.toList());
256+
final List<Integer> ids = new ArrayList<>();
257+
for(DownloadInfo downloadInfo : downloadInfoList) {
258+
ids.add(downloadInfo.getId());
259+
}
246260
final List<DownloadInfo> queryList = databaseManager.get(ids);
247261
assertNotNull(queryList);
248262
assertEquals(downloadInfoList.size(), queryList.size());
@@ -264,10 +278,14 @@ public void getStatus() throws Exception {
264278
final Request request = new Request(url, file);
265279
requestList.add(request);
266280
}
267-
final List<DownloadInfo> downloadInfoList =
268-
requestList.stream().map(FetchTypeConverterExtensions::toDownloadInfo)
269-
.collect(Collectors.toList());
270-
downloadInfoList.forEach(download -> download.setStatus(status));
281+
final List<DownloadInfo> downloadInfoList = new ArrayList<>();
282+
for (Request request : requestList) {
283+
final DownloadInfo downloadInfo = FetchTypeConverterExtensions.toDownloadInfo(request);
284+
downloadInfoList.add(downloadInfo);
285+
}
286+
for (DownloadInfo downloadInfo : downloadInfoList) {
287+
downloadInfo.setStatus(status);
288+
}
271289
databaseManager.insert(downloadInfoList);
272290
final List<DownloadInfo> queryList = databaseManager.getByStatus(status);
273291
assertNotNull(queryList);
@@ -291,10 +309,14 @@ public void getGroup() throws Exception {
291309
final Request request = new Request(url, file);
292310
requestList.add(request);
293311
}
294-
final List<DownloadInfo> downloadInfoList =
295-
requestList.stream().map(FetchTypeConverterExtensions::toDownloadInfo)
296-
.collect(Collectors.toList());
297-
downloadInfoList.forEach(download -> download.setGroup(group));
312+
final List<DownloadInfo> downloadInfoList = new ArrayList<>();
313+
for (Request request : requestList) {
314+
final DownloadInfo downloadInfo = FetchTypeConverterExtensions.toDownloadInfo(request);
315+
downloadInfoList.add(downloadInfo);
316+
}
317+
for (DownloadInfo downloadInfo : downloadInfoList) {
318+
downloadInfo.setGroup(group);
319+
}
298320
databaseManager.insert(downloadInfoList);
299321
final List<DownloadInfo> queryList = databaseManager.getByGroup(group);
300322
assertNotNull(queryList);
@@ -340,10 +362,14 @@ public void getGroupWithStatus() throws Exception {
340362
request.setGroupId(group);
341363
requestList.add(request);
342364
}
343-
final List<DownloadInfo> downloadInfoList =
344-
requestList.stream().map(FetchTypeConverterExtensions::toDownloadInfo)
345-
.collect(Collectors.toList());
346-
downloadInfoList.forEach(download -> download.setStatus(status));
365+
final List<DownloadInfo> downloadInfoList = new ArrayList<>();
366+
for (Request request : requestList) {
367+
final DownloadInfo downloadInfo = FetchTypeConverterExtensions.toDownloadInfo(request);
368+
downloadInfoList.add(downloadInfo);
369+
}
370+
for (DownloadInfo downloadInfo : downloadInfoList) {
371+
downloadInfo.setStatus(status);
372+
}
347373
databaseManager.insert(downloadInfoList);
348374
final List<DownloadInfo> queryList = databaseManager.getDownloadsInGroupWithStatus(group, status);
349375
assertNotNull(queryList);

‎fetch2/src/androidTest/java/com/tonyodev/fetch2/DownloadProviderInstrumentedTest.java

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import java.util.ArrayList;
1919
import java.util.List;
20-
import java.util.stream.Collectors;
2120

2221
import static org.junit.Assert.assertEquals;
2322
import static org.junit.Assert.assertNotNull;
@@ -60,9 +59,11 @@ public void get() throws Exception {
6059
final Request request = new Request(url, file);
6160
requestList.add(request);
6261
}
63-
final List<DownloadInfo> downloadInfoList =
64-
requestList.stream().map(FetchTypeConverterExtensions::toDownloadInfo)
65-
.collect(Collectors.toList());
62+
final List<DownloadInfo> downloadInfoList = new ArrayList<>();
63+
for (Request request : requestList) {
64+
final DownloadInfo downloadInfo = FetchTypeConverterExtensions.toDownloadInfo(request);
65+
downloadInfoList.add(downloadInfo);
66+
}
6667
databaseManager.insert(downloadInfoList);
6768
final List<Download> queryList = downloadProvider.getDownloads();
6869
assertNotNull(queryList);
@@ -92,13 +93,16 @@ public void getIds() throws Exception {
9293
final Request request = new Request(url, file);
9394
requestList.add(request);
9495
}
95-
final List<DownloadInfo> downloadInfoList =
96-
requestList.stream().map(FetchTypeConverterExtensions::toDownloadInfo)
97-
.collect(Collectors.toList());
96+
final List<DownloadInfo> downloadInfoList = new ArrayList<>();
97+
for (Request request : requestList) {
98+
final DownloadInfo downloadInfo = FetchTypeConverterExtensions.toDownloadInfo(request);
99+
downloadInfoList.add(downloadInfo);
100+
}
98101
databaseManager.insert(downloadInfoList);
99-
final List<Integer> ids = downloadInfoList.stream()
100-
.mapToInt(Download::getId)
101-
.boxed().collect(Collectors.toList());
102+
final List<Integer> ids = new ArrayList<>();
103+
for(DownloadInfo downloadInfo : downloadInfoList) {
104+
ids.add(downloadInfo.getId());
105+
}
102106
final List<Download> queryList = downloadProvider.getDownloads(ids);
103107
assertNotNull(queryList);
104108
assertEquals(downloadInfoList.size(), queryList.size());
@@ -120,10 +124,14 @@ public void getStatus() throws Exception {
120124
final Request request = new Request(url, file);
121125
requestList.add(request);
122126
}
123-
final List<DownloadInfo> downloadInfoList =
124-
requestList.stream().map(FetchTypeConverterExtensions::toDownloadInfo)
125-
.collect(Collectors.toList());
126-
downloadInfoList.forEach(download -> download.setStatus(status));
127+
final List<DownloadInfo> downloadInfoList = new ArrayList<>();
128+
for (Request request : requestList) {
129+
final DownloadInfo downloadInfo = FetchTypeConverterExtensions.toDownloadInfo(request);
130+
downloadInfoList.add(downloadInfo);
131+
}
132+
for (DownloadInfo downloadInfo : downloadInfoList) {
133+
downloadInfo.setStatus(status);
134+
}
127135
databaseManager.insert(downloadInfoList);
128136
final List<Download> queryList = downloadProvider.getByStatus(status);
129137
assertNotNull(queryList);
@@ -146,10 +154,14 @@ public void getGroup() throws Exception {
146154
final Request request = new Request(url, file);
147155
requestList.add(request);
148156
}
149-
final List<DownloadInfo> downloadInfoList =
150-
requestList.stream().map(FetchTypeConverterExtensions::toDownloadInfo)
151-
.collect(Collectors.toList());
152-
downloadInfoList.forEach(download -> download.setGroup(group));
157+
final List<DownloadInfo> downloadInfoList = new ArrayList<>();
158+
for (Request request : requestList) {
159+
final DownloadInfo downloadInfo = FetchTypeConverterExtensions.toDownloadInfo(request);
160+
downloadInfoList.add(downloadInfo);
161+
}
162+
for (DownloadInfo downloadInfo : downloadInfoList) {
163+
downloadInfo.setGroup(group);
164+
}
153165
databaseManager.insert(downloadInfoList);
154166
final List<Download> queryList = downloadProvider.getByGroup(group);
155167
assertNotNull(queryList);

‎fetch2/src/androidTest/java/com/tonyodev/fetch2/FetchHandlerInstrumentedTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828

2929
import java.util.ArrayList;
3030
import java.util.List;
31-
import java.util.stream.Collectors;
3231

3332
import static org.junit.Assert.assertEquals;
3433
import static org.junit.Assert.assertFalse;
@@ -472,9 +471,10 @@ public void getIds() throws Exception {
472471
requestList.add(request);
473472
}
474473
final List<Download> downloadInfoList = fetchHandler.enqueue(requestList);
475-
final List<Integer> ids = downloadInfoList.stream()
476-
.mapToInt(Download::getId)
477-
.boxed().collect(Collectors.toList());
474+
final List<Integer> ids = new ArrayList<>();
475+
for(Request request : requestList) {
476+
ids.add(request.getId());
477+
}
478478
final List<Download> queryList = fetchHandler.getDownloads(ids);
479479
assertNotNull(queryList);
480480
assertEquals(downloadInfoList.size(), queryList.size());

0 commit comments

Comments
 (0)