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

Naming things

Browse Source
This commit is contained in:
René Pfeuffer
2020-06-02 17:05:23 +02:00
parent 88d4490da9
commit 4fda6daaa0
8 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,6 @@ import org.apache.shiro.subject.Subject;
import org.apache.shiro.subject.support.SubjectThreadState;
import org.apache.shiro.util.ThreadContext;
import org.apache.shiro.util.ThreadState;
import org.assertj.core.api.Assertions;
import org.assertj.core.util.Lists;
import org.jboss.resteasy.mock.MockHttpRequest;
import org.jboss.resteasy.mock.MockHttpResponse;
@@ -45,7 +44,7 @@ import sonia.scm.repository.Branch;
import sonia.scm.repository.Branches;
import sonia.scm.repository.Changeset;
import sonia.scm.repository.ChangesetPagingResult;
import sonia.scm.repository.ChangesetTrailers;
import sonia.scm.repository.ChangesetTrailerProvider;
import sonia.scm.repository.NamespaceAndName;
import sonia.scm.repository.Person;
import sonia.scm.repository.Repository;
@@ -117,7 +116,7 @@ public class BranchRootResourceTest extends RepositoryTestBase {
private TagCollectionToDtoMapper tagCollectionToDtoMapper;
@Mock
private Set<ChangesetTrailers> changesetTrailers;
private Set<ChangesetTrailerProvider> changesetTrailers;
@InjectMocks

2
scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetDescriptionTrailersTest.java
View File

@@ -43,7 +43,7 @@ class ChangesetDescriptionTrailersTest {
private static final Repository REPOSITORY = RepositoryTestData.createHeartOfGold();
private final ChangesetDescriptionTrailers changesetDescriptionTrailers = new ChangesetDescriptionTrailers();
private final ChangesetDescriptionTrailerProvider changesetDescriptionTrailers = new ChangesetDescriptionTrailerProvider();
@Test
void shouldReturnEmptyList() {

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

@@ -43,7 +43,7 @@ import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import sonia.scm.repository.Changeset;
import sonia.scm.repository.ChangesetPagingResult;
import sonia.scm.repository.ChangesetTrailers;
import sonia.scm.repository.ChangesetTrailerProvider;
import sonia.scm.repository.NamespaceAndName;
import sonia.scm.repository.Person;
import sonia.scm.repository.Repository;
@@ -88,7 +88,7 @@ public class ChangesetRootResourceTest extends RepositoryTestBase {
private LogCommandBuilder logCommandBuilder;
@Mock
private Set<ChangesetTrailers> changesetTrailers;
private Set<ChangesetTrailerProvider> changesetTrailers;
@InjectMocks
private ChangesetCollectionToDtoMapper changesetCollectionToDtoMapper;

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

@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.api.v2.resources;
import com.google.inject.util.Providers;
@@ -44,7 +44,7 @@ import sonia.scm.ContextEntry;
import sonia.scm.NotFoundException;
import sonia.scm.repository.Changeset;
import sonia.scm.repository.ChangesetPagingResult;
import sonia.scm.repository.ChangesetTrailers;
import sonia.scm.repository.ChangesetTrailerProvider;
import sonia.scm.repository.InternalRepositoryException;
import sonia.scm.repository.NamespaceAndName;
import sonia.scm.repository.Person;
@@ -92,7 +92,7 @@ public class FileHistoryResourceTest extends RepositoryTestBase {
private FileHistoryCollectionToDtoMapper fileHistoryCollectionToDtoMapper;
@Mock
private Set<ChangesetTrailers> changesetTrailers;
private Set<ChangesetTrailerProvider> changesetTrailers;
@InjectMocks
private DefaultChangesetToChangesetDtoMapperImpl changesetToChangesetDtoMapper;

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

@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.api.v2.resources;
@@ -45,7 +45,7 @@ import org.mockito.junit.MockitoJUnitRunner;
import sonia.scm.NotFoundException;
import sonia.scm.repository.Changeset;
import sonia.scm.repository.ChangesetPagingResult;
import sonia.scm.repository.ChangesetTrailers;
import sonia.scm.repository.ChangesetTrailerProvider;
import sonia.scm.repository.NamespaceAndName;
import sonia.scm.repository.Person;
import sonia.scm.repository.Repository;
@@ -110,7 +110,7 @@ public class IncomingRootResourceTest extends RepositoryTestBase {
private IncomingChangesetCollectionToDtoMapper incomingChangesetCollectionToDtoMapper;
@Mock
private Set<ChangesetTrailers> changesetTrailers;
private Set<ChangesetTrailerProvider> changesetTrailers;
@InjectMocks
private DefaultChangesetToChangesetDtoMapperImpl changesetToChangesetDtoMapper;