Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-17 10:41:06 +01:00
Code Issues Packages Projects Releases Activity

#8771 merge

Browse Source
This commit is contained in:
Mohamed Karray
2018-08-24 11:13:24 +02:00
parent abe3dec8df b3fd051321
commit 19ce115786
4 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java
View File

@@ -120,15 +120,15 @@ public final class IntegrationTestUtil
}
}
public static Collection<String> createRepositoryTypeParameters() {
Collection<String> params = new ArrayList<>();
public static Collection<String[]> createRepositoryTypeParameters() {
Collection<String[]> 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;

8
scm-webapp/src/test/java/sonia/scm/it/RepositoryArchiveITCase.java
View File

@@ -51,11 +51,7 @@ import java.util.Collection;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static sonia.scm.it.IntegrationTestUtil.createAdminClient;
import static sonia.scm.it.IntegrationTestUtil.createResource;
import static sonia.scm.it.IntegrationTestUtil.getLink;
import static sonia.scm.it.IntegrationTestUtil.readJson;
import static sonia.scm.it.IntegrationTestUtil.serialize;
import static sonia.scm.it.IntegrationTestUtil.*;
import static sonia.scm.it.RepositoryITUtil.createRepository;
import static sonia.scm.it.RepositoryITUtil.deleteRepository;
@@ -81,7 +77,7 @@ public class RepositoryArchiveITCase
//~--- methods --------------------------------------------------------------
@Parameterized.Parameters(name = "{0}")
public static Collection<String> createParameters() {
public static Collection<String[]> createParameters() {
return IntegrationTestUtil.createRepositoryTypeParameters();
}

8
scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java
View File

@@ -33,11 +33,7 @@ package sonia.scm.it;
import com.google.common.base.Charsets;
import com.google.common.io.Files;
import com.sun.jersey.api.client.WebResource;
import org.junit.After;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.*;
import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -208,7 +204,7 @@ public class RepositoryHookITCase extends AbstractAdminITCaseBase
* @return repository types test parameter
*/
@Parameters(name = "{0}")
public static Collection<String> createParameters()
public static Collection<String[]> createParameters()
{
return IntegrationTestUtil.createRepositoryTypeParameters();
}