Skip to content

Commit ee3d96d

Browse files
small fixes
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
1 parent 18e176c commit ee3d96d

File tree

3 files changed

+28
-10
lines changed

3 files changed

+28
-10
lines changed

library/src/androidTest/java/com/owncloud/android/lib/resources/files/webdav/ChunkedFileUploadRemoteOperationIT.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ import java.io.File
3535

3636
class ChunkedFileUploadRemoteOperationIT : AbstractIT() {
3737
@Test
38-
fun upload_wifi() {
38+
fun uploadWifi() {
3939
val sut = genLargeUpload(true)
4040
val uploadResult = sut.execute(client)
4141
assert(uploadResult.isSuccess)
4242
}
4343

4444
@Test
45-
fun upload_mobile() {
45+
fun uploadMobile() {
4646
val sut = genLargeUpload(false)
4747
val uploadResult = sut.execute(client)
4848
assert(uploadResult.isSuccess)

library/src/main/java/com/owncloud/android/lib/resources/files/Chunk.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@
2727

2828
package com.owncloud.android.lib.resources.files
2929

30-
data class Chunk(val id: Int, val start: Long, val length: Long)
30+
data class Chunk(val id: Int, val start: Long, val length: Long)

library/src/test/java/com/owncloud/android/lib/resources/files/ChunkedFileUploadRemoteOperationTest.kt

+25-7
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,12 @@ class ChunkedFileUploadRemoteOperationTest {
4545
fun testAssembleTimeout() {
4646
MockitoAnnotations.openMocks(this)
4747
val sut = ChunkedFileUploadRemoteOperation(
48-
null, null, null, null, System.currentTimeMillis() / 1000, false
48+
null,
49+
null,
50+
null,
51+
null,
52+
System.currentTimeMillis() / 1000,
53+
false
4954
)
5055

5156
// 0b
@@ -131,7 +136,10 @@ class ChunkedFileUploadRemoteOperationTest {
131136
// segment first half with CHUNK_SIZE_WIFI
132137
while (nextByte + 1 < length / 2) {
133138
val chunk = ChunkedFileUploadRemoteOperation.calcNextChunk(
134-
length, ++id, nextByte, ChunkedFileUploadRemoteOperation.CHUNK_SIZE_WIFI
139+
length,
140+
++id,
141+
nextByte,
142+
ChunkedFileUploadRemoteOperation.CHUNK_SIZE_WIFI
135143
)
136144

137145
chunks.add(chunk)
@@ -141,16 +149,23 @@ class ChunkedFileUploadRemoteOperationTest {
141149
// segment remaining half with CHUNK_SIZE_MOBILE
142150
while (nextByte + 1 < length) {
143151
val chunk = ChunkedFileUploadRemoteOperation.calcNextChunk(
144-
length, ++id, nextByte, ChunkedFileUploadRemoteOperation.CHUNK_SIZE_MOBILE
152+
length,
153+
++id,
154+
nextByte,
155+
ChunkedFileUploadRemoteOperation.CHUNK_SIZE_MOBILE
145156
)
146157

147158
chunks.add(chunk)
148159
nextByte += chunk.length
149160
}
150161

151162
// calculate expected number of chunks
152-
var expectedChunkCount = ceil((length / 2) / ChunkedFileUploadRemoteOperation.CHUNK_SIZE_WIFI.toFloat())
153-
expectedChunkCount += ceil((length - expectedChunkCount * ChunkedFileUploadRemoteOperation.CHUNK_SIZE_WIFI) / ChunkedFileUploadRemoteOperation.CHUNK_SIZE_MOBILE.toFloat())
163+
var expectedChunkCount =
164+
ceil((length / 2) / ChunkedFileUploadRemoteOperation.CHUNK_SIZE_WIFI.toFloat())
165+
expectedChunkCount += ceil(
166+
(length - expectedChunkCount * ChunkedFileUploadRemoteOperation.CHUNK_SIZE_WIFI) /
167+
ChunkedFileUploadRemoteOperation.CHUNK_SIZE_MOBILE.toFloat()
168+
)
154169
assertEquals(expectedChunkCount.toInt(), chunks.size)
155170

156171
// does total length match file size?
@@ -198,7 +213,10 @@ class ChunkedFileUploadRemoteOperationTest {
198213

199214
while (nextByte + 1 < length) {
200215
val chunk = ChunkedFileUploadRemoteOperation.calcNextChunk(
201-
length, ++id, nextByte, chunkSize
216+
length,
217+
++id,
218+
nextByte,
219+
chunkSize
202220
)
203221

204222
chunks.add(chunk)
@@ -212,4 +230,4 @@ class ChunkedFileUploadRemoteOperationTest {
212230
private const val MB = 1000 * 1000L
213231
private const val GB = 1000 * MB
214232
}
215-
}
233+
}

0 commit comments

Comments
 (0)