spotless apply
This commit is contained in:
@@ -12,12 +12,11 @@
|
|||||||
* copies or substantial portions of the Software.
|
* copies or substantial portions of the Software.
|
||||||
*
|
*
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
* SOFTWARE.
|
|
||||||
*/
|
*/
|
||||||
package com.vitorpamplona.quartz.nipB7Blossom
|
package com.vitorpamplona.quartz.nipB7Blossom
|
||||||
|
|
||||||
|
|||||||
+23
-22
@@ -12,12 +12,11 @@
|
|||||||
* copies or substantial portions of the Software.
|
* copies or substantial portions of the Software.
|
||||||
*
|
*
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
* SOFTWARE.
|
|
||||||
*/
|
*/
|
||||||
package com.vitorpamplona.quartz.nipB7Blossom
|
package com.vitorpamplona.quartz.nipB7Blossom
|
||||||
|
|
||||||
@@ -33,7 +32,7 @@ class BlossomUriTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun parsesMinimalUri() {
|
fun parsesMinimalUri() {
|
||||||
val uri = "blossom:${sha256}.jpg"
|
val uri = "blossom:$sha256.jpg"
|
||||||
val result = BlossomUri.parse(uri)
|
val result = BlossomUri.parse(uri)
|
||||||
|
|
||||||
assertNotNull(result)
|
assertNotNull(result)
|
||||||
@@ -46,11 +45,12 @@ class BlossomUriTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun parsesFullUri() {
|
fun parsesFullUri() {
|
||||||
val uri = "blossom:${sha256}.mp4" +
|
val uri =
|
||||||
"?xs=https%3A%2F%2Fcdn.example.com" +
|
"blossom:$sha256.mp4" +
|
||||||
"&xs=https%3A%2F%2Fbackup.example.com" +
|
"?xs=https%3A%2F%2Fcdn.example.com" +
|
||||||
"&as=$authorPubkey" +
|
"&xs=https%3A%2F%2Fbackup.example.com" +
|
||||||
"&sz=1048576"
|
"&as=$authorPubkey" +
|
||||||
|
"&sz=1048576"
|
||||||
val result = BlossomUri.parse(uri)
|
val result = BlossomUri.parse(uri)
|
||||||
|
|
||||||
assertNotNull(result)
|
assertNotNull(result)
|
||||||
@@ -64,7 +64,7 @@ class BlossomUriTest {
|
|||||||
@Test
|
@Test
|
||||||
fun parsesUriWithUnencodedServerUrls() {
|
fun parsesUriWithUnencodedServerUrls() {
|
||||||
// xs values with unencoded colons/slashes should still parse
|
// xs values with unencoded colons/slashes should still parse
|
||||||
val uri = "blossom:${sha256}.bin?xs=https://cdn.example.com&sz=512"
|
val uri = "blossom:$sha256.bin?xs=https://cdn.example.com&sz=512"
|
||||||
val result = BlossomUri.parse(uri)
|
val result = BlossomUri.parse(uri)
|
||||||
|
|
||||||
assertNotNull(result)
|
assertNotNull(result)
|
||||||
@@ -83,7 +83,7 @@ class BlossomUriTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun isCaseInsensitiveForScheme() {
|
fun isCaseInsensitiveForScheme() {
|
||||||
val result = BlossomUri.parse("BLOSSOM:${sha256}.png")
|
val result = BlossomUri.parse("BLOSSOM:$sha256.png")
|
||||||
assertNotNull(result)
|
assertNotNull(result)
|
||||||
assertEquals(sha256, result.sha256)
|
assertEquals(sha256, result.sha256)
|
||||||
}
|
}
|
||||||
@@ -109,13 +109,14 @@ class BlossomUriTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun roundTrip() {
|
fun roundTrip() {
|
||||||
val original = BlossomUri(
|
val original =
|
||||||
sha256 = sha256,
|
BlossomUri(
|
||||||
extension = "jpg",
|
sha256 = sha256,
|
||||||
servers = listOf("https://cdn.example.com", "https://backup.example.com"),
|
extension = "jpg",
|
||||||
authors = listOf(authorPubkey),
|
servers = listOf("https://cdn.example.com", "https://backup.example.com"),
|
||||||
size = 204800L,
|
authors = listOf(authorPubkey),
|
||||||
)
|
size = 204800L,
|
||||||
|
)
|
||||||
val reparsed = BlossomUri.parse(original.toUriString())
|
val reparsed = BlossomUri.parse(original.toUriString())
|
||||||
|
|
||||||
assertEquals(original, reparsed)
|
assertEquals(original, reparsed)
|
||||||
@@ -124,7 +125,7 @@ class BlossomUriTest {
|
|||||||
@Test
|
@Test
|
||||||
fun handlesMultipleAuthors() {
|
fun handlesMultipleAuthors() {
|
||||||
val author2 = "b8f3721a0dc1b4d5c12f4cc7c54ae14071eb9c1b4f9b2cf0d4ab22c0e9f0c7f"
|
val author2 = "b8f3721a0dc1b4d5c12f4cc7c54ae14071eb9c1b4f9b2cf0d4ab22c0e9f0c7f"
|
||||||
val uri = "blossom:${sha256}.jpg?as=$authorPubkey&as=$author2"
|
val uri = "blossom:$sha256.jpg?as=$authorPubkey&as=$author2"
|
||||||
val result = BlossomUri.parse(uri)
|
val result = BlossomUri.parse(uri)
|
||||||
|
|
||||||
assertNotNull(result)
|
assertNotNull(result)
|
||||||
|
|||||||
Reference in New Issue
Block a user