hubert/SimpleNotes
1
0
Fork 0
Code Projects Releases Activity

Update dependencies

Browse Source
This commit is contained in:
Hubert Van De Walle 2020-11-29 21:26:29 +01:00
parent 909fb482a8
commit 8997433974
3 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
buildSrc/src/main/kotlin/be/simplenotes/Libs.kt
View File

@ -12,11 +12,11 @@ object Libs {
object Database { object Database {
const val flyway = "org.flywaydb:flyway-core:6.5.4" const val flyway = "org.flywaydb:flyway-core:6.5.4"
const val hikariCP = "com.zaxxer:HikariCP:3.4.3" const val hikariCP = "com.zaxxer:HikariCP:3.4.5"
object Drivers { object Drivers {
const val h2 = "com.h2database:h2:1.4.200" const val h2 = "com.h2database:h2:1.4.200"
const val mariadb = "org.mariadb.jdbc:mariadb-java-client:2.6.2" const val mariadb = "org.mariadb.jdbc:mariadb-java-client:2.7.1"
} }
object Ktorm { object Ktorm {
@ -27,14 +27,14 @@ object Libs {
} }
object Lucene { object Lucene {
private const val version = "8.6.1" private const val version = "8.7.0"
const val core = "org.apache.lucene:lucene-core:$version" const val core = "org.apache.lucene:lucene-core:$version"
const val analyzersCommon = "org.apache.lucene:lucene-analyzers-common:$version" const val analyzersCommon = "org.apache.lucene:lucene-analyzers-common:$version"
const val queryParser = "org.apache.lucene:lucene-queryparser:$version" const val queryParser = "org.apache.lucene:lucene-queryparser:$version"
} }
object Http4k { object Http4k {
private const val version = "3.268.0" private const val version = "3.280.0"
const val core = "org.http4k:http4k-core:$version" const val core = "org.http4k:http4k-core:$version"
const val testingHamkrest = "org.http4k:http4k-testing-hamkrest:$version" const val testingHamkrest = "org.http4k:http4k-testing-hamkrest:$version"
} }
@ -46,10 +46,10 @@ object Libs {
} }
object Kotlinx { object Kotlinx {
const val html = "org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.1" const val html = "org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.2"
object Serialization { object Serialization {
const val json = "org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.0.0" const val json = "org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.0.1"
} }
} }
@ -72,21 +72,21 @@ object Libs {
const val arrowCoreData = "io.arrow-kt:arrow-core-data:0.11.0" const val arrowCoreData = "io.arrow-kt:arrow-core-data:0.11.0"
const val commonsCompress = "org.apache.commons:commons-compress:1.20" const val commonsCompress = "org.apache.commons:commons-compress:1.20"
const val javaJwt = "com.auth0:java-jwt:3.10.3" const val javaJwt = "com.auth0:java-jwt:3.11.0"
const val javaxServlet = "javax.servlet:javax.servlet-api:4.0.1" const val javaxServlet = "javax.servlet:javax.servlet-api:4.0.1"
const val jbcrypt = "org.mindrot:jbcrypt:0.4" const val jbcrypt = "org.mindrot:jbcrypt:0.4"
const val konform = "io.konform:konform-jvm:0.2.0" const val konform = "io.konform:konform-jvm:0.2.0"
const val owaspHtmlSanitizer = "com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20200713.1" const val owaspHtmlSanitizer = "com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20200713.1"
const val prettytime = "org.ocpsoft.prettytime:prettytime:4.0.5.Final" const val prettytime = "org.ocpsoft.prettytime:prettytime:4.0.6.Final"
const val snakeyaml = "org.yaml:snakeyaml:1.26" const val snakeyaml = "org.yaml:snakeyaml:1.27"
object Test { object Test {
const val assertJ = "org.assertj:assertj-core:3.16.1" const val assertJ = "org.assertj:assertj-core:3.18.1"
const val hamkrest = "com.natpryce:hamkrest:1.7.0.3" const val hamkrest = "com.natpryce:hamkrest:1.8.0.1"
const val junit = "org.junit.jupiter:junit-jupiter:5.6.2" const val junit = "org.junit.jupiter:junit-jupiter:5.7.0"
const val mockk = "io.mockk:mockk:1.10.0" const val mockk = "io.mockk:mockk:1.10.2"
const val faker = "com.github.javafaker:javafaker:1.0.2" const val faker = "com.github.javafaker:javafaker:1.0.2"
const val mariaTestContainer = "org.testcontainers:mariadb:1.15.0-rc2" const val mariaTestContainer = "org.testcontainers:mariadb:1.15.0"
} }
} }

20
persistance/test/notes/BaseNoteRepositoryImplTest.kt
View File

@ -54,13 +54,17 @@ internal abstract class BaseNoteRepositoryImplTest : DbTest() {
val note = fakeNote() val note = fakeNote()
assertThat(noteRepo.create(user1.id, note)) assertThat(noteRepo.create(user1.id, note))
.isEqualToIgnoringGivenFields(note, "uuid", "updatedAt", "public")
.hasNoNullFieldsOrProperties() .hasNoNullFieldsOrProperties()
.usingRecursiveComparison()
.ignoringFields("uuid", "updatedAt", "public")
.isEqualTo(note)
assertThat(db.notes.toList()) assertThat(db.notes.toList())
.hasSize(1) .hasSize(1)
.first() .first()
.isEqualToIgnoringGivenFields(note, "uuid", "updatedAt", "public") .usingRecursiveComparison()
.ignoringFields("uuid", "updatedAt", "public")
.isEqualTo(note)
} }
} }
@ -220,7 +224,9 @@ internal abstract class BaseNoteRepositoryImplTest : DbTest() {
assertThat(noteRepo.update(user1.id, note1.uuid, newNote1)).isNotNull assertThat(noteRepo.update(user1.id, note1.uuid, newNote1)).isNotNull
assertThat(noteRepo.find(user1.id, note1.uuid)) assertThat(noteRepo.find(user1.id, note1.uuid))
.isEqualToComparingOnlyGivenFields(newNote1, "meta", "markdown", "html") .usingRecursiveComparison()
.ignoringFields("updatedAt", "uuid", "public")
.isEqualTo(newNote1)
val note2 = noteRepo.insertFakeNote(user1) val note2 = noteRepo.insertFakeNote(user1)
val newNote2 = fakeNote().let { val newNote2 = fakeNote().let {
@ -230,7 +236,9 @@ internal abstract class BaseNoteRepositoryImplTest : DbTest() {
.isNotNull .isNotNull
assertThat(noteRepo.find(user1.id, note2.uuid)) assertThat(noteRepo.find(user1.id, note2.uuid))
.isEqualToComparingOnlyGivenFields(newNote2, "meta", "markdown", "html") .usingRecursiveComparison()
.ignoringFields("updatedAt", "uuid", "public")
.isEqualTo(newNote2)
} }
} }
@ -321,7 +329,9 @@ internal abstract class BaseNoteRepositoryImplTest : DbTest() {
val n = noteRepo.insertFakeNote(user1) val n = noteRepo.insertFakeNote(user1)
noteRepo.makePublic(user1.id, n.uuid) noteRepo.makePublic(user1.id, n.uuid)
assertThat(noteRepo.findPublic(n.uuid)) assertThat(noteRepo.findPublic(n.uuid))
.isEqualToIgnoringGivenFields(n.copy(public = true), "updatedAt") .usingRecursiveComparison()
.ignoringFields("updatedAt")
.isEqualTo(n.copy(public = true))
noteRepo.makePrivate(user1.id, n.uuid) noteRepo.makePrivate(user1.id, n.uuid)
assertThat(noteRepo.findPublic(n.uuid)).isNull() assertThat(noteRepo.findPublic(n.uuid)).isNull()

5
persistance/test/users/BaseUserRepositoryImplTest.kt
View File

@ -46,7 +46,10 @@ internal abstract class BaseUserRepositoryImplTest : DbTest() {
val foundUserMaybe = userRepo.find(user.username) val foundUserMaybe = userRepo.find(user.username)
assertThat(foundUserMaybe).isNotNull assertThat(foundUserMaybe).isNotNull
val foundUser = foundUserMaybe!! val foundUser = foundUserMaybe!!
assertThat(foundUser).isEqualToIgnoringGivenFields(user, "id") assertThat(foundUser)
.usingRecursiveComparison()
.ignoringFields("id")
.isEqualTo(user)
assertThat(userRepo.exists(user.username)).isTrue assertThat(userRepo.exists(user.username)).isTrue
assertThat(userRepo.find(foundUser.id)).isEqualTo(foundUser) assertThat(userRepo.find(foundUser.id)).isEqualTo(foundUser)
assertThat(userRepo.exists(foundUser.id)).isTrue assertThat(userRepo.exists(foundUser.id)).isTrue