From 2e3a60e1856a3fa0bee527f8bdf7d7a7d4d84463 Mon Sep 17 00:00:00 2001 From: q3769 Date: Sat, 30 Sep 2023 13:57:40 -0500 Subject: [PATCH] + tests --- pom.xml | 4 +-- .../maven/plugins/semver/mojos/MergeTest.java | 9 +------ src/test/resources/elf4j-test.properties | 4 +-- src/test/resources/tinylog.properties | 26 ------------------- 4 files changed, 4 insertions(+), 39 deletions(-) delete mode 100644 src/test/resources/tinylog.properties diff --git a/pom.xml b/pom.xml index 67423eb..8750bea 100644 --- a/pom.xml +++ b/pom.xml @@ -121,12 +121,12 @@ io.github.elf4j elf4j-provider - 10.0.7 + 11.0.2 test org.junit.jupiter - junit-jupiter-engine + junit-jupiter 5.10.0 test diff --git a/src/test/java/q3769/maven/plugins/semver/mojos/MergeTest.java b/src/test/java/q3769/maven/plugins/semver/mojos/MergeTest.java index ae93d09..3fc2ec8 100644 --- a/src/test/java/q3769/maven/plugins/semver/mojos/MergeTest.java +++ b/src/test/java/q3769/maven/plugins/semver/mojos/MergeTest.java @@ -26,9 +26,7 @@ import com.github.zafarkhaja.semver.Version; import elf4j.Logger; -import elf4j.engine.service.LogServiceManager; import org.apache.maven.plugin.MojoFailureException; -import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import q3769.maven.plugins.semver.SemverCategory; @@ -42,11 +40,6 @@ class MergeTest { Merge mergeMojo = new Merge(); - @AfterAll - static void cleanup() { - LogServiceManager.INSTANCE.stop(); - } - @Nested class update { @Test @@ -79,4 +72,4 @@ void whenOriginalVersionIsOlder() throws MojoFailureException { updated); } } -} \ No newline at end of file +} diff --git a/src/test/resources/elf4j-test.properties b/src/test/resources/elf4j-test.properties index 0e5ef8a..b0ad513 100644 --- a/src/test/resources/elf4j-test.properties +++ b/src/test/resources/elf4j-test.properties @@ -21,6 +21,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. # -writer1=standard -writer1.stream=stderr -writer1.pattern={json:caller-detail,pretty} +pattern={json} diff --git a/src/test/resources/tinylog.properties b/src/test/resources/tinylog.properties deleted file mode 100644 index 2926ddf..0000000 --- a/src/test/resources/tinylog.properties +++ /dev/null @@ -1,26 +0,0 @@ -# -# MIT License -# -# Copyright (c) 2020 Qingtian Wang -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# -writer.level=trace -writer.format={date} {level} [{thread}] {class}#{method}:{line} -- {message} -escaping.enabled=true \ No newline at end of file