CheckoutCommandTest: Create Git instances in try-with-resource
Also rename a local variable in one of the tests that was hiding a class variable of the same name. Change-Id: Ia9398157b87a78df6eef0b64a833c16ca2e57ce3 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
This commit is contained in:
parent
78b3f174f2
commit
4b93de43ba
|
@ -417,8 +417,7 @@ private Repository createRepositoryWithRemote() throws IOException,
|
||||||
InvalidRemoteException, TransportException {
|
InvalidRemoteException, TransportException {
|
||||||
// create second repository
|
// create second repository
|
||||||
Repository db2 = createWorkRepository();
|
Repository db2 = createWorkRepository();
|
||||||
Git git2 = new Git(db2);
|
try (Git git2 = new Git(db2)) {
|
||||||
|
|
||||||
// setup the second repository to fetch from the first repository
|
// setup the second repository to fetch from the first repository
|
||||||
final StoredConfig config = db2.getConfig();
|
final StoredConfig config = db2.getConfig();
|
||||||
RemoteConfig remoteConfig = new RemoteConfig(config, "origin");
|
RemoteConfig remoteConfig = new RemoteConfig(config, "origin");
|
||||||
|
@ -432,6 +431,7 @@ private Repository createRepositoryWithRemote() throws IOException,
|
||||||
git2.fetch().setRemote("origin").setRefSpecs(spec).call();
|
git2.fetch().setRemote("origin").setRefSpecs(spec).call();
|
||||||
return db2;
|
return db2;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private CheckoutCommand newOrphanBranchCommand() {
|
private CheckoutCommand newOrphanBranchCommand() {
|
||||||
return git.checkout().setOrphan(true)
|
return git.checkout().setOrphan(true)
|
||||||
|
@ -639,7 +639,7 @@ public void testSmudgeAndClean() throws IOException, GitAPIException {
|
||||||
File clean_filter = writeTempFile("sed s/V1/@version/g -");
|
File clean_filter = writeTempFile("sed s/V1/@version/g -");
|
||||||
File smudge_filter = writeTempFile("sed s/@version/V1/g -");
|
File smudge_filter = writeTempFile("sed s/@version/V1/g -");
|
||||||
|
|
||||||
Git git = new Git(db);
|
try (Git git2 = new Git(db)) {
|
||||||
StoredConfig config = git.getRepository().getConfig();
|
StoredConfig config = git.getRepository().getConfig();
|
||||||
config.setString("filter", "tstFilter", "smudge",
|
config.setString("filter", "tstFilter", "smudge",
|
||||||
"sh " + slashify(smudge_filter.getPath()));
|
"sh " + slashify(smudge_filter.getPath()));
|
||||||
|
@ -647,33 +647,34 @@ public void testSmudgeAndClean() throws IOException, GitAPIException {
|
||||||
"sh " + slashify(clean_filter.getPath()));
|
"sh " + slashify(clean_filter.getPath()));
|
||||||
config.save();
|
config.save();
|
||||||
writeTrashFile(".gitattributes", "*.txt filter=tstFilter");
|
writeTrashFile(".gitattributes", "*.txt filter=tstFilter");
|
||||||
git.add().addFilepattern(".gitattributes").call();
|
git2.add().addFilepattern(".gitattributes").call();
|
||||||
git.commit().setMessage("add attributes").call();
|
git2.commit().setMessage("add attributes").call();
|
||||||
|
|
||||||
writeTrashFile("filterTest.txt", "hello world, V1");
|
writeTrashFile("filterTest.txt", "hello world, V1");
|
||||||
git.add().addFilepattern("filterTest.txt").call();
|
git2.add().addFilepattern("filterTest.txt").call();
|
||||||
git.commit().setMessage("add filterText.txt").call();
|
git2.commit().setMessage("add filterText.txt").call();
|
||||||
assertEquals(
|
assertEquals(
|
||||||
"[.gitattributes, mode:100644, content:*.txt filter=tstFilter][Test.txt, mode:100644, content:Some other change][filterTest.txt, mode:100644, content:hello world, @version]",
|
"[.gitattributes, mode:100644, content:*.txt filter=tstFilter][Test.txt, mode:100644, content:Some other change][filterTest.txt, mode:100644, content:hello world, @version]",
|
||||||
indexState(CONTENT));
|
indexState(CONTENT));
|
||||||
|
|
||||||
git.checkout().setCreateBranch(true).setName("test2").call();
|
git2.checkout().setCreateBranch(true).setName("test2").call();
|
||||||
writeTrashFile("filterTest.txt", "bon giorno world, V1");
|
writeTrashFile("filterTest.txt", "bon giorno world, V1");
|
||||||
git.add().addFilepattern("filterTest.txt").call();
|
git2.add().addFilepattern("filterTest.txt").call();
|
||||||
git.commit().setMessage("modified filterText.txt").call();
|
git2.commit().setMessage("modified filterText.txt").call();
|
||||||
|
|
||||||
assertTrue(git.status().call().isClean());
|
assertTrue(git2.status().call().isClean());
|
||||||
assertEquals(
|
assertEquals(
|
||||||
"[.gitattributes, mode:100644, content:*.txt filter=tstFilter][Test.txt, mode:100644, content:Some other change][filterTest.txt, mode:100644, content:bon giorno world, @version]",
|
"[.gitattributes, mode:100644, content:*.txt filter=tstFilter][Test.txt, mode:100644, content:Some other change][filterTest.txt, mode:100644, content:bon giorno world, @version]",
|
||||||
indexState(CONTENT));
|
indexState(CONTENT));
|
||||||
|
|
||||||
git.checkout().setName("refs/heads/test").call();
|
git2.checkout().setName("refs/heads/test").call();
|
||||||
assertTrue(git.status().call().isClean());
|
assertTrue(git2.status().call().isClean());
|
||||||
assertEquals(
|
assertEquals(
|
||||||
"[.gitattributes, mode:100644, content:*.txt filter=tstFilter][Test.txt, mode:100644, content:Some other change][filterTest.txt, mode:100644, content:hello world, @version]",
|
"[.gitattributes, mode:100644, content:*.txt filter=tstFilter][Test.txt, mode:100644, content:Some other change][filterTest.txt, mode:100644, content:hello world, @version]",
|
||||||
indexState(CONTENT));
|
indexState(CONTENT));
|
||||||
assertEquals("hello world, V1", read("filterTest.txt"));
|
assertEquals("hello world, V1", read("filterTest.txt"));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private File writeTempFile(String body) throws IOException {
|
private File writeTempFile(String body) throws IOException {
|
||||||
File f = File.createTempFile("AddCommandTest_", "");
|
File f = File.createTempFile("AddCommandTest_", "");
|
||||||
|
|
Loading…
Reference in New Issue