Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.mockito.ArgumentMatcher;

/**
* Mockito constraint to compare tags since it has no equals method.
* Mockito constraint to compare tags since ScmTagParameters has no equals method.
*
* @author <a href="mailto:olamy@apache.org">olamy</a>
*/
Expand All @@ -38,6 +38,6 @@ public boolean matches(ScmTagParameters stp) {
return stp.getMessage().equals(this.scmTagParameters.getMessage())
&& stp.isRemoteTagging() == this.scmTagParameters.isRemoteTagging()
&& stp.isPinExternals() == this.scmTagParameters.isPinExternals()
&& stp.isSign() == this.scmTagParameters.isSign();
&& stp.getSignOption() == this.scmTagParameters.getSignOption();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import java.util.List;

import org.apache.maven.project.MavenProject;
import org.apache.maven.scm.CommandParameters;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
Expand Down Expand Up @@ -102,7 +103,7 @@ void testTag() throws Exception {
builder.setScmSignTags(true);

ScmTagParameters expectedTagParameters = new ScmTagParameters("[my prefix] copy for tag release-label");
expectedTagParameters.setSign(true);
expectedTagParameters.setSignOption(CommandParameters.SignOption.FORCE_SIGN);

ScmFileSet fileSet = new ScmFileSet(rootProject.getFile().getParentFile());

Expand Down
Loading