diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/client/spi/GitRepositoryClientProvider.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/client/spi/GitRepositoryClientProvider.java index f545540a38..41b63440b6 100644 --- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/client/spi/GitRepositoryClientProvider.java +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/client/spi/GitRepositoryClientProvider.java @@ -35,20 +35,17 @@ package sonia.scm.repository.client.spi; //~--- non-JDK imports -------------------------------------------------------- import com.google.common.collect.ImmutableSet; -import java.io.File; - import org.eclipse.jgit.api.Git; import org.eclipse.jgit.transport.CredentialsProvider; - import sonia.scm.repository.GitUtil; import sonia.scm.repository.client.api.ClientCommand; -//~--- JDK imports ------------------------------------------------------------ - +import java.io.File; import java.io.IOException; - import java.util.Set; +//~--- JDK imports ------------------------------------------------------------ + /** * * @author Sebastian Sdorra @@ -59,7 +56,7 @@ public class GitRepositoryClientProvider extends RepositoryClientProvider /** Field description */ private static final Set SUPPORTED_COMMANDS = ImmutableSet.of(ClientCommand.ADD, ClientCommand.REMOVE, - ClientCommand.COMMIT, ClientCommand.TAG, ClientCommand.BANCH, + ClientCommand.COMMIT, ClientCommand.TAG, ClientCommand.BRANCH, ClientCommand.PUSH); //~--- constructors --------------------------------------------------------- diff --git a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/client/spi/HgRepositoryClientProvider.java b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/client/spi/HgRepositoryClientProvider.java index 583fe7f488..feb4887173 100644 --- a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/client/spi/HgRepositoryClientProvider.java +++ b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/client/spi/HgRepositoryClientProvider.java @@ -32,10 +32,11 @@ package sonia.scm.repository.client.spi; import com.aragost.javahg.Repository; import com.google.common.collect.ImmutableSet; +import sonia.scm.repository.client.api.ClientCommand; + import java.io.File; import java.io.IOException; import java.util.Set; -import sonia.scm.repository.client.api.ClientCommand; /** * Mercurial implementation of the {@link RepositoryClientProvider}. @@ -47,7 +48,7 @@ public class HgRepositoryClientProvider extends RepositoryClientProvider private static final Set SUPPORTED_COMMANDS = ImmutableSet.of( ClientCommand.ADD, ClientCommand.REMOVE, ClientCommand.COMMIT, - ClientCommand.TAG, ClientCommand.BANCH, ClientCommand.PUSH + ClientCommand.TAG, ClientCommand.BRANCH, ClientCommand.PUSH ); private final Repository repository; diff --git a/scm-test/src/main/java/sonia/scm/repository/client/api/ClientCommand.java b/scm-test/src/main/java/sonia/scm/repository/client/api/ClientCommand.java index 219767fe6c..b5de4ee5f7 100644 --- a/scm-test/src/main/java/sonia/scm/repository/client/api/ClientCommand.java +++ b/scm-test/src/main/java/sonia/scm/repository/client/api/ClientCommand.java @@ -39,5 +39,5 @@ package sonia.scm.repository.client.api; */ public enum ClientCommand { - ADD, REMOVE, COMMIT, PUSH, TAG, BANCH + ADD, REMOVE, COMMIT, PUSH, TAG, BRANCH } diff --git a/scm-test/src/main/java/sonia/scm/repository/client/spi/RepositoryClientProvider.java b/scm-test/src/main/java/sonia/scm/repository/client/spi/RepositoryClientProvider.java index dd32ee066f..6cb40411e1 100644 --- a/scm-test/src/main/java/sonia/scm/repository/client/spi/RepositoryClientProvider.java +++ b/scm-test/src/main/java/sonia/scm/repository/client/spi/RepositoryClientProvider.java @@ -37,14 +37,13 @@ package sonia.scm.repository.client.spi; import sonia.scm.repository.client.api.ClientCommand; import sonia.scm.repository.client.api.ClientCommandNotSupportedException; -//~--- JDK imports ------------------------------------------------------------ - import java.io.Closeable; import java.io.File; import java.io.IOException; - import java.util.Set; +//~--- JDK imports ------------------------------------------------------------ + /** * * @author Sebastian Sdorra @@ -93,7 +92,7 @@ public abstract class RepositoryClientProvider implements Closeable */ public BranchCommand getBranchCommand() { - throw new ClientCommandNotSupportedException(ClientCommand.BANCH); + throw new ClientCommandNotSupportedException(ClientCommand.BRANCH); } /** diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java index e7b85056e5..cee6a4d92f 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryHookITCase.java @@ -34,12 +34,7 @@ import com.google.common.base.Charsets; import com.google.common.collect.Lists; import com.google.common.io.Files; import com.sun.jersey.api.client.WebResource; -import java.io.File; -import java.io.IOException; -import java.util.Collection; import org.junit.After; -import static org.junit.Assert.*; -import static org.hamcrest.Matchers.*; import org.junit.Assume; import org.junit.Before; import org.junit.Rule; @@ -49,9 +44,6 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; import sonia.scm.debug.DebugHookData; -import static sonia.scm.it.IntegrationTestUtil.createResource; -import static sonia.scm.it.RepositoryITUtil.createRepository; -import static sonia.scm.it.RepositoryITUtil.deleteRepository; import sonia.scm.repository.Changeset; import sonia.scm.repository.Person; import sonia.scm.repository.Repository; @@ -61,6 +53,19 @@ import sonia.scm.repository.client.api.RepositoryClient; import sonia.scm.repository.client.api.RepositoryClientFactory; import sonia.scm.util.IOUtil; +import java.io.File; +import java.io.IOException; +import java.util.Collection; + +import static org.hamcrest.Matchers.allOf; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.not; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThat; +import static sonia.scm.it.IntegrationTestUtil.createResource; +import static sonia.scm.it.RepositoryITUtil.createRepository; +import static sonia.scm.it.RepositoryITUtil.deleteRepository; + /** * Integration tests for repository hooks. * @@ -149,7 +154,7 @@ public class RepositoryHookITCase extends AbstractAdminITCaseBase public void testOnlyNewCommit() throws IOException, InterruptedException { // skip test if branches are not supported by repository type - Assume.assumeTrue(repositoryClient.isCommandSupported(ClientCommand.BANCH)); + Assume.assumeTrue(repositoryClient.isCommandSupported(ClientCommand.BRANCH)); // push commit Files.write("a", new File(workingCopy, "a.txt"), Charsets.UTF_8);