Before

…lines 1–9 unchanged (9 lines)
10import com.owncloud.android.datamodel.OCFile
11import com.owncloud.android.ui.activities.data.files.FilesRepository.ReadRemoteFileCallback
12import com.owncloud.android.ui.activities.data.files.FilesServiceApi.FilesServiceCallback
13import com.owncloud.android.ui.activity.BaseActivity
14import org.junit.Before
15import org.junit.Test
16import org.mockito.ArgumentCaptor
17import org.mockito.ArgumentMatchers.eq
18import org.mockito.Captor
19import org.mockito.Mock
20import org.mockito.Mockito.verify
21import org.mockito.MockitoAnnotations
22
23class RemoteFilesRepositoryTest {
24
25 @Mock private lateinit var serviceApi: FilesServiceApi
26
27 @Mock private lateinit var mockedReadRemoteFileCallback: ReadRemoteFileCallback
28
29 @Mock private lateinit var baseActivity: BaseActivity
30
31 @Mock private lateinit var ocFile: OCFile
32
33 @Captor private lateinit var filesServiceCallbackCaptor: ArgumentCaptor<FilesServiceCallback<OCFile>>
34
35 private lateinit var filesRepository: FilesRepository
36
37 @Before
38 fun setUpFilesRepository() {
39 MockitoAnnotations.openMocks(this)
40 filesRepository = RemoteFilesRepository(serviceApi)
41 }
42
43 @Test
44 fun readRemoteFileReturnSuccess() {
45 filesRepository.readRemoteFile("path", baseActivity, mockedReadRemoteFileCallback)
46 verify(serviceApi).readRemoteFile(eq("path"), eq(baseActivity), filesServiceCallbackCaptor.capture())
47 filesServiceCallbackCaptor.value.onLoaded(ocFile)
48 verify(mockedReadRemoteFileCallback).onFileLoaded(eq(ocFile))
49 }
50
51 @Test
52 fun readRemoteFileReturnError() {
53 filesRepository.readRemoteFile("path", baseActivity, mockedReadRemoteFileCallback)
54 verify(serviceApi).readRemoteFile(eq("path"), eq(baseActivity), filesServiceCallbackCaptor.capture())
55 filesServiceCallbackCaptor.value.onError("error")
56 verify(mockedReadRemoteFileCallback).onFileLoadError(eq("error"))
57 }
58}
59

After

…lines 1–9 unchanged (9 lines)
10import com.owncloud.android.datamodel.OCFile
11import com.owncloud.android.ui.activities.data.files.FilesRepository.ReadRemoteFileCallback
12import com.owncloud.android.ui.activities.data.files.FilesServiceApi.FilesServiceCallback
13import com.owncloud.android.ui.activity.BaseActivity
14import org.junit.Before
15import org.junit.Test
16import org.mockito.Mock
17import org.mockito.Mockito.verify
18import org.mockito.MockitoAnnotations
19import org.mockito.kotlin.argumentCaptor
20import org.mockito.kotlin.eq
21
22class RemoteFilesRepositoryTest {
23
24 @Mock private lateinit var serviceApi: FilesServiceApi
25
26 @Mock private lateinit var mockedReadRemoteFileCallback: ReadRemoteFileCallback
27
28 @Mock private lateinit var baseActivity: BaseActivity
29
30 @Mock private lateinit var ocFile: OCFile
31
32 private lateinit var filesRepository: FilesRepository
33
34 @Before
35 fun setUpFilesRepository() {
36 MockitoAnnotations.openMocks(this)
37 filesRepository = RemoteFilesRepository(serviceApi)
38 }
39
40 @Test
41 fun readRemoteFileReturnSuccess() {
42 val captor = argumentCaptor<FilesServiceCallback<OCFile>>()
43
44 filesRepository.readRemoteFile("path", baseActivity, mockedReadRemoteFileCallback)
45 verify(serviceApi).readRemoteFile(eq("path"), eq(baseActivity), captor.capture())
46 captor.firstValue.onLoaded(ocFile)
47 verify(mockedReadRemoteFileCallback).onFileLoaded(eq(ocFile))
48 }
49
50 @Test
51 fun readRemoteFileReturnError() {
52 val captor = argumentCaptor<FilesServiceCallback<OCFile>>()
53
54 filesRepository.readRemoteFile("path", baseActivity, mockedReadRemoteFileCallback)
55 verify(serviceApi).readRemoteFile(eq("path"), eq(baseActivity), captor.capture())
56 captor.firstValue.onError("error")
57 verify(mockedReadRemoteFileCallback).onFileLoadError(eq("error"))
58 }
59}
60

Before

