summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test
diff options
context:
space:
mode:
authorRobin Stocker <robin@nibor.org>2014-10-19 14:40:29 +1100
committerRobin Stocker <robin@nibor.org>2014-10-19 14:40:29 +1100
commit590e1b7602120198cbaffa9b1e639154ded265b7 (patch)
treefd5d11743a981c448a252fbba1ebc94fbddc2ae0 /org.eclipse.jgit.test
parent5c85d5d58adbe415c217e45aa365892f2ca9fd0c (diff)
downloadjgit-590e1b7602120198cbaffa9b1e639154ded265b7.tar.gz
jgit-590e1b7602120198cbaffa9b1e639154ded265b7.zip
BundleWriter: Support including HEAD in bundle
Bug: 446813 Change-Id: Ide64aec2a995dd7ff6c1325c3ada242a4eb4565e Signed-off-by: Robin Stocker <robin@nibor.org>
Diffstat (limited to 'org.eclipse.jgit.test')
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/BundleWriterTest.java27
1 files changed, 17 insertions, 10 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/BundleWriterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/BundleWriterTest.java
index efc3834f45..24cee0a6a1 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/BundleWriterTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/BundleWriterTest.java
@@ -73,20 +73,19 @@ import org.junit.Test;
public class BundleWriterTest extends SampleDataRepositoryTestCase {
@Test
- public void testWrite0() throws Exception {
+ public void testWriteSingleRef() throws Exception {
// Create a tiny bundle, (well one of) the first commits only
final byte[] bundle = makeBundle("refs/heads/firstcommit",
"42e4e7c5e507e113ebbb7801b16b52cf867b7ce1", null);
// Then we clone a new repo from that bundle and do a simple test. This
- // makes sure
- // we could read the bundle we created.
+ // makes sure we could read the bundle we created.
Repository newRepo = createBareRepository();
FetchResult fetchResult = fetchFromBundle(newRepo, bundle);
Ref advertisedRef = fetchResult
.getAdvertisedRef("refs/heads/firstcommit");
- // We expect firstcommit to appear by id
+ // We expect first commit to appear by id
assertEquals("42e4e7c5e507e113ebbb7801b16b52cf867b7ce1", advertisedRef
.getObjectId().name());
// ..and by name as the bundle created a new ref
@@ -94,13 +93,21 @@ public class BundleWriterTest extends SampleDataRepositoryTestCase {
.resolve("refs/heads/firstcommit").name());
}
- /**
- * Incremental bundle test
- *
- * @throws Exception
- */
@Test
- public void testWrite1() throws Exception {
+ public void testWriteHEAD() throws Exception {
+ byte[] bundle = makeBundle("HEAD",
+ "42e4e7c5e507e113ebbb7801b16b52cf867b7ce1", null);
+
+ Repository newRepo = createBareRepository();
+ FetchResult fetchResult = fetchFromBundle(newRepo, bundle);
+ Ref advertisedRef = fetchResult.getAdvertisedRef("HEAD");
+
+ assertEquals("42e4e7c5e507e113ebbb7801b16b52cf867b7ce1", advertisedRef
+ .getObjectId().name());
+ }
+
+ @Test
+ public void testIncrementalBundle() throws Exception {
byte[] bundle;
// Create a small bundle, an early commit