diff options
Diffstat (limited to 'org.eclipse.jgit.pgm.test')
| -rw-r--r-- | org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 36 | ||||
| -rw-r--r-- | org.eclipse.jgit.pgm.test/pom.xml | 2 | ||||
| -rw-r--r-- | org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/RevListTest.java | 75 |
3 files changed, 94 insertions, 19 deletions
diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index ae67125a3c..704ad7cc6c 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,28 +3,28 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 5.11.2.qualifier +Bundle-Version: 5.12.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.api;version="[5.11.2,5.12.0)", - org.eclipse.jgit.api.errors;version="[5.11.2,5.12.0)", - org.eclipse.jgit.diff;version="[5.11.2,5.12.0)", - org.eclipse.jgit.dircache;version="[5.11.2,5.12.0)", - org.eclipse.jgit.internal.storage.file;version="5.11.2", - org.eclipse.jgit.junit;version="[5.11.2,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.2,5.12.0)", - org.eclipse.jgit.merge;version="[5.11.2,5.12.0)", - org.eclipse.jgit.pgm;version="[5.11.2,5.12.0)", - org.eclipse.jgit.pgm.internal;version="[5.11.2,5.12.0)", - org.eclipse.jgit.pgm.opt;version="[5.11.2,5.12.0)", - org.eclipse.jgit.revwalk;version="[5.11.2,5.12.0)", - org.eclipse.jgit.storage.file;version="[5.11.2,5.12.0)", - org.eclipse.jgit.transport;version="[5.11.2,5.12.0)", - org.eclipse.jgit.treewalk;version="[5.11.2,5.12.0)", - org.eclipse.jgit.util;version="[5.11.2,5.12.0)", - org.eclipse.jgit.util.io;version="[5.11.2,5.12.0)", +Import-Package: org.eclipse.jgit.api;version="[5.12.1,5.13.0)", + org.eclipse.jgit.api.errors;version="[5.12.1,5.13.0)", + org.eclipse.jgit.diff;version="[5.12.1,5.13.0)", + org.eclipse.jgit.dircache;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.storage.file;version="5.12.1", + org.eclipse.jgit.junit;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.1,5.13.0)", + org.eclipse.jgit.merge;version="[5.12.1,5.13.0)", + org.eclipse.jgit.pgm;version="[5.12.1,5.13.0)", + org.eclipse.jgit.pgm.internal;version="[5.12.1,5.13.0)", + org.eclipse.jgit.pgm.opt;version="[5.12.1,5.13.0)", + org.eclipse.jgit.revwalk;version="[5.12.1,5.13.0)", + org.eclipse.jgit.storage.file;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.1,5.13.0)", + org.eclipse.jgit.treewalk;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util.io;version="[5.12.1,5.13.0)", org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index ca908a4f58..77dd85fd81 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.11.2-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.pgm.test</artifactId> diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/RevListTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/RevListTest.java new file mode 100644 index 0000000000..06fddc29d9 --- /dev/null +++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/RevListTest.java @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2021, kylezhao <kylezhao@tencent.com> and others. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.pgm; + +import static org.junit.Assert.assertEquals; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.lib.CLIRepositoryTestCase; +import org.eclipse.jgit.revwalk.RevCommit; +import org.junit.Before; +import org.junit.Test; + +public class RevListTest extends CLIRepositoryTestCase { + + private Git git; + + @Override + @Before + public void setUp() throws Exception { + super.setUp(); + git = new Git(db); + } + + @Test + public void testWithParentsFlag() throws Exception { + List<RevCommit> commits = createCommitsForParentsFlag(git); + String result = toString( + execute("git rev-list HEAD --parents -- Test.txt")); + + String expect = toString( + commits.get(3).name() + ' ' + commits.get(1).name(), + commits.get(1).name()); + + assertEquals(expect, result); + } + + @Test + public void testWithoutParentsFlag() throws Exception { + List<RevCommit> commits = createCommitsForParentsFlag(git); + String result = toString(execute("git rev-list HEAD -- Test.txt")); + + String expect = toString(commits.get(3).name(), commits.get(1).name()); + + assertEquals(expect, result); + } + + private List<RevCommit> createCommitsForParentsFlag(Git git) + throws Exception { + List<RevCommit> commits = new ArrayList<>(); + writeTrashFile("Test1.txt", "Hello world"); + git.add().addFilepattern("Test1.txt").call(); + commits.add(git.commit().setMessage("commit#0").call()); + writeTrashFile("Test.txt", "Hello world!"); + git.add().addFilepattern("Test.txt").call(); + commits.add(git.commit().setMessage("commit#1").call()); + writeTrashFile("Test1.txt", "Hello world!!"); + git.add().addFilepattern("Test1.txt").call(); + commits.add(git.commit().setMessage("commit#2").call()); + writeTrashFile("Test.txt", "Hello world!!!"); + git.add().addFilepattern("Test.txt").call(); + commits.add(git.commit().setMessage("commit#3").call()); + return commits; + } +} |