diff options
Diffstat (limited to 'org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/BranchConfigTest.java')
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/BranchConfigTest.java | 90 |
1 files changed, 50 insertions, 40 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/BranchConfigTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/BranchConfigTest.java index 87bb082485..2c9097f377 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/BranchConfigTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/BranchConfigTest.java @@ -1,45 +1,12 @@ /* * Copyright (C) 2011, Robin Stocker <robin@nibor.org> - * Copyright (C) 2012, Matthias Sohn <matthias.sohn@sap.com> - * and other copyright owners as documented in the project's IP log. + * Copyright (C) 2012, Matthias Sohn <matthias.sohn@sap.com> and others * - * This program and the accompanying materials are made available - * under the terms of the Eclipse Distribution License v1.0 which - * accompanies this distribution, is reproduced below, and is - * available at http://www.eclipse.org/org/documents/edl-v10.php + * 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. * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * - Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * - * - Neither the name of the Eclipse Foundation, Inc. nor the - * names of its contributors may be used to endorse or promote - * products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * SPDX-License-Identifier: BSD-3-Clause */ package org.eclipse.jgit.lib; @@ -47,9 +14,11 @@ package org.eclipse.jgit.lib; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; import org.eclipse.jgit.errors.ConfigInvalidException; +import org.eclipse.jgit.lib.BranchConfig.BranchRebaseMode; import org.junit.Test; public class BranchConfigTest { @@ -147,20 +116,61 @@ public class BranchConfigTest { } @Test + public void testRebaseMode() { + Config c = parse("" // + + "[branch \"undefined\"]\n" + + "[branch \"false\"]\n" + + " rebase = false\n" + + "[branch \"true\"]\n" + + " rebase = true\n" + + "[branch \"interactive\"]\n" + + " rebase = interactive\n" + + "[branch \"merges\"]\n" + + " rebase = merges\n" + + "[branch \"preserve\"]\n" + + " rebase = preserve\n" + + "[branch \"illegal\"]\n" + + " rebase = illegal\n"); + assertEquals(BranchRebaseMode.NONE, + new BranchConfig(c, " undefined").getRebaseMode()); + assertEquals(BranchRebaseMode.NONE, + new BranchConfig(c, "false").getRebaseMode()); + assertEquals(BranchRebaseMode.REBASE, + new BranchConfig(c, "true").getRebaseMode()); + assertEquals(BranchRebaseMode.INTERACTIVE, + new BranchConfig(c, "interactive").getRebaseMode()); + assertEquals(BranchRebaseMode.MERGES, + new BranchConfig(c, "merges").getRebaseMode()); + assertEquals(BranchRebaseMode.MERGES, + new BranchConfig(c, "preserve").getRebaseMode()); + assertThrows(IllegalArgumentException.class, + () -> new BranchConfig(c, "illegal").getRebaseMode()); + } + + @Test public void isRebase() { Config c = parse("" // + "[branch \"undefined\"]\n" + "[branch \"false\"]\n" + " rebase = false\n" + "[branch \"true\"]\n" - + " rebase = true\n"); + + " rebase = true\n" + + "[branch \"interactive\"]\n" + + " rebase = interactive\n" + + "[branch \"merges\"]\n" + + " rebase = merges\n" + + "[branch \"preserve\"]\n" + + " rebase = preserve\n"); assertFalse(new BranchConfig(c, "undefined").isRebase()); assertFalse(new BranchConfig(c, "false").isRebase()); assertTrue(new BranchConfig(c, "true").isRebase()); + assertTrue(new BranchConfig(c, "interactive").isRebase()); + assertTrue(new BranchConfig(c, "merges").isRebase()); + assertTrue(new BranchConfig(c, "preserve").isRebase()); } - private static Config parse(final String content) { + private static Config parse(String content) { final Config c = new Config(null); try { c.fromText(content); |