diff --git a/scm-core/src/test/java/sonia/scm/url/UrlTestBase.java b/scm-core/src/test/java/sonia/scm/url/UrlTestBase.java index 884f9f6a30..c8dcd7938d 100644 --- a/scm-core/src/test/java/sonia/scm/url/UrlTestBase.java +++ b/scm-core/src/test/java/sonia/scm/url/UrlTestBase.java @@ -31,6 +31,10 @@ package sonia.scm.url; +//~--- non-JDK imports -------------------------------------------------------- + +import sonia.scm.util.HttpUtil; + /** * * @author Sebastian Sdorra @@ -44,6 +48,9 @@ public abstract class UrlTestBase /** Field description */ public static final String EXTENSION_XML = ".xml"; + /** Field description */ + public static final String URLSUFFIX_INDEX = "/index.html"; + /** Field description */ public static final String URLSUFFIX_RESTAPI = "/api/rest/"; @@ -80,4 +87,46 @@ public abstract class UrlTestBase { return createBaseRestUrl(baseUrl).concat(urlPart).concat(extension); } + + /** + * Method description + * + * + * @param baseUrl + * + * @return + */ + protected String createWuiUrl(String baseUrl) + { + return baseUrl.concat(URLSUFFIX_INDEX); + } + + /** + * Method description + * + * + * @param baseUrl + * @param param + * + * @return + */ + protected String createWuiUrl(String baseUrl, String param) + { + return baseUrl.concat(URLSUFFIX_INDEX).concat( + HttpUtil.SEPARATOR_HASH).concat(param); + } + + /** + * Method description + * + * + * @param baseUrl + * + * @return + */ + protected UrlProvider createWuiUrlProvider(String baseUrl) + { + return UrlProviderFactory.createUrlProvider(baseUrl, + UrlProviderFactory.TYPE_WUI); + } } diff --git a/scm-core/src/test/java/sonia/scm/url/WUIModelUrlProviderTest.java b/scm-core/src/test/java/sonia/scm/url/WUIModelUrlProviderTest.java new file mode 100644 index 0000000000..877748c450 --- /dev/null +++ b/scm-core/src/test/java/sonia/scm/url/WUIModelUrlProviderTest.java @@ -0,0 +1,157 @@ +/** + * 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.url; + +//~--- JDK imports ------------------------------------------------------------ + +import java.util.HashMap; +import java.util.Map; + +/** + * + * @author Sebastian Sdorra + */ +public class WUIModelUrlProviderTest extends ModelUrlProviderTestBase +{ + + /** + * Constructs ... + * + */ + public WUIModelUrlProviderTest() + { + modelMap = new HashMap(); + modelMap.put(MODEL_REPOSITORY, "repositoryPanel"); + modelMap.put(MODEL_USERS, "userPanel"); + modelMap.put(MODEL_GROUPS, "groupPanel"); + } + + //~--- methods -------------------------------------------------------------- + + /** + * Method description + * + * + * @param baseUrl + * + * @return + */ + @Override + protected ModelUrlProvider createGroupModelUrlProvider(String baseUrl) + { + return createWuiUrlProvider(baseUrl).getGroupUrlProvider(); + } + + /** + * Method description + * + * + * @param baseUrl + * + * @return + */ + @Override + protected ModelUrlProvider createRepositoryModelUrlProvider(String baseUrl) + { + return createWuiUrlProvider(baseUrl).getRepositoryUrlProvider(); + } + + /** + * Method description + * + * + * @param baseUrl + * + * @return + */ + @Override + protected ModelUrlProvider createUserModelUrlProvider(String baseUrl) + { + return createWuiUrlProvider(baseUrl).getUserUrlProvider(); + } + + //~--- get methods ---------------------------------------------------------- + + /** + * Method description + * + * + * @param baseUrl + * @param model + * + * @return + */ + @Override + protected String getExpectedAllUrl(String baseUrl, String model) + { + return createModelBaseUrl(baseUrl, model); + } + + /** + * Method description + * + * + * @param baseUrl + * @param model + * @param item + * + * @return + */ + @Override + protected String getExpectedDetailUrl(String baseUrl, String model, + String item) + { + return createModelBaseUrl(baseUrl, model).concat( + WUIUrlBuilder.SEPARATOR).concat(item); + } + + //~--- methods -------------------------------------------------------------- + + /** + * Method description + * + * + * @param baseUrl + * @param model + * + * @return + */ + private String createModelBaseUrl(String baseUrl, String model) + { + return createWuiUrl(baseUrl, modelMap.get(model)); + } + + //~--- fields --------------------------------------------------------------- + + /** Field description */ + private Map modelMap; +} diff --git a/scm-core/src/test/java/sonia/scm/url/WUIUrlProviderTest.java b/scm-core/src/test/java/sonia/scm/url/WUIUrlProviderTest.java index ca41f4701c..d86c3caa00 100644 --- a/scm-core/src/test/java/sonia/scm/url/WUIUrlProviderTest.java +++ b/scm-core/src/test/java/sonia/scm/url/WUIUrlProviderTest.java @@ -42,11 +42,6 @@ import sonia.scm.util.HttpUtil; public class WUIUrlProviderTest extends UrlProviderTestBase { - /** Field description */ - public static final String URLSUFFIX_INDEX = "/index.html"; - - //~--- methods -------------------------------------------------------------- - /** * Method description * @@ -105,34 +100,4 @@ public class WUIUrlProviderTest extends UrlProviderTestBase { return createWuiUrl(baseUrl); } - - //~--- methods -------------------------------------------------------------- - - /** - * Method description - * - * - * @param baseUrl - * - * @return - */ - private String createWuiUrl(String baseUrl) - { - return baseUrl.concat(URLSUFFIX_INDEX); - } - - /** - * Method description - * - * - * @param baseUrl - * @param param - * - * @return - */ - private String createWuiUrl(String baseUrl, String param) - { - return baseUrl.concat(URLSUFFIX_INDEX).concat( - HttpUtil.SEPARATOR_HASH).concat(param); - } }