Merge branch 'develop' of https://github.com/ProjectKaiser/scm4j-vcs-svn into develop

# Conflicts:
#	build.gradle
#	src/main/java/org/scm4j/vcs/svn/SVNVCS.java

Author: host6

.travis.yml

@@ -0,0 +1,11 @@
+language: java
+before_install:
+ - chmod +x gradlew
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
+

README.md

@@ -1,4 +1,5 @@
-[![Release](https://jitpack.io/v/scm4j/scm4j-vcs-svn.svg)](https://jitpack.io/#scm4j/scm4j-vcs-svn)	
+[![Release](https://jitpack.io/v/scm4j/scm4j-vcs-svn.svg)](https://jitpack.io/#scm4j/scm4j-vcs-svn)
+[![Build Status](https://travis-ci.org/scm4j/scm4j-vcs-svn.svg?branch=master)](https://travis-ci.org/scm4j/scm4j-vcs-svn)
 
 # Overview
 scm4j-vcs-svn is lightweight library for execute basic SVN VCS operations (merge, branch create etc). It uses [scm4j-vcs-api](https://github.com/scm4j/scm4j-vcs-api) exposing IVCS implementation for SVN repositories and [SVNKit](https://svnkit.com/) as framework to work with SVN repositories.

src/test/java/org/scm4j/vcs/svn/SVNVCSTest.java

@@ -4,11 +4,9 @@
 import org.mockito.Mockito;
 import org.scm4j.vcs.api.IVCS;
 import org.scm4j.vcs.api.abstracttest.VCSAbstractTest;
-import org.scm4j.vcs.api.exceptions.EVCSException;
 import org.scm4j.vcs.api.workingcopy.IVCSRepositoryWorkspace;
 import org.tmatesoft.svn.core.SVNDepth;
 import org.tmatesoft.svn.core.SVNException;
-import org.tmatesoft.svn.core.SVNURL;
 import org.tmatesoft.svn.core.internal.wc.DefaultSVNOptions;
 import org.tmatesoft.svn.core.io.SVNRepository;
 import org.tmatesoft.svn.core.wc.SVNWCClient;
@@ -19,8 +17,7 @@
 
 public class SVNVCSTest extends VCSAbstractTest {
 
-	private static final String TRUNK_CREATED_COMMIT_MESSAGE = "trunk/ created";
-	private static final String BRANCHES_CREATED_COMMIT_MESSAGE = "branches/ created";
+	private static final String FOLDER_STRUCT_CREATED_COMMIT_MESSAGE = "trunk/ and branches/ created";
 	private SVNVCS svn;
 	private SVNRepository svnRepo;
 	private SVNWCClient mockedSVNRevertClient;
@@ -30,21 +27,7 @@ public class SVNVCSTest extends VCSAbstractTest {
 	public void setUp() throws Exception {
 		super.setUp();
 		svnRepo = SVNVCSUtils.createRepository(new File(repoUrl.replace("file://", "")));
-
-		createFolder("/" + SVNVCS.MASTER_PATH, TRUNK_CREATED_COMMIT_MESSAGE);
-		createFolder("/" + SVNVCS.BRANCHES_PATH, BRANCHES_CREATED_COMMIT_MESSAGE);
-	}
-
-	private void createFolder(String folderName, String commitMessage) {
-		try {
-			svn
-					.getClientManager()
-					.getCommitClient()
-					.doMkDir(new SVNURL[] {SVNURL.parseURIEncoded(svn.getRepoUrl() + folderName)},
-							commitMessage);
-		} catch (SVNException e) {
-			throw new EVCSException(e);
-		}
+		SVNVCSUtils.createFolderStructure(svn, FOLDER_STRUCT_CREATED_COMMIT_MESSAGE);
 	}
 
 	@After

src/test/java/org/scm4j/vcs/svn/SVNVCSUtils.java

@@ -17,4 +17,30 @@ public static SVNRepository createRepository(File repoDir) {
 			throw new EVCSException(e);
 		}
 	}
+
+	public static void createFolderStructure(SVNVCS svn, String commitMessage) {
+		try {
+			svn
+					.getClientManager()
+					.getCommitClient()
+					.doMkDir(new SVNURL[] {
+							SVNURL.parseURIEncoded(appendSlash(svn.getRepoUrl()) + SVNVCS.MASTER_PATH),
+							SVNURL.parseURIEncoded(appendSlash(svn.getRepoUrl()) + SVNVCS.BRANCHES_PATH)},
+							commitMessage);
+		} catch (SVNException e) {
+			throw new EVCSException(e);
+		}
+	}
+
+	public static String removeLastSlash(String url) {
+		if(url.endsWith("/")) {
+			return url.substring(0, url.lastIndexOf("/"));
+		} else {
+			return url;
+		}
+	}
+
+	public static String appendSlash(String url) {
+		return removeLastSlash(url) + "/";
+	}
 }