diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/webfinger/responses/WebfingerResponse.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/webfinger/responses/WebfingerResponse.kt index fcf9bf84..45e85a75 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/webfinger/responses/WebfingerResponse.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/webfinger/responses/WebfingerResponse.kt @@ -27,13 +27,13 @@ package com.owncloud.android.lib.resources.webfinger.responses import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) -data class WebfingerJrdResponse ( - val subject:String, - val links:List +data class WebfingerJrdResponse( + val subject: String, + val links: List ) @JsonClass(generateAdapter = true) data class LinkItem( - val href:String, - val rel:String -) \ No newline at end of file + val href: String, + val rel: String +) diff --git a/owncloudComLibrary/src/test/java/com/owncloud/android/lib/resources/webfinger/responses/WebfingerResponseTest.kt b/owncloudComLibrary/src/test/java/com/owncloud/android/lib/resources/webfinger/responses/WebfingerResponseTest.kt index 303e06d9..2d0c6235 100644 --- a/owncloudComLibrary/src/test/java/com/owncloud/android/lib/resources/webfinger/responses/WebfingerResponseTest.kt +++ b/owncloudComLibrary/src/test/java/com/owncloud/android/lib/resources/webfinger/responses/WebfingerResponseTest.kt @@ -11,8 +11,7 @@ import java.io.File class WebfingerResponseTest { lateinit var adapter: JsonAdapter - private fun loadResponses(fileName: String) = - adapter.fromJson(File(fileName).readText()) + private fun loadResponses(fileName: String) = adapter.fromJson(File(fileName).readText()) @Before fun prepare() { @@ -21,8 +20,8 @@ class WebfingerResponseTest { } @Test - fun `check rel in to much information - ok - correct rell is returned`() { - val response = loadResponses(TO_MUCH_INFORMATION_JSON)!! + fun `check rel in too much information - ok`() { + val response = loadResponses(TOO_MUCH_INFORMATION_JSON)!! Assert.assertEquals("https://gast.somedomain.de", response.links[0].href) Assert.assertEquals("http://webfinger.owncloud/rel/server-instance", response.links[0].rel) } @@ -40,11 +39,11 @@ class WebfingerResponseTest { } companion object { - val RESOURCES_PATH = + private const val RESOURCES_PATH = "src/test/responses/com.owncloud.android.lib.resources.webfinger.responses" - val EXAMPLE_RESPONSE_JSON = "$RESOURCES_PATH/simple_response.json" - val TO_MUCH_INFORMATION_JSON = "$RESOURCES_PATH/to_much_information_response.json" - val BROKEN_JSON = "$RESOURCES_PATH/broken_response.json" - val NOT_CONTAINING_RELEVANT_INFORMATION_JSON = "$RESOURCES_PATH/not_containing_relevant_info_response.json" + private const val EXAMPLE_RESPONSE_JSON = "$RESOURCES_PATH/simple_response.json" + private const val TOO_MUCH_INFORMATION_JSON = "$RESOURCES_PATH/to_much_information_response.json" + private const val BROKEN_JSON = "$RESOURCES_PATH/broken_response.json" + private const val NOT_CONTAINING_RELEVANT_INFORMATION_JSON = "$RESOURCES_PATH/not_containing_relevant_info_response.json" } } diff --git a/owncloudComLibrary/src/test/responses/com.owncloud.android.lib.resources.webfinger.responses/not_containing_releavant_info_response.json b/owncloudComLibrary/src/test/responses/com.owncloud.android.lib.resources.webfinger.responses/not_containing_releavant_info_response.json deleted file mode 100644 index cae2ae74..00000000 --- a/owncloudComLibrary/src/test/responses/com.owncloud.android.lib.resources.webfinger.responses/not_containing_releavant_info_response.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "subject": "acct:peter.sine@gurken.xxx", - "links" : - [ - { - "rel" : "http://webfinger.example/rel/businesscard", - "href" : "https://www.example.com/~bob/bob.vcf" - } - ] -} \ No newline at end of file diff --git a/owncloudComLibrary/src/test/responses/com.owncloud.android.lib.resources.webfinger.responses/not_containing_relevant_info_response.json b/owncloudComLibrary/src/test/responses/com.owncloud.android.lib.resources.webfinger.responses/not_containing_relevant_info_response.json new file mode 100644 index 00000000..712d113a --- /dev/null +++ b/owncloudComLibrary/src/test/responses/com.owncloud.android.lib.resources.webfinger.responses/not_containing_relevant_info_response.json @@ -0,0 +1,9 @@ +{ + "subject": "acct:peter.sine@gurken.xxx", + "links": [ + { + "rel": "http://webfinger.example/rel/businesscard", + "href": "https://www.example.com/~bob/bob.vcf" + } + ] +} diff --git a/owncloudComLibrary/src/test/responses/com.owncloud.android.lib.resources.webfinger.responses/simple_response.json b/owncloudComLibrary/src/test/responses/com.owncloud.android.lib.resources.webfinger.responses/simple_response.json index a7e18f2c..bda67449 100644 --- a/owncloudComLibrary/src/test/responses/com.owncloud.android.lib.resources.webfinger.responses/simple_response.json +++ b/owncloudComLibrary/src/test/responses/com.owncloud.android.lib.resources.webfinger.responses/simple_response.json @@ -1,9 +1,9 @@ { - "links": [ - { - "href": "https://gast.somedomain.de", - "rel": "http://webfinger.owncloud/rel/server-instance" - } - ], - "subject": "acct:peter.sine@gurken.xxx" + "links": [ + { + "href": "https://gast.somedomain.de", + "rel": "http://webfinger.owncloud/rel/server-instance" + } + ], + "subject": "acct:peter.sine@gurken.xxx" } diff --git a/owncloudComLibrary/src/test/responses/com.owncloud.android.lib.resources.webfinger.responses/to_much_information_response.json b/owncloudComLibrary/src/test/responses/com.owncloud.android.lib.resources.webfinger.responses/to_much_information_response.json index be02c6ad..79c68f3c 100644 --- a/owncloudComLibrary/src/test/responses/com.owncloud.android.lib.resources.webfinger.responses/to_much_information_response.json +++ b/owncloudComLibrary/src/test/responses/com.owncloud.android.lib.resources.webfinger.responses/to_much_information_response.json @@ -1,18 +1,15 @@ { "subject": "acct:peter.sine@gurken.xxx", - "aliases" : - [ + "aliases": [ "https://www.example.com/~bob/" ], - "properties" : - { - "http://example.com/ns/role" : "employee" + "properties": { + "http://example.com/ns/role": "employee" }, "gurken": { "whatever": 42 }, - "links" : - [ + "links": [ { "gurken": "sallat", "href": "https://gast.somedomain.de", @@ -20,8 +17,8 @@ }, { "gurken": "sallat", - "rel" : "http://webfinger.example/rel/businesscard", - "href" : "https://www.example.com/~bob/bob.vcf" + "rel": "http://webfinger.example/rel/businesscard", + "href": "https://www.example.com/~bob/bob.vcf" } ] -} \ No newline at end of file +}