tests amend

Author: Denis

src/main/java/com/projectkaiser/scm/vcs/GitVCS.java

@@ -20,6 +20,7 @@
 import org.eclipse.jgit.api.MergeResult;
 import org.eclipse.jgit.api.ResetCommand.ResetType;
 import org.eclipse.jgit.api.errors.GitAPIException;
+import org.eclipse.jgit.api.errors.RefAlreadyExistsException;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
 import org.eclipse.jgit.transport.CredentialsProvider;
@@ -30,6 +31,7 @@
 import com.projectkaiser.scm.vcs.api.IVCS;
 import com.projectkaiser.scm.vcs.api.PKVCSMergeResult;
 import com.projectkaiser.scm.vcs.api.VCSWorkspace;
+import com.projectkaiser.scm.vcs.api.exceptions.EVCSBranchExists;
 import com.projectkaiser.scm.vcs.api.exceptions.EVCSException;
 
 public class GitVCS extends AbstractVCS implements IVCS {
@@ -75,6 +77,8 @@ public void createBranch(String srcBranchName, String newBranchName, String comm
 			} finally {
 				workspace.unlock();
 			}
+		} catch (RefAlreadyExistsException e) {
+			throw new EVCSBranchExists (e);
 		} catch (GitAPIException e) {
 			throw new EVCSException(e);
 		} catch (Exception e) {

src/test/java/com/projectkaiser/scm/vcs/GitVCSTest.java

@@ -25,24 +25,30 @@
 
 import com.projectkaiser.scm.vcs.api.IVCS;
 import com.projectkaiser.scm.vcs.api.VCSWorkspace;
+import com.projectkaiser.scm.vcs.api.exceptions.EVCSBranchExists;
 
 public class GitVCSTest  {
 
 	private static final String FILE1_ADDED_COMMIT_MESSAGE = "file1 added";
 	private static final String FILE2_ADDED_COMMIT_MESSAGE = "file2 added";
 	private static final String WORKSPACE_DIR = System.getProperty("java.io.tmpdir") + "pk-vcs-workspaces";
 	private static final String REPO_NAME = "pk-vcs-git-testrepo";
-	private static final String GITHUB_USER = System.getenv("PK_VCS_TEST_GITHUB_USER");
-	private static final String GITHUB_PASS = System.getenv("PK_VCS_TEST_GITHUB_PASS");
+	private static final String GITHUB_USER = System.getProperty("PK_VCS_TEST_GITHUB_USER") == null ? 
+			System.getenv("PK_VCS_TEST_GITHUB_USER") : System.getProperty("PK_VCS_TEST_GITHUB_USER");
+	private static final String GITHUB_PASS = System.getProperty("PK_VCS_TEST_GITHUB_PASS") == null ? 
+			System.getenv("PK_VCS_TEST_GITHUB_PASS") : System.getProperty("PK_VCS_TEST_GITHUB_PASS");
 	private static final String NEW_BRANCH = "new-branch";
 	private static final String SRC_BRANCH = "master";
 	private static final String INITIAL_COMMIT_MESSAGE = "Initial commit";
 	private static final String CREATED_DST_BRANCH_COMMIT_MESSAGE = "created dst branch";
 	private static final String CONTENT_CHANGED_COMMIT_MESSAGE = "changed file content";
 	private static final String MERGE_COMMIT_MESSAGE = "merged.";
 	private static final String DELETE_BRANCH_COMMIT_MESSAGE = "deleted";
-	private static final String PROXY_HOST = "localhost";
-	private static final Integer PROXY_PORT = 3128;
+	private static final String PROXY_HOST = getJvmProperty("https.proxyHost");
+	private static final Integer PROXY_PORT = getJvmProperty("https.proxyPort") == null ? null :
+			Integer.parseInt(getJvmProperty("https.proxyPort"));
+	private static final String PROXY_USER = getJvmProperty("https.proxyUser");
+	private static final String PROXY_PASS = getJvmProperty("https.proxyPassword");
 	private static final String LINE_1 = "line 1";
 	private static final String LINE_2 = "line 2";
 
@@ -64,12 +70,37 @@ public static void setUpClass() {
 				GITHUB_PASS != null);
 	}
 
+	private static String getJvmProperty(String name) {
+		if (name == null) {
+			return null;
+		}
+		
+		String res = System.getProperty(name);
+		if (res != null) {
+			return res;
+		}
+		
+		res = System.getenv("JAVA_OPTS");
+		if (res == null) {
+			return null;
+		}
+		
+		Integer st = res.indexOf(name);
+		if (st < 0) {
+			return null;
+		}
+		
+		res = res.substring(st + name.length() + 1, res.indexOf(" -D", st + name.length() + 1) < 0 ? name.length() : 
+				res.indexOf(" -D", st + name.length())).trim();
+		return res;
+	}
+	
 	@Before
 	public void setUp() throws IOException {
 		github = GitHub.connectUsingPassword(GITHUB_USER, GITHUB_PASS);
 		String uuid = UUID.randomUUID().toString();
 		repoName = (REPO_NAME + "_" + uuid);
-		
+		 
 		repo = github.createRepository(repoName)
 				.issues(false)
 				.wiki(false)
@@ -79,7 +110,9 @@ public void setUp() throws IOException {
 		gitVCS = new GitVCS(null, WORKSPACE_DIR, gitUrl + repoName + ".git");
 		vcs = gitVCS;
 		vcs.setCredentials(GITHUB_USER, GITHUB_PASS);
-		vcs.setProxy(PROXY_HOST, PROXY_PORT, "", "");
+		if (PROXY_HOST != null) {
+			vcs.setProxy(PROXY_HOST, PROXY_PORT, PROXY_USER, PROXY_PASS);
+		}
 	}
 
 	@After
@@ -98,6 +131,12 @@ public void testGitCreateAndDeleteBranch() throws InterruptedException, IOExcept
 		assertTrue(repo.getBranches().containsKey(NEW_BRANCH));
 		assertTrue(repo.getBranches().size() == 2); // master & NEW_BRANCH
 
+		try {
+			vcs.createBranch(SRC_BRANCH, NEW_BRANCH, CREATED_DST_BRANCH_COMMIT_MESSAGE);
+			fail("\"Branch exists\" situation not detected");
+		} catch (EVCSBranchExists e) {
+		}
+		
 		vcs.deleteBranch(NEW_BRANCH, DELETE_BRANCH_COMMIT_MESSAGE);
 		Thread.sleep(2000); // next operation fails from time to time. Looks like github has some latency on branch operations
 		assertTrue (repo.getBranches().size() == 1);