Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-02-22 06:26:56 +01:00
Code Issues Packages Projects Releases Activity

rollback changes on branches overview

Browse Source
This commit is contained in:
Eduard Heimbuch
2020-09-17 11:17:25 +02:00
parent 89b6829108
commit fe832ae13e
12 changed files with 18 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchToBranchDtoMapperTest.java
View File

@@ -24,29 +24,16 @@
package sonia.scm.api.v2.resources;
import com.google.common.collect.ImmutableList;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Answers;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import sonia.scm.repository.Branch;
import sonia.scm.repository.Changeset;
import sonia.scm.repository.ChangesetPagingResult;
import sonia.scm.repository.NamespaceAndName;
import sonia.scm.repository.PersonTestData;
import sonia.scm.repository.api.LogCommandBuilder;
import sonia.scm.repository.api.RepositoryService;
import sonia.scm.repository.api.RepositoryServiceFactory;
import java.io.IOException;
import java.net.URI;
import java.time.Instant;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
class BranchToBranchDtoMapperTest {
@@ -56,13 +43,6 @@ class BranchToBranchDtoMapperTest {
@SuppressWarnings("unused") // Is injected
private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(baseUri);
@Mock
private RepositoryServiceFactory serviceFactory;
@Mock
private RepositoryService repositoryService;
@Mock(answer = Answers.RETURNS_SELF)
private LogCommandBuilder logCommandBuilder;
@InjectMocks
private BranchToBranchDtoMapperImpl mapper;
@@ -79,27 +59,7 @@ class BranchToBranchDtoMapperTest {
Branch branch = Branch.normalBranch("master", "42");
BranchDto dto = mapper.map(branch, new NamespaceAndName("hitchhiker", "heart-of-gold"), false);
BranchDto dto = mapper.map(branch, new NamespaceAndName("hitchhiker", "heart-of-gold"));
assertThat(dto.getLinks().getLinkBy("ka").get().getHref()).isEqualTo("http://hitchhiker/heart-of-gold/master");
assertThat(dto.getLastModified()).isNull();
assertThat(dto.getLastModifier()).isNull();
}
@Test
void shouldMapLastChangeDateAndLastModifier() throws IOException {
long creationTime = 1000000000;
Changeset changeset = new Changeset("1", 1L, PersonTestData.ZAPHOD);
changeset.setDate(creationTime);
when(serviceFactory.create(any(NamespaceAndName.class))).thenReturn(repositoryService);
when(repositoryService.getLogCommand()).thenReturn(logCommandBuilder);
when(logCommandBuilder.getChangesets()).thenReturn(new ChangesetPagingResult(1, ImmutableList.of(changeset)));
Branch branch = Branch.normalBranch("master", "42");
BranchDto dto = mapper.map(branch, new NamespaceAndName("hitchhiker", "heart-of-gold"), true);
assertThat(dto.getLastModified()).isEqualTo(Instant.ofEpochMilli(creationTime));
assertThat(dto.getLastModifier().getName()).isEqualTo(PersonTestData.ZAPHOD.getName());
}
}