diff --git a/ant_tasks/source/java/ch/systemsx/cisd/ant/task/subversion/SVNRepositoryProjectContext.java b/ant_tasks/source/java/ch/systemsx/cisd/ant/task/subversion/SVNRepositoryProjectContext.java
index cd21430d07bc5640796ec721d920245f37d2cb64..ac8890d8fa0d6ba6e724a689b549fca98aeadfb9 100644
--- a/ant_tasks/source/java/ch/systemsx/cisd/ant/task/subversion/SVNRepositoryProjectContext.java
+++ b/ant_tasks/source/java/ch/systemsx/cisd/ant/task/subversion/SVNRepositoryProjectContext.java
@@ -3,8 +3,9 @@ package ch.systemsx.cisd.ant.task.subversion;
import java.util.Arrays;
import java.util.regex.Pattern;
+import org.apache.commons.lang.StringUtils;
+
import ch.systemsx.cisd.common.exceptions.UserFailureException;
-import ch.systemsx.cisd.common.utilities.StringUtilities;
/**
* A class for assembling and storing the subversion repository definition of a project.
@@ -247,17 +248,17 @@ class SVNRepositoryProjectContext
switch (versionType)
{
case TRUNK:
- return StringUtilities.concatenate(Arrays.asList(getRepositoryRoot(), getGroup()), "/");
+ return StringUtils.join(Arrays.asList(getRepositoryRoot(), getGroup()), "/");
case RELEASE_BRANCH:
- return StringUtilities.concatenate(Arrays.asList(getRepositoryRoot(), getGroup(), getProjectName(),
- "branches/release", getVersion()), "/");
+ return StringUtils.join(Arrays.asList(getRepositoryRoot(), getGroup(), getProjectName(),
+ "branches/release", getVersion()), "/");
case RELEASE_TAG:
final String branchName = SVNUtilities.getBranchForTag(getVersion());
- return StringUtilities.concatenate(Arrays.asList(getRepositoryRoot(), getGroup(), getProjectName(),
- "tags/release", branchName, getVersion()), "/");
+ return StringUtils.join(Arrays.asList(getRepositoryRoot(), getGroup(), getProjectName(),
+ "tags/release", branchName, getVersion()), "/");
case FEATURE_BRANCH:
- return StringUtilities.concatenate(Arrays.asList(getRepositoryRoot(), getGroup(), getProjectName(),
- "branches/feature", getVersion()), "/");
+ return StringUtils.join(Arrays.asList(getRepositoryRoot(), getGroup(), getProjectName(),
+ "branches/feature", getVersion()), "/");
default:
throw new AssertionError("Unknown version type '" + versionType + "'.");
}
@@ -292,11 +293,11 @@ class SVNRepositoryProjectContext
if (SVNProjectVersionType.TRUNK == versionType)
{
- return StringUtilities.concatenate(Arrays.asList(getRepositoryUrl(), subProjectName,
- SVNUtilities.DEFAULT_VERSION), "/");
+ return StringUtils.join(Arrays.asList(getRepositoryUrl(), subProjectName,
+ SVNUtilities.DEFAULT_VERSION), "/");
} else
{
- return StringUtilities.concatenate(Arrays.asList(getRepositoryUrl(), subProjectName), "/");
+ return StringUtils.join(Arrays.asList(getRepositoryUrl(), subProjectName), "/");
}
}
diff --git a/ant_tasks/sourceTest/java/ch/systemsx/cisd/ant/task/subversion/SVNBranchAndTagTaskTest.java b/ant_tasks/sourceTest/java/ch/systemsx/cisd/ant/task/subversion/SVNBranchAndTagTaskTest.java
index e86e96161593144fdb77d974fd444632ed8b9b7b..b6846b128d531479f839bdab8f884e5fe9b3c32c 100644
--- a/ant_tasks/sourceTest/java/ch/systemsx/cisd/ant/task/subversion/SVNBranchAndTagTaskTest.java
+++ b/ant_tasks/sourceTest/java/ch/systemsx/cisd/ant/task/subversion/SVNBranchAndTagTaskTest.java
@@ -16,6 +16,8 @@
package ch.systemsx.cisd.ant.task.subversion;
+import static org.testng.AssertJUnit.assertEquals;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -25,14 +27,11 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.commons.lang.StringUtils;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.testng.annotations.Test;
-import static org.testng.AssertJUnit.*;
-
-import ch.systemsx.cisd.common.utilities.StringUtilities;
-
/**
* Test cases for the {@link SVNBranchAndTagTask}.
*
@@ -204,10 +203,9 @@ public class SVNBranchAndTagTaskTest
final String branchName = "1.2.x";
final Map<String, List<String>> listMap = new HashMap<String, List<String>>();
final String sourceUrl =
- StringUtilities.concatenate(Arrays.asList(repositoryRoot, groupName, projectName, "trunk"), "/");
+ StringUtils.join(Arrays.asList(repositoryRoot, groupName, projectName, "trunk"), "/");
final String releaseBranchesUrl =
- StringUtilities.concatenate(Arrays.asList(repositoryRoot, groupName, projectName, "branches/release"),
- "/");
+ StringUtils.join(Arrays.asList(repositoryRoot, groupName, projectName, "branches/release"), "/");
listMap.put(sourceUrl, Collections.<String> emptyList());
listMap.put(releaseBranchesUrl, Collections.<String> emptyList());
final Map<String, String> catMap = new HashMap<String, String>();
@@ -227,11 +225,11 @@ public class SVNBranchAndTagTaskTest
task.setReleaseBranch(branchName);
task.execute();
final String branchUrl =
- StringUtilities.concatenate(Arrays.asList(repositoryRoot, groupName, projectName, "branches/release",
- branchName), "/");
+ StringUtils.join(Arrays.asList(repositoryRoot, groupName, projectName, "branches/release",
+ branchName), "/");
final String tagBaseUrl =
- StringUtilities.concatenate(Arrays.asList(repositoryRoot, groupName, projectName, "tags/release",
- branchName), "/");
+ StringUtils.join(Arrays.asList(repositoryRoot, groupName, projectName, "tags/release",
+ branchName), "/");
final String logMessage = "Create branch '" + branchName + "'";
final List<MkdirItem> expectedMkDirList =
Arrays.asList(new MkdirItem(branchUrl, logMessage), new MkdirItem(tagBaseUrl, logMessage));
@@ -239,8 +237,8 @@ public class SVNBranchAndTagTaskTest
final String branchMainUrl = branchUrl + "/" + projectName;
final String branchBuildResourcesUrl = branchUrl + "/" + SVNUtilities.BUILD_RESOURCES_PROJECT;
final String sourceBuildResourcesUrl =
- StringUtilities.concatenate(Arrays.asList(repositoryRoot, groupName,
- SVNUtilities.BUILD_RESOURCES_PROJECT, "trunk"), "/");
+ StringUtils.join(Arrays.asList(repositoryRoot, groupName,
+ SVNUtilities.BUILD_RESOURCES_PROJECT, "trunk"), "/");
final Set<CopyItem> expectedCopySet =
new HashSet<CopyItem>(Arrays.asList(new CopyItem(sourceBuildResourcesUrl, SVNUtilities.HEAD_REVISION,
branchBuildResourcesUrl, logMessage), new CopyItem(sourceUrl, SVNUtilities.HEAD_REVISION,
@@ -258,13 +256,11 @@ public class SVNBranchAndTagTaskTest
final String branchName = "someFeature";
final Map<String, List<String>> listMap = new HashMap<String, List<String>>();
final String sourceUrl =
- StringUtilities.concatenate(Arrays.asList(repositoryRoot, groupName, projectName, "trunk"), "/");
+ StringUtils.join(Arrays.asList(repositoryRoot, groupName, projectName, "trunk"), "/");
final String sourceUrlDependent =
- StringUtilities.concatenate(Arrays.asList(repositoryRoot, groupName, dependentProjectName, "trunk"),
- "/");
+ StringUtils.join(Arrays.asList(repositoryRoot, groupName, dependentProjectName, "trunk"), "/");
final String featureBranchesUrl =
- StringUtilities.concatenate(Arrays.asList(repositoryRoot, groupName, projectName, "branches/feature"),
- "/");
+ StringUtils.join(Arrays.asList(repositoryRoot, groupName, projectName, "branches/feature"), "/");
listMap.put(sourceUrl, Collections.singletonList(".classpath"));
listMap.put(sourceUrlDependent, Collections.<String> emptyList());
listMap.put(featureBranchesUrl, Collections.<String> emptyList());
@@ -292,8 +288,8 @@ public class SVNBranchAndTagTaskTest
task.setFeatureBranch(branchName);
task.execute();
final String branchUrl =
- StringUtilities.concatenate(Arrays.asList(repositoryRoot, groupName, projectName, "branches/feature",
- branchName), "/");
+ StringUtils.join(Arrays.asList(repositoryRoot, groupName, projectName, "branches/feature",
+ branchName), "/");
final String logMessage = "Create branch '" + branchName + "'";
final List<MkdirItem> expectedMkDirList = Arrays.asList(new MkdirItem(branchUrl, logMessage));
assertEquals(expectedMkDirList, svn.mkdirList);
@@ -301,8 +297,8 @@ public class SVNBranchAndTagTaskTest
final String branchBuildResourcesUrl = branchUrl + "/" + SVNUtilities.BUILD_RESOURCES_PROJECT;
final String branchDependendUrl = branchUrl + "/" + dependentProjectName;
final String sourceBuildResourcesUrl =
- StringUtilities.concatenate(Arrays.asList(repositoryRoot, groupName,
- SVNUtilities.BUILD_RESOURCES_PROJECT, "trunk"), "/");
+ StringUtils.join(Arrays.asList(repositoryRoot, groupName,
+ SVNUtilities.BUILD_RESOURCES_PROJECT, "trunk"), "/");
final Set<CopyItem> expectedCopySet =
new HashSet<CopyItem>(Arrays.asList(new CopyItem(sourceBuildResourcesUrl, SVNUtilities.HEAD_REVISION,
branchBuildResourcesUrl, logMessage), new CopyItem(sourceUrl, SVNUtilities.HEAD_REVISION,
@@ -321,8 +317,7 @@ public class SVNBranchAndTagTaskTest
final String branchName = "1.2.x";
final Map<String, List<String>> listMap = new HashMap<String, List<String>>();
final String releaseBranchesUrl =
- StringUtilities.concatenate(Arrays.asList(repositoryRoot, groupName, projectName, "branches/release"),
- "/");
+ StringUtils.join(Arrays.asList(repositoryRoot, groupName, projectName, "branches/release"), "/");
listMap.put(releaseBranchesUrl, Collections.singletonList(branchName + "/"));
final Map<String, String> catMap = new HashMap<String, String>();
final MockSVNRepositoryActions svn = new MockSVNRepositoryActions(listMap, catMap);
@@ -341,11 +336,11 @@ public class SVNBranchAndTagTaskTest
task.setReleaseTag(tagName);
task.execute();
final String tagUrl =
- StringUtilities.concatenate(Arrays.asList(repositoryRoot, groupName, projectName, "tags/release",
- branchName, tagName), "/");
+ StringUtils.join(Arrays.asList(repositoryRoot, groupName, projectName, "tags/release",
+ branchName, tagName), "/");
final String branchUrl =
- StringUtilities.concatenate(Arrays.asList(repositoryRoot, groupName, projectName, "branches/release",
- branchName), "/");
+ StringUtils.join(Arrays.asList(repositoryRoot, groupName, projectName, "branches/release",
+ branchName), "/");
final String logMessage = "Create tag '" + tagName + "'";
assertEquals(0, svn.mkdirList.size());
final Set<CopyItem> expectedCopySet =
@@ -364,8 +359,7 @@ public class SVNBranchAndTagTaskTest
final String tagName = "1.2.0";
final Map<String, List<String>> listMap = new HashMap<String, List<String>>();
final String releaseBranchesUrl =
- StringUtilities.concatenate(Arrays.asList(repositoryRoot, groupName, projectName, "branches/release"),
- "/");
+ StringUtils.join(Arrays.asList(repositoryRoot, groupName, projectName, "branches/release"), "/");
listMap.put(releaseBranchesUrl, Collections.<String> emptyList());
final Map<String, String> catMap = new HashMap<String, String>();
final MockSVNRepositoryActions svn = new MockSVNRepositoryActions(listMap, catMap);
@@ -395,10 +389,9 @@ public class SVNBranchAndTagTaskTest
final String branchName = "1.2.x";
final Map<String, List<String>> listMap = new HashMap<String, List<String>>();
final String sourceUrl =
- StringUtilities.concatenate(Arrays.asList(repositoryRoot, groupName, projectName, "trunk"), "/");
+ StringUtils.join(Arrays.asList(repositoryRoot, groupName, projectName, "trunk"), "/");
final String releaseBranchesUrl =
- StringUtilities.concatenate(Arrays.asList(repositoryRoot, groupName, projectName, "branches/release"),
- "/");
+ StringUtils.join(Arrays.asList(repositoryRoot, groupName, projectName, "branches/release"), "/");
listMap.put(releaseBranchesUrl, Collections.<String> emptyList());
final Map<String, String> catMap = new HashMap<String, String>();
final MockSVNRepositoryActions svn = new MockSVNRepositoryActions(listMap, catMap);
@@ -418,12 +411,12 @@ public class SVNBranchAndTagTaskTest
task.setBranchIfNecessary(true);
task.execute();
final String tagBaseUrl =
- StringUtilities.concatenate(Arrays.asList(repositoryRoot, groupName, projectName, "tags/release",
- branchName), "/");
+ StringUtils.join(Arrays.asList(repositoryRoot, groupName, projectName, "tags/release",
+ branchName), "/");
final String tagUrl = tagBaseUrl + "/" + tagName;
final String branchUrl =
- StringUtilities.concatenate(Arrays.asList(repositoryRoot, groupName, projectName, "branches/release",
- branchName), "/");
+ StringUtils.join(Arrays.asList(repositoryRoot, groupName, projectName, "branches/release",
+ branchName), "/");
final String logMessageBranch = "Create branch '" + branchName + "'";
final String logMessageTag = "Create tag '" + tagName + "'";
final List<MkdirItem> expectedMkDirList =
@@ -432,8 +425,8 @@ public class SVNBranchAndTagTaskTest
final String branchMainUrl = branchUrl + "/" + projectName;
final String branchBuildResourcesUrl = branchUrl + "/" + SVNUtilities.BUILD_RESOURCES_PROJECT;
final String sourceBuildResourcesUrl =
- StringUtilities.concatenate(Arrays.asList(repositoryRoot, groupName,
- SVNUtilities.BUILD_RESOURCES_PROJECT, "trunk"), "/");
+ StringUtils.join(Arrays.asList(repositoryRoot, groupName,
+ SVNUtilities.BUILD_RESOURCES_PROJECT, "trunk"), "/");
final List<CopyItem> expectedCopyList =
Arrays.asList(new CopyItem(sourceUrl, SVNUtilities.HEAD_REVISION, branchMainUrl, logMessageBranch),
new CopyItem(sourceBuildResourcesUrl, SVNUtilities.HEAD_REVISION, branchBuildResourcesUrl,
@@ -451,8 +444,7 @@ public class SVNBranchAndTagTaskTest
final String tagName = "1.2.1";
final Map<String, List<String>> listMap = new HashMap<String, List<String>>();
final String releaseBranchesUrl =
- StringUtilities.concatenate(Arrays.asList(repositoryRoot, groupName, projectName, "branches/release"),
- "/");
+ StringUtils.join(Arrays.asList(repositoryRoot, groupName, projectName, "branches/release"), "/");
listMap.put(releaseBranchesUrl, Collections.<String> emptyList());
final Map<String, String> catMap = new HashMap<String, String>();
final MockSVNRepositoryActions svn = new MockSVNRepositoryActions(listMap, catMap);
diff --git a/ant_tasks/sourceTest/java/ch/systemsx/cisd/ant/task/subversion/SVNRepositoryProjectContextTest.java b/ant_tasks/sourceTest/java/ch/systemsx/cisd/ant/task/subversion/SVNRepositoryProjectContextTest.java
index bfd2983c6cb0ba928ce92dcc79c9386f11ae5e73..63de8d0d93e2c0d3e1670c805869d18137b07bce 100644
--- a/ant_tasks/sourceTest/java/ch/systemsx/cisd/ant/task/subversion/SVNRepositoryProjectContextTest.java
+++ b/ant_tasks/sourceTest/java/ch/systemsx/cisd/ant/task/subversion/SVNRepositoryProjectContextTest.java
@@ -1,16 +1,17 @@
package ch.systemsx.cisd.ant.task.subversion;
+import static ch.systemsx.cisd.ant.task.subversion.SVNProjectVersionType.FEATURE_BRANCH;
+import static ch.systemsx.cisd.ant.task.subversion.SVNProjectVersionType.RELEASE_BRANCH;
+import static ch.systemsx.cisd.ant.task.subversion.SVNProjectVersionType.RELEASE_TAG;
+import static ch.systemsx.cisd.ant.task.subversion.SVNProjectVersionType.TRUNK;
+import static org.testng.AssertJUnit.assertEquals;
+
import java.util.Arrays;
+import org.apache.commons.lang.StringUtils;
import org.testng.annotations.Test;
-import static org.testng.AssertJUnit.*;
-
-import ch.systemsx.cisd.ant.task.subversion.SVNRepositoryProjectContext;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
-import ch.systemsx.cisd.common.utilities.StringUtilities;
-
-import static ch.systemsx.cisd.ant.task.subversion.SVNProjectVersionType.*;
/*
* Copyright 2007 ETH Zuerich, CISD
@@ -84,7 +85,7 @@ public class SVNRepositoryProjectContextTest
def.setProjectName(name);
final String repositoryUrl =
SVNUtilities.DEFAULT_REPOSITORY_ROOT + "/" + SVNUtilities.DEFAULT_GROUP;
- final String projectPath = StringUtilities.concatenate(Arrays.asList(repositoryUrl, name, "trunk"), "/");
+ final String projectPath = StringUtils.join(Arrays.asList(repositoryUrl, name, "trunk"), "/");
assertEquals(repositoryUrl, def.getRepositoryUrl());
assertEquals(projectPath, def.getPathProvider().getPath());
}
@@ -98,7 +99,7 @@ public class SVNRepositoryProjectContextTest
def.setProjectName(name);
final String repositoryUrl =
SVNUtilities.DEFAULT_REPOSITORY_ROOT + "/" + SVNUtilities.DEFAULT_GROUP;
- final String projectPath = StringUtilities.concatenate(Arrays.asList(repositoryUrl, subName, "trunk"), "/");
+ final String projectPath = StringUtils.join(Arrays.asList(repositoryUrl, subName, "trunk"), "/");
assertEquals(projectPath, def.getPathProvider().getPath(subName));
}
@@ -113,7 +114,7 @@ public class SVNRepositoryProjectContextTest
final String repositoryUrl =
SVNUtilities.DEFAULT_REPOSITORY_ROOT + "/" + SVNUtilities.DEFAULT_GROUP;
final String projectPath =
- StringUtilities.concatenate(Arrays.asList(repositoryUrl, subName, "trunk", pathEntry), "/");
+ StringUtils.join(Arrays.asList(repositoryUrl, subName, "trunk", pathEntry), "/");
assertEquals(projectPath, def.getPathProvider().getPath(subName, pathEntry));
}
@@ -128,7 +129,7 @@ public class SVNRepositoryProjectContextTest
final String branchUrl =
SVNUtilities.DEFAULT_REPOSITORY_ROOT + "/" + SVNUtilities.DEFAULT_GROUP
+ "/" + name + "/branches/release/" + branchName;
- final String projectPath = StringUtilities.concatenate(Arrays.asList(branchUrl, name), "/");
+ final String projectPath = StringUtils.join(Arrays.asList(branchUrl, name), "/");
assertEquals(branchUrl, def.getRepositoryUrl());
assertEquals(projectPath, def.getPathProvider().getPath());
}
@@ -145,7 +146,7 @@ public class SVNRepositoryProjectContextTest
final String branchUrl =
SVNUtilities.DEFAULT_REPOSITORY_ROOT + "/" + SVNUtilities.DEFAULT_GROUP
+ "/" + name + "/branches/release/" + branchName;
- final String projectPath = StringUtilities.concatenate(Arrays.asList(branchUrl, subName), "/");
+ final String projectPath = StringUtils.join(Arrays.asList(branchUrl, subName), "/");
assertEquals(projectPath, def.getPathProvider().getPath(subName));
}
@@ -162,7 +163,7 @@ public class SVNRepositoryProjectContextTest
final String branchUrl =
SVNUtilities.DEFAULT_REPOSITORY_ROOT + "/" + SVNUtilities.DEFAULT_GROUP
+ "/" + name + "/branches/release/" + branchName;
- final String projectPath = StringUtilities.concatenate(Arrays.asList(branchUrl, subName, pathEntry), "/");
+ final String projectPath = StringUtils.join(Arrays.asList(branchUrl, subName, pathEntry), "/");
assertEquals(projectPath, def.getPathProvider().getPath(subName, pathEntry));
}
@@ -177,7 +178,7 @@ public class SVNRepositoryProjectContextTest
final String branchUrl =
SVNUtilities.DEFAULT_REPOSITORY_ROOT + "/" + SVNUtilities.DEFAULT_GROUP
+ "/" + name + "/branches/feature/" + branchName;
- final String projectPath = StringUtilities.concatenate(Arrays.asList(branchUrl, name), "/");
+ final String projectPath = StringUtils.join(Arrays.asList(branchUrl, name), "/");
assertEquals(branchUrl, def.getRepositoryUrl());
assertEquals(projectPath, def.getPathProvider().getPath());
}
@@ -194,7 +195,7 @@ public class SVNRepositoryProjectContextTest
final String branchUrl =
SVNUtilities.DEFAULT_REPOSITORY_ROOT + "/" + SVNUtilities.DEFAULT_GROUP
+ "/" + name + "/branches/feature/" + branchName;
- final String projectPath = StringUtilities.concatenate(Arrays.asList(branchUrl, subName), "/");
+ final String projectPath = StringUtils.join(Arrays.asList(branchUrl, subName), "/");
assertEquals(projectPath, def.getPathProvider().getPath(subName));
}
@@ -210,7 +211,7 @@ public class SVNRepositoryProjectContextTest
final String tagUrl =
SVNUtilities.DEFAULT_REPOSITORY_ROOT + "/" + SVNUtilities.DEFAULT_GROUP
+ "/" + name + "/tags/release/" + branchName + "/" + tagName;
- final String projectPath = StringUtilities.concatenate(Arrays.asList(tagUrl, name), "/");
+ final String projectPath = StringUtils.join(Arrays.asList(tagUrl, name), "/");
assertEquals(tagUrl, def.getRepositoryUrl());
assertEquals(projectPath, def.getPathProvider().getPath());
}
@@ -228,7 +229,7 @@ public class SVNRepositoryProjectContextTest
final String tagUrl =
SVNUtilities.DEFAULT_REPOSITORY_ROOT + "/" + SVNUtilities.DEFAULT_GROUP
+ "/" + name + "/tags/release/" + branchName + "/" + tagName;
- final String projectPath = StringUtilities.concatenate(Arrays.asList(tagUrl, subName), "/");
+ final String projectPath = StringUtils.join(Arrays.asList(tagUrl, subName), "/");
assertEquals(tagUrl, def.getRepositoryUrl());
assertEquals(projectPath, def.getPathProvider().getPath(subName));
}
diff --git a/ant_tasks/sourceTest/java/ch/systemsx/cisd/ant/task/subversion/SVNWCProjectPathProviderTest.java b/ant_tasks/sourceTest/java/ch/systemsx/cisd/ant/task/subversion/SVNWCProjectPathProviderTest.java
index acee49a79b4240aadbf9f3e5b085277a3854a987..f1d792f49020ae287abe1fe0128c5e15fc85cff7 100644
--- a/ant_tasks/sourceTest/java/ch/systemsx/cisd/ant/task/subversion/SVNWCProjectPathProviderTest.java
+++ b/ant_tasks/sourceTest/java/ch/systemsx/cisd/ant/task/subversion/SVNWCProjectPathProviderTest.java
@@ -16,18 +16,18 @@
package ch.systemsx.cisd.ant.task.subversion;
+import static org.testng.AssertJUnit.assertEquals;
+
import java.io.File;
import java.util.Arrays;
-import static org.testng.AssertJUnit.*;
-
+import org.apache.commons.lang.StringUtils;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import ch.systemsx.cisd.common.logging.LogInitializer;
import ch.systemsx.cisd.common.utilities.FileUtilities;
-import ch.systemsx.cisd.common.utilities.StringUtilities;
/**
* Test cases for the {@link SVNWCProjectPathProvider}.
@@ -82,16 +82,15 @@ public class SVNWCProjectPathProviderTest
final ISVNProjectPathProvider provider = new SVNWCProjectPathProvider(workingCopyDirectory);
String expectedPath;
expectedPath =
- StringUtilities.concatenate(
- Arrays.asList(workingDirectory.getAbsolutePath(), project), File.separator);
+ StringUtils.join(Arrays.asList(workingDirectory.getAbsolutePath(), project), File.separator);
assertEquals(expectedPath, provider.getPath());
expectedPath =
- StringUtilities.concatenate(Arrays.asList(workingDirectory.getAbsolutePath(),
- subProject), File.separator);
+ StringUtils.join(Arrays.asList(workingDirectory.getAbsolutePath(),
+ subProject), File.separator);
assertEquals(expectedPath, provider.getPath(subProject));
expectedPath =
- StringUtilities.concatenate(Arrays.asList(workingDirectory.getAbsolutePath(),
- subProject, path), File.separator);
+ StringUtils.join(Arrays.asList(workingDirectory.getAbsolutePath(),
+ subProject, path), File.separator);
assertEquals(expectedPath, provider.getPath(subProject, path));
}
@@ -109,8 +108,8 @@ public class SVNWCProjectPathProviderTest
workingDirectory.deleteOnExit();
final ISVNProjectPathProvider provider = new SVNWCProjectPathProvider(workingCopyDirectory);
final String expectedPath =
- StringUtilities.concatenate(Arrays.asList(workingDirectory.getAbsolutePath(), subProject,
- "somePath/two"), File.separator);
+ StringUtils.join(Arrays.asList(workingDirectory.getAbsolutePath(), subProject,
+ "somePath/two"), File.separator);
assertEquals(expectedPath, provider.getPath(subProject, path));
} else
{
@@ -121,8 +120,8 @@ public class SVNWCProjectPathProviderTest
workingCopyDirectory.mkdir();
final ISVNProjectPathProvider provider = new SVNWCProjectPathProvider(workingCopyDirectory);
final String expectedPath =
- StringUtilities.concatenate(Arrays.asList(workingDirectory.getAbsolutePath(), subProject,
- "somePath\\two"), File.separator);
+ StringUtils.join(Arrays.asList(workingDirectory.getAbsolutePath(), subProject,
+ "somePath\\two"), File.separator);
assertEquals(expectedPath, provider.getPath(subProject, path));
}
}