Browse Source

SubmoduleStatusTest: Open TestRepository in try-with-resource

Change-Id: Iebb6abd35fa5b084a4c044e416a448785a3c9291
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
stable-5.4
David Pursehouse 6 years ago
parent
commit
a2455e9e40
  1. 30
      org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleStatusTest.java

30
org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleStatusTest.java

@ -263,8 +263,10 @@ public class SubmoduleStatusTest extends RepositoryTestCase {
.getRepository(); .getRepository();
assertNotNull(subRepo); assertNotNull(subRepo);
TestRepository<?> subTr = new TestRepository<>(subRepo); ObjectId id;
ObjectId id = subTr.branch(Constants.HEAD).commit().create().copy(); try (TestRepository<?> subTr = new TestRepository<>(subRepo)) {
id = subTr.branch(Constants.HEAD).commit().create().copy();
}
DirCache cache = db.lockDirCache(); DirCache cache = db.lockDirCache();
DirCacheEditor editor = cache.editor(); DirCacheEditor editor = cache.editor();
@ -315,9 +317,8 @@ public class SubmoduleStatusTest extends RepositoryTestCase {
.getRepository(); .getRepository();
assertNotNull(subRepo); assertNotNull(subRepo);
TestRepository<?> subTr = new TestRepository<>(subRepo); try (TestRepository<?> subTr = new TestRepository<>(subRepo)) {
ObjectId id = subTr.branch(Constants.HEAD).commit().create().copy(); ObjectId id = subTr.branch(Constants.HEAD).commit().create().copy();
DirCache cache = db.lockDirCache(); DirCache cache = db.lockDirCache();
DirCacheEditor editor = cache.editor(); DirCacheEditor editor = cache.editor();
editor.add(new PathEdit(path) { editor.add(new PathEdit(path) {
@ -336,22 +337,24 @@ public class SubmoduleStatusTest extends RepositoryTestCase {
ConfigConstants.CONFIG_KEY_URL, url); ConfigConstants.CONFIG_KEY_URL, url);
config.save(); config.save();
FileBasedConfig modulesConfig = new FileBasedConfig(new File( FileBasedConfig modulesConfig = new FileBasedConfig(
db.getWorkTree(), Constants.DOT_GIT_MODULES), db.getFS()); new File(db.getWorkTree(), Constants.DOT_GIT_MODULES),
modulesConfig.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION, path, db.getFS());
ConfigConstants.CONFIG_KEY_PATH, path); modulesConfig.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION,
modulesConfig.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION, path, path, ConfigConstants.CONFIG_KEY_PATH, path);
ConfigConstants.CONFIG_KEY_URL, url); modulesConfig.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION,
path, ConfigConstants.CONFIG_KEY_URL, url);
modulesConfig.save(); modulesConfig.save();
ObjectId newId = subTr.branch(Constants.HEAD).commit().create().copy(); ObjectId newId = subTr.branch(Constants.HEAD).commit().create()
.copy();
SubmoduleStatusCommand command = new SubmoduleStatusCommand(db); SubmoduleStatusCommand command = new SubmoduleStatusCommand(db);
Map<String, SubmoduleStatus> statuses = command.call(); Map<String, SubmoduleStatus> statuses = command.call();
assertNotNull(statuses); assertNotNull(statuses);
assertEquals(1, statuses.size()); assertEquals(1, statuses.size());
Entry<String, SubmoduleStatus> module = statuses.entrySet().iterator() Entry<String, SubmoduleStatus> module = statuses.entrySet()
.next(); .iterator().next();
assertNotNull(module); assertNotNull(module);
assertEquals(path, module.getKey()); assertEquals(path, module.getKey());
SubmoduleStatus status = module.getValue(); SubmoduleStatus status = module.getValue();
@ -361,4 +364,5 @@ public class SubmoduleStatusTest extends RepositoryTestCase {
assertEquals(newId, status.getHeadId()); assertEquals(newId, status.getHeadId());
assertEquals(SubmoduleStatusType.REV_CHECKED_OUT, status.getType()); assertEquals(SubmoduleStatusType.REV_CHECKED_OUT, status.getType());
} }
}
} }

Loading…
Cancel
Save