meissa/provs
7
1
Fork 0
Code Issues Pull requests Projects Releases 12 Packages Wiki Activity

add cmd to desktop

Browse source
This commit is contained in:
gittestuser 2022-02-03 23:22:01 +01:00
parent 5b3a4ea4ac
commit 9d4634737c
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/CliWorkplaceCommand.kt → src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopCliCommand.kt
View file

@ -8,7 +8,8 @@ import org.domaindrivenarchitecture.provs.desktop.domain.Scope
class DesktopCliCommand( class DesktopCliCommand(
val configFile: ConfigFileName, val configFile: ConfigFileName,
val scopes: List<Scope>, val scopes: List<Scope>,
val target: TargetCliCommand, ) { val target: TargetCliCommand,
) {
fun isValid(): Boolean { fun isValid(): Boolean {
return configFile.fileName.isNotEmpty() && target.isValid() return configFile.fileName.isNotEmpty() && target.isValid()
@ -18,4 +19,3 @@ class DesktopCliCommand(
return scopes.isNotEmpty() return scopes.isNotEmpty()
} }
} }

13
src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/application/CliWorkplaceKtTest.kt
View file

@ -5,6 +5,8 @@ import io.mockk.every
import io.mockk.mockkStatic import io.mockk.mockkStatic
import io.mockk.unmockkStatic import io.mockk.unmockkStatic
import io.mockk.verify import io.mockk.verify
import org.domaindrivenarchitecture.provs.configuration.domain.ConfigFileName
import org.domaindrivenarchitecture.provs.configuration.domain.TargetCliCommand
import org.domaindrivenarchitecture.provs.framework.core.* import org.domaindrivenarchitecture.provs.framework.core.*
import org.domaindrivenarchitecture.provs.framework.core.cli.retrievePassword import org.domaindrivenarchitecture.provs.framework.core.cli.retrievePassword
import org.domaindrivenarchitecture.provs.framework.core.processors.PrintOnlyProcessor import org.domaindrivenarchitecture.provs.framework.core.processors.PrintOnlyProcessor
@ -26,6 +28,11 @@ internal class CliWorkplaceKtTest {
val printOnlyProv = Prov.newInstance(PrintOnlyProcessor()) val printOnlyProv = Prov.newInstance(PrintOnlyProcessor())
val testConfig = DesktopConfig(WorkplaceType.MINIMAL, gitUserName = "gittestuser", gitEmail = "git@test.mail") val testConfig = DesktopConfig(WorkplaceType.MINIMAL, gitUserName = "gittestuser", gitEmail = "git@test.mail")
val cmd = DesktopCliCommand(
ConfigFileName("bla"),
listOf(),
TargetCliCommand(null, null, null, false, null, false)
)
@BeforeAll @BeforeAll
@JvmStatic @JvmStatic
@ -118,7 +125,8 @@ internal class CliWorkplaceKtTest {
System.setOut(originalOut) System.setOut(originalOut)
System.setErr(originalErr) System.setErr(originalErr)
val expectedOutput = "Error: File\u001B[31m ConfigFileName(fileName=idontexist.yaml) \u001B[0m was not found.Pls copy file \u001B[31m WorkplaceConfigExample.yaml \u001B[0m to file \u001B[31m ConfigFileName(fileName=idontexist.yaml) \u001B[0m and change the content according to your needs." val expectedOutput =
"Error: File\u001B[31m ConfigFileName(fileName=idontexist.yaml) \u001B[0m was not found.Pls copy file \u001B[31m WorkplaceConfigExample.yaml \u001B[0m to file \u001B[31m ConfigFileName(fileName=idontexist.yaml) \u001B[0m and change the content according to your needs."
assertEquals(expectedOutput, outContent.toString().replace("\r", "").replace("\n", "")) assertEquals(expectedOutput, outContent.toString().replace("\r", "").replace("\n", ""))
verify(exactly = 0) { any<Prov>().provisionWorkplace(any(), cmd = cmd) } verify(exactly = 0) { any<Prov>().provisionWorkplace(any(), cmd = cmd) }
@ -144,7 +152,8 @@ internal class CliWorkplaceKtTest {
System.setOut(originalOut) System.setOut(originalOut)
System.setErr(originalErr) System.setErr(originalErr)
val expectedOutput = "Error: File \"ConfigFileName(fileName=src/test/resources/InvalidWorkplaceConfig.yaml)\" has an invalid format and or invalid data." val expectedOutput =
"Error: File \"ConfigFileName(fileName=src/test/resources/InvalidWorkplaceConfig.yaml)\" has an invalid format and or invalid data."
assertEquals(expectedOutput, outContent.toString().replace("\r", "").replace("\n", "")) assertEquals(expectedOutput, outContent.toString().replace("\r", "").replace("\n", ""))
verify(exactly = 0) { any<Prov>().provisionWorkplace(any(), cmd = cmd) } verify(exactly = 0) { any<Prov>().provisionWorkplace(any(), cmd = cmd) }