source_file
block_comment "/*\n * Nextcloud - Android Client\n *\n * SPDX-FileCopyrightTex"...
package_header
package "package"
qualified_identifier
identifier "com"
. "."
identifier "owncloud"
. "."
identifier "android"
. "."
identifier "ui"
. "."
identifier "activities"
. "."
identifier "data"
. "."
identifier "files"
import
import "import"
qualified_identifier
identifier "com"
. "."
identifier "owncloud"
. "."
identifier "android"
. "."
identifier "datamodel"
. "."
identifier "OCFile"
import
import "import"
qualified_identifier
identifier "com"
. "."
identifier "owncloud"
. "."
identifier "android"
. "."
identifier "ui"
. "."
identifier "activities"
. "."
identifier "data"
. "."
identifier "files"
. "."
identifier "FilesRepository"
. "."
identifier "ReadRemoteFileCallback"
import
import "import"
qualified_identifier
identifier "com"
. "."
identifier "owncloud"
. "."
identifier "android"
. "."
identifier "ui"
. "."
identifier "activities"
. "."
identifier "data"
. "."
identifier "files"
. "."
identifier "FilesServiceApi"
. "."
identifier "FilesServiceCallback"
import
import "import"
qualified_identifier
identifier "com"
. "."
identifier "owncloud"
. "."
identifier "android"
. "."
identifier "ui"
. "."
identifier "activity"
. "."
identifier "BaseActivity"
import
import "import"
qualified_identifier
identifier "org"
. "."
identifier "junit"
. "."
identifier "Before"
import
import "import"
qualified_identifier
identifier "org"
. "."
identifier "junit"
. "."
identifier "Test"
import
import "import"
qualified_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "ArgumentCaptor"
import
import "import"
qualified_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "ArgumentMatchers"
. "."
identifier "eq"
import
import "import"
qualified_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "Captor"
import
import "import"
qualified_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "Mock"
import
import "import"
qualified_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "Mockito"
. "."
identifier "verify"
import
import "import"
qualified_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "MockitoAnnotations"
class_declaration
class "class"
identifier "RemoteFilesRepositoryTest"
class_body
{ "{"
property_declaration
modifiers
annotation
@ "@"
user_type
identifier "Mock"
visibility_modifier
private "private"
member_modifier
lateinit "lateinit"
var "var"
variable_declaration
identifier "serviceApi"
: ":"
user_type
identifier "FilesServiceApi"
property_declaration
modifiers
annotation
@ "@"
user_type
identifier "Mock"
visibility_modifier
private "private"
member_modifier
lateinit "lateinit"
var "var"
variable_declaration
identifier "mockedReadRemoteFileCallback"
: ":"
user_type
identifier "ReadRemoteFileCallback"
property_declaration
modifiers
annotation
@ "@"
user_type
identifier "Mock"
visibility_modifier
private "private"
member_modifier
lateinit "lateinit"
var "var"
variable_declaration
identifier "baseActivity"
: ":"
user_type
identifier "BaseActivity"
property_declaration
modifiers
annotation
@ "@"
user_type
identifier "Mock"
visibility_modifier
private "private"
member_modifier
lateinit "lateinit"
var "var"
variable_declaration
identifier "ocFile"
: ":"
user_type
identifier "OCFile"
property_declaration
modifiers
annotation
@ "@"
user_type
identifier "Captor"
visibility_modifier
private "private"
member_modifier
lateinit "lateinit"
var "var"
variable_declaration
identifier "filesServiceCallbackCaptor"
: ":"
user_type
identifier "ArgumentCaptor"
type_arguments
< "<"
type_projection
user_type
identifier "FilesServiceCallback"
type_arguments
< "<"
type_projection
user_type
identifier "OCFile"
> ">"
> ">"
property_declaration
modifiers
visibility_modifier
private "private"
member_modifier
lateinit "lateinit"
var "var"
variable_declaration
identifier "filesRepository"
: ":"
user_type
identifier "FilesRepository"
function_declaration (+36 nodes collapsed)
function_declaration
modifiers
annotation
@ "@"
user_type
identifier "Test"
fun "fun"
identifier "readRemoteFileReturnSuccess"
function_value_parameters
( "("
) ")"
function_body
block
{ "{"
call_expression
navigation_expression
identifier "filesRepository"
. "."
identifier "readRemoteFile"
value_arguments
( "("
value_argument
string_literal
" "\""
string_content "path"
" "\""
, ","
value_argument
identifier "baseActivity"
, ","
value_argument
identifier "mockedReadRemoteFileCallback"
) ")"
call_expression
navigation_expression
call_expression
identifier "verify"
value_arguments
( "("
value_argument
identifier "serviceApi"
) ")"
. "."
identifier "readRemoteFile"
value_arguments
( "("
value_argument
call_expression
identifier "eq"
value_arguments
( "("
value_argument
string_literal
" "\""
string_content "path"
" "\""
) ")"
, ","
value_argument
call_expression
identifier "eq"
value_arguments
( "("
value_argument
identifier "baseActivity"
) ")"
, ","
value_argument
call_expression
navigation_expression
identifier "filesServiceCallbackCaptor"
. "."
identifier "capture"
value_arguments
( "("
) ")"
) ")"
call_expression
navigation_expression
navigation_expression
identifier "filesServiceCallbackCaptor"
. "."
identifier "value"
. "."
identifier "onLoaded"
value_arguments
( "("
value_argument
identifier "ocFile"
) ")"
call_expression (+22 nodes collapsed)
} "}"
function_declaration
modifiers
annotation
@ "@"
user_type
identifier "Test"
fun "fun"
identifier "readRemoteFileReturnError"
function_value_parameters
( "("
) ")"
function_body
block
{ "{"
call_expression
navigation_expression
identifier "filesRepository"
. "."
identifier "readRemoteFile"
value_arguments
( "("
value_argument
string_literal
" "\""
string_content "path"
" "\""
, ","
value_argument
identifier "baseActivity"
, ","
value_argument
identifier "mockedReadRemoteFileCallback"
) ")"
call_expression
navigation_expression
call_expression
identifier "verify"
value_arguments
( "("
value_argument
identifier "serviceApi"
) ")"
. "."
identifier "readRemoteFile"
value_arguments
( "("
value_argument
call_expression
identifier "eq"
value_arguments
( "("
value_argument
string_literal
" "\""
string_content "path"
" "\""
) ")"
, ","
value_argument
call_expression
identifier "eq"
value_arguments
( "("
value_argument
identifier "baseActivity"
) ")"
, ","
value_argument
call_expression
navigation_expression
identifier "filesServiceCallbackCaptor"
. "."
identifier "capture"
value_arguments
( "("
) ")"
) ")"
call_expression
navigation_expression
navigation_expression
identifier "filesServiceCallbackCaptor"
. "."
identifier "value"
. "."
identifier "onError"
value_arguments
( "("
value_argument
string_literal
" "\""
string_content "error"
" "\""
) ")"
call_expression (+25 nodes collapsed)
} "}"
} "}"

After

source_file
block_comment "/*\n * Nextcloud - Android Client\n *\n * SPDX-FileCopyrightTex"...
package_header
package "package"
qualified_identifier
identifier "com"
. "."
identifier "owncloud"
. "."
identifier "android"
. "."
identifier "ui"
. "."
identifier "activities"
. "."
identifier "data"
. "."
identifier "files"
import
import "import"
qualified_identifier
identifier "com"
. "."
identifier "owncloud"
. "."
identifier "android"
. "."
identifier "datamodel"
. "."
identifier "OCFile"
import
import "import"
qualified_identifier
identifier "com"
. "."
identifier "owncloud"
. "."
identifier "android"
. "."
identifier "ui"
. "."
identifier "activities"
. "."
identifier "data"
. "."
identifier "files"
. "."
identifier "FilesRepository"
. "."
identifier "ReadRemoteFileCallback"
import
import "import"
qualified_identifier
identifier "com"
. "."
identifier "owncloud"
. "."
identifier "android"
. "."
identifier "ui"
. "."
identifier "activities"
. "."
identifier "data"
. "."
identifier "files"
. "."
identifier "FilesServiceApi"
. "."
identifier "FilesServiceCallback"
import
import "import"
qualified_identifier
identifier "com"
. "."
identifier "owncloud"
. "."
identifier "android"
. "."
identifier "ui"
. "."
identifier "activity"
. "."
identifier "BaseActivity"
import
import "import"
qualified_identifier
identifier "org"
. "."
identifier "junit"
. "."
identifier "Before"
import
import "import"
qualified_identifier
identifier "org"
. "."
identifier "junit"
. "."
identifier "Test"
import
import "import"
qualified_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "Mock"
import
import "import"
qualified_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "Mockito"
. "."
identifier "verify"
import
import "import"
qualified_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "MockitoAnnotations"
import
import "import"
qualified_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "kotlin"
. "."
identifier "argumentCaptor"
import
import "import"
qualified_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "kotlin"
. "."
identifier "eq"
class_declaration
class "class"
identifier "RemoteFilesRepositoryTest"
class_body
{ "{"
property_declaration
modifiers
annotation
@ "@"
user_type
identifier "Mock"
visibility_modifier
private "private"
member_modifier
lateinit "lateinit"
var "var"
variable_declaration
identifier "serviceApi"
: ":"
user_type
identifier "FilesServiceApi"
property_declaration
modifiers
annotation
@ "@"
user_type
identifier "Mock"
visibility_modifier
private "private"
member_modifier
lateinit "lateinit"
var "var"
variable_declaration
identifier "mockedReadRemoteFileCallback"
: ":"
user_type
identifier "ReadRemoteFileCallback"
property_declaration
modifiers
annotation
@ "@"
user_type
identifier "Mock"
visibility_modifier
private "private"
member_modifier
lateinit "lateinit"
var "var"
variable_declaration
identifier "baseActivity"
: ":"
user_type
identifier "BaseActivity"
property_declaration
modifiers
annotation
@ "@"
user_type
identifier "Mock"
visibility_modifier
private "private"
member_modifier
lateinit "lateinit"
var "var"
variable_declaration
identifier "ocFile"
: ":"
user_type
identifier "OCFile"
property_declaration
modifiers
visibility_modifier
private "private"
member_modifier
lateinit "lateinit"
var "var"
variable_declaration
identifier "filesRepository"
: ":"
user_type
identifier "FilesRepository"
function_declaration (+36 nodes collapsed)
function_declaration
modifiers
annotation
@ "@"
user_type
identifier "Test"
fun "fun"
identifier "readRemoteFileReturnSuccess"
function_value_parameters
( "("
) ")"
function_body
block
{ "{"
property_declaration
val "val"
variable_declaration
identifier "captor"
= "="
call_expression
identifier "argumentCaptor"
type_arguments
< "<"
type_projection
user_type
identifier "FilesServiceCallback"
type_arguments
< "<"
type_projection
user_type
identifier "OCFile"
> ">"
> ">"
value_arguments
( "("
) ")"
call_expression
navigation_expression
identifier "filesRepository"
. "."
identifier "readRemoteFile"
value_arguments
( "("
value_argument
string_literal
" "\""
string_content "path"
" "\""
, ","
value_argument
identifier "baseActivity"
, ","
value_argument
identifier "mockedReadRemoteFileCallback"
) ")"
call_expression
navigation_expression
call_expression
identifier "verify"
value_arguments
( "("
value_argument
identifier "serviceApi"
) ")"
. "."
identifier "readRemoteFile"
value_arguments
( "("
value_argument
call_expression
identifier "eq"
value_arguments
( "("
value_argument
string_literal
" "\""
string_content "path"
" "\""
) ")"
, ","
value_argument
call_expression
identifier "eq"
value_arguments
( "("
value_argument
identifier "baseActivity"
) ")"
, ","
value_argument
call_expression
navigation_expression
identifier "captor"
. "."
identifier "capture"
value_arguments
( "("
) ")"
) ")"
call_expression
navigation_expression
navigation_expression
identifier "captor"
. "."
identifier "firstValue"
. "."
identifier "onLoaded"
value_arguments
( "("
value_argument
identifier "ocFile"
) ")"
call_expression (+22 nodes collapsed)
} "}"
function_declaration
modifiers
annotation
@ "@"
user_type
identifier "Test"
fun "fun"
identifier "readRemoteFileReturnError"
function_value_parameters
( "("
) ")"
function_body
block
{ "{"
property_declaration
val "val"
variable_declaration
identifier "captor"
= "="
call_expression
identifier "argumentCaptor"
type_arguments
< "<"
type_projection
user_type
identifier "FilesServiceCallback"
type_arguments
< "<"
type_projection
user_type
identifier "OCFile"
> ">"
> ">"
value_arguments
( "("
) ")"
call_expression
navigation_expression
identifier "filesRepository"
. "."
identifier "readRemoteFile"
value_arguments
( "("
value_argument
string_literal
" "\""
string_content "path"
" "\""
, ","
value_argument
identifier "baseActivity"
, ","
value_argument
identifier "mockedReadRemoteFileCallback"
) ")"
call_expression
navigation_expression
call_expression
identifier "verify"
value_arguments
( "("
value_argument
identifier "serviceApi"
) ")"
. "."
identifier "readRemoteFile"
value_arguments
( "("
value_argument
call_expression
identifier "eq"
value_arguments
( "("
value_argument
string_literal
" "\""
string_content "path"
" "\""
) ")"
, ","
value_argument
call_expression
identifier "eq"
value_arguments
( "("
value_argument
identifier "baseActivity"
) ")"
, ","
value_argument
call_expression
navigation_expression
identifier "captor"
. "."
identifier "capture"
value_arguments
( "("
) ")"
) ")"
call_expression
navigation_expression
navigation_expression
identifier "captor"
. "."
identifier "firstValue"
. "."
identifier "onError"
value_arguments
( "("
value_argument
string_literal
" "\""
string_content "error"
" "\""
) ")"
call_expression (+25 nodes collapsed)
} "}"
} "}"