Add first integration tests for merge detection

scm-test/src/main/java/sonia/scm/repository/client/api/CheckoutCommandBuilder.java

@@ -0,0 +1,53 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020-present Cloudogu GmbH and Contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package sonia.scm.repository.client.api;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import sonia.scm.repository.client.spi.CheckoutCommand;
+
+import java.io.IOException;
+
+/**
+ * @since 2.4.0
+ */
+public final class CheckoutCommandBuilder {
+
+  private static final Logger LOG = LoggerFactory.getLogger(CheckoutCommandBuilder.class);
+
+  private final CheckoutCommand command;
+
+  public CheckoutCommandBuilder(CheckoutCommand command) {
+    this.command = command;
+  }
+
+  public CheckoutCommandBuilder checkout(String name) throws IOException {
+    LOG.debug("checkout {}", name);
+
+    command.checkout(name);
+
+    return this;
+  }
+}

scm-test/src/main/java/sonia/scm/repository/client/api/ClientCommand.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-    
+
 package sonia.scm.repository.client.api;
 
 /**
@@ -31,5 +31,5 @@ package sonia.scm.repository.client.api;
  */
 public enum ClientCommand
 {
-  ADD, REMOVE, COMMIT, PUSH, TAG, BRANCH
+  ADD, REMOVE, COMMIT, PUSH, TAG, BRANCH, DELETE_REMOTE_BRANCH, CHECKOUT, MERGE
 }

scm-test/src/main/java/sonia/scm/repository/client/api/DeleteRemoteBranchCommandBuilder.java

@@ -0,0 +1,53 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020-present Cloudogu GmbH and Contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package sonia.scm.repository.client.api;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import sonia.scm.repository.client.spi.DeleteRemoteBranchCommand;
+
+import java.io.IOException;
+
+/**
+ * @since 2.4.0
+ */
+public final class DeleteRemoteBranchCommandBuilder {
+
+  private static final Logger LOG = LoggerFactory.getLogger(DeleteRemoteBranchCommandBuilder.class);
+
+  private DeleteRemoteBranchCommand command;
+
+  public DeleteRemoteBranchCommandBuilder(DeleteRemoteBranchCommand command) {
+    this.command = command;
+  }
+
+  public DeleteRemoteBranchCommandBuilder delete(String name) throws IOException {
+    LOG.debug("delete branch {}", name);
+
+    command.delete(name);
+
+    return this;
+  }
+}

scm-test/src/main/java/sonia/scm/repository/client/api/MergeCommandBuilder.java

@@ -0,0 +1,48 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020-present Cloudogu GmbH and Contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package sonia.scm.repository.client.api;
+
+import sonia.scm.repository.client.spi.MergeCommand;
+import sonia.scm.repository.client.spi.MergeRequest;
+
+import java.io.IOException;
+
+/**
+ * @since 2.4.0
+ */
+public final class MergeCommandBuilder {
+
+  private final MergeCommand command;
+
+  MergeCommandBuilder(MergeCommand command) {
+    this.command = command;
+  }
+
+  public void merge(String branch) throws IOException {
+    MergeRequest request = new MergeRequest();
+    request.setBranch(branch);
+    command.merge(request);
+  }
+}

scm-test/src/main/java/sonia/scm/repository/client/api/RepositoryClient.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-    
+
 package sonia.scm.repository.client.api;
 
 import org.slf4j.Logger;
@@ -60,6 +60,18 @@ public final class RepositoryClient implements Closeable {
     return new BranchCommandBuilder(clientProvider.getBranchCommand());
   }
 
