From bc009c02ac14f01bfb7da52eb1dfc62850315ac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Thu, 23 Aug 2018 17:24:00 +0200 Subject: [PATCH] Fix parameterized tests for junit 5 --- .../test/java/sonia/scm/it/IntegrationTestUtil.java | 10 +++++----- .../java/sonia/scm/it/RepositoryArchiveITCase.java | 2 +- .../test/java/sonia/scm/it/RepositoryHookITCase.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java b/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java index 741702ad81..3f17aff7a7 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java +++ b/scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java @@ -120,15 +120,15 @@ public final class IntegrationTestUtil } } - public static Collection createRepositoryTypeParameters() { - Collection params = new ArrayList<>(); + public static Collection createRepositoryTypeParameters() { + Collection params = new ArrayList<>(); - params.add("git"); - params.add("svn" ); + params.add(new String[] {"git"}); + params.add(new String[] {"svn"}); if (IOUtil.search("hg") != null) { - params.add("hg"); + params.add(new String[] {"hg"}); } return params; diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryArchiveITCase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryArchiveITCase.java index 4cf7cd6571..bc79b9fa20 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryArchiveITCase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryArchiveITCase.java @@ -81,7 +81,7 @@ public class RepositoryArchiveITCase //~--- methods -------------------------------------------------------------- @Parameterized.Parameters(name = "{0}") - public static Collection createParameters() { + public static Collection createParameters() { return IntegrationTestUtil.createRepositoryTypeParameters(); } diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java index 2be3bfd81b..dae80cd00d 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java @@ -208,7 +208,7 @@ public class RepositoryHookITCase extends AbstractAdminITCaseBase * @return repository types test parameter */ @Parameters(name = "{0}") - public static Collection createParameters() + public static Collection createParameters() { return IntegrationTestUtil.createRepositoryTypeParameters(); }