github
/
jgit
mirror of https://gitee.com/github-mirror-repo/jgit.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Close SubmoduleWalks in tests 

Change-Id: If1b9d80830b6b136d4ab33f5c7043b140bd92f85
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
next
Thomas Wolf 5 years ago
parent
36e16435be
commit
5e0eca6943
9 changed files with 352 additions and 316 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java
  2. 52
      org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java
  3. 21
      org.eclipse.jgit.test/tst/org/eclipse/jgit/api/FetchAndPullCommandsRecurseSubmodulesTest.java
  4. 89
      org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleAddTest.java
  5. 53
      org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleDeinitTest.java
  6. 106
      org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleInitTest.java
  7. 62
      org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleSyncTest.java
  8. 18
      org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleUpdateTest.java
  9. 239
      org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleWalkTest.java

28
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java
Unescape View File

@ -646,25 +646,27 @@ public class CloneCommandTest extends RepositoryTestCase {
assertEquals(sub1Head, pathStatus.getHeadId()); assertEquals(sub1Head, pathStatus.getHeadId());
assertEquals(sub1Head, pathStatus.getIndexId()); assertEquals(sub1Head, pathStatus.getIndexId());
SubmoduleWalk walk = SubmoduleWalk.forIndex(git2.getRepository()); try (SubmoduleWalk walk = SubmoduleWalk
assertTrue(walk.next()); .forIndex(git2.getRepository())) {
try (Repository clonedSub1 = walk.getRepository()) { assertTrue(walk.next());
assertNotNull(clonedSub1); try (Repository clonedSub1 = walk.getRepository()) {
assertEquals(new File(git2.getRepository().getWorkTree(), assertNotNull(clonedSub1);
walk.getPath()), clonedSub1.getWorkTree()); assertEquals(new File(git2.getRepository().getWorkTree(),
assertEquals( walk.getPath()), clonedSub1.getWorkTree());
new File(new File(git2.getRepository().getDirectory(), assertEquals(
"modules"), walk.getPath()), new File(new File(git2.getRepository().getDirectory(),
clonedSub1.getDirectory()); "modules"), walk.getPath()),
status = new SubmoduleStatusCommand(clonedSub1); clonedSub1.getDirectory());
statuses = status.call(); status = new SubmoduleStatusCommand(clonedSub1);
statuses = status.call();
}
assertFalse(walk.next());
} }
pathStatus = statuses.get(path); pathStatus = statuses.get(path);
assertNotNull(pathStatus); assertNotNull(pathStatus);
assertEquals(SubmoduleStatusType.INITIALIZED, pathStatus.getType()); assertEquals(SubmoduleStatusType.INITIALIZED, pathStatus.getType());
assertEquals(sub2Head, pathStatus.getHeadId()); assertEquals(sub2Head, pathStatus.getHeadId());
assertEquals(sub2Head, pathStatus.getIndexId()); assertEquals(sub2Head, pathStatus.getIndexId());
assertFalse(walk.next());
} }
@Test @Test

52
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java
Unescape View File

@ -148,9 +148,10 @@ public class CommitCommandTest extends RepositoryTestCase {
writeTrashFile(path, "content"); writeTrashFile(path, "content");
git.add().addFilepattern(path).call(); git.add().addFilepattern(path).call();
RevCommit commit1 = git.commit().setMessage("commit").call(); RevCommit commit1 = git.commit().setMessage("commit").call();
TreeWalk walk = TreeWalk.forPath(db, path, commit1.getTree()); try (TreeWalk walk = TreeWalk.forPath(db, path, commit1.getTree())) {
assertNotNull(walk); assertNotNull(walk);
assertEquals(FileMode.EXECUTABLE_FILE, walk.getFileMode(0)); assertEquals(FileMode.EXECUTABLE_FILE, walk.getFileMode(0));
}
FS nonExecutableFs = new FS() { FS nonExecutableFs = new FS() {
@ -204,9 +205,10 @@ public class CommitCommandTest extends RepositoryTestCase {
writeTrashFile(path, "content2"); writeTrashFile(path, "content2");
RevCommit commit2 = git2.commit().setOnly(path).setMessage("commit2") RevCommit commit2 = git2.commit().setOnly(path).setMessage("commit2")
.call(); .call();
walk = TreeWalk.forPath(db, path, commit2.getTree()); try (TreeWalk walk = TreeWalk.forPath(db, path, commit2.getTree())) {
assertNotNull(walk); assertNotNull(walk);
assertEquals(FileMode.EXECUTABLE_FILE, walk.getFileMode(0)); assertEquals(FileMode.EXECUTABLE_FILE, walk.getFileMode(0));
}
} }
@Test @Test
@ -225,15 +227,16 @@ public class CommitCommandTest extends RepositoryTestCase {
assertNotNull(repo); assertNotNull(repo);
addRepoToClose(repo); addRepoToClose(repo);
SubmoduleWalk generator = SubmoduleWalk.forIndex(db); try (SubmoduleWalk generator = SubmoduleWalk.forIndex(db)) {
assertTrue(generator.next()); assertTrue(generator.next());
assertEquals(path, generator.getPath()); assertEquals(path, generator.getPath());
assertEquals(commit, generator.getObjectId()); assertEquals(commit, generator.getObjectId());
assertEquals(uri, generator.getModulesUrl()); assertEquals(uri, generator.getModulesUrl());
assertEquals(path, generator.getModulesPath()); assertEquals(path, generator.getModulesPath());
assertEquals(uri, generator.getConfigUrl()); assertEquals(uri, generator.getConfigUrl());
try (Repository subModRepo = generator.getRepository()) { try (Repository subModRepo = generator.getRepository()) {
assertNotNull(subModRepo); assertNotNull(subModRepo);
}
} }
assertEquals(commit, repo.resolve(Constants.HEAD)); assertEquals(commit, repo.resolve(Constants.HEAD));
@ -275,15 +278,16 @@ public class CommitCommandTest extends RepositoryTestCase {
assertNotNull(repo); assertNotNull(repo);
addRepoToClose(repo); addRepoToClose(repo);
SubmoduleWalk generator = SubmoduleWalk.forIndex(db); try (SubmoduleWalk generator = SubmoduleWalk.forIndex(db)) {
assertTrue(generator.next()); assertTrue(generator.next());
assertEquals(path, generator.getPath()); assertEquals(path, generator.getPath());
assertEquals(commit2, generator.getObjectId()); assertEquals(commit2, generator.getObjectId());
assertEquals(uri, generator.getModulesUrl()); assertEquals(uri, generator.getModulesUrl());
assertEquals(path, generator.getModulesPath()); assertEquals(path, generator.getModulesPath());
assertEquals(uri, generator.getConfigUrl()); assertEquals(uri, generator.getConfigUrl());
try (Repository subModRepo = generator.getRepository()) { try (Repository subModRepo = generator.getRepository()) {
assertNotNull(subModRepo); assertNotNull(subModRepo);
}
} }
assertEquals(commit2, repo.resolve(Constants.HEAD)); assertEquals(commit2, repo.resolve(Constants.HEAD));

21
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/FetchAndPullCommandsRecurseSubmodulesTest.java
Unescape View File

@ -343,19 +343,22 @@ public class FetchAndPullCommandsRecurseSubmodulesTest extends RepositoryTestCas
private void assertSubmoduleFetchHeads(ObjectId expectedHead1, private void assertSubmoduleFetchHeads(ObjectId expectedHead1,
ObjectId expectedHead2) throws Exception { ObjectId expectedHead2) throws Exception {
Object newHead1 = null;
ObjectId newHead2 = null;
try (SubmoduleWalk walk = SubmoduleWalk try (SubmoduleWalk walk = SubmoduleWalk
.forIndex(git2.getRepository())) { .forIndex(git2.getRepository())) {
assertTrue(walk.next()); assertTrue(walk.next());
Repository r = walk.getRepository(); try (Repository r = walk.getRepository()) {
ObjectId newHead1 = r.resolve(Constants.FETCH_HEAD); newHead1 = r.resolve(Constants.FETCH_HEAD);
ObjectId newHead2; try (SubmoduleWalk walk2 = SubmoduleWalk.forIndex(r)) {
try (SubmoduleWalk walk2 = SubmoduleWalk.forIndex(r)) { assertTrue(walk2.next());
assertTrue(walk2.next()); try (Repository r2 = walk2.getRepository()) {
newHead2 = walk2.getRepository().resolve(Constants.FETCH_HEAD); newHead2 = r2.resolve(Constants.FETCH_HEAD);
}
}
} }
assertEquals(expectedHead1, newHead1);
assertEquals(expectedHead2, newHead2);
} }
assertEquals(expectedHead1, newHead1);
assertEquals(expectedHead2, newHead2);
} }
} }

89
org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleAddTest.java
Unescape View File

@ -135,20 +135,20 @@ public class SubmoduleAddTest extends RepositoryTestCase {
subCommit = repo.resolve(Constants.HEAD); subCommit = repo.resolve(Constants.HEAD);
} }
SubmoduleWalk generator = SubmoduleWalk.forIndex(db); try (SubmoduleWalk generator = SubmoduleWalk.forIndex(db)) {
generator.loadModulesConfig(); generator.loadModulesConfig();
assertTrue(generator.next()); assertTrue(generator.next());
assertEquals(path, generator.getModuleName()); assertEquals(path, generator.getModuleName());
assertEquals(path, generator.getPath()); assertEquals(path, generator.getPath());
assertEquals(commit, generator.getObjectId()); assertEquals(commit, generator.getObjectId());
assertEquals(uri, generator.getModulesUrl()); assertEquals(uri, generator.getModulesUrl());
assertEquals(path, generator.getModulesPath()); assertEquals(path, generator.getModulesPath());
assertEquals(uri, generator.getConfigUrl()); assertEquals(uri, generator.getConfigUrl());
try (Repository subModRepo = generator.getRepository()) { try (Repository subModRepo = generator.getRepository()) {
assertNotNull(subModRepo); assertNotNull(subModRepo);
assertEquals(subCommit, commit); assertEquals(subCommit, commit);
}
} }
Status status = Git.wrap(db).status().call(); Status status = Git.wrap(db).status().call();
assertTrue(status.getAdded().contains(Constants.DOT_GIT_MODULES)); assertTrue(status.getAdded().contains(Constants.DOT_GIT_MODULES));
assertTrue(status.getAdded().contains(path)); assertTrue(status.getAdded().contains(path));
@ -175,20 +175,20 @@ public class SubmoduleAddTest extends RepositoryTestCase {
subCommit = repo.resolve(Constants.HEAD); subCommit = repo.resolve(Constants.HEAD);
} }
SubmoduleWalk generator = SubmoduleWalk.forIndex(db); try (SubmoduleWalk generator = SubmoduleWalk.forIndex(db)) {
generator.loadModulesConfig(); generator.loadModulesConfig();
assertTrue(generator.next()); assertTrue(generator.next());
assertEquals(name, generator.getModuleName()); assertEquals(name, generator.getModuleName());
assertEquals(path, generator.getPath()); assertEquals(path, generator.getPath());
assertEquals(commit, generator.getObjectId()); assertEquals(commit, generator.getObjectId());
assertEquals(uri, generator.getModulesUrl()); assertEquals(uri, generator.getModulesUrl());
assertEquals(path, generator.getModulesPath()); assertEquals(path, generator.getModulesPath());
assertEquals(uri, generator.getConfigUrl()); assertEquals(uri, generator.getConfigUrl());
try (Repository subModRepo = generator.getRepository()) { try (Repository subModRepo = generator.getRepository()) {
assertNotNull(subModRepo); assertNotNull(subModRepo);
assertEquals(subCommit, commit); assertEquals(subCommit, commit);
}
} }
Status status = Git.wrap(db).status().call(); Status status = Git.wrap(db).status().call();
assertTrue(status.getAdded().contains(Constants.DOT_GIT_MODULES)); assertTrue(status.getAdded().contains(Constants.DOT_GIT_MODULES));
assertTrue(status.getAdded().contains(path)); assertTrue(status.getAdded().contains(path));
@ -269,24 +269,25 @@ public class SubmoduleAddTest extends RepositoryTestCase {
assertNotNull(repo); assertNotNull(repo);
addRepoToClose(repo); addRepoToClose(repo);
SubmoduleWalk generator = SubmoduleWalk.forIndex(db); try (SubmoduleWalk generator = SubmoduleWalk.forIndex(db)) {
assertTrue(generator.next()); assertTrue(generator.next());
assertEquals(path, generator.getPath()); assertEquals(path, generator.getPath());
assertEquals(commit, generator.getObjectId()); assertEquals(commit, generator.getObjectId());
assertEquals(uri, generator.getModulesUrl()); assertEquals(uri, generator.getModulesUrl());
assertEquals(path, generator.getModulesPath()); assertEquals(path, generator.getModulesPath());
String fullUri = db.getDirectory().getAbsolutePath(); String fullUri = db.getDirectory().getAbsolutePath();
if (File.separatorChar == '\\') { if (File.separatorChar == '\\') {
fullUri = fullUri.replace('\\', '/'); fullUri = fullUri.replace('\\', '/');
} }
assertEquals(fullUri, generator.getConfigUrl()); assertEquals(fullUri, generator.getConfigUrl());
try (Repository subModRepo = generator.getRepository()) { try (Repository subModRepo = generator.getRepository()) {
assertNotNull(subModRepo); assertNotNull(subModRepo);
assertEquals(fullUri, assertEquals(fullUri,
subModRepo.getConfig().getString( subModRepo.getConfig().getString(
ConfigConstants.CONFIG_REMOTE_SECTION, ConfigConstants.CONFIG_REMOTE_SECTION,
Constants.DEFAULT_REMOTE_NAME, Constants.DEFAULT_REMOTE_NAME,
ConfigConstants.CONFIG_KEY_URL)); ConfigConstants.CONFIG_KEY_URL));
}
} }
assertEquals(commit, repo.resolve(Constants.HEAD)); assertEquals(commit, repo.resolve(Constants.HEAD));

53
org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleDeinitTest.java
Unescape View File

@ -107,7 +107,6 @@ public class SubmoduleDeinitTest extends RepositoryTestCase {
assertEquals(1, updated.size()); assertEquals(1, updated.size());
File submoduleDir = assertSubmoduleIsInitialized(); File submoduleDir = assertSubmoduleIsInitialized();
SubmoduleWalk generator;
write(new File(submoduleDir, "untracked"), "untracked"); write(new File(submoduleDir, "untracked"), "untracked");
@ -115,8 +114,9 @@ public class SubmoduleDeinitTest extends RepositoryTestCase {
assertEquals(path, result.getPath()); assertEquals(path, result.getPath());
assertEquals(SubmoduleDeinitCommand.SubmoduleDeinitStatus.DIRTY, result.getStatus()); assertEquals(SubmoduleDeinitCommand.SubmoduleDeinitStatus.DIRTY, result.getStatus());
generator = SubmoduleWalk.forIndex(db); try (SubmoduleWalk generator = SubmoduleWalk.forIndex(db)) {
assertTrue(generator.next()); assertTrue(generator.next());
}
assertTrue(submoduleDir.isDirectory()); assertTrue(submoduleDir.isDirectory());
assertNotEquals(0, submoduleDir.list().length); assertNotEquals(0, submoduleDir.list().length);
} }
@ -132,33 +132,36 @@ public class SubmoduleDeinitTest extends RepositoryTestCase {
assertEquals(1, updated.size()); assertEquals(1, updated.size());
File submoduleDir = assertSubmoduleIsInitialized(); File submoduleDir = assertSubmoduleIsInitialized();
SubmoduleWalk generator = SubmoduleWalk.forIndex(db); try (SubmoduleWalk generator = SubmoduleWalk.forIndex(db)) {
generator.next(); generator.next();
//want to create a commit inside the repo... // want to create a commit inside the repo...
try (Repository submoduleLocalRepo = generator.getRepository()) { try (Repository submoduleLocalRepo = generator.getRepository()) {
JGitTestUtil.writeTrashFile(submoduleLocalRepo, "file.txt", JGitTestUtil.writeTrashFile(submoduleLocalRepo, "file.txt",
"new data"); "new data");
Git.wrap(submoduleLocalRepo).commit().setAll(true) Git.wrap(submoduleLocalRepo).commit().setAll(true)
.setMessage("local commit").call(); .setMessage("local commit").call();
}
} }
SubmoduleDeinitResult result = runDeinit(new SubmoduleDeinitCommand(db).addPath("sub")); SubmoduleDeinitResult result = runDeinit(new SubmoduleDeinitCommand(db).addPath("sub"));
assertEquals(path, result.getPath()); assertEquals(path, result.getPath());
assertEquals(SubmoduleDeinitCommand.SubmoduleDeinitStatus.DIRTY, result.getStatus()); assertEquals(SubmoduleDeinitCommand.SubmoduleDeinitStatus.DIRTY, result.getStatus());
generator = SubmoduleWalk.forIndex(db); try (SubmoduleWalk generator = SubmoduleWalk.forIndex(db)) {
assertTrue(generator.next()); assertTrue(generator.next());
}
assertTrue(submoduleDir.isDirectory()); assertTrue(submoduleDir.isDirectory());
assertNotEquals(0, submoduleDir.list().length); assertNotEquals(0, submoduleDir.list().length);
} }
private File assertSubmoduleIsInitialized() throws IOException { private File assertSubmoduleIsInitialized() throws IOException {
SubmoduleWalk generator = SubmoduleWalk.forIndex(db); try (SubmoduleWalk generator = SubmoduleWalk.forIndex(db)) {
assertTrue(generator.next()); assertTrue(generator.next());
File submoduleDir = new File(db.getWorkTree(), generator.getPath()); File submoduleDir = new File(db.getWorkTree(), generator.getPath());
assertTrue(submoduleDir.isDirectory()); assertTrue(submoduleDir.isDirectory());
assertNotEquals(0, submoduleDir.list().length); assertNotEquals(0, submoduleDir.list().length);
return submoduleDir; return submoduleDir;
}
} }
@Test @Test
@ -180,8 +183,9 @@ public class SubmoduleDeinitTest extends RepositoryTestCase {
assertEquals(path, result.getPath()); assertEquals(path, result.getPath());
assertEquals(SubmoduleDeinitCommand.SubmoduleDeinitStatus.FORCED, result.getStatus()); assertEquals(SubmoduleDeinitCommand.SubmoduleDeinitStatus.FORCED, result.getStatus());
SubmoduleWalk generator = SubmoduleWalk.forIndex(db); try (SubmoduleWalk generator = SubmoduleWalk.forIndex(db)) {
assertTrue(generator.next()); assertTrue(generator.next());
}
assertTrue(submoduleDir.isDirectory()); assertTrue(submoduleDir.isDirectory());
assertEquals(0, submoduleDir.list().length); assertEquals(0, submoduleDir.list().length);
} }
@ -202,8 +206,9 @@ public class SubmoduleDeinitTest extends RepositoryTestCase {
assertEquals(path, result.getPath()); assertEquals(path, result.getPath());
assertEquals(SubmoduleDeinitCommand.SubmoduleDeinitStatus.SUCCESS, result.getStatus()); assertEquals(SubmoduleDeinitCommand.SubmoduleDeinitStatus.SUCCESS, result.getStatus());
SubmoduleWalk generator = SubmoduleWalk.forIndex(db); try (SubmoduleWalk generator = SubmoduleWalk.forIndex(db)) {
assertTrue(generator.next()); assertTrue(generator.next());
}
assertTrue(submoduleDir.isDirectory()); assertTrue(submoduleDir.isDirectory());
assertEquals(0, submoduleDir.list().length); assertEquals(0, submoduleDir.list().length);
} }

106
org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleInitTest.java
Unescape View File

@ -86,11 +86,11 @@ public class SubmoduleInitTest extends RepositoryTestCase {
ConfigInvalidException, GitAPIException { ConfigInvalidException, GitAPIException {
final String path = addSubmoduleToIndex(); final String path = addSubmoduleToIndex();
SubmoduleWalk generator = SubmoduleWalk.forIndex(db); try (SubmoduleWalk generator = SubmoduleWalk.forIndex(db)) {
assertTrue(generator.next()); assertTrue(generator.next());
assertNull(generator.getConfigUrl()); assertNull(generator.getConfigUrl());
assertNull(generator.getConfigUpdate()); assertNull(generator.getConfigUpdate());
}
FileBasedConfig modulesConfig = new FileBasedConfig(new File( FileBasedConfig modulesConfig = new FileBasedConfig(new File(
db.getWorkTree(), Constants.DOT_GIT_MODULES), db.getFS()); db.getWorkTree(), Constants.DOT_GIT_MODULES), db.getFS());
modulesConfig.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION, path, modulesConfig.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION, path,
@ -109,10 +109,11 @@ public class SubmoduleInitTest extends RepositoryTestCase {
assertEquals(1, modules.size()); assertEquals(1, modules.size());
assertEquals(path, modules.iterator().next()); assertEquals(path, modules.iterator().next());
generator = SubmoduleWalk.forIndex(db); try (SubmoduleWalk generator = SubmoduleWalk.forIndex(db)) {
assertTrue(generator.next()); assertTrue(generator.next());
assertEquals(url, generator.getConfigUrl()); assertEquals(url, generator.getConfigUrl());
assertEquals(update, generator.getConfigUpdate()); assertEquals(update, generator.getConfigUpdate());
}
} }
@Test @Test
@ -126,11 +127,11 @@ public class SubmoduleInitTest extends RepositoryTestCase {
base); base);
config.save(); config.save();
SubmoduleWalk generator = SubmoduleWalk.forIndex(db); try (SubmoduleWalk generator = SubmoduleWalk.forIndex(db)) {
assertTrue(generator.next()); assertTrue(generator.next());
assertNull(generator.getConfigUrl()); assertNull(generator.getConfigUrl());
assertNull(generator.getConfigUpdate()); assertNull(generator.getConfigUpdate());
}
FileBasedConfig modulesConfig = new FileBasedConfig(new File( FileBasedConfig modulesConfig = new FileBasedConfig(new File(
db.getWorkTree(), Constants.DOT_GIT_MODULES), db.getFS()); db.getWorkTree(), Constants.DOT_GIT_MODULES), db.getFS());
modulesConfig.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION, path, modulesConfig.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION, path,
@ -149,10 +150,12 @@ public class SubmoduleInitTest extends RepositoryTestCase {
assertEquals(1, modules.size()); assertEquals(1, modules.size());
assertEquals(path, modules.iterator().next()); assertEquals(path, modules.iterator().next());
generator = SubmoduleWalk.forIndex(db); try (SubmoduleWalk generator = SubmoduleWalk.forIndex(db)) {
assertTrue(generator.next()); assertTrue(generator.next());
assertEquals("git://server/repo.git/sub.git", generator.getConfigUrl()); assertEquals("git://server/repo.git/sub.git",
assertEquals(update, generator.getConfigUpdate()); generator.getConfigUrl());
assertEquals(update, generator.getConfigUpdate());
}
} }
@Test @Test
@ -167,11 +170,11 @@ public class SubmoduleInitTest extends RepositoryTestCase {
base); base);
config.save(); config.save();
SubmoduleWalk generator = SubmoduleWalk.forIndex(db); try (SubmoduleWalk generator = SubmoduleWalk.forIndex(db)) {
assertTrue(generator.next()); assertTrue(generator.next());
assertNull(generator.getConfigUrl()); assertNull(generator.getConfigUrl());
assertNull(generator.getConfigUpdate()); assertNull(generator.getConfigUpdate());
}
FileBasedConfig modulesConfig = new FileBasedConfig(new File( FileBasedConfig modulesConfig = new FileBasedConfig(new File(
db.getWorkTree(), Constants.DOT_GIT_MODULES), db.getFS()); db.getWorkTree(), Constants.DOT_GIT_MODULES), db.getFS());
modulesConfig.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION, path, modulesConfig.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION, path,
@ -190,10 +193,11 @@ public class SubmoduleInitTest extends RepositoryTestCase {
assertEquals(1, modules.size()); assertEquals(1, modules.size());
assertEquals(path, modules.iterator().next()); assertEquals(path, modules.iterator().next());
generator = SubmoduleWalk.forIndex(db); try (SubmoduleWalk generator = SubmoduleWalk.forIndex(db)) {
assertTrue(generator.next()); assertTrue(generator.next());
assertEquals("git://server/sub.git", generator.getConfigUrl()); assertEquals("git://server/sub.git", generator.getConfigUrl());
assertEquals(update, generator.getConfigUpdate()); assertEquals(update, generator.getConfigUpdate());
}
} }
@Test @Test
@ -208,11 +212,11 @@ public class SubmoduleInitTest extends RepositoryTestCase {
base); base);
config.save(); config.save();
SubmoduleWalk generator = SubmoduleWalk.forIndex(db); try (SubmoduleWalk generator = SubmoduleWalk.forIndex(db)) {
assertTrue(generator.next()); assertTrue(generator.next());
assertNull(generator.getConfigUrl()); assertNull(generator.getConfigUrl());
assertNull(generator.getConfigUpdate()); assertNull(generator.getConfigUpdate());
}
FileBasedConfig modulesConfig = new FileBasedConfig(new File( FileBasedConfig modulesConfig = new FileBasedConfig(new File(
db.getWorkTree(), Constants.DOT_GIT_MODULES), db.getFS()); db.getWorkTree(), Constants.DOT_GIT_MODULES), db.getFS());
modulesConfig.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION, path, modulesConfig.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION, path,
@ -231,10 +235,11 @@ public class SubmoduleInitTest extends RepositoryTestCase {
assertEquals(1, modules.size()); assertEquals(1, modules.size());
assertEquals(path, modules.iterator().next()); assertEquals(path, modules.iterator().next());
generator = SubmoduleWalk.forIndex(db); try (SubmoduleWalk generator = SubmoduleWalk.forIndex(db)) {
assertTrue(generator.next()); assertTrue(generator.next());
assertEquals("git://server2/sub.git", generator.getConfigUrl()); assertEquals("git://server2/sub.git", generator.getConfigUrl());
assertEquals(update, generator.getConfigUpdate()); assertEquals(update, generator.getConfigUpdate());
}
} }
@Test @Test
@ -250,11 +255,11 @@ public class SubmoduleInitTest extends RepositoryTestCase {
Constants.DEFAULT_REMOTE_NAME, ConfigConstants.CONFIG_KEY_URL); Constants.DEFAULT_REMOTE_NAME, ConfigConstants.CONFIG_KEY_URL);
config.save(); config.save();
SubmoduleWalk generator = SubmoduleWalk.forIndex(db); try (SubmoduleWalk generator = SubmoduleWalk.forIndex(db)) {
assertTrue(generator.next()); assertTrue(generator.next());
assertNull(generator.getConfigUrl()); assertNull(generator.getConfigUrl());
assertNull(generator.getConfigUpdate()); assertNull(generator.getConfigUpdate());
}
FileBasedConfig modulesConfig = new FileBasedConfig(new File( FileBasedConfig modulesConfig = new FileBasedConfig(new File(
db.getWorkTree(), Constants.DOT_GIT_MODULES), db.getFS()); db.getWorkTree(), Constants.DOT_GIT_MODULES), db.getFS());
modulesConfig.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION, path, modulesConfig.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION, path,
@ -273,10 +278,11 @@ public class SubmoduleInitTest extends RepositoryTestCase {
assertEquals(1, modules.size()); assertEquals(1, modules.size());
assertEquals(path, modules.iterator().next()); assertEquals(path, modules.iterator().next());
generator = SubmoduleWalk.forIndex(db); try (SubmoduleWalk generator = SubmoduleWalk.forIndex(db)) {
assertTrue(generator.next()); assertTrue(generator.next());
assertEquals(base + "/sub.git", generator.getConfigUrl()); assertEquals(base + "/sub.git", generator.getConfigUrl());
assertEquals(update, generator.getConfigUpdate()); assertEquals(update, generator.getConfigUpdate());
}
} }
@Test @Test
@ -291,11 +297,11 @@ public class SubmoduleInitTest extends RepositoryTestCase {
base); base);
config.save(); config.save();
SubmoduleWalk generator = SubmoduleWalk.forIndex(db); try (SubmoduleWalk generator = SubmoduleWalk.forIndex(db)) {
assertTrue(generator.next()); assertTrue(generator.next());
assertNull(generator.getConfigUrl()); assertNull(generator.getConfigUrl());
assertNull(generator.getConfigUpdate()); assertNull(generator.getConfigUpdate());
}
FileBasedConfig modulesConfig = new FileBasedConfig(new File( FileBasedConfig modulesConfig = new FileBasedConfig(new File(
db.getWorkTree(), Constants.DOT_GIT_MODULES), db.getFS()); db.getWorkTree(), Constants.DOT_GIT_MODULES), db.getFS());
modulesConfig.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION, path, modulesConfig.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION, path,

62
org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleSyncTest.java
Unescape View File

@ -119,11 +119,11 @@ public class SubmoduleSyncTest extends RepositoryTestCase {
addRepoToClose(subRepo); addRepoToClose(subRepo);
assertNotNull(subRepo); assertNotNull(subRepo);
SubmoduleWalk generator = SubmoduleWalk.forIndex(db); try (SubmoduleWalk generator = SubmoduleWalk.forIndex(db)) {
assertTrue(generator.next()); assertTrue(generator.next());
assertNull(generator.getConfigUrl()); assertNull(generator.getConfigUrl());
assertEquals(url, generator.getModulesUrl()); assertEquals(url, generator.getModulesUrl());
}
SubmoduleSyncCommand command = new SubmoduleSyncCommand(db); SubmoduleSyncCommand command = new SubmoduleSyncCommand(db);
Map<String, String> synced = command.call(); Map<String, String> synced = command.call();
assertNotNull(synced); assertNotNull(synced);
@ -132,16 +132,17 @@ public class SubmoduleSyncTest extends RepositoryTestCase {
assertEquals(path, module.getKey()); assertEquals(path, module.getKey());
assertEquals(url, module.getValue()); assertEquals(url, module.getValue());
generator = SubmoduleWalk.forIndex(db); try (SubmoduleWalk generator = SubmoduleWalk.forIndex(db)) {
assertTrue(generator.next()); assertTrue(generator.next());
assertEquals(url, generator.getConfigUrl()); assertEquals(url, generator.getConfigUrl());
try (Repository subModRepository = generator.getRepository()) { try (Repository subModRepository = generator.getRepository()) {
StoredConfig submoduleConfig = subModRepository.getConfig(); StoredConfig submoduleConfig = subModRepository.getConfig();
assertEquals(url, assertEquals(url,
submoduleConfig.getString( submoduleConfig.getString(
ConfigConstants.CONFIG_REMOTE_SECTION, ConfigConstants.CONFIG_REMOTE_SECTION,
Constants.DEFAULT_REMOTE_NAME, Constants.DEFAULT_REMOTE_NAME,
ConfigConstants.CONFIG_KEY_URL)); ConfigConstants.CONFIG_KEY_URL));
}
} }
} }
@ -190,11 +191,11 @@ public class SubmoduleSyncTest extends RepositoryTestCase {
assertNotNull(subRepo); assertNotNull(subRepo);
addRepoToClose(subRepo); addRepoToClose(subRepo);
SubmoduleWalk generator = SubmoduleWalk.forIndex(db); try (SubmoduleWalk generator = SubmoduleWalk.forIndex(db)) {
assertTrue(generator.next()); assertTrue(generator.next());
assertNull(generator.getConfigUrl()); assertNull(generator.getConfigUrl());
assertEquals(current, generator.getModulesUrl()); assertEquals(current, generator.getModulesUrl());
}
modulesConfig.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION, path, modulesConfig.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION, path,
ConfigConstants.CONFIG_KEY_URL, "../sub.git"); ConfigConstants.CONFIG_KEY_URL, "../sub.git");
modulesConfig.save(); modulesConfig.save();
@ -207,16 +208,17 @@ public class SubmoduleSyncTest extends RepositoryTestCase {
assertEquals(path, module.getKey()); assertEquals(path, module.getKey());
assertEquals("git://server/sub.git", module.getValue()); assertEquals("git://server/sub.git", module.getValue());
generator = SubmoduleWalk.forIndex(db); try (SubmoduleWalk generator = SubmoduleWalk.forIndex(db)) {
assertTrue(generator.next()); assertTrue(generator.next());
assertEquals("git://server/sub.git", generator.getConfigUrl()); assertEquals("git://server/sub.git", generator.getConfigUrl());
try (Repository subModRepository1 = generator.getRepository()) { try (Repository subModRepository1 = generator.getRepository()) {
StoredConfig submoduleConfig = subModRepository1.getConfig(); StoredConfig submoduleConfig = subModRepository1.getConfig();
assertEquals("git://server/sub.git", assertEquals("git://server/sub.git",
submoduleConfig.getString( submoduleConfig.getString(
ConfigConstants.CONFIG_REMOTE_SECTION, ConfigConstants.CONFIG_REMOTE_SECTION,
Constants.DEFAULT_REMOTE_NAME, Constants.DEFAULT_REMOTE_NAME,
ConfigConstants.CONFIG_KEY_URL)); ConfigConstants.CONFIG_KEY_URL));
}
} }
} }
} }

18
org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleUpdateTest.java
Unescape View File

@ -119,11 +119,12 @@ public class SubmoduleUpdateTest extends RepositoryTestCase {
assertEquals(1, updated.size()); assertEquals(1, updated.size());
assertEquals(path, updated.iterator().next()); assertEquals(path, updated.iterator().next());
SubmoduleWalk generator = SubmoduleWalk.forIndex(db); try (SubmoduleWalk generator = SubmoduleWalk.forIndex(db)) {
assertTrue(generator.next()); assertTrue(generator.next());
try (Repository subRepo = generator.getRepository()) { try (Repository subRepo = generator.getRepository()) {
assertNotNull(subRepo); assertNotNull(subRepo);
assertEquals(commit, subRepo.resolve(Constants.HEAD)); assertEquals(commit, subRepo.resolve(Constants.HEAD));
}
} }
} }
@ -181,10 +182,11 @@ public class SubmoduleUpdateTest extends RepositoryTestCase {
}); });
editor.commit(); editor.commit();
Repository subRepo = Git.init().setBare(false) try (Repository subRepo = Git.init().setBare(false)
.setDirectory(new File(db.getWorkTree(), path)).call() .setDirectory(new File(db.getWorkTree(), path)).call()
.getRepository(); .getRepository()) {
assertNotNull(subRepo); assertNotNull(subRepo);
}
SubmoduleUpdateCommand command = new SubmoduleUpdateCommand(db); SubmoduleUpdateCommand command = new SubmoduleUpdateCommand(db);
Collection<String> updated = command.call(); Collection<String> updated = command.call();

239
org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleWalkTest.java
Unescape View File

@ -98,10 +98,11 @@ public class SubmoduleWalkTest extends RepositoryTestCase {
@Test @Test
public void repositoryWithNoSubmodules() throws IOException { public void repositoryWithNoSubmodules() throws IOException {
SubmoduleWalk gen = SubmoduleWalk.forIndex(db); try (SubmoduleWalk gen = SubmoduleWalk.forIndex(db)) {
assertFalse(gen.next()); assertFalse(gen.next());
assertNull(gen.getPath()); assertNull(gen.getPath());
assertEquals(ObjectId.zeroId(), gen.getObjectId()); assertEquals(ObjectId.zeroId(), gen.getObjectId());
}
} }
@Test @Test
@ -129,20 +130,21 @@ public class SubmoduleWalkTest extends RepositoryTestCase {
}); });
editor.commit(); editor.commit();
SubmoduleWalk gen = SubmoduleWalk.forIndex(db); try (SubmoduleWalk gen = SubmoduleWalk.forIndex(db)) {
assertTrue(gen.next()); assertTrue(gen.next());
assertEquals(path, gen.getPath()); assertEquals(path, gen.getPath());
assertEquals(id, gen.getObjectId()); assertEquals(id, gen.getObjectId());
assertEquals(new File(db.getWorkTree(), path), gen.getDirectory()); assertEquals(new File(db.getWorkTree(), path), gen.getDirectory());
assertNull(gen.getConfigUpdate()); assertNull(gen.getConfigUpdate());
assertNull(gen.getConfigUrl()); assertNull(gen.getConfigUrl());
assertNull(gen.getModulesPath()); assertNull(gen.getModulesPath());
assertNull(gen.getModulesUpdate()); assertNull(gen.getModulesUpdate());
assertNull(gen.getModulesUrl()); assertNull(gen.getModulesUrl());
assertNull(gen.getRepository()); assertNull(gen.getRepository());
assertFalse(gen.next());
}
Status status = Git.wrap(db).status().call(); Status status = Git.wrap(db).status().call();
assertTrue(!status.isClean()); assertFalse(status.isClean());
assertFalse(gen.next());
} }
@Test @Test
@ -178,24 +180,25 @@ public class SubmoduleWalkTest extends RepositoryTestCase {
}); });
editor.commit(); editor.commit();
SubmoduleWalk gen = SubmoduleWalk.forIndex(db); try (SubmoduleWalk gen = SubmoduleWalk.forIndex(db)) {
assertTrue(gen.next()); assertTrue(gen.next());
assertEquals(path, gen.getPath()); assertEquals(path, gen.getPath());
assertEquals(id, gen.getObjectId()); assertEquals(id, gen.getObjectId());
assertEquals(new File(db.getWorkTree(), path), gen.getDirectory()); assertEquals(new File(db.getWorkTree(), path), gen.getDirectory());
assertNull(gen.getConfigUpdate()); assertNull(gen.getConfigUpdate());
assertNull(gen.getConfigUrl()); assertNull(gen.getConfigUrl());
assertNull(gen.getModulesPath()); assertNull(gen.getModulesPath());
assertNull(gen.getModulesUpdate()); assertNull(gen.getModulesUpdate());
assertNull(gen.getModulesUrl()); assertNull(gen.getModulesUrl());
try (Repository subRepo = gen.getRepository()) { try (Repository subRepo = gen.getRepository()) {
assertNotNull(subRepo); assertNotNull(subRepo);
assertEquals(modulesGitDir.getAbsolutePath(), assertEquals(modulesGitDir.getAbsolutePath(),
subRepo.getDirectory().getAbsolutePath()); subRepo.getDirectory().getAbsolutePath());
assertEquals(new File(db.getWorkTree(), path).getAbsolutePath(), assertEquals(new File(db.getWorkTree(), path).getAbsolutePath(),
subRepo.getWorkTree().getAbsolutePath()); subRepo.getWorkTree().getAbsolutePath());
}
assertFalse(gen.next());
} }
assertFalse(gen.next());
} }
@Test @Test
@ -232,23 +235,24 @@ public class SubmoduleWalkTest extends RepositoryTestCase {
}); });
editor.commit(); editor.commit();
SubmoduleWalk gen = SubmoduleWalk.forIndex(db); try (SubmoduleWalk gen = SubmoduleWalk.forIndex(db)) {
assertTrue(gen.next()); assertTrue(gen.next());
assertEquals(path, gen.getPath()); assertEquals(path, gen.getPath());
assertEquals(id, gen.getObjectId()); assertEquals(id, gen.getObjectId());
assertEquals(new File(db.getWorkTree(), path), gen.getDirectory()); assertEquals(new File(db.getWorkTree(), path), gen.getDirectory());
assertNull(gen.getConfigUpdate()); assertNull(gen.getConfigUpdate());
assertNull(gen.getConfigUrl()); assertNull(gen.getConfigUrl());
assertNull(gen.getModulesPath()); assertNull(gen.getModulesPath());
assertNull(gen.getModulesUpdate()); assertNull(gen.getModulesUpdate());
assertNull(gen.getModulesUrl()); assertNull(gen.getModulesUrl());
try (Repository subRepo = gen.getRepository()) { try (Repository subRepo = gen.getRepository()) {
assertNotNull(subRepo); assertNotNull(subRepo);
assertEqualsFile(modulesGitDir, subRepo.getDirectory()); assertEqualsFile(modulesGitDir, subRepo.getDirectory());
assertEqualsFile(new File(db.getWorkTree(), path), assertEqualsFile(new File(db.getWorkTree(), path),
subRepo.getWorkTree()); subRepo.getWorkTree());
subRepo.close(); subRepo.close();
assertFalse(gen.next()); assertFalse(gen.next());
}
} }
} }
@ -270,18 +274,19 @@ public class SubmoduleWalkTest extends RepositoryTestCase {
}); });
editor.commit(); editor.commit();
SubmoduleWalk gen = SubmoduleWalk.forIndex(db); try (SubmoduleWalk gen = SubmoduleWalk.forIndex(db)) {
assertTrue(gen.next()); assertTrue(gen.next());
assertEquals(path, gen.getPath()); assertEquals(path, gen.getPath());
assertEquals(id, gen.getObjectId()); assertEquals(id, gen.getObjectId());
assertEquals(new File(db.getWorkTree(), path), gen.getDirectory()); assertEquals(new File(db.getWorkTree(), path), gen.getDirectory());
assertNull(gen.getConfigUpdate()); assertNull(gen.getConfigUpdate());
assertNull(gen.getConfigUrl()); assertNull(gen.getConfigUrl());
assertNull(gen.getModulesPath()); assertNull(gen.getModulesPath());
assertNull(gen.getModulesUpdate()); assertNull(gen.getModulesUpdate());
assertNull(gen.getModulesUrl()); assertNull(gen.getModulesUrl());
assertNull(gen.getRepository()); assertNull(gen.getRepository());
assertFalse(gen.next()); assertFalse(gen.next());
}
} }
@Test @Test
@ -312,12 +317,13 @@ public class SubmoduleWalkTest extends RepositoryTestCase {
}); });
editor.commit(); editor.commit();
SubmoduleWalk gen = SubmoduleWalk.forIndex(db); try (SubmoduleWalk gen = SubmoduleWalk.forIndex(db)) {
gen.setFilter(PathFilter.create(path1)); gen.setFilter(PathFilter.create(path1));
assertTrue(gen.next()); assertTrue(gen.next());
assertEquals(path1, gen.getPath()); assertEquals(path1, gen.getPath());
assertEquals(id1, gen.getObjectId()); assertEquals(id1, gen.getObjectId());
assertFalse(gen.next()); assertFalse(gen.next());
}
} }
@Test @Test
@ -358,18 +364,19 @@ public class SubmoduleWalkTest extends RepositoryTestCase {
}); });
editor.commit(); editor.commit();
SubmoduleWalk gen = SubmoduleWalk.forIndex(db); try (SubmoduleWalk gen = SubmoduleWalk.forIndex(db)) {
assertTrue(gen.next()); assertTrue(gen.next());
assertEquals(path, gen.getPath()); assertEquals(path, gen.getPath());
assertEquals(subId, gen.getObjectId()); assertEquals(subId, gen.getObjectId());
assertEquals(new File(db.getWorkTree(), path), gen.getDirectory()); assertEquals(new File(db.getWorkTree(), path), gen.getDirectory());
assertNull(gen.getConfigUpdate()); assertNull(gen.getConfigUpdate());
assertNull(gen.getConfigUrl()); assertNull(gen.getConfigUrl());
assertEquals("sub", gen.getModulesPath()); assertEquals("sub", gen.getModulesPath());
assertNull(gen.getModulesUpdate()); assertNull(gen.getModulesUpdate());
assertEquals("git://example.com/sub", gen.getModulesUrl()); assertEquals("git://example.com/sub", gen.getModulesUrl());
assertNull(gen.getRepository()); assertNull(gen.getRepository());
assertFalse(gen.next()); assertFalse(gen.next());
}
} }
@Test @Test
@ -397,17 +404,19 @@ public class SubmoduleWalkTest extends RepositoryTestCase {
}) })
.create()); .create());
SubmoduleWalk gen = SubmoduleWalk.forPath(db, commit.getTree(), "sub"); try (SubmoduleWalk gen = SubmoduleWalk.forPath(db, commit.getTree(),
assertEquals(path, gen.getPath()); "sub")) {
assertEquals(subId, gen.getObjectId()); assertEquals(path, gen.getPath());
assertEquals(new File(db.getWorkTree(), path), gen.getDirectory()); assertEquals(subId, gen.getObjectId());
assertNull(gen.getConfigUpdate()); assertEquals(new File(db.getWorkTree(), path), gen.getDirectory());
assertNull(gen.getConfigUrl()); assertNull(gen.getConfigUpdate());
assertEquals("sub", gen.getModulesPath()); assertNull(gen.getConfigUrl());
assertNull(gen.getModulesUpdate()); assertEquals("sub", gen.getModulesPath());
assertEquals("git://example.com/sub", gen.getModulesUrl()); assertNull(gen.getModulesUpdate());
assertNull(gen.getRepository()); assertEquals("git://example.com/sub", gen.getModulesUrl());
assertFalse(gen.next()); assertNull(gen.getRepository());
assertFalse(gen.next());
}
} }
@Test @Test
@ -437,17 +446,18 @@ public class SubmoduleWalkTest extends RepositoryTestCase {
final CanonicalTreeParser p = new CanonicalTreeParser(); final CanonicalTreeParser p = new CanonicalTreeParser();
p.reset(testDb.getRevWalk().getObjectReader(), commit.getTree()); p.reset(testDb.getRevWalk().getObjectReader(), commit.getTree());
SubmoduleWalk gen = SubmoduleWalk.forPath(db, p, "sub"); try (SubmoduleWalk gen = SubmoduleWalk.forPath(db, p, "sub")) {
assertEquals(path, gen.getPath()); assertEquals(path, gen.getPath());
assertEquals(subId, gen.getObjectId()); assertEquals(subId, gen.getObjectId());
assertEquals(new File(db.getWorkTree(), path), gen.getDirectory()); assertEquals(new File(db.getWorkTree(), path), gen.getDirectory());
assertNull(gen.getConfigUpdate()); assertNull(gen.getConfigUpdate());
assertNull(gen.getConfigUrl()); assertNull(gen.getConfigUrl());
assertEquals("sub", gen.getModulesPath()); assertEquals("sub", gen.getModulesPath());
assertNull(gen.getModulesUpdate()); assertNull(gen.getModulesUpdate());
assertEquals("git://example.com/sub", gen.getModulesUrl()); assertEquals("git://example.com/sub", gen.getModulesUrl());
assertNull(gen.getRepository()); assertNull(gen.getRepository());
assertFalse(gen.next()); assertFalse(gen.next());
}
} }
@Test @Test
@ -477,16 +487,17 @@ public class SubmoduleWalkTest extends RepositoryTestCase {
final CanonicalTreeParser p = new CanonicalTreeParser(); final CanonicalTreeParser p = new CanonicalTreeParser();
p.reset(testDb.getRevWalk().getObjectReader(), commit.getTree()); p.reset(testDb.getRevWalk().getObjectReader(), commit.getTree());
SubmoduleWalk gen = SubmoduleWalk.forPath(db, p, "sub"); try (SubmoduleWalk gen = SubmoduleWalk.forPath(db, p, "sub")) {
assertEquals(path, gen.getPath()); assertEquals(path, gen.getPath());
assertEquals(subId, gen.getObjectId()); assertEquals(subId, gen.getObjectId());
assertEquals(new File(db.getWorkTree(), path), gen.getDirectory()); assertEquals(new File(db.getWorkTree(), path), gen.getDirectory());
assertNull(gen.getConfigUpdate()); assertNull(gen.getConfigUpdate());
assertNull(gen.getConfigUrl()); assertNull(gen.getConfigUrl());
assertEquals("sub", gen.getModulesPath()); assertEquals("sub", gen.getModulesPath());
assertNull(gen.getModulesUpdate()); assertNull(gen.getModulesUpdate());
assertEquals("git://example.com/sub", gen.getModulesUrl()); assertEquals("git://example.com/sub", gen.getModulesUrl());
assertNull(gen.getRepository()); assertNull(gen.getRepository());
assertFalse(gen.next()); assertFalse(gen.next());
}
} }
} }

Write Preview
Loading…
Cancel
Save