From 7a87be4182d405cedcde74afeb92ca68a68fccf6 Mon Sep 17 00:00:00 2001 From: Torsten Grote <t@grobox.de> Date: Wed, 15 Feb 2023 10:45:16 -0300 Subject: [PATCH] Upgrade some libs to be included in testing --- mailbox-android/build.gradle | 4 ++-- mailbox-core/build.gradle | 2 +- .../contacts/ContactsManagerIntegrationTest.kt | 2 +- .../core/files/FileManagerIntegrationTest.kt | 14 +++++++------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/mailbox-android/build.gradle b/mailbox-android/build.gradle index bd999835..a30bcac0 100644 --- a/mailbox-android/build.gradle +++ b/mailbox-android/build.gradle @@ -80,7 +80,7 @@ dependencies { implementation 'org.briarproject:dont-kill-me-lib:0.2.5' implementation 'com.github.tony19:logback-android:2.0.1' - implementation 'androidx.appcompat:appcompat:1.6.0' + implementation 'androidx.appcompat:appcompat:1.6.1' implementation "androidx.activity:activity-ktx:1.6.1" implementation "androidx.fragment:fragment-ktx:1.5.5" implementation 'androidx.preference:preference-ktx:1.2.0' @@ -96,7 +96,7 @@ dependencies { implementation "androidx.navigation:navigation-ui-ktx:$nav_version" implementation "androidx.constraintlayout:constraintlayout:2.1.4" - implementation "com.google.android.material:material:1.7.0" + implementation "com.google.android.material:material:1.8.0" implementation "com.google.dagger:hilt-android:$hilt_version" kapt "com.google.dagger:hilt-compiler:$hilt_version" diff --git a/mailbox-core/build.gradle b/mailbox-core/build.gradle index 6f1e27ca..b8f62310 100644 --- a/mailbox-core/build.gradle +++ b/mailbox-core/build.gradle @@ -26,7 +26,7 @@ dependencies { implementation 'org.briarproject:jtorctl:0.5' - def ktor_version = '2.0.3' + def ktor_version = '2.2.3' implementation "io.ktor:ktor-server-core:$ktor_version" implementation "io.ktor:ktor-server-netty:$ktor_version" implementation "io.ktor:ktor-server-auth:$ktor_version" diff --git a/mailbox-core/src/test/java/org/briarproject/mailbox/core/contacts/ContactsManagerIntegrationTest.kt b/mailbox-core/src/test/java/org/briarproject/mailbox/core/contacts/ContactsManagerIntegrationTest.kt index 8931c3e1..86ac8509 100644 --- a/mailbox-core/src/test/java/org/briarproject/mailbox/core/contacts/ContactsManagerIntegrationTest.kt +++ b/mailbox-core/src/test/java/org/briarproject/mailbox/core/contacts/ContactsManagerIntegrationTest.kt @@ -256,7 +256,7 @@ class ContactsManagerIntegrationTest : IntegrationTest() { } assertEquals(BadRequest, response.status) assertEquals( - "\"Bad request: Invalid value for parameter contactId\"", + "Bad request: Invalid value for parameter contactId", response.bodyAsText(), ) } diff --git a/mailbox-core/src/test/java/org/briarproject/mailbox/core/files/FileManagerIntegrationTest.kt b/mailbox-core/src/test/java/org/briarproject/mailbox/core/files/FileManagerIntegrationTest.kt index 92c2bc4f..6011c240 100644 --- a/mailbox-core/src/test/java/org/briarproject/mailbox/core/files/FileManagerIntegrationTest.kt +++ b/mailbox-core/src/test/java/org/briarproject/mailbox/core/files/FileManagerIntegrationTest.kt @@ -60,7 +60,7 @@ class FileManagerIntegrationTest : IntegrationTest() { setBody(bytes) } assertEquals(HttpStatusCode.BadRequest, response.status) - assertEquals("\"Malformed ID: foo\"", response.bodyAsText()) + assertEquals("Malformed ID: foo", response.bodyAsText()) } @Test @@ -72,7 +72,7 @@ class FileManagerIntegrationTest : IntegrationTest() { setBody(maxBytes) } assertEquals(HttpStatusCode.BadRequest, response.status) - assertEquals("\"Bad request: File larger than allowed.\"", response.bodyAsText()) + assertEquals("Bad request: File larger than allowed.", response.bodyAsText()) assertNoTmpFiles() } @@ -179,7 +179,7 @@ class FileManagerIntegrationTest : IntegrationTest() { authenticateWithToken(ownerToken) } assertEquals(HttpStatusCode.BadRequest, response.status) - assertEquals("\"Malformed ID: foo\"", response.bodyAsText()) + assertEquals("Malformed ID: foo", response.bodyAsText()) } @Test @@ -218,7 +218,7 @@ class FileManagerIntegrationTest : IntegrationTest() { authenticateWithToken(ownerToken) } assertEquals(HttpStatusCode.BadRequest, response.status) - assertEquals("\"Malformed ID: foo\"", response.bodyAsText()) + assertEquals("Malformed ID: foo", response.bodyAsText()) } @Test @@ -227,7 +227,7 @@ class FileManagerIntegrationTest : IntegrationTest() { authenticateWithToken(ownerToken) } assertEquals(HttpStatusCode.BadRequest, response.status) - assertEquals("\"Malformed ID: bar\"", response.bodyAsText()) + assertEquals("Malformed ID: bar", response.bodyAsText()) } @Test @@ -274,7 +274,7 @@ class FileManagerIntegrationTest : IntegrationTest() { authenticateWithToken(ownerToken) } assertEquals(HttpStatusCode.BadRequest, response.status) - assertEquals("\"Malformed ID: foo\"", response.bodyAsText()) + assertEquals("Malformed ID: foo", response.bodyAsText()) } @Test @@ -283,7 +283,7 @@ class FileManagerIntegrationTest : IntegrationTest() { authenticateWithToken(ownerToken) } assertEquals(HttpStatusCode.BadRequest, response.status) - assertEquals("\"Malformed ID: bar\"", response.bodyAsText()) + assertEquals("Malformed ID: bar", response.bodyAsText()) } @Test -- GitLab