Added
Link Here
|
1 |
/* |
2 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
3 |
* |
4 |
* Copyright 2010 Oracle and/or its affiliates. All rights reserved. |
5 |
* |
6 |
* Oracle and Java are registered trademarks of Oracle and/or its affiliates. |
7 |
* Other names may be trademarks of their respective owners. |
8 |
* |
9 |
* The contents of this file are subject to the terms of either the GNU |
10 |
* General Public License Version 2 only ("GPL") or the Common |
11 |
* Development and Distribution License("CDDL") (collectively, the |
12 |
* "License"). You may not use this file except in compliance with the |
13 |
* License. You can obtain a copy of the License at |
14 |
* http://www.netbeans.org/cddl-gplv2.html |
15 |
* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the |
16 |
* specific language governing permissions and limitations under the |
17 |
* License. When distributing the software, include this License Header |
18 |
* Notice in each file and include the License file at |
19 |
* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this |
20 |
* particular file as subject to the "Classpath" exception as provided |
21 |
* by Oracle in the GPL Version 2 section of the License file that |
22 |
* accompanied this code. If applicable, add the following below the |
23 |
* License Header, with the fields enclosed by brackets [] replaced by |
24 |
* your own identifying information: |
25 |
* "Portions Copyrighted [year] [name of copyright owner]" |
26 |
* |
27 |
* If you wish your version of this file to be governed by only the CDDL |
28 |
* or only the GPL Version 2, indicate your decision by adding |
29 |
* "[Contributor] elects to include this software in this distribution |
30 |
* under the [CDDL or GPL Version 2] license." If you do not indicate a |
31 |
* single choice of license, a recipient has the option to distribute |
32 |
* your version of this file under either the CDDL, the GPL Version 2 or |
33 |
* to extend the choice of license to its licensees as provided above. |
34 |
* However, if you add GPL Version 2 code and therefore, elected the GPL |
35 |
* Version 2 license, then the option applies only if the new code is |
36 |
* made subject to such option by the copyright holder. |
37 |
* |
38 |
* Contributor(s): |
39 |
* |
40 |
* Portions Copyrighted 2010 Sun Microsystems, Inc. |
41 |
*/ |
42 |
|
43 |
package org.netbeans.libs.git.jgit.commands; |
44 |
|
45 |
import java.io.File; |
46 |
import java.io.IOException; |
47 |
import java.util.Arrays; |
48 |
import java.util.Collections; |
49 |
import java.util.Map; |
50 |
import org.eclipse.jgit.lib.Config; |
51 |
import org.eclipse.jgit.lib.ConfigConstants; |
52 |
import org.eclipse.jgit.lib.Constants; |
53 |
import org.eclipse.jgit.lib.Repository; |
54 |
import org.netbeans.libs.git.GitBranch; |
55 |
import org.netbeans.libs.git.GitClient; |
56 |
import org.netbeans.libs.git.GitException; |
57 |
import org.netbeans.libs.git.GitRemoteConfig; |
58 |
import org.netbeans.libs.git.jgit.AbstractGitTestCase; |
59 |
|
60 |
/** |
61 |
* |
62 |
* @author ondra |
63 |
*/ |
64 |
public class SetUpstreamBranchTest extends AbstractGitTestCase { |
65 |
private File workDir; |
66 |
private static final String BRANCH = "mybranch"; |
67 |
private Repository repository; |
68 |
|
69 |
public SetUpstreamBranchTest (String testName) throws IOException { |
70 |
super(testName); |
71 |
} |
72 |
|
73 |
@Override |
74 |
protected void setUp() throws Exception { |
75 |
super.setUp(); |
76 |
workDir = getWorkingDirectory(); |
77 |
repository = getRepository(getLocalGitRepository()); |
78 |
} |
79 |
|
80 |
public void testLocalTracking () throws GitException { |
81 |
GitClient client = getClient(workDir); |
82 |
File f = new File(workDir, "f"); |
83 |
add(f); |
84 |
client.commit(new File[] { f }, "init commit", null, null, NULL_PROGRESS_MONITOR); |
85 |
|
86 |
// prepare twp branches |
87 |
GitBranch b = client.createBranch(BRANCH, Constants.MASTER, NULL_PROGRESS_MONITOR); |
88 |
assertNull(b.getTrackedBranch()); |
89 |
|
90 |
// set tracking |
91 |
b = client.setUpstreamBranch(BRANCH, Constants.MASTER, NULL_PROGRESS_MONITOR); |
92 |
assertEquals(Constants.MASTER, b.getTrackedBranch().getName()); |
93 |
} |
94 |
|
95 |
public void testRemoteTrackingNoRemoteSet () throws GitException { |
96 |
GitClient client = getClient(workDir); |
97 |
File f = new File(workDir, "f"); |
98 |
add(f); |
99 |
client.commit(new File[] { f }, "init commit", null, null, NULL_PROGRESS_MONITOR); |
100 |
|
101 |
// push to remote |
102 |
String remoteUri = getRemoteRepository().getWorkTree().toURI().toString(); |
103 |
client.push(remoteUri, |
104 |
Arrays.asList("refs/heads/master:refs/heads/master"), |
105 |
Arrays.asList("+refs/heads/*:refs/remotes/origin/*"), |
106 |
NULL_PROGRESS_MONITOR); |
107 |
Map<String, GitBranch> branches = client.getBranches(true, NULL_PROGRESS_MONITOR); |
108 |
assertTrue(branches.containsKey("origin/master")); |
109 |
assertNull(branches.get("master").getTrackedBranch()); |
110 |
|
111 |
// set tracking |
112 |
GitBranch b = client.setUpstreamBranch("master", "origin/master", NULL_PROGRESS_MONITOR); |
113 |
assertEquals("origin/master", b.getTrackedBranch().getName()); |
114 |
|
115 |
Config cfg = repository.getConfig(); |
116 |
assertEquals(".", cfg.getString(ConfigConstants.CONFIG_BRANCH_SECTION, "master", ConfigConstants.CONFIG_KEY_REMOTE)); |
117 |
assertEquals("refs/remotes/origin/master", cfg.getString(ConfigConstants.CONFIG_BRANCH_SECTION, "master", ConfigConstants.CONFIG_KEY_MERGE)); |
118 |
} |
119 |
|
120 |
public void testRemoteTracking () throws GitException { |
121 |
GitClient client = getClient(workDir); |
122 |
File f = new File(workDir, "f"); |
123 |
add(f); |
124 |
client.commit(new File[] { f }, "init commit", null, null, NULL_PROGRESS_MONITOR); |
125 |
|
126 |
// push to remote |
127 |
String remoteUri = getRemoteRepository().getWorkTree().toURI().toString(); |
128 |
client.setRemote(new GitRemoteConfig("origin", |
129 |
Arrays.asList(remoteUri), |
130 |
Collections.<String>emptyList(), |
131 |
Arrays.asList("+refs/heads/*:refs/remotes/origin/*"), |
132 |
Collections.<String>emptyList()), |
133 |
NULL_PROGRESS_MONITOR); |
134 |
client.push("origin", |
135 |
Arrays.asList("refs/heads/master:refs/heads/master"), |
136 |
Arrays.asList("+refs/heads/master:refs/remotes/origin/master"), |
137 |
NULL_PROGRESS_MONITOR); |
138 |
Map<String, GitBranch> branches = client.getBranches(true, NULL_PROGRESS_MONITOR); |
139 |
assertTrue(branches.containsKey("origin/master")); |
140 |
assertNull(branches.get("master").getTrackedBranch()); |
141 |
|
142 |
// set tracking |
143 |
GitBranch b = client.setUpstreamBranch("master", "origin/master", NULL_PROGRESS_MONITOR); |
144 |
assertEquals("origin/master", b.getTrackedBranch().getName()); |
145 |
|
146 |
Config cfg = repository.getConfig(); |
147 |
assertEquals("origin", cfg.getString(ConfigConstants.CONFIG_BRANCH_SECTION, "master", ConfigConstants.CONFIG_KEY_REMOTE)); |
148 |
assertEquals("refs/heads/master", cfg.getString(ConfigConstants.CONFIG_BRANCH_SECTION, "master", ConfigConstants.CONFIG_KEY_MERGE)); |
149 |
} |
150 |
|
151 |
} |