Skip to content
This repository was archived by the owner on Mar 19, 2024. It is now read-only.

Commit 6ec1bd2

Browse files
theScrabiabelgardep
theScrabi
authored and
abelgardep
committed
move response json to resource folder
1 parent 76c55c9 commit 6ec1bd2

File tree

6 files changed

+114
-85
lines changed

6 files changed

+114
-85
lines changed

‎owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,9 @@ import com.owncloud.android.lib.resources.shares.responses.ShareeOcsResponse
4141
import com.squareup.moshi.JsonAdapter
4242
import com.squareup.moshi.Moshi
4343
import com.squareup.moshi.Types
44-
import org.json.JSONArray
45-
import org.json.JSONObject
4644
import timber.log.Timber
4745
import java.lang.reflect.Type
4846
import java.net.URL
49-
import java.util.ArrayList
5047

5148
/**
5249
* Created by masensio on 08/10/2015.

‎owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/RemoteShare.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
package com.owncloud.android.lib.resources.shares
2626

27-
import com.owncloud.android.lib.resources.files.FileUtils
2827
import java.io.File
2928

3029
/**

‎owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/services/implementation/OCShareeService.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult
2525
import com.owncloud.android.lib.resources.shares.GetRemoteShareesOperation
2626
import com.owncloud.android.lib.resources.shares.responses.ShareeOcsResponse
2727
import com.owncloud.android.lib.resources.shares.services.ShareeService
28-
import org.json.JSONObject
29-
import java.util.ArrayList
3028

3129
class OCShareeService(override val client: OwnCloudClient) :
3230
ShareeService {

‎owncloudComLibrary/src/test/java/com/owncloud/android/lib/resources/shares/responses/ShareeResponseTest.kt

Lines changed: 33 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -29,140 +29,94 @@ import com.squareup.moshi.JsonAdapter
2929
import com.squareup.moshi.Moshi
3030
import com.squareup.moshi.Types
3131
import org.junit.Assert.assertEquals
32-
import org.junit.Assert.assertTrue
3332
import org.junit.Assert.assertNotEquals
33+
import org.junit.Assert.assertTrue
3434
import org.junit.Before
3535
import org.junit.Test
36+
import java.io.File
3637
import java.lang.reflect.Type
3738

3839
class ShareeResponseTest {
3940

40-
var response: CommonOcsResponse<ShareeOcsResponse>? = null
41+
lateinit var response: CommonOcsResponse<ShareeOcsResponse>
42+
43+
private fun loadResponses(fileName: String, adapter: JsonAdapter<CommonOcsResponse<ShareeOcsResponse>>) =
44+
adapter.fromJson(File(fileName).readText())
4145

4246
@Before
4347
fun prepare() {
4448
val moshi = Moshi.Builder().build()
4549
val type: Type = Types.newParameterizedType(CommonOcsResponse::class.java, ShareeOcsResponse::class.java)
4650
val adapter: JsonAdapter<CommonOcsResponse<ShareeOcsResponse>> = moshi.adapter(type)
47-
response = adapter.fromJson(EXAMPLE_RESPONSE)
51+
response = loadResponses(EXAMPLE_RESPONSE_JSON, adapter)!!
4852
}
4953

5054
@Test
5155
fun `check structure - ok - contains meta`() {
52-
assertEquals("OK", response?.ocs?.meta?.message!!)
53-
assertEquals(200, response?.ocs?.meta?.statusCode!!)
54-
assertEquals("ok", response?.ocs?.meta?.status!!)
55-
assertTrue(response?.ocs?.meta?.itemsPerPage?.isEmpty()!!)
56-
assertTrue(response?.ocs?.meta?.totalItems?.isEmpty()!!)
56+
assertEquals("OK", response.ocs.meta.message!!)
57+
assertEquals(200, response.ocs.meta.statusCode!!)
58+
assertEquals("ok", response.ocs.meta.status!!)
59+
assertTrue(response.ocs.meta.itemsPerPage?.isEmpty()!!)
60+
assertTrue(response.ocs.meta.totalItems?.isEmpty()!!)
5761
}
5862

5963
@Test
6064
fun `check structure - ok - contains exact`() {
61-
assertNotEquals(null, response?.ocs?.data?.exact)
65+
assertNotEquals(null, response.ocs.data.exact)
6266
}
6367

6468
@Test
6569
fun `check structure - ok - contains groups`() {
66-
assertNotEquals(null, response?.ocs?.data?.groups)
70+
assertNotEquals(null, response.ocs.data.groups)
6771
}
6872

6973
@Test
7074
fun `check structure - ok - contains remotes`() {
71-
assertNotEquals(null, response?.ocs?.data?.remotes)
75+
assertNotEquals(null, response.ocs.data.remotes)
7276
}
7377

7478
@Test
7579
fun `check structure - ok - contains users`() {
76-
assertNotEquals(null, response?.ocs?.data?.users)
80+
assertNotEquals(null, response.ocs.data.users)
7781
}
7882

7983
@Test
8084
fun `check structure - ok - groups contains two items`() {
81-
assertEquals(2, response?.ocs?.data?.groups?.size)
85+
assertEquals(2, response.ocs.data.groups.size)
8286
}
8387

8488
@Test
8589
fun `check structure - ok - users contains two items`() {
86-
assertEquals(2, response?.ocs?.data?.users?.size)
90+
assertEquals(2, response.ocs.data.users.size)
8791
}
8892

8993
@Test
9094
fun `check structure - ok - exact_users contains one item`() {
91-
assertEquals(1, response?.ocs?.data?.exact?.users?.size)
95+
assertEquals(1, response.ocs.data.exact?.users?.size)
9296
}
9397

9498
@Test
9599
fun `check structure - ok - user1 contains additional data`() {
96-
assertEquals("[email protected]", response?.ocs?.data?.users?.get(0)?.value?.additionalInfo)
100+
assertEquals("[email protected]", response.ocs.data.users.get(0).value.additionalInfo)
97101
}
98102

99103
@Test
100104
fun `check structure - ok - user2 does not contain additional data`() {
101-
assertEquals(null, response!!.ocs.data.users!![1].value!!.additionalInfo)
105+
assertEquals(null, response.ocs.data.users[1].value.additionalInfo)
102106
}
103107

104-
companion object {
105-
val EXAMPLE_RESPONSE = """
106-
{
107-
"ocs": {
108-
"data": {
109-
"exact": {
110-
"groups": [],
111-
"remotes": [],
112-
"users": [
113-
{
114-
"label": "admin",
115-
"value": {
116-
"shareType": 0,
117-
"shareWith": "admin"
118-
}
119-
}
120-
]
121-
},
122-
"groups": [
123-
{
124-
"label": "group1",
125-
"value": {
126-
"shareType": 1,
127-
"shareWith": "group1"
128-
}
129-
},
130-
{
131-
"label": "group2",
132-
"value": {
133-
"shareType": 1,
134-
"shareWith": "group2"
135-
}
136-
}
137-
],
138-
"remotes": [],
139-
"users": [
140-
{
141-
"label": "user1",
142-
"value": {
143-
"shareType": 0,
144-
"shareWith": "user1",
145-
"shareWithAdditionalInfo": "[email protected]"
146-
}
147-
},
148-
{
149-
"label": "user2",
150-
"value": {
151-
"shareType": 0,
152-
"shareWith": "user2"
153-
}
154-
}
155-
]
156-
},
157-
"meta": {
158-
"itemsperpage": "",
159-
"message": "OK",
160-
"status": "ok",
161-
"statuscode": 200,
162-
"totalitems": ""
163-
}
108+
@Test
109+
fun `check empty response - ok - parsing ok`() {
110+
val moshi = Moshi.Builder().build()
111+
val type: Type = Types.newParameterizedType(CommonOcsResponse::class.java, ShareeOcsResponse::class.java)
112+
val adapter: JsonAdapter<CommonOcsResponse<ShareeOcsResponse>> = moshi.adapter(type)
113+
loadResponses(EMPTY_RESPONSE_JSON, adapter)!!
164114
}
165-
}
166-
"""
115+
116+
companion object {
117+
val RESOURCES_PATH =
118+
"/home/schabi/Projects/owncloud-android/owncloud-android-library/owncloudComLibrary/src/test/resources/com.owncloud.android.lib.resources.sharees.responses"
119+
val EXAMPLE_RESPONSE_JSON = "$RESOURCES_PATH/example_sharee_response.json"
120+
val EMPTY_RESPONSE_JSON = "$RESOURCES_PATH/empty_sharee_response.json"
167121
}
168122
}

‎owncloudComLibrary/src/test/resources/com.owncloud.android.lib.resources.sharees.responses/empty_sharee_response.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"ocs": {
3+
"meta": {
4+
"status": "ok",
5+
"statuscode": 100,
6+
"message": "OK",
7+
"totalitems": "",
8+
"itemsperpage": ""
9+
},
10+
"data": {
11+
"exact": {
12+
"users": [],
13+
"groups": [],
14+
"remotes": []
15+
},
16+
"users": [],
17+
"groups": [],
18+
"remotes": []
19+
}
20+
}
21+
}

‎owncloudComLibrary/src/test/resources/com.owncloud.android.lib.resources.sharees.responses/example_sharee_response.json

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
{
2+
"ocs": {
3+
"data": {
4+
"exact": {
5+
"groups": [],
6+
"remotes": [],
7+
"users": [
8+
{
9+
"label": "admin",
10+
"value": {
11+
"shareType": 0,
12+
"shareWith": "admin"
13+
}
14+
}
15+
]
16+
},
17+
"groups": [
18+
{
19+
"label": "group1",
20+
"value": {
21+
"shareType": 1,
22+
"shareWith": "group1"
23+
}
24+
},
25+
{
26+
"label": "group2",
27+
"value": {
28+
"shareType": 1,
29+
"shareWith": "group2"
30+
}
31+
}
32+
],
33+
"remotes": [],
34+
"users": [
35+
{
36+
"label": "user1",
37+
"value": {
38+
"shareType": 0,
39+
"shareWith": "user1",
40+
"shareWithAdditionalInfo": "[email protected]"
41+
}
42+
},
43+
{
44+
"label": "user2",
45+
"value": {
46+
"shareType": 0,
47+
"shareWith": "user2"
48+
}
49+
}
50+
]
51+
},
52+
"meta": {
53+
"itemsperpage": "",
54+
"message": "OK",
55+
"status": "ok",
56+
"statuscode": 200,
57+
"totalitems": ""
58+
}
59+
}
60+
}

0 commit comments

Comments
 (0)