Simplify scm test parameters

This commit is contained in:
René Pfeuffer
2018-08-03 10:42:47 +02:00
parent 62f8509e85
commit e60bea5f08
6 changed files with 32 additions and 29 deletions

View File

@@ -39,11 +39,9 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import sonia.scm.util.IOUtil;
import sonia.scm.web.VndMediaType;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import static org.hamcrest.Matchers.equalTo;
@@ -64,17 +62,8 @@ public class RepositoriesITCase {
}
@Parameters(name = "{0}")
public static Collection<String[]> createParameters() {
Collection<String[]> params = new ArrayList<>();
params.add(new String[]{"git"});
params.add(new String[]{"svn"});
if (IOUtil.search("hg") != null) {
params.add(new String[]{"hg"});
}
return params;
public static Collection<String> createParameters() {
return ScmParameterizedIntegrationTestUtil.createParameters();
}
@After

View File

@@ -0,0 +1,21 @@
package sonia.scm.it;
import sonia.scm.util.IOUtil;
import java.util.ArrayList;
import java.util.Collection;
class ScmParameterizedIntegrationTestUtil {
static Collection<String> createParameters() {
Collection<String> params = new ArrayList<>();
params.add("git");
params.add("svn");
if (IOUtil.search("hg") != null) {
params.add("hg");
}
return params;
}
}