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

Rename utility class

Browse Source
This commit is contained in:
Rene Pfeuffer
2019-12-05 17:43:21 +01:00
parent e363f057b2
commit d0f8e4ccf2
29 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/AuthenticationResourceTest.java
View File

@@ -16,7 +16,7 @@ import sonia.scm.security.AccessTokenBuilder;
import sonia.scm.security.AccessTokenBuilderFactory;
import sonia.scm.security.AccessTokenCookieIssuer;
import sonia.scm.security.DefaultAccessTokenCookieIssuer;
import sonia.scm.web.ScmTestDispatcher;
import sonia.scm.web.RestDispatcher;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -43,7 +43,7 @@ public class AuthenticationResourceTest {
@Rule
public ShiroRule shiro = new ShiroRule();
private ScmTestDispatcher dispatcher = new ScmTestDispatcher();
private RestDispatcher dispatcher = new RestDispatcher();
@Mock
private AccessTokenBuilderFactory accessTokenBuilderFactory;

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/AutoCompleteResourceTest.java
View File

@@ -22,7 +22,7 @@ import sonia.scm.store.ConfigurationStoreFactory;
import sonia.scm.user.DefaultUserDisplayManager;
import sonia.scm.user.User;
import sonia.scm.user.xml.XmlUserDAO;
import sonia.scm.web.ScmTestDispatcher;
import sonia.scm.web.RestDispatcher;
import sonia.scm.web.VndMediaType;
import sonia.scm.xml.XmlDatabase;
@@ -50,7 +50,7 @@ public class AutoCompleteResourceTest {
public static final String URL = "/" + AutoCompleteResource.PATH;
private final Integer defaultLimit = DisplayManager.DEFAULT_LIMIT;
private ScmTestDispatcher dispatcher = new ScmTestDispatcher();
private RestDispatcher dispatcher = new RestDispatcher();
private XmlUserDAO userDao;
private XmlGroupDAO groupDao;

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/AvailablePluginResourceTest.java
View File

@@ -21,7 +21,7 @@ import sonia.scm.plugin.InstalledPluginDescriptor;
import sonia.scm.plugin.PluginCondition;
import sonia.scm.plugin.PluginInformation;
import sonia.scm.plugin.PluginManager;
import sonia.scm.web.ScmTestDispatcher;
import sonia.scm.web.RestDispatcher;
import sonia.scm.web.VndMediaType;
import javax.inject.Provider;
@@ -44,7 +44,7 @@ import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
class AvailablePluginResourceTest {
private ScmTestDispatcher dispatcher = new ScmTestDispatcher();
private RestDispatcher dispatcher = new RestDispatcher();
@Mock
Provider<AvailablePluginResource> availablePluginResourceProvider;

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTest.java
View File

@@ -29,7 +29,7 @@ import sonia.scm.repository.api.BranchesCommandBuilder;
import sonia.scm.repository.api.LogCommandBuilder;
import sonia.scm.repository.api.RepositoryService;
import sonia.scm.repository.api.RepositoryServiceFactory;
import sonia.scm.web.ScmTestDispatcher;
import sonia.scm.web.RestDispatcher;
import sonia.scm.web.VndMediaType;
import javax.ws.rs.core.MediaType;
@@ -56,7 +56,7 @@ public class BranchRootResourceTest extends RepositoryTestBase {
public static final String BRANCH_URL = "/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + BRANCH_PATH;
public static final String REVISION = "revision";
private ScmTestDispatcher dispatcher = new ScmTestDispatcher();
private RestDispatcher dispatcher = new RestDispatcher();
private final URI baseUri = URI.create("/");
private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(baseUri);

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java
View File

@@ -25,7 +25,7 @@ import sonia.scm.repository.Repository;
import sonia.scm.repository.api.LogCommandBuilder;
import sonia.scm.repository.api.RepositoryService;
import sonia.scm.repository.api.RepositoryServiceFactory;
import sonia.scm.web.ScmTestDispatcher;
import sonia.scm.web.RestDispatcher;
import sonia.scm.web.VndMediaType;
import java.net.URI;
@@ -48,7 +48,7 @@ public class ChangesetRootResourceTest extends RepositoryTestBase {
public static final String CHANGESET_PATH = "space/repo/changesets/";
public static final String CHANGESET_URL = "/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + CHANGESET_PATH;
private ScmTestDispatcher dispatcher = new ScmTestDispatcher();
private RestDispatcher dispatcher = new RestDispatcher();
private final URI baseUri = URI.create("/");
private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(baseUri);

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/ConfigResourceTest.java
View File

@@ -13,7 +13,7 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.repository.NamespaceStrategyValidator;
import sonia.scm.web.ScmTestDispatcher;
import sonia.scm.web.RestDispatcher;
import sonia.scm.web.VndMediaType;
import javax.servlet.http.HttpServletResponse;
@@ -39,7 +39,7 @@ public class ConfigResourceTest {
@Rule
public ShiroRule shiro = new ShiroRule();
private ScmTestDispatcher dispatcher = new ScmTestDispatcher();
private RestDispatcher dispatcher = new RestDispatcher();
private final URI baseUri = URI.create("/");
@SuppressWarnings("unused") // Is injected

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
View File

@@ -23,7 +23,7 @@ import sonia.scm.repository.api.DiffFormat;
import sonia.scm.repository.api.RepositoryService;
import sonia.scm.repository.api.RepositoryServiceFactory;
import sonia.scm.util.CRLFInjectionException;
import sonia.scm.web.ScmTestDispatcher;
import sonia.scm.web.RestDispatcher;
import sonia.scm.web.VndMediaType;
import javax.ws.rs.core.Response;
@@ -46,7 +46,7 @@ public class DiffResourceTest extends RepositoryTestBase {
public static final String DIFF_PATH = "space/repo/diff/";
public static final String DIFF_URL = "/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + DIFF_PATH;
private ScmTestDispatcher dispatcher = new ScmTestDispatcher();
private RestDispatcher dispatcher = new RestDispatcher();
@Mock
private RepositoryServiceFactory serviceFactory;

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java
View File

@@ -27,7 +27,7 @@ import sonia.scm.repository.Repository;
import sonia.scm.repository.api.LogCommandBuilder;
import sonia.scm.repository.api.RepositoryService;
import sonia.scm.repository.api.RepositoryServiceFactory;
import sonia.scm.web.ScmTestDispatcher;
import sonia.scm.web.RestDispatcher;
import sonia.scm.web.VndMediaType;
import java.net.URI;
@@ -70,7 +70,7 @@ public class FileHistoryResourceTest extends RepositoryTestBase {
private FileHistoryRootResource fileHistoryRootResource;
private ScmTestDispatcher dispatcher = new ScmTestDispatcher();
private RestDispatcher dispatcher = new RestDispatcher();
private final Subject subject = mock(Subject.class);
private final ThreadState subjectThreadState = new SubjectThreadState(subject);

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupRootResourceTest.java
View File

@@ -18,7 +18,7 @@ import sonia.scm.group.Group;
import sonia.scm.group.GroupManager;
import sonia.scm.security.PermissionAssigner;
import sonia.scm.security.PermissionDescriptor;
import sonia.scm.web.ScmTestDispatcher;
import sonia.scm.web.RestDispatcher;
import sonia.scm.web.VndMediaType;
import javax.servlet.http.HttpServletResponse;
@@ -52,7 +52,7 @@ public class GroupRootResourceTest {
@Rule
public ShiroRule shiro = new ShiroRule();
private ScmTestDispatcher dispatcher = new ScmTestDispatcher();
private RestDispatcher dispatcher = new RestDispatcher();
private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(URI.create("/"));

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/IncomingRootResourceTest.java
View File

@@ -28,7 +28,7 @@ import sonia.scm.repository.api.LogCommandBuilder;
import sonia.scm.repository.api.RepositoryService;
import sonia.scm.repository.api.RepositoryServiceFactory;
import sonia.scm.util.CRLFInjectionException;
import sonia.scm.web.ScmTestDispatcher;
import sonia.scm.web.RestDispatcher;
import sonia.scm.web.VndMediaType;
import javax.ws.rs.core.Response;
@@ -55,7 +55,7 @@ public class IncomingRootResourceTest extends RepositoryTestBase {
public static final String INCOMING_CHANGESETS_URL = "/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + INCOMING_PATH;
public static final String INCOMING_DIFF_URL = "/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + INCOMING_PATH;
private ScmTestDispatcher dispatcher = new ScmTestDispatcher();
private RestDispatcher dispatcher = new RestDispatcher();
private final URI baseUri = URI.create("/");
private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(baseUri);

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/InstalledPluginResourceTest.java
View File

@@ -17,7 +17,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
import sonia.scm.plugin.InstalledPlugin;
import sonia.scm.plugin.PluginInformation;
import sonia.scm.plugin.PluginManager;
import sonia.scm.web.ScmTestDispatcher;
import sonia.scm.web.RestDispatcher;
import sonia.scm.web.VndMediaType;
import javax.inject.Provider;
@@ -39,7 +39,7 @@ import static sonia.scm.plugin.PluginTestHelper.createInstalled;
@ExtendWith(MockitoExtension.class)
class InstalledPluginResourceTest {
private ScmTestDispatcher dispatcher = new ScmTestDispatcher();
private RestDispatcher dispatcher = new RestDispatcher();
@Mock
Provider<InstalledPluginResource> installedPluginResourceProvider;

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/MeResourceTest.java
View File

@@ -20,7 +20,7 @@ import sonia.scm.group.GroupCollector;
import sonia.scm.user.InvalidPasswordException;
import sonia.scm.user.User;
import sonia.scm.user.UserManager;
import sonia.scm.web.ScmTestDispatcher;
import sonia.scm.web.RestDispatcher;
import sonia.scm.web.VndMediaType;
import javax.servlet.http.HttpServletResponse;
@@ -48,7 +48,7 @@ public class MeResourceTest {
@Rule
public ShiroRule shiro = new ShiroRule();
private ScmTestDispatcher dispatcher = new ScmTestDispatcher();
private RestDispatcher dispatcher = new RestDispatcher();
private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(URI.create("/"));

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/ModificationsResourceTest.java
View File

@@ -23,7 +23,7 @@ import sonia.scm.repository.Repository;
import sonia.scm.repository.api.ModificationsCommandBuilder;
import sonia.scm.repository.api.RepositoryService;
import sonia.scm.repository.api.RepositoryServiceFactory;
import sonia.scm.web.ScmTestDispatcher;
import sonia.scm.web.RestDispatcher;
import sonia.scm.web.VndMediaType;
import java.net.URI;
@@ -45,7 +45,7 @@ public class ModificationsResourceTest extends RepositoryTestBase {
public static final String MODIFICATIONS_PATH = "space/repo/modifications/";
public static final String MODIFICATIONS_URL = "/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + MODIFICATIONS_PATH;
private ScmTestDispatcher dispatcher = new ScmTestDispatcher();
private RestDispatcher dispatcher = new RestDispatcher();
private final URI baseUri = URI.create("/");
private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(baseUri);

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/PendingPluginResourceTest.java
View File

@@ -20,7 +20,7 @@ import sonia.scm.plugin.InstalledPlugin;
import sonia.scm.plugin.InstalledPluginDescriptor;
import sonia.scm.plugin.PluginInformation;
import sonia.scm.plugin.PluginManager;
import sonia.scm.web.ScmTestDispatcher;
import sonia.scm.web.RestDispatcher;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.core.Response;
@@ -40,7 +40,7 @@ import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
class PendingPluginResourceTest {
private ScmTestDispatcher dispatcher = new ScmTestDispatcher();
private RestDispatcher dispatcher = new RestDispatcher();
ResourceLinks resourceLinks = ResourceLinksMock.createMock(create("/"));

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryPermissionRootResourceTest.java
View File

@@ -29,7 +29,7 @@ import sonia.scm.repository.NamespaceAndName;
import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryManager;
import sonia.scm.repository.RepositoryPermission;
import sonia.scm.web.ScmTestDispatcher;
import sonia.scm.web.RestDispatcher;
import sonia.scm.web.VndMediaType;
import javax.ws.rs.HttpMethod;
@@ -104,7 +104,7 @@ public class RepositoryPermissionRootResourceTest extends RepositoryTestBase {
.content(PERMISSION_TEST_PAYLOAD)
.path(PATH_OF_ONE_PERMISSION);
private ScmTestDispatcher dispatcher = new ScmTestDispatcher();
private RestDispatcher dispatcher = new RestDispatcher();
@Mock
private RepositoryManager repositoryManager;

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRoleRootResourceTest.java
View File

@@ -17,7 +17,7 @@ import org.mockito.junit.MockitoJUnitRunner;
import sonia.scm.PageResult;
import sonia.scm.repository.RepositoryRole;
import sonia.scm.repository.RepositoryRoleManager;
import sonia.scm.web.ScmTestDispatcher;
import sonia.scm.web.RestDispatcher;
import sonia.scm.web.VndMediaType;
import javax.servlet.http.HttpServletResponse;
@@ -63,7 +63,7 @@ public class RepositoryRoleRootResourceTest {
private RepositoryRoleCollectionToDtoMapper collectionToDtoMapper;
private ScmTestDispatcher dispatcher = new ScmTestDispatcher();
private RestDispatcher dispatcher = new RestDispatcher();
@Captor
private ArgumentCaptor<RepositoryRole> modifyCaptor;

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java
View File

@@ -22,7 +22,7 @@ import sonia.scm.repository.RepositoryManager;
import sonia.scm.repository.api.RepositoryService;
import sonia.scm.repository.api.RepositoryServiceFactory;
import sonia.scm.user.User;
import sonia.scm.web.ScmTestDispatcher;
import sonia.scm.web.RestDispatcher;
import sonia.scm.web.VndMediaType;
import javax.servlet.http.HttpServletResponse;
@@ -61,7 +61,7 @@ public class RepositoryRootResourceTest extends RepositoryTestBase {
private static final String REALM = "AdminRealm";
private ScmTestDispatcher dispatcher = new ScmTestDispatcher();
private RestDispatcher dispatcher = new RestDispatcher();
@Rule
public ShiroRule shiro = new ShiroRule();

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeRootResourceTest.java
View File

@@ -13,7 +13,7 @@ import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import sonia.scm.repository.RepositoryManager;
import sonia.scm.repository.RepositoryType;
import sonia.scm.web.ScmTestDispatcher;
import sonia.scm.web.RestDispatcher;
import sonia.scm.web.VndMediaType;
import java.net.URI;
@@ -31,7 +31,7 @@ import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.Silent.class)
public class RepositoryTypeRootResourceTest {
private ScmTestDispatcher dispatcher = new ScmTestDispatcher();
private RestDispatcher dispatcher = new RestDispatcher();
@Mock
private RepositoryManager repositoryManager;

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTest.java
View File

@@ -17,7 +17,7 @@ import sonia.scm.repository.NamespaceAndName;
import sonia.scm.repository.api.BrowseCommandBuilder;
import sonia.scm.repository.api.RepositoryService;
import sonia.scm.repository.api.RepositoryServiceFactory;
import sonia.scm.web.ScmTestDispatcher;
import sonia.scm.web.RestDispatcher;
import java.io.IOException;
import java.net.URI;
@@ -30,7 +30,7 @@ import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.Silent.class)
public class SourceRootResourceTest extends RepositoryTestBase {
private ScmTestDispatcher dispatcher = new ScmTestDispatcher();
private RestDispatcher dispatcher = new RestDispatcher();
private final URI baseUri = URI.create("/");
private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(baseUri);

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/TagRootResourceTest.java
View File

@@ -23,7 +23,7 @@ import sonia.scm.repository.Tags;
import sonia.scm.repository.api.RepositoryService;
import sonia.scm.repository.api.RepositoryServiceFactory;
import sonia.scm.repository.api.TagsCommandBuilder;
import sonia.scm.web.ScmTestDispatcher;
import sonia.scm.web.RestDispatcher;
import sonia.scm.web.VndMediaType;
import java.net.URI;
@@ -42,7 +42,7 @@ public class TagRootResourceTest extends RepositoryTestBase {
public static final String TAG_PATH = "space/repo/tags/";
public static final String TAG_URL = "/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + TAG_PATH;
private ScmTestDispatcher dispatcher = new ScmTestDispatcher();
private RestDispatcher dispatcher = new RestDispatcher();
private final URI baseUri = URI.create("/");
private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(baseUri);

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/UIRootResourceTest.java
View File

@@ -15,7 +15,7 @@ import sonia.scm.plugin.InstalledPluginDescriptor;
import sonia.scm.plugin.PluginInformation;
import sonia.scm.plugin.PluginLoader;
import sonia.scm.plugin.PluginResources;
import sonia.scm.web.ScmTestDispatcher;
import sonia.scm.web.RestDispatcher;
import sonia.scm.web.VndMediaType;
import javax.servlet.http.HttpServletRequest;
@@ -37,7 +37,7 @@ import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.Silent.class)
public class UIRootResourceTest {
private ScmTestDispatcher dispatcher = new ScmTestDispatcher();
private RestDispatcher dispatcher = new RestDispatcher();
@Mock
private PluginLoader pluginLoader;

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java
View File

@@ -22,7 +22,7 @@ import sonia.scm.security.PermissionDescriptor;
import sonia.scm.user.ChangePasswordNotAllowedException;
import sonia.scm.user.User;
import sonia.scm.user.UserManager;
import sonia.scm.web.ScmTestDispatcher;
import sonia.scm.web.RestDispatcher;
import sonia.scm.web.VndMediaType;
import javax.servlet.http.HttpServletResponse;
@@ -56,7 +56,7 @@ public class UserRootResourceTest {
@Rule
public ShiroRule shiro = new ShiroRule();
private ScmTestDispatcher dispatcher = new ScmTestDispatcher();
private RestDispatcher dispatcher = new RestDispatcher();
private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(URI.create("/"));