@Test
public void testDiffParts() throws Exception {
URI workspaceLocation = createWorkspace(getMethodName());
String projectName = getMethodName();
JSONObject project = createProjectOrLink(workspaceLocation, projectName, gitDir.toString());
String projectId = project.getString(ProtocolConstants.KEY_ID);
JSONObject gitSection = project.optJSONObject(GitConstants.KEY_GIT);
assertNotNull(gitSection);
String gitDiffUri = gitSection.getString(GitConstants.KEY_DIFF);
String gitIndexUri = gitSection.getString(GitConstants.KEY_INDEX);
String gitHeadUri = gitSection.getString(GitConstants.KEY_HEAD);
// modify
WebRequest request = getPutFileRequest(projectId + "/test.txt", "change");
WebResponse response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
// add
request = GitAddTest.getPutGitIndexRequest(gitIndexUri + "test.txt");
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
// commit
request = GitCommitTest.getPostGitCommitRequest(gitHeadUri, "commit1", false);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
// TODO: replace with REST API for git log when ready, see bug 339104
String initialCommit = Constants.HEAD + "^";
String commit = Constants.HEAD;
// TODO: don't create URIs out of thin air
String enc = URLEncoder.encode(initialCommit + ".." + commit, "UTF-8");
String location = gitDiffUri.replaceAll(GitConstants.KEY_DIFF_DEFAULT, enc);
location += "test.txt";
request = getGetFilesRequest(location + "?parts=uris,diff");
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
String[] parts = parseMultiPartResponse(response);
assertDiffUris(location, new String[] {"test", "change", "test"}, new JSONObject(parts[0]));
StringBuilder sb = new StringBuilder();
sb.append("diff --git a/test.txt b/test.txt").append("\n");
sb.append("index 30d74d2..8013df8 100644").append("\n");
sb.append("--- a/test.txt").append("\n");
sb.append("+++ b/test.txt").append("\n");
sb.append("@@ -1 +1 @@").append("\n");
sb.append("-test").append("\n");
sb.append("\\ No newline at end of file").append("\n");
sb.append("+change").append("\n");
sb.append("\\ No newline at end of file").append("\n");
assertEquals(sb.toString(), parts[1]);
request = getGetFilesRequest(location + "?parts=diff,uris");
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
parseMultiPartResponse(response);
assertDiffUris(location, new String[] {"test", "change", "test"}, new JSONObject(parts[0]));
assertEquals(sb.toString(), parts[1]);
request = getGetFilesRequest(location + "?parts=diff");
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
assertEquals(sb.toString(), response.getText());
request = getGetFilesRequest(location + "?parts=uris");
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
assertDiffUris(
location, new String[] {"test", "change", "test"}, new JSONObject(response.getText()));
}
@Test
public void testDiffWithCommonAncestor() throws Exception {
// clone: create
URI workspaceLocation = createWorkspace(getMethodName());
JSONObject project = createProjectOrLink(workspaceLocation, getMethodName(), null);
String projectId = project.getString(ProtocolConstants.KEY_ID);
IPath clonePath =
new Path("file").append(project.getString(ProtocolConstants.KEY_ID)).makeAbsolute();
JSONObject clone = clone(clonePath);
String cloneLocation = clone.getString(ProtocolConstants.KEY_LOCATION);
String branchesLocation = clone.getString(GitConstants.KEY_BRANCH);
// get project metadata
WebRequest request =
getGetFilesRequest(project.getString(ProtocolConstants.KEY_CONTENT_LOCATION));
WebResponse response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
project = new JSONObject(response.getText());
JSONObject gitSection = project.optJSONObject(GitConstants.KEY_GIT);
assertNotNull(gitSection);
String a = "a";
branch(branchesLocation, a);
// checkout 'a'
checkoutBranch(cloneLocation, a);
// modify while on 'a'
request = getPutFileRequest(projectId + "/test.txt", "change in a");
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
gitSection = project.optJSONObject(GitConstants.KEY_GIT);
assertNotNull(gitSection);
String gitIndexUri = gitSection.getString(GitConstants.KEY_INDEX);
String gitStatusUri = gitSection.getString(GitConstants.KEY_STATUS);
String gitHeadUri = gitSection.getString(GitConstants.KEY_HEAD);
String gitDiffUri = gitSection.getString(GitConstants.KEY_DIFF);
// "git add ."
request = GitAddTest.getPutGitIndexRequest(gitIndexUri);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
// commit all
request = GitCommitTest.getPostGitCommitRequest(gitHeadUri, "commit on a", false);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
// assert clean
request = GitStatusTest.getGetGitStatusRequest(gitStatusUri);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
JSONObject statusResponse = new JSONObject(response.getText());
GitStatusTest.assertStatusClean(statusResponse);
// checkout 'master'
checkoutBranch(cloneLocation, Constants.MASTER);
// modify the same file on master
request = getPutFileRequest(projectId + "/test.txt", "change in master");
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
gitSection = project.optJSONObject(GitConstants.KEY_GIT);
assertNotNull(gitSection);
gitIndexUri = gitSection.getString(GitConstants.KEY_INDEX);
gitStatusUri = gitSection.getString(GitConstants.KEY_STATUS);
gitHeadUri = gitSection.getString(GitConstants.KEY_HEAD);
// "git add ."
request = GitAddTest.getPutGitIndexRequest(gitIndexUri);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
// commit all
request = GitCommitTest.getPostGitCommitRequest(gitHeadUri, "commit on master", false);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
// assert clean
request = GitStatusTest.getGetGitStatusRequest(gitStatusUri);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
statusResponse = new JSONObject(response.getText());
GitStatusTest.assertStatusClean(statusResponse);
// TODO: replace with REST API for git log when ready, see bug 339104
// TODO: don't create URIs out of thin air
String enc = URLEncoder.encode(Constants.MASTER + ".." + a, "UTF-8");
String location = gitDiffUri.replaceAll(GitConstants.KEY_DIFF_DEFAULT, enc);
location += "test.txt";
request = getGetFilesRequest(location + "?parts=uris,diff");
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
String[] parts = parseMultiPartResponse(response);
assertDiffUris(
location,
new String[] {"change in master", "change in a", "test"},
new JSONObject(parts[0]));
}
@Test
public void testDiffCommitWithWorkingTree() throws Exception {
URI workspaceLocation = createWorkspace(getMethodName());
String projectName = getMethodName();
JSONObject project = createProjectOrLink(workspaceLocation, projectName, gitDir.toString());
String projectId = project.getString(ProtocolConstants.KEY_ID);
JSONObject gitSection = project.optJSONObject(GitConstants.KEY_GIT);
assertNotNull(gitSection);
String gitDiffUri = gitSection.getString(GitConstants.KEY_DIFF);
String gitIndexUri = gitSection.getString(GitConstants.KEY_INDEX);
String gitHeadUri = gitSection.getString(GitConstants.KEY_HEAD);
// modify
WebRequest request = getPutFileRequest(projectId + "/test.txt", "first change");
WebResponse response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
// TODO: don't create URIs out of thin air
// add
request = GitAddTest.getPutGitIndexRequest(gitIndexUri + "test.txt");
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
// commit1
request = GitCommitTest.getPostGitCommitRequest(gitHeadUri, "commit1", false);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
// modify again
request = getPutFileRequest(projectId + "/test.txt", "second change");
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
// add
request = GitAddTest.getPutGitIndexRequest(gitIndexUri + "test.txt");
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
// commit2
request = GitCommitTest.getPostGitCommitRequest(gitHeadUri, "commit2", false);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
// modify again and leave the change in the working tree only
request = getPutFileRequest(projectId + "/test.txt", "third change (in tree only)");
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
String commit1 = db.resolve(Constants.HEAD + "^").getName();
String commit2 = db.resolve(Constants.HEAD).getName();
// TODO: don't create URIs out of thin air
String enc = URLEncoder.encode(commit1, "UTF-8");
request =
getGetGitDiffRequest(
new String(gitDiffUri).replaceAll(GitConstants.KEY_DIFF_DEFAULT, enc) + "test.txt");
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
StringBuilder sb = new StringBuilder();
sb.append("diff --git a/test.txt b/test.txt").append("\n");
sb.append("index 3c26ed4..4cb5d38 100644").append("\n");
sb.append("--- a/test.txt").append("\n");
sb.append("+++ b/test.txt").append("\n");
sb.append("@@ -1 +1 @@").append("\n");
sb.append("-first change").append("\n");
sb.append("\\ No newline at end of file").append("\n");
sb.append("+third change (in tree only)").append("\n");
sb.append("\\ No newline at end of file").append("\n");
String[] parts = parseMultiPartResponse(response);
assertEquals(sb.toString(), parts[1]);
// TODO: don't create URIs out of thin air
enc = URLEncoder.encode(commit2, "UTF-8");
request =
getGetGitDiffRequest(
new String(gitDiffUri).replaceAll(GitConstants.KEY_DIFF_DEFAULT, enc) + "test.txt");
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
sb = new StringBuilder();
sb.append("diff --git a/test.txt b/test.txt").append("\n");
sb.append("index 58bcb48..4cb5d38 100644").append("\n");
sb.append("--- a/test.txt").append("\n");
sb.append("+++ b/test.txt").append("\n");
sb.append("@@ -1 +1 @@").append("\n");
sb.append("-second change").append("\n");
sb.append("\\ No newline at end of file").append("\n");
sb.append("+third change (in tree only)").append("\n");
sb.append("\\ No newline at end of file").append("\n");
parts = parseMultiPartResponse(response);
assertEquals(sb.toString(), parts[1]);
}
@Test
public void testMerge() throws Exception {
// clone a repo
createWorkspace(SimpleMetaStore.DEFAULT_WORKSPACE_NAME);
String workspaceId = workspaceIdFromLocation(workspaceLocation);
JSONObject project =
createProjectOrLink(workspaceLocation, getMethodName().concat("Project"), null);
IPath clonePath = getClonePath(workspaceId, project);
JSONObject clone = clone(clonePath);
String cloneContentLocation = clone.getString(ProtocolConstants.KEY_CONTENT_LOCATION);
String cloneLocation = clone.getString(ProtocolConstants.KEY_LOCATION);
String branchesLocation = clone.getString(GitConstants.KEY_BRANCH);
// get project metadata
WebRequest request = getGetRequest(project.getString(ProtocolConstants.KEY_CONTENT_LOCATION));
WebResponse response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
project = new JSONObject(response.getText());
// create branch 'a'
branch(branchesLocation, "a");
// checkout 'a'
Repository db1 = getRepositoryForContentLocation(cloneContentLocation);
Git git = Git.wrap(db1);
assertBranchExist(git, "a");
checkoutBranch(cloneLocation, "a");
// modify while on 'a'
JSONObject testTxt = getChild(project, "test.txt");
modifyFile(testTxt, "change in a");
JSONObject gitSection = project.getJSONObject(GitConstants.KEY_GIT);
String gitIndexUri = gitSection.getString(GitConstants.KEY_INDEX);
String gitStatusUri = gitSection.getString(GitConstants.KEY_STATUS);
String gitHeadUri = gitSection.getString(GitConstants.KEY_HEAD);
// "git add ."
request = GitAddTest.getPutGitIndexRequest(gitIndexUri);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
// commit all
request = GitCommitTest.getPostGitCommitRequest(gitHeadUri, "commit on a", false);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
// assert clean
assertStatus(StatusResult.CLEAN, gitStatusUri);
// checkout 'master'
checkoutBranch(cloneLocation, Constants.MASTER);
// modify a different file on master
JSONObject folder1 = getChild(project, "folder");
JSONObject folderTxt = getChild(folder1, "folder.txt");
modifyFile(folderTxt, "change in master");
gitSection = project.getJSONObject(GitConstants.KEY_GIT);
gitIndexUri = gitSection.getString(GitConstants.KEY_INDEX);
gitStatusUri = gitSection.getString(GitConstants.KEY_STATUS);
gitHeadUri = gitSection.getString(GitConstants.KEY_HEAD);
// "git add ."
request = GitAddTest.getPutGitIndexRequest(gitIndexUri);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
// commit all
request = GitCommitTest.getPostGitCommitRequest(gitHeadUri, "commit on master", false);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
// assert clean
assertStatus(StatusResult.CLEAN, gitStatusUri);
// merge: "git merge a"
JSONObject merge = merge(gitHeadUri, "a");
MergeStatus mergeResult = MergeStatus.valueOf(merge.getString(GitConstants.KEY_RESULT));
assertEquals(MergeStatus.MERGED, mergeResult);
// assert clean
assertStatus(StatusResult.CLEAN, gitStatusUri);
request = getGetRequest(testTxt.getString(ProtocolConstants.KEY_LOCATION));
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
assertEquals("change in a", response.getText());
request = getGetRequest(folderTxt.getString(ProtocolConstants.KEY_LOCATION));
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
assertEquals("change in master", response.getText());
// TODO: check commits, bug 340051
}
@Test
public void testMergeRemovingFolders() throws Exception {
// see org.eclipse.jgit.api.MergeCommandTest.testMergeRemovingFolders()
createWorkspace(SimpleMetaStore.DEFAULT_WORKSPACE_NAME);
IPath[] clonePaths = createTestProjects(workspaceLocation);
for (IPath clonePath : clonePaths) {
// clone a repo
JSONObject clone = clone(clonePath);
String cloneContentLocation = clone.getString(ProtocolConstants.KEY_CONTENT_LOCATION);
// get project/folder metadata
WebRequest request = getGetRequest(cloneContentLocation);
WebResponse response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
JSONObject folder = new JSONObject(response.getText());
String folderChildrenLocation = folder.getString(ProtocolConstants.KEY_CHILDREN_LOCATION);
String folderLocation = folder.getString(ProtocolConstants.KEY_LOCATION);
JSONObject gitSection = folder.getJSONObject(GitConstants.KEY_GIT);
String gitIndexUri = gitSection.getString(GitConstants.KEY_INDEX);
String gitHeadUri = gitSection.getString(GitConstants.KEY_HEAD);
String folderName = "folder1";
request =
getPostFilesRequest(
folderLocation + "/", getNewDirJSON(folderName).toString(), folderName);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_CREATED, response.getResponseCode());
JSONObject folder1 = getChild(folder, "folder1");
String fileName = "file1.txt";
request =
getPostFilesRequest(
folder1.getString(ProtocolConstants.KEY_LOCATION),
getNewFileJSON(fileName).toString(),
fileName);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_CREATED, response.getResponseCode());
fileName = "file2.txt";
request =
getPostFilesRequest(
folder1.getString(ProtocolConstants.KEY_LOCATION),
getNewFileJSON(fileName).toString(),
fileName);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_CREATED, response.getResponseCode());
folderName = "folder2";
request =
getPostFilesRequest(
folderLocation + "/", getNewDirJSON(folderName).toString(), folderName);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_CREATED, response.getResponseCode());
JSONObject folder2 = getChild(folder, "folder2");
fileName = "file1.txt";
request =
getPostFilesRequest(
folder2.getString(ProtocolConstants.KEY_LOCATION),
getNewFileJSON(fileName).toString(),
fileName);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_CREATED, response.getResponseCode());
fileName = "file2.txt";
request =
getPostFilesRequest(
folder2.getString(ProtocolConstants.KEY_LOCATION),
getNewFileJSON(fileName).toString(),
fileName);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_CREATED, response.getResponseCode());
request = GitAddTest.getPutGitIndexRequest(gitIndexUri);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
request = GitCommitTest.getPostGitCommitRequest(gitHeadUri, "folders and files", false);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
deleteFile(folder1);
deleteFile(folder2);
request = GitAddTest.getPutGitIndexRequest(gitIndexUri);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
request = GitCommitTest.getPostGitCommitRequest(gitHeadUri, "removing folders", false);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
JSONArray commitsArray = log(gitHeadUri);
assertEquals(3, commitsArray.length());
JSONObject commit = commitsArray.getJSONObject(0);
assertEquals("removing folders", commit.get(GitConstants.KEY_COMMIT_MESSAGE));
String toMerge = commit.getString(ProtocolConstants.KEY_NAME);
commit = commitsArray.getJSONObject(1);
assertEquals("folders and files", commit.get(GitConstants.KEY_COMMIT_MESSAGE));
String toCheckout = commit.getString(ProtocolConstants.KEY_NAME);
Repository db1 = getRepositoryForContentLocation(cloneContentLocation);
Git git = Git.wrap(db1);
git.checkout().setName(toCheckout).call();
JSONObject merge = merge(gitHeadUri, toMerge);
MergeStatus mergeResult = MergeStatus.valueOf(merge.getString(GitConstants.KEY_RESULT));
assertEquals(MergeStatus.FAST_FORWARD, mergeResult);
request = getGetRequest(folderChildrenLocation);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
List<JSONObject> children = getDirectoryChildren(new JSONObject(response.getText()));
assertNull(getChildByName(children, "folder1"));
assertNull(getChildByName(children, "folder2"));
}
}
@Test
public void testMergeRemote() throws Exception {
createWorkspace(SimpleMetaStore.DEFAULT_WORKSPACE_NAME);
String workspaceId = workspaceIdFromLocation(workspaceLocation);
// clone1
JSONObject project1 =
createProjectOrLink(workspaceLocation, getMethodName().concat("Project1"), null);
IPath clonePath1 = getClonePath(workspaceId, project1);
clone(clonePath1);
// get project1 metadata
WebRequest request = getGetRequest(project1.getString(ProtocolConstants.KEY_CONTENT_LOCATION));
WebResponse response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
project1 = new JSONObject(response.getText());
JSONObject gitSection1 = project1.getJSONObject(GitConstants.KEY_GIT);
String gitRemoteUri1 = gitSection1.getString(GitConstants.KEY_REMOTE);
// clone2
JSONObject project2 =
createProjectOrLink(workspaceLocation, getMethodName().concat("Project2"), null);
IPath clonePath2 = getClonePath(workspaceId, project2);
clone(clonePath2);
// get project2 metadata
request = getGetRequest(project2.getString(ProtocolConstants.KEY_CONTENT_LOCATION));
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
project2 = new JSONObject(response.getText());
JSONObject gitSection2 = project2.getJSONObject(GitConstants.KEY_GIT);
String gitRemoteUri2 = gitSection2.getString(GitConstants.KEY_REMOTE);
String gitIndexUri2 = gitSection2.getString(GitConstants.KEY_INDEX);
String gitHeadUri2 = gitSection2.getString(GitConstants.KEY_HEAD);
// clone1: get remote details
JSONObject details = getRemoteBranch(gitRemoteUri1, 1, 0, Constants.MASTER);
String refId1 = details.getString(ProtocolConstants.KEY_ID);
String remoteBranchLocation1 = details.getString(ProtocolConstants.KEY_LOCATION);
// clone2: change
JSONObject testTxt = getChild(project2, "test.txt");
modifyFile(testTxt, "incoming change");
// clone2: add
request = GitAddTest.getPutGitIndexRequest(gitIndexUri2);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
// clone2: commit
request = GitCommitTest.getPostGitCommitRequest(gitHeadUri2, "incoming change commit", false);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
// clone2: push
ServerStatus pushStatus = push(gitRemoteUri2, 1, 0, Constants.MASTER, Constants.HEAD, false);
assertEquals(true, pushStatus.isOK());
// clone1: fetch
request = GitFetchTest.getPostGitRemoteRequest(remoteBranchLocation1, true, false);
response = webConversation.getResponse(request);
ServerStatus status = waitForTask(response);
assertTrue(status.toString(), status.isOK());
// clone1: get remote details again
JSONObject remoteBranch = getRemoteBranch(gitRemoteUri1, 1, 0, Constants.MASTER);
String newRefId1 = remoteBranch.getString(ProtocolConstants.KEY_ID);
// an incoming commit
assertFalse(refId1.equals(newRefId1));
// clone1: merge into HEAD, "git merge origin/master"
// String gitCommitUri = remoteBranch.getString(GitConstants.KEY_COMMIT);
// TODO: should fail when POSTing to the above URI, see bug 342845
String gitHeadUri = remoteBranch.getString(GitConstants.KEY_HEAD);
// merge
JSONObject merge = merge(gitHeadUri, newRefId1);
MergeStatus mergeResult = MergeStatus.valueOf(merge.getString(GitConstants.KEY_RESULT));
assertEquals(MergeStatus.FAST_FORWARD, mergeResult);
request =
getGetRequest(getChild(project1, "test.txt").getString(ProtocolConstants.KEY_LOCATION));
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
assertEquals("incoming change", response.getText());
}
@Test
public void testMergeConflict() throws Exception {
// clone a repo
createWorkspace(SimpleMetaStore.DEFAULT_WORKSPACE_NAME);
String workspaceId = workspaceIdFromLocation(workspaceLocation);
JSONObject project =
createProjectOrLink(workspaceLocation, getMethodName().concat("Project"), null);
IPath clonePath = getClonePath(workspaceId, project);
JSONObject clone = clone(clonePath);
String cloneContentLocation = clone.getString(ProtocolConstants.KEY_CONTENT_LOCATION);
String cloneLocation = clone.getString(ProtocolConstants.KEY_LOCATION);
String branchesLocation = clone.getString(GitConstants.KEY_BRANCH);
// get project metadata
WebRequest request = getGetRequest(project.getString(ProtocolConstants.KEY_CONTENT_LOCATION));
WebResponse response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
project = new JSONObject(response.getText());
JSONObject gitSection = project.optJSONObject(GitConstants.KEY_GIT);
assertNotNull(gitSection);
String gitRemoteUri = gitSection.optString(GitConstants.KEY_REMOTE, null);
assertNotNull(gitRemoteUri);
// create branch 'a'
branch(branchesLocation, "a");
// checkout 'a'
Repository db1 = getRepositoryForContentLocation(cloneContentLocation);
Git git = Git.wrap(db1);
assertBranchExist(git, "a");
checkoutBranch(cloneLocation, "a");
// modify while on 'a'
JSONObject testTxt = getChild(project, "test.txt");
modifyFile(testTxt, "change in a");
gitSection = project.getJSONObject(GitConstants.KEY_GIT);
String gitIndexUri = gitSection.getString(GitConstants.KEY_INDEX);
String gitStatusUri = gitSection.getString(GitConstants.KEY_STATUS);
String gitHeadUri = gitSection.getString(GitConstants.KEY_HEAD);
// "git add ."
request = GitAddTest.getPutGitIndexRequest(gitIndexUri);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
// commit all
request = GitCommitTest.getPostGitCommitRequest(gitHeadUri, "commit on a", false);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
// assert clean
assertStatus(StatusResult.CLEAN, gitStatusUri);
// checkout 'master'
checkoutBranch(cloneLocation, Constants.MASTER);
// modify the same file on master
modifyFile(testTxt, "change in master");
gitSection = project.getJSONObject(GitConstants.KEY_GIT);
gitIndexUri = gitSection.getString(GitConstants.KEY_INDEX);
gitStatusUri = gitSection.getString(GitConstants.KEY_STATUS);
gitHeadUri = gitSection.getString(GitConstants.KEY_HEAD);
// "git add ."
request = GitAddTest.getPutGitIndexRequest(gitIndexUri);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
// commit all
request = GitCommitTest.getPostGitCommitRequest(gitHeadUri, "commit on master", false);
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
// assert clean
assertStatus(StatusResult.CLEAN, gitStatusUri);
// merge: "git merge a"
JSONObject merge = merge(gitHeadUri, "a");
MergeStatus mergeResult = MergeStatus.valueOf(merge.getString(GitConstants.KEY_RESULT));
assertEquals(MergeStatus.CONFLICTING, mergeResult);
// check status
assertStatus(new StatusResult().setConflictingNames("test.txt"), gitStatusUri);
request = getGetRequest(testTxt.getString(ProtocolConstants.KEY_LOCATION));
response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
String[] responseLines = response.getText().split("\n");
assertEquals(5, responseLines.length);
assertEquals("<<<<<<< HEAD", responseLines[0]);
assertEquals("change in master", responseLines[1]);
assertEquals("=======", responseLines[2]);
assertEquals("change in a", responseLines[3]);
// ignore the last line since it's different each time
// assertEquals(">>>>>>> c5ddb0e22e7e829683bb3b336ca6cb24a1b5bb2e", responseLines[4]);
// TODO: check commits, bug 340051
}
