diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryArchiveITCase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryArchiveITCase.java index 9539be674f..4cf7cd6571 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryArchiveITCase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryArchiveITCase.java @@ -33,7 +33,6 @@ package sonia.scm.it; -//~--- non-JDK imports -------------------------------------------------------- import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.WebResource; @@ -48,6 +47,7 @@ import sonia.scm.web.VndMediaType; import javax.ws.rs.core.MediaType; import java.net.URI; +import java.util.Collection; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -59,15 +59,12 @@ import static sonia.scm.it.IntegrationTestUtil.serialize; import static sonia.scm.it.RepositoryITUtil.createRepository; import static sonia.scm.it.RepositoryITUtil.deleteRepository; -//~--- JDK imports ------------------------------------------------------------ - - /** * * @author Sebastian Sdorra */ @RunWith(Parameterized.class) -public class RepositoryArchiveITCase extends RepositoryTypeITCaseBase +public class RepositoryArchiveITCase { /** @@ -83,6 +80,11 @@ public class RepositoryArchiveITCase extends RepositoryTypeITCaseBase //~--- methods -------------------------------------------------------------- + @Parameterized.Parameters(name = "{0}") + public static Collection createParameters() { + return IntegrationTestUtil.createRepositoryTypeParameters(); + } + /** * Method description * @@ -148,8 +150,6 @@ public class RepositoryArchiveITCase extends RepositoryTypeITCaseBase response.close(); } - //~--- set methods ---------------------------------------------------------- - /** * Method description * @@ -170,8 +170,6 @@ public class RepositoryArchiveITCase extends RepositoryTypeITCaseBase assertEquals(204, resp.getStatus()); } - //~--- fields --------------------------------------------------------------- - /** Field description */ private ScmClient client; diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java deleted file mode 100644 index ab86edafd0..0000000000 --- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryTypeITCaseBase.java +++ /dev/null @@ -1,48 +0,0 @@ -/** - * Copyright (c) 2010, Sebastian Sdorra - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of SCM-Manager; nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * http://bitbucket.org/sdorra/scm-manager - * - */ - - -package sonia.scm.it; - -//~--- non-JDK imports -------------------------------------------------------- - -import org.junit.runners.Parameterized.Parameters; - -import java.util.Collection; - -//~--- JDK imports ------------------------------------------------------------ - -public class RepositoryTypeITCaseBase { - @Parameters(name = "{0}") - public static Collection createParameters() { - return IntegrationTestUtil.createRepositoryTypeParameters(); - } -}