fix formatting

octopusden · Jun 4, 2024 · 81a74ac · 81a74ac
1 parent e912280
commit 81a74ac
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 7 deletions.
diff --git a/ft/src/ft/kotlin/org/octopusden/octopus/vcsfacade/VcsFacadeFunctionalTestBitbucket.kt b/ft/src/ft/kotlin/org/octopusden/octopus/vcsfacade/VcsFacadeFunctionalTestBitbucket.kt
@@ -10,7 +10,7 @@ class VcsFacadeFunctionalTestBitbucket : BaseVcsFacadeFunctionalTest(
         Configuration.model.bitbucket.user,
         Configuration.model.bitbucket.password,
         Configuration.model.bitbucket.host,
-        ),
+    ),
     "ssh://git@${Configuration.model.bitbucket.host}/%s/%s.git"
 ) {
     override val exceptionsMessageInfo: Map<String, String> by lazy {
@@ -24,7 +24,11 @@ class VcsFacadeFunctionalTestBitbucket : BaseVcsFacadeFunctionalTest(
             "commitById" to "Commit '$defaultId' does not exist in repository '$repository'.",
             "commitsException_1" to "Commit '$defaultId' does not exist in repository '$repository'.",
             "commitsException_2" to "Params 'fromHashOrRef' and 'fromDate' can not be used together",
-            "commitsException_3" to "Cannot find commit '${message3.commitId(repository)}' in commit graph for commit '${message1.commitId(repository)}' in '$project:$repository'",
+            "commitsException_3" to "Cannot find commit '${message3.commitId(repository)}' in commit graph for commit '${
+                message1.commitId(
+                    repository
+                )
+            }' in '$project:$repository'",
             "pr_1" to "Project absent does not exist.",
             "pr_2" to "Source branch 'absent' not found in '$project:$repository'",
             "pr_3" to "Target branch 'absent' not found in '$project:$repository'"

diff --git a/server/src/test/kotlin/org/octopusden/octopus/vcsfacade/vcs/VcsFacadeUnitTestBitbucket.kt b/server/src/test/kotlin/org/octopusden/octopus/vcsfacade/vcs/VcsFacadeUnitTestBitbucket.kt
@@ -8,7 +8,8 @@ import org.springframework.test.context.junit.jupiter.EnabledIf
 @EnabledIf("#{environment.getActiveProfiles().$[#this == '$BITBUCKET'] == '$BITBUCKET'}", loadContext = true)
 class VcsFacadeUnitTestBitbucket : BaseVcsFacadeUnitTest(
     BitbucketTestClient(
-        Configuration.model.bitbucket.url, Configuration.model.bitbucket.user, Configuration.model.bitbucket.password),
+        Configuration.model.bitbucket.url, Configuration.model.bitbucket.user, Configuration.model.bitbucket.password
+    ),
     "ssh://git@${Configuration.model.bitbucket.host}/%s/%s.git"
 ) {
     override val exceptionsMessageInfo: Map<String, String> by lazy {
@@ -22,7 +23,11 @@ class VcsFacadeUnitTestBitbucket : BaseVcsFacadeUnitTest(
             "commitById" to "Commit '$defaultId' does not exist in repository '$repository'.",
             "commitsException_1" to "Commit '$defaultId' does not exist in repository '$repository'.",
             "commitsException_2" to "Params 'fromHashOrRef' and 'fromDate' can not be used together",
-            "commitsException_3" to "Cannot find commit '${message3.commitId(repository)}' in commit graph for commit '${message1.commitId(repository)}' in '$project:$repository'",
+            "commitsException_3" to "Cannot find commit '${message3.commitId(repository)}' in commit graph for commit '${
+                message1.commitId(
+                    repository
+                )
+            }' in '$project:$repository'",
             "pr_1" to "Project absent does not exist.",
             "pr_2" to "Source branch 'absent' not found in '$project:$repository'",
             "pr_3" to "Target branch 'absent' not found in '$project:$repository'"

diff --git a/server/src/test/kotlin/org/octopusden/octopus/vcsfacade/vcs/VcsFacadeUnitTestGitea.kt b/server/src/test/kotlin/org/octopusden/octopus/vcsfacade/vcs/VcsFacadeUnitTestGitea.kt
@@ -28,7 +28,11 @@ class VcsFacadeUnitTestGitea : BaseVcsFacadeUnitTest(
             "commitById" to defaultId,
             "commitsException_1" to "object does not exist [id: $defaultId, rel_path: ]",
             "commitsException_2" to "Params 'fromHashOrRef' and 'fromDate' can not be used together",
-            "commitsException_3" to "Cannot find commit '${message3.commitId(repository)}' in commit graph for commit '${message1.commitId(repository)}' in '$project:$repository'",
+            "commitsException_3" to "Cannot find commit '${message3.commitId(repository)}' in commit graph for commit '${
+                message1.commitId(
+                    repository
+                )
+            }' in '$project:$repository'",
             "pr_1" to "GetUserByName",
             "pr_2" to "Source branch 'absent' not found in '$project:$repository'",
             "pr_3" to "Target branch 'absent' not found in '$project:$repository'"

diff --git a/server/src/test/kotlin/org/octopusden/octopus/vcsfacade/vcs/VcsFacadeUnitTestGitlab.kt b/server/src/test/kotlin/org/octopusden/octopus/vcsfacade/vcs/VcsFacadeUnitTestGitlab.kt
@@ -9,7 +9,11 @@ import org.springframework.test.context.junit.jupiter.EnabledIf
 
 @EnabledIf("#{environment.getActiveProfiles().$[#this == '$GITLAB'] == '$GITLAB'}", loadContext = true)
 class VcsFacadeUnitTestGitlab : BaseVcsFacadeUnitTest(
-    GitlabTestClient(Configuration.model.gitlab.url, Configuration.model.gitlab.user, Configuration.model.gitlab.password),
+    GitlabTestClient(
+        Configuration.model.gitlab.url,
+        Configuration.model.gitlab.user,
+        Configuration.model.gitlab.password
+    ),
     "ssh://git@${Configuration.model.bitbucket.host}:%s/%s.git"
 ) {
     override fun issueCommits(): Stream<Arguments> = Stream.of(

diff --git a/test-common/src/main/kotlin/org/octopusden/octopus/vcsfacade/Configuration.kt b/test-common/src/main/kotlin/org/octopusden/octopus/vcsfacade/Configuration.kt
@@ -37,7 +37,12 @@ object Configuration {
  */
 data class ConfigModel(
     var bitbucket: VcsModel = VcsModel("admin", "admin", "bitbucket:7990", "http://localhost:7990"),
-    var gitlab: VcsModel = VcsModel("root", "VomkaEa6PD1OIgY7dQVbPUuO8wi9RMCaZw/i9yPXcI0=", "gitlab:8990", "http://localhost:8990"),
+    var gitlab: VcsModel = VcsModel(
+        "root",
+        "VomkaEa6PD1OIgY7dQVbPUuO8wi9RMCaZw/i9yPXcI0=",
+        "gitlab:8990",
+        "http://localhost:8990"
+    ),
     var gitea: VcsModel = VcsModel("test-admin", "test-admin", "gitea:3000", "http://localhost:3000"),
 
     var vcsFacadeUrl: String = "http://localhost:8080",