From 20369f6d92858daaebf844c6fa5d1104f310c28e Mon Sep 17 00:00:00 2001 From: ansgarz Date: Mon, 3 Jan 2022 20:46:28 +0100 Subject: [PATCH] v0.8.34 --- build.gradle | 2 +- .../domaindrivenarchitecture/provs/core/ProvTest.kt | 6 ++++++ .../provs/workplace/application/CliWorkplaceKtTest.kt | 6 ++++++ .../org/domaindrivenarchitecture/provs/test/Logging.kt | 10 ++++++++++ 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 src/testFixtures/kotlin/org/domaindrivenarchitecture/provs/test/Logging.kt diff --git a/build.gradle b/build.gradle index 4734bd3..ecbe88d 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ apply plugin: 'kotlinx-serialization' group = 'org.domaindrivenarchitecture.provs' -version = '0.8.34-SNAPSHOT' +version = '0.8.34' repositories { mavenCentral() diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/ProvTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/core/ProvTest.kt index 7dfa67c..ca02d9d 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/ProvTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/core/ProvTest.kt @@ -1,6 +1,8 @@ package org.domaindrivenarchitecture.provs.core +import ch.qos.logback.classic.Level import org.domaindrivenarchitecture.provs.core.docker.provideContainer +import org.domaindrivenarchitecture.provs.test.setRootLoggingLevel import org.domaindrivenarchitecture.provs.test.tags.ContainerTest import org.domaindrivenarchitecture.provs.test.tags.NonCi import org.domaindrivenarchitecture.provs.test.testLocal @@ -280,6 +282,8 @@ internal class ProvTest { fun runProv_printsCorrectOutput() { // given + setRootLoggingLevel(Level.OFF) + val outContent = ByteArrayOutputStream() val errContent = ByteArrayOutputStream() val originalOut = System.out @@ -353,6 +357,8 @@ internal class ProvTest { } } + setRootLoggingLevel(Level.OFF) + val outContent = ByteArrayOutputStream() val errContent = ByteArrayOutputStream() val originalOut = System.out diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplaceKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplaceKtTest.kt index d412232..141c1af 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplaceKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplaceKtTest.kt @@ -1,5 +1,6 @@ package org.domaindrivenarchitecture.provs.workplace.application +import ch.qos.logback.classic.Level import io.mockk.every import io.mockk.mockkStatic import io.mockk.unmockkStatic @@ -7,6 +8,7 @@ import io.mockk.verify import org.domaindrivenarchitecture.provs.core.* import org.domaindrivenarchitecture.provs.core.cli.retrievePassword import org.domaindrivenarchitecture.provs.core.processors.PrintOnlyProcessor +import org.domaindrivenarchitecture.provs.test.setRootLoggingLevel import org.domaindrivenarchitecture.provs.workplace.domain.WorkplaceConfig import org.domaindrivenarchitecture.provs.workplace.domain.WorkplaceType import org.domaindrivenarchitecture.provs.workplace.domain.provisionWorkplace @@ -97,6 +99,8 @@ internal class CliWorkplaceKtTest { @Test fun prints_error_message_if_config_not_found() { // given + setRootLoggingLevel(Level.OFF) + val outContent = ByteArrayOutputStream() val errContent = ByteArrayOutputStream() val originalOut = System.out @@ -121,6 +125,8 @@ internal class CliWorkplaceKtTest { @Test fun prints_error_message_if_config_not_parsable() { // given + setRootLoggingLevel(Level.OFF) + val outContent = ByteArrayOutputStream() val errContent = ByteArrayOutputStream() val originalOut = System.out diff --git a/src/testFixtures/kotlin/org/domaindrivenarchitecture/provs/test/Logging.kt b/src/testFixtures/kotlin/org/domaindrivenarchitecture/provs/test/Logging.kt new file mode 100644 index 0000000..acaa5a3 --- /dev/null +++ b/src/testFixtures/kotlin/org/domaindrivenarchitecture/provs/test/Logging.kt @@ -0,0 +1,10 @@ +package org.domaindrivenarchitecture.provs.test + +import ch.qos.logback.classic.Level +import ch.qos.logback.classic.Logger +import org.slf4j.LoggerFactory + +fun setRootLoggingLevel(level: Level?) { + val root = LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME) as Logger + root.level = level +} \ No newline at end of file