From 97d158ab3515efe77b74efac9405f98537b075c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Thu, 8 Nov 2018 14:39:30 +0100 Subject: [PATCH] Naming --- .../main/java/sonia/scm/repository/spi/GitMergeCommand.java | 4 ++-- .../test/java/sonia/scm/repository/CloseableWrapperTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java index 6376262228..f61038b069 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java @@ -73,7 +73,7 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand } private MergeCommandResult merge() throws IOException { - createClone(); + checkOutTargetBranch(); MergeResult result = doMergeInClone(); if (result.getMergeStatus().isSuccessful()) { doCommit(); @@ -84,7 +84,7 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand } } - private void createClone() { + private void checkOutTargetBranch() { try { clone.checkout().setName(target).call(); } catch (GitAPIException e) { diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/CloseableWrapperTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/CloseableWrapperTest.java index 34c5e8e7e2..e92ee7abb5 100644 --- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/CloseableWrapperTest.java +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/CloseableWrapperTest.java @@ -10,7 +10,7 @@ import static org.mockito.Mockito.verify; public class CloseableWrapperTest { @Test - public void x() { + public void shouldExecuteGivenMethodAtClose() { Consumer wrapped = new Consumer() { // no this cannot be replaced with a lambda because otherwise we could not use Mockito#spy @Override