From 8e37c3912a5d14bc35a17ad61c67238a856e6fd1 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 17 Oct 2023 13:26:24 -0700 Subject: [PATCH 1/2] Improved feed reader testing --- .../net/thauvin/erik/mobibot/FeedReaderTest.kt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt index 51e2296..78f5b18 100644 --- a/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt +++ b/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt @@ -59,8 +59,13 @@ class FeedReaderTest { messages = readFeed("https://lorem-rss.herokuapp.com/feed?length=84", 42) assertThat(messages, "messages").size().isEqualTo(84) - assertThat(messages[messages.size - 2], "messages.size - 2").prop(Message::msg).startsWith("Lorem ipsum") - assertThat(messages.last(), "messages.last").prop(Message::msg).contains("http://example.com/test/") + messages.forEachIndexed { i, m -> + if (i % 2 == 0) { + assertThat(m, "messages($i)").prop(Message::msg).startsWith("Lorem ipsum") + } else { + assertThat(m, "messages($i)").prop(Message::msg).contains("http://example.com/test/") + } + } assertFailure { readFeed("blah") }.isInstanceOf(MalformedURLException::class.java) @@ -68,7 +73,6 @@ class FeedReaderTest { assertFailure { readFeed("https://www.thauvin.net/foo") }.isInstanceOf(IOException::class.java) - assertFailure { readFeed("https://www.examplesfoo.com/") } - .isInstanceOf(UnknownHostException::class.java) + assertFailure { readFeed("https://www.examplesfoo.com/") }.isInstanceOf(UnknownHostException::class.java) } } From abebca50796430694d12eecd478d5399c78377a9 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 17 Oct 2023 13:26:43 -0700 Subject: [PATCH 2/2] Updated dependencies --- build.gradle | 4 ++-- version.properties | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 4bd1a08..75db38b 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ def isNonStable = { String version -> mainClassName = packageName + '.Mobibot' ext.versions = [ - log4j: '2.20.0', + log4j: '2.21.0', pmd : '6.55.0', ] @@ -80,7 +80,7 @@ dependencies { implementation 'com.squareup.okio:okio:3.6.0' implementation 'net.aksingh:owm-japis:2.5.3.0' implementation 'net.objecthunter:exp4j:0.4.8' - implementation 'org.json:json:20230618' + implementation 'org.json:json:20231013' implementation 'org.jsoup:jsoup:1.16.1' // Thauvin diff --git a/version.properties b/version.properties index 8b93b12..ad204e5 100644 --- a/version.properties +++ b/version.properties @@ -1,9 +1,9 @@ #Generated by the Semver Plugin for Gradle -#Fri Oct 13 13:31:20 PDT 2023 -version.buildmeta=20231013133120 +#Fri Oct 13 20:37:28 PDT 2023 +version.buildmeta=20231013203728 version.major=0 version.minor=8 version.patch=0 version.prerelease=rc version.project=mobibot -version.semver=0.8.0-rc+20231013133120 +version.semver=0.8.0-rc+20231013203728