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. 98
      org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleStatusTest.java

98
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,50 +317,52 @@ 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) {
@Override
@Override public void apply(DirCacheEntry ent) {
public void apply(DirCacheEntry ent) { ent.setFileMode(FileMode.GITLINK);
ent.setFileMode(FileMode.GITLINK); ent.setObjectId(id);
ent.setObjectId(id); }
} });
}); editor.commit();
editor.commit();
String url = "git://server/repo.git";
String url = "git://server/repo.git"; StoredConfig config = db.getConfig();
StoredConfig config = db.getConfig(); config.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION, path,
config.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION, path, ConfigConstants.CONFIG_KEY_URL, url);
ConfigConstants.CONFIG_KEY_URL, url); config.save();
config.save();
FileBasedConfig modulesConfig = new FileBasedConfig(
FileBasedConfig modulesConfig = new FileBasedConfig(new File( new File(db.getWorkTree(), Constants.DOT_GIT_MODULES),
db.getWorkTree(), Constants.DOT_GIT_MODULES), db.getFS()); db.getFS());
modulesConfig.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION, path, modulesConfig.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION,
ConfigConstants.CONFIG_KEY_PATH, path); path, ConfigConstants.CONFIG_KEY_PATH, path);
modulesConfig.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION, path, modulesConfig.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION,
ConfigConstants.CONFIG_KEY_URL, url); 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);
Map<String, SubmoduleStatus> statuses = command.call(); SubmoduleStatusCommand command = new SubmoduleStatusCommand(db);
assertNotNull(statuses); Map<String, SubmoduleStatus> statuses = command.call();
assertEquals(1, statuses.size()); assertNotNull(statuses);
Entry<String, SubmoduleStatus> module = statuses.entrySet().iterator() assertEquals(1, statuses.size());
.next(); Entry<String, SubmoduleStatus> module = statuses.entrySet()
assertNotNull(module); .iterator().next();
assertEquals(path, module.getKey()); assertNotNull(module);
SubmoduleStatus status = module.getValue(); assertEquals(path, module.getKey());
assertNotNull(status); SubmoduleStatus status = module.getValue();
assertEquals(path, status.getPath()); assertNotNull(status);
assertEquals(id, status.getIndexId()); assertEquals(path, status.getPath());
assertEquals(newId, status.getHeadId()); assertEquals(id, status.getIndexId());
assertEquals(SubmoduleStatusType.REV_CHECKED_OUT, status.getType()); assertEquals(newId, status.getHeadId());
assertEquals(SubmoduleStatusType.REV_CHECKED_OUT, status.getType());
}
} }
} }

Loading…
Cancel
Save