motiejus
/
jgit
1
Fork 0
Code Releases Activity

RepoCommandTest: Extract method to assert file contents 

Many tests verify the contents of files in a try-with-resources
incantation that clutters the code.

Extract that verification to an "assertContents" method, that is easier
to read.

Change-Id: If430eac6f5b9ae352e42b2d43867ceb6cd618fbb
Signed-off-by: Ivan Frade <ifrade@google.com>
This commit is contained in:
Ivan Frade 2018-10-30 12:31:48 -07:00
parent d0f44d4396
commit 17dbaa4fdd
1 changed files with 17 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/RepoCommandTest.java
View File

@ -55,6 +55,7 @@
import java.io.IOException;
import java.net.URI;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.HashMap;
import java.util.Map;
@ -199,6 +200,15 @@ private Repository cloneRepository(Repository repo, boolean bare)
return r;
}
private static void assertContents(Path path, String expected)
throws IOException {
try (BufferedReader reader = Files.newBufferedReader(path, UTF_8)) {
String content = reader.readLine();
assertEquals("Unexpected content in " + path.getFileName(),
expected, content);
}
}
@Test
public void runTwiceIsNOP() throws Exception {
try (Repository child = cloneRepository(groupADb, true);
@ -474,12 +484,7 @@ public void testAddRepoManifest() throws Exception {
.call();
File hello = new File(db.getWorkTree(), "foo/hello.txt");
assertTrue("submodule should be checked out", hello.exists());
try (BufferedReader reader = Files.newBufferedReader(hello.toPath(),
UTF_8)) {
String content = reader.readLine();
assertEquals("submodule content should be as expected",
"master world", content);
}
assertContents(hello.toPath(), "master world");
}
@Test
@ -565,21 +570,11 @@ public void testRepoManifestCopyFile() throws Exception {
// The original file should exist
File hello = new File(localDb.getWorkTree(), "foo/hello.txt");
assertTrue("The original file should exist", hello.exists());
try (BufferedReader reader = Files.newBufferedReader(hello.toPath(),
UTF_8)) {
String content = reader.readLine();
assertEquals("The original file should have expected content",
"master world", content);
}
assertContents(hello.toPath(), "master world");
// The dest file should also exist
hello = new File(localDb.getWorkTree(), "Hello");
assertTrue("The destination file should exist", hello.exists());
try (BufferedReader reader = Files.newBufferedReader(hello.toPath(),
UTF_8)) {
String content = reader.readLine();
assertEquals("The destination file should have expected content",
"master world", content);
}
assertContents(hello.toPath(), "master world");
}
@Test
@ -671,12 +666,7 @@ public void testRevisionBranch() throws Exception {
.setURI(rootUri)
.call();
File hello = new File(db.getWorkTree(), "foo/hello.txt");
try (BufferedReader reader = Files.newBufferedReader(hello.toPath(),
UTF_8)) {
String content = reader.readLine();
assertEquals("submodule content should be as expected",
"branch world", content);
}
assertContents(hello.toPath(), "branch world");
}
@Test
@ -698,12 +688,7 @@ public void testRevisionTag() throws Exception {
.setURI(rootUri)
.call();
File hello = new File(db.getWorkTree(), "foo/hello.txt");
try (BufferedReader reader = Files.newBufferedReader(hello.toPath(),
UTF_8)) {
String content = reader.readLine();
assertEquals("submodule content should be as expected",
"branch world", content);
}
assertContents(hello.toPath(), "branch world");
}
@Test
@ -771,12 +756,7 @@ public void testCopyFileBare() throws Exception {
assertFalse("The foo/Hello file should be skipped",
foohello.exists());
// The content of Hello file should be expected
try (BufferedReader reader = Files.newBufferedReader(hello.toPath(),
UTF_8)) {
String content = reader.readLine();
assertEquals("The Hello file should have expected content",
"branch world", content);
}
assertContents(hello.toPath(), "branch world");
}
}
@ -1143,12 +1123,7 @@ public void testRemoteRevision() throws Exception {
.setURI(rootUri)
.call();
File hello = new File(db.getWorkTree(), "foo/hello.txt");
try (BufferedReader reader = Files.newBufferedReader(hello.toPath(),
UTF_8)) {
String content = reader.readLine();
assertEquals("submodule content should be as expected",
"branch world", content);
}
assertContents(hello.toPath(), "branch world");
}
@Test