+  public DeleteRemoteBranchCommandBuilder getDeleteRemoteBranchCommand() {
+    logger.trace("delete branch command");
+
+    return new DeleteRemoteBranchCommandBuilder(clientProvider.getDeleteRemoteBranchCommand());
+  }
+
+  public CheckoutCommandBuilder getCheckoutCommand() {
+    logger.trace("create checkout command");
+
+    return new CheckoutCommandBuilder(clientProvider.getCheckoutCommand());
+  }
+
   public CommitCommandBuilder getCommitCommand() {
     logger.trace("create commit command");
 
@@ -84,10 +96,16 @@ public final class RepositoryClient implements Closeable {
     return new TagCommandBuilder(clientProvider.getTagCommand());
   }
 
+  public MergeCommandBuilder getMergeCommand() {
+    logger.trace("create merge command");
+
+    return new MergeCommandBuilder(clientProvider.getMergeCommand());
+  }
+
   public File getWorkingCopy() {
     return clientProvider.getWorkingCopy();
   }
-  
+
   public boolean isCommandSupported(ClientCommand command) {
     return clientProvider.getSupportedClientCommands().contains(command);
   }

scm-test/src/main/java/sonia/scm/repository/client/spi/CheckoutCommand.java

@@ -0,0 +1,35 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020-present Cloudogu GmbH and Contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package sonia.scm.repository.client.spi;
+
+import java.io.IOException;
+
+/**
+ * @since 2.4.0
+ */
+public interface CheckoutCommand {
+
+  void checkout(String name) throws IOException;
+}

scm-test/src/main/java/sonia/scm/repository/client/spi/DeleteRemoteBranchCommand.java

@@ -0,0 +1,32 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020-present Cloudogu GmbH and Contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package sonia.scm.repository.client.spi;
+
+import java.io.IOException;
+
+public interface DeleteRemoteBranchCommand {
+
+  void delete(String name) throws IOException;
+}

scm-test/src/main/java/sonia/scm/repository/client/spi/MergeCommand.java

@@ -0,0 +1,37 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020-present Cloudogu GmbH and Contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package sonia.scm.repository.client.spi;
+
+import sonia.scm.repository.Changeset;
+
+import java.io.IOException;
+
+/**
+ * @since 2.4.0
+ */
+public interface MergeCommand {
+
+  Changeset merge(MergeRequest request) throws IOException;
+}

scm-test/src/main/java/sonia/scm/repository/client/spi/MergeRequest.java

@@ -0,0 +1,89 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020-present Cloudogu GmbH and Contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package sonia.scm.repository.client.spi;
+
+import com.google.common.base.MoreObjects;
+import com.google.common.base.Objects;
+
+/**
+ * @since 2.4.0
+ */
+public final class MergeRequest {
+
+  private String branch;
+  private String message;
+
+  @Override
+  public boolean equals(Object obj) {
+    if (obj == null)
+    {
+      return false;
+    }
+
+    if (getClass() != obj.getClass())
+    {
+      return false;
+    }
+
+    final MergeRequest other = (MergeRequest) obj;
+
+    return Objects.equal(branch, other.branch)
+      && Objects.equal(message, other.message);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hashCode(branch, message);
+  }
+
+  public void reset() {
+    this.branch = null;
+    this.message = null;
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+                  .add("branch", branch)
+                  .add("message", message)
+                  .toString();
+  }
+
+  public void setBranch(String branch) {
+    this.branch = branch;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  String getBranch() {
+    return branch;
+  }
+
+  String getMessage() {
+    return message;
+  }
+}

scm-test/src/main/java/sonia/scm/repository/client/spi/RepositoryClientProvider.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-    
+
 package sonia.scm.repository.client.spi;
 
 //~--- non-JDK imports --------------------------------------------------------
@@ -87,6 +87,14 @@ public abstract class RepositoryClientProvider implements Closeable
     throw new ClientCommandNotSupportedException(ClientCommand.BRANCH);
   }
 
+  public DeleteRemoteBranchCommand getDeleteRemoteBranchCommand() {
+    throw new ClientCommandNotSupportedException(ClientCommand.DELETE_REMOTE_BRANCH);
+  }
+
+  public CheckoutCommand getCheckoutCommand() {
+    throw new ClientCommandNotSupportedException(ClientCommand.CHECKOUT);
+  }
+
   /**
    * Method description
    *
@@ -131,6 +139,10 @@ public abstract class RepositoryClientProvider implements Closeable
     throw new ClientCommandNotSupportedException(ClientCommand.TAG);
   }
 
+  public MergeCommand getMergeCommand() {
+    throw new ClientCommandNotSupportedException(ClientCommand.MERGE);
+  }
+
   /**
    * Returns the working copy of the repository client.
    *