From 1384b6bbcfae8dfc634b1fe66514cf3b3dccb412 Mon Sep 17 00:00:00 2001
From: ansgarz <ansgar.zwick@meissa-gmbh.de>
Date: Fri, 10 Jun 2022 12:32:57 +0200
Subject: [PATCH] [skip ci] remove redundant test tags

---
 .../provs/desktop/infrastructure/VSCodeKtTest.kt          | 2 --
 .../provs/framework/core/ProvTest.kt                      | 2 --
 .../provs/framework/core/UtilsKtTest.kt                   | 1 -
 .../core/docker/platforms/UbuntuHostDockerKtTest.kt       | 2 --
 .../provs/framework/core/platformTest/UbuntuProvTest.kt   | 1 -
 .../framework/core/processors/ContainerProcessorTest.kt   | 3 ---
 .../core/processors/ContainerUbuntuHostProcessorTest.kt   | 2 --
 .../framework/extensions/workplace/base/GopassKtTest.kt   | 1 -
 .../framework/ubuntu/filesystem/base/FilesystemKtTest.kt  | 1 -
 .../provs/framework/ubuntu/git/base/GitKtTest.kt          | 3 ---
 .../provs/framework/ubuntu/install/base/InstallKtTest.kt  | 4 ----
 .../provs/framework/ubuntu/keys/base/GpgKtTest.kt         | 5 -----
 .../provs/framework/ubuntu/keys/base/SshKtTest.kt         | 5 +----
 .../provs/framework/ubuntu/user/ProvisionUserKtTest.kt    | 8 ++------
 .../provs/framework/ubuntu/utils/UtilsKtTest.kt           | 2 --
 .../provs/server/infrastructure/K3dKtTest.kt              | 2 --
 .../provs/server/infrastructure/NetworkKtTest.kt          | 2 --
 17 files changed, 3 insertions(+), 43 deletions(-)

diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/VSCodeKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/VSCodeKtTest.kt
index 0a30a22..1d8a575 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/VSCodeKtTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/VSCodeKtTest.kt
@@ -4,11 +4,9 @@ import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInsta
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
 import org.domaindrivenarchitecture.provs.test.tags.ExtensiveContainerTest
 import org.junit.jupiter.api.Assertions.assertTrue
-import org.junit.jupiter.api.Test
 
 internal class VSCodeKtTest {
 
-    @Test
     @ExtensiveContainerTest
     fun provisionAdditionalTools() {
         // given
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/ProvTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/ProvTest.kt
index 10e056b..7f37281 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/ProvTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/ProvTest.kt
@@ -33,7 +33,6 @@ internal class ProvTest {
         assertTrue(res)
     }
 
-    @Test
     @ContainerTest
     fun sh() {
         // given
@@ -52,7 +51,6 @@ internal class ProvTest {
         assertTrue(res)
     }
 
-    @Test
     @ContainerTest
     @NonCi
     fun sh_with_dir_and_sudo() {
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/UtilsKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/UtilsKtTest.kt
index 0a79392..efe0f4b 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/UtilsKtTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/UtilsKtTest.kt
@@ -20,7 +20,6 @@ internal class UtilsKtTest {
         assertEquals("test_getCallingMethodName", s)
     }
 
-    @Test
     @ContainerTest
     fun runCmdInContainer() {
         // when
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/docker/platforms/UbuntuHostDockerKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/docker/platforms/UbuntuHostDockerKtTest.kt
index 185f588..1c35fff 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/docker/platforms/UbuntuHostDockerKtTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/docker/platforms/UbuntuHostDockerKtTest.kt
@@ -8,11 +8,9 @@ import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
 import org.domaindrivenarchitecture.provs.test.tags.NonCi
 import org.domaindrivenarchitecture.provs.test.testLocal
 import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.Test
 
 internal class UbuntuHostDockerKtTest {
 
-    @Test
     @NonCi
     @ContainerTest
     fun runAndCheckAndExitContainer() {
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/platformTest/UbuntuProvTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/platformTest/UbuntuProvTest.kt
index 72a88bf..644afe0 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/platformTest/UbuntuProvTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/platformTest/UbuntuProvTest.kt
@@ -78,7 +78,6 @@ internal class UbuntuProvTest {
         assertTrue(res2.out?.trim() == "echoed")
     }
 
-    @Test
     @ContainerTest
     @NonCi
     fun test_user_cannot_sudo_without_password() {
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/ContainerProcessorTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/ContainerProcessorTest.kt
index 914cda4..3dd8245 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/ContainerProcessorTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/ContainerProcessorTest.kt
@@ -5,11 +5,9 @@ import org.domaindrivenarchitecture.provs.test.defaultTestContainer
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
-import org.junit.jupiter.api.Test
 
 internal class ContainerProcessorTest {
 
-    @Test
     @ContainerTest
     fun cmd_works_with_echo() {
 
@@ -26,7 +24,6 @@ internal class ContainerProcessorTest {
     }
 
 
-    @Test
     @ContainerTest
     fun cmdNoLog_works_with_echo() {
         // given
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/ContainerUbuntuHostProcessorTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/ContainerUbuntuHostProcessorTest.kt
index fc98156..520e9e9 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/ContainerUbuntuHostProcessorTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/ContainerUbuntuHostProcessorTest.kt
@@ -4,13 +4,11 @@ import org.domaindrivenarchitecture.provs.framework.core.platforms.SHELL
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
 import org.domaindrivenarchitecture.provs.test.testDockerWithSudo
 import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.Test
 
 val DEFAULT_START_MODE_TEST_CONTAINER = ContainerStartMode.USE_RUNNING_ELSE_CREATE
 
 class ContainerUbuntuHostProcessorTest {
 
-    @Test
     @ContainerTest
     fun test_execution() {
         // given
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/GopassKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/GopassKtTest.kt
index 8927c19..4d40f5e 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/GopassKtTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/GopassKtTest.kt
@@ -23,7 +23,6 @@ import org.junit.jupiter.api.Assertions.assertFalse
 internal class GopassKtTest {
 
     @ContainerTest
-    @Test
     fun test_configureGopass_fails_with_path_starting_with_tilde() {
         // when
         val res = defaultTestContainer().task {
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/filesystem/base/FilesystemKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/filesystem/base/FilesystemKtTest.kt
index 82d1c23..cc3ea20 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/filesystem/base/FilesystemKtTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/filesystem/base/FilesystemKtTest.kt
@@ -218,7 +218,6 @@ internal class FilesystemKtTest {
     }
 
 
-    @Test
     @ContainerTest
     fun userHome() {
         // given
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/git/base/GitKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/git/base/GitKtTest.kt
index 37c0edb..873d603 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/git/base/GitKtTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/git/base/GitKtTest.kt
@@ -7,12 +7,10 @@ import org.domaindrivenarchitecture.provs.test.defaultTestContainer
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
 import org.domaindrivenarchitecture.provs.test.tags.ExtensiveContainerTest
 import org.junit.jupiter.api.Assertions.*
-import org.junit.jupiter.api.Test
 
 
 internal class GitKtTest {
 
-    @Test
     @ContainerTest
     fun trustGitServers(){
         // given
@@ -31,7 +29,6 @@ internal class GitKtTest {
         assertTrue(a.isHostKnown("gitlab.com"), "gitlab.com does not seem to be a known host")
     }
 
-    @Test
     @ExtensiveContainerTest
     fun gitClone() {
         // given
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/install/base/InstallKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/install/base/InstallKtTest.kt
index 161ed86..3949961 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/install/base/InstallKtTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/install/base/InstallKtTest.kt
@@ -5,13 +5,11 @@ import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Disabled
-import org.junit.jupiter.api.Test
 
 
 internal class InstallKtTest {
 
     @ContainerTest
-    @Test
     fun aptInstall_installsPackage() {
         // given
         val a = defaultTestContainer()
@@ -24,7 +22,6 @@ internal class InstallKtTest {
     }
 
     @ContainerTest
-    @Test
     fun aptInstall_ignores_packages_already_installed() {
         // given
         val a = defaultTestContainer()
@@ -38,7 +35,6 @@ internal class InstallKtTest {
     }
 
     @ContainerTest
-    @Test
     @Disabled  // run manually if needed;
     // todo: replace zim by a smaller repo
     fun aptInstallFromPpa_installsPackage() {
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/base/GpgKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/base/GpgKtTest.kt
index d508d8a..b8a75c4 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/base/GpgKtTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/base/GpgKtTest.kt
@@ -9,11 +9,9 @@ import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.privateGPGSnakeo
 import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.publicGPGSnakeoilKey
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
-import org.junit.jupiter.api.Test
 
 internal class GpgKtTest {
 
-    @Test
     @ContainerTest
     fun gpgFingerprint_returnsCorrectFingerprint() {
         // given
@@ -29,7 +27,6 @@ internal class GpgKtTest {
     }
 
 
-    @Test
     @ContainerTest
     fun configureGpgKeys() {
         // given
@@ -43,7 +40,6 @@ internal class GpgKtTest {
     }
 
 
-    @Test
     @ContainerTest
     fun configureGpgKeysTrusted() {
         // given
@@ -59,7 +55,6 @@ internal class GpgKtTest {
     }
 
 
-    @Test
     @ContainerTest
     fun configureGpgKeysIsIdempotent() {
         // given
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/base/SshKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/base/SshKtTest.kt
index f909bd9..d1b4f57 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/base/SshKtTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/base/SshKtTest.kt
@@ -6,13 +6,10 @@ import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.privateSSHSnakeo
 import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.publicSSHSnakeoilKey
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
-import org.junit.jupiter.api.Test
-
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Assertions.assertTrue
 
 internal class SshKtTest {
 
-    @Test
     @ContainerTest
     fun configureSshKeys() {
         // given
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/user/ProvisionUserKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/user/ProvisionUserKtTest.kt
index 335832a..e77f260 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/user/ProvisionUserKtTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/user/ProvisionUserKtTest.kt
@@ -1,7 +1,5 @@
 package org.domaindrivenarchitecture.provs.framework.ubuntu.user
 
-import org.domaindrivenarchitecture.provs.test.defaultTestContainer
-import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
 import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDir
 import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createFile
 import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.fileContent
@@ -11,15 +9,15 @@ import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.configureUs
 import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.createUser
 import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.userExists
 import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.userIsInGroupSudo
+import org.domaindrivenarchitecture.provs.test.defaultTestContainer
+import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
 import org.domaindrivenarchitecture.provs.test.tags.ExtensiveContainerTest
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
-import org.junit.jupiter.api.Test
 
 
 internal class ProvisionUserKtTest {
 
-    @Test
     @ExtensiveContainerTest
     fun configureUser() {
         // given
@@ -39,7 +37,6 @@ internal class ProvisionUserKtTest {
         assertTrue(res.success)
     }
 
-    @Test
     @ContainerTest
     fun createUser() {
         // given
@@ -60,7 +57,6 @@ internal class ProvisionUserKtTest {
         assertEquals("newdummykey", a.fileContent("/home/$newUser/.ssh/authorized_keys", sudo = true))
     }
 
-    @Test
     @ContainerTest
     fun createUserWithSudo() {
         // given
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/utils/UtilsKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/utils/UtilsKtTest.kt
index 4cf033a..4a92e08 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/utils/UtilsKtTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/utils/UtilsKtTest.kt
@@ -13,7 +13,6 @@ internal class UtilsKtTest {
     val a = Prov.defaultInstance()
 
     @ContainerTest
-    @Test
     fun printToShell_escapes_String_successfully() {
         // when
         val testString = "test if newline \n and apostrophe's ' \" and special chars $ !§$%[]\\ äöüß \$variable and tabs     \t are handled correctly"
@@ -54,7 +53,6 @@ internal class UtilsKtTest {
         assertEquals(testMultiLineString(), resMl)
     }
 
-    @Test
     @ContainerTest
     fun echoCommandForText_in_ubuntu_container() {
         // given
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/K3dKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/K3dKtTest.kt
index 1fc19fe..4cf1e8f 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/K3dKtTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/K3dKtTest.kt
@@ -10,11 +10,9 @@ import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
 import org.domaindrivenarchitecture.provs.test.tags.NonCi
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Disabled
-import org.junit.jupiter.api.Test
 
 internal class K3dKtTest {
 
-    @Test
     @Disabled // remove line and execute manually as this test may take several minutes
     @ContainerTest
     @NonCi
diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/NetworkKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/NetworkKtTest.kt
index 69abf24..1dbe79f 100644
--- a/src/test/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/NetworkKtTest.kt
+++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/NetworkKtTest.kt
@@ -11,11 +11,9 @@ import org.domaindrivenarchitecture.provs.server.domain.k3s.Node
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
 import org.domaindrivenarchitecture.provs.test.tags.ExtensiveContainerTest
 import org.junit.jupiter.api.Assertions.assertTrue
-import org.junit.jupiter.api.Test
 
 internal class NetworkKtTest {
 
-    @Test
     @ExtensiveContainerTest
     fun test_provisionNetwork() {
         // given