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

Simplify scm test parameters

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -162,22 +162,15 @@ public final class IntegrationTestUtil
client.getAddCommand().add(name);
}
/**
* Method description
*
*
* @return
*/
public static Collection<String[]> createRepositoryTypeParameters()
{
Collection<String[]> params = new ArrayList<>();
public static Collection<String> createRepositoryTypeParameters() {
Collection<String> params = new ArrayList<>();
params.add(new String[] { "git" });
params.add(new String[] { "svn" });
params.add("git");
params.add("svn" );
if (IOUtil.search("hg") != null)
{
params.add(new String[] { "hg" });
params.add("hg");
}
return params;

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

@@ -200,7 +200,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();
}

4
scm-webapp/src/test/java/sonia/scm/it/RepositoryITCaseBase.java
View File

@@ -54,6 +54,7 @@ import static sonia.scm.it.IntegrationTestUtil.ADMIN_USERNAME;
import static sonia.scm.it.IntegrationTestUtil.commit;
import static sonia.scm.it.IntegrationTestUtil.createAdminClient;
import static sonia.scm.it.IntegrationTestUtil.createRandomFile;
import static sonia.scm.it.IntegrationTestUtil.createRepositoryTypeParameters;
import static sonia.scm.it.IntegrationTestUtil.createResource;
import static sonia.scm.it.IntegrationTestUtil.createTempDirectory;
import static sonia.scm.it.IntegrationTestUtil.readJson;
@@ -200,8 +201,7 @@ public class RepositoryITCaseBase
User noperm = UserTestData.createPerfect();
createUser(noperm);
IntegrationTestUtil.createRepositoryTypeParameters().stream().map(array -> array[0])
.forEach(t -> appendTestParameter(params, t, owner, write, read, noperm));
createRepositoryTypeParameters().forEach(t -> appendTestParameter(params, t, owner, write, read, noperm));
return params;
}

2
scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java
View File

@@ -42,7 +42,7 @@ import java.util.Collection;
public class RepositoryTypeITCaseBase {
@Parameters(name = "{0}")
public static Collection<String[]> createParameters() {
public static Collection<String> createParameters() {
return IntegrationTestUtil.createRepositoryTypeParameters();
}
}