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

Remove unnecessary null check

Browse Source 
The function RevWalk#parseAny indeed never returns null. This check only
was there to satisfy the (therefore wrong) unit test.
This commit is contained in:
René Pfeuffer
2020-10-12 19:02:28 +02:00
parent befd50eeef
commit c5f8d975a3
2 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/api/GitHookTagProvider.java
View File

@@ -92,21 +92,19 @@ public class GitHookTagProvider implements HookTagProvider {
}
private Tag createTagFromNewId(RevWalk revWalk, ReceiveCommand rc, String tag) throws IOException {
final ObjectId newId = rc.getNewId();
ObjectId newId = rc.getNewId();
return new Tag(tag, getId(unpeelTag(revWalk, newId)), GitUtil.getTagTime(revWalk, newId));
}
private Tag createTagFromOldId(RevWalk revWalk, ReceiveCommand rc, String tag) throws IOException {
final ObjectId oldId = rc.getOldId();
ObjectId oldId = rc.getOldId();
return new Tag(tag, getId(unpeelTag(revWalk, oldId)), GitUtil.getTagTime(revWalk, oldId));
}
public ObjectId unpeelTag(RevWalk revWalk, ObjectId oldId) throws IOException {
final RevObject revObject = revWalk.parseAny(oldId);
RevObject revObject = revWalk.parseAny(oldId);
if (revObject instanceof RevTag) {
return unpeelTag(revWalk, ((RevTag) revObject).getObject());
} else if (revObject == null) {
return oldId;
} else {
return revObject;
}

35
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/api/GitHookTagProviderTest.java
View File

@@ -25,6 +25,7 @@
package sonia.scm.repository.api;
import com.google.common.collect.Lists;
import org.eclipse.jgit.lib.AnyObjectId;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevObject;
@@ -49,6 +50,8 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -78,8 +81,15 @@ public class GitHookTagProviderTest {
* Set up mocks for upcoming tests.
*/
@Before
public void setUpMocks() {
public void setUpMocks() throws IOException {
commands = Lists.newArrayList(command);
when(revWalk.parseAny(any(ObjectId.class))).thenAnswer(invocationOnMock -> {
ObjectId objectId = invocationOnMock.getArgument(0);
RevObject revObject = mock(RevObject.class);
String name = objectId.getName();
when(revObject.name()).thenReturn(name);
return revObject;
});
}
/**
@@ -95,7 +105,7 @@ public class GitHookTagProviderTest {
dummy.when(() -> GitUtil.getTagTime(revWalk, ObjectId.fromString(revision))).thenReturn(timestamp);
dummy.when(() -> GitUtil.getTagName(ref)).thenReturn(tagName);
dummy.when(() -> GitUtil.getId(ObjectId.fromString(revision))).thenReturn(revision);
dummy.when(() -> GitUtil.getId(hasObjectId(revision))).thenReturn(revision);
GitHookTagProvider provider = createProvider(ReceiveCommand.Type.CREATE, ref, revision, ZERO);
@@ -117,7 +127,7 @@ public class GitHookTagProviderTest {
dummy.when(() -> GitUtil.getTagTime(revWalk, ObjectId.fromString(revision))).thenReturn(timestamp);
dummy.when(() -> GitUtil.getTagName(ref)).thenReturn(tagName);
dummy.when(() -> GitUtil.getId(ObjectId.fromString(revision))).thenReturn(revision);
dummy.when(() -> GitUtil.getId(hasObjectId(revision))).thenReturn(revision);
GitHookTagProvider provider = createProvider(ReceiveCommand.Type.DELETE, ref, ZERO, revision);
@@ -154,8 +164,8 @@ public class GitHookTagProviderTest {
dummy.when(() -> GitUtil.getTagTime(revWalk, ObjectId.fromString(oldRevision))).thenReturn(timestamp);
dummy.when(() -> GitUtil.getTagTime(revWalk, ObjectId.fromString(newRevision))).thenReturn(null);
dummy.when(() -> GitUtil.getTagName(ref)).thenReturn(tagName);
dummy.when(() -> GitUtil.getId(ObjectId.fromString(oldRevision))).thenReturn(oldRevision);
dummy.when(() -> GitUtil.getId(ObjectId.fromString(newRevision))).thenReturn(newRevision);
dummy.when(() -> GitUtil.getId(hasObjectId(oldRevision))).thenReturn(oldRevision);
dummy.when(() -> GitUtil.getId(hasObjectId(newRevision))).thenReturn(newRevision);
GitHookTagProvider provider = createProvider(ReceiveCommand.Type.UPDATE, ref, newRevision, oldRevision);
@@ -180,8 +190,8 @@ public class GitHookTagProviderTest {
dummy.when(() -> GitUtil.getTagTime(revWalk, ObjectId.fromString(newRevision))).thenReturn(timestamp);
dummy.when(() -> GitUtil.getTagTime(revWalk, ObjectId.fromString(oldRevision))).thenReturn(null);
dummy.when(() -> GitUtil.getTagName(ref)).thenReturn(tagName);
dummy.when(() -> GitUtil.getId(ObjectId.fromString(oldRevision))).thenReturn(oldRevision);
dummy.when(() -> GitUtil.getId(ObjectId.fromString(newRevision))).thenReturn(newRevision);
dummy.when(() -> GitUtil.getId(hasObjectId(oldRevision))).thenReturn(oldRevision);
dummy.when(() -> GitUtil.getId(hasObjectId(newRevision))).thenReturn(newRevision);
GitHookTagProvider provider = createProvider(ReceiveCommand.Type.UPDATE, ref, newRevision, oldRevision);
@@ -200,16 +210,17 @@ public class GitHookTagProviderTest {
String tagName = "1.0.0";
String ref = "refs/tags/" + tagName;
final RevTag mockedTag = mock(RevTag.class);
RevTag mockedTag = mock(RevTag.class);
when(revWalk.parseAny(ObjectId.fromString(REVISION_1))).thenReturn(mockedTag);
final RevObject commitForTag = mock(RevObject.class);
RevObject commitForTag = mock(RevObject.class);
when(commitForTag.getName()).thenReturn(revisionOfCommit);
when(mockedTag.getObject()).thenReturn(commitForTag);
dummy.when(() -> GitUtil.getTagTime(revWalk, ObjectId.fromString(REVISION_1))).thenReturn(timestampOfTag);
dummy.when(() -> GitUtil.getTagTime(revWalk, commitForTag)).thenReturn(timestampOfCommit);
dummy.when(() -> GitUtil.getTagTime(revWalk, ObjectId.fromString(revisionOfTag))).thenReturn(timestampOfCommit);
dummy.when(() -> GitUtil.getTagName(ref)).thenReturn(tagName);
dummy.when(() -> GitUtil.getId(commitForTag)).thenReturn(revisionOfCommit);
dummy.when(() -> GitUtil.getId(hasObjectId(revisionOfCommit))).thenReturn(revisionOfCommit);
GitHookTagProvider provider = createProvider(ReceiveCommand.Type.CREATE, ref, revisionOfTag, ZERO);
@@ -218,6 +229,10 @@ public class GitHookTagProviderTest {
}
}
public AnyObjectId hasObjectId(String oldRevision) {
return argThat(anyObjectId -> oldRevision.equals(anyObjectId.name()));
}
private void assertTag(String name, String revision, Long date, List<Tag> tags) {
assertNotNull(tags);
assertFalse(tags.isEmpty());