1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
|
/*******************************************************************************
* Copyright (C) 2012, 2013 Maik Schreiber <blizzy@blizzy.de> and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
package org.eclipse.egit.core.test.op;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.io.File;
import java.util.Arrays;
import org.eclipse.core.resources.IFile;
import org.eclipse.egit.core.op.AddToIndexOperation;
import org.eclipse.egit.core.op.StashCreateOperation;
import org.eclipse.egit.core.test.GitTestCase;
import org.eclipse.egit.core.test.TestRepository;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
public class StashCreateOperationTest extends GitTestCase {
TestRepository testRepository;
Repository repository;
@Override
@Before
public void setUp() throws Exception {
super.setUp();
gitDir = new File(project.getProject()
.getLocationURI().getPath(), Constants.DOT_GIT);
testRepository = new TestRepository(gitDir);
repository = testRepository.getRepository();
testRepository.connect(project.getProject());
testRepository.commit("initial commit");
}
@Override
@After
public void tearDown() throws Exception {
testRepository.dispose();
repository = null;
super.tearDown();
}
@Test
public void testDefaultMessage() throws Exception {
IFile file = testUtils.addFileToProject(project.getProject(),
"foo/a.txt", "some text");
new AddToIndexOperation(Arrays.asList(file)).execute(null);
StashCreateOperation stashCreateOperation = new StashCreateOperation(repository);
stashCreateOperation.execute(null);
try (RevWalk revWalk = new RevWalk(repository)) {
RevCommit commit = revWalk
.parseCommit(repository.resolve("stash@{0}"));
assertTrue(commit.getFullMessage().length() > 0);
}
}
@Test
public void testCustomMessage() throws Exception {
IFile file = testUtils.addFileToProject(project.getProject(),
"foo/a.txt", "some text");
new AddToIndexOperation(Arrays.asList(file)).execute(null);
String message = "stash message";
StashCreateOperation stashCreateOperation = new StashCreateOperation(repository, message);
stashCreateOperation.execute(null);
try (RevWalk revWalk = new RevWalk(repository)) {
RevCommit commit = revWalk
.parseCommit(repository.resolve("stash@{0}"));
assertEquals(message, commit.getFullMessage());
}
}
@Test
public void testUntrackedFlag() throws Exception {
testUtils.addFileToProject(project.getProject(), "foo/untracked.txt",
"some text");
String message = "stash with untracked files";
StashCreateOperation stashCreateOperation = new StashCreateOperation(
repository, message, true);
stashCreateOperation.execute(null);
try (RevWalk revWalk = new RevWalk(repository)) {
RevCommit commit = revWalk
.parseCommit(repository.resolve("stash@{0}"));
// untracked commit is the third parent
assertEquals(commit.getParentCount(), 3);
}
}
}
|
