diff options
Diffstat (limited to 'org.eclipse.jgit.test/tst/org/eclipse/jgit/ignore/BasicRuleTest.java')
-rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/ignore/BasicRuleTest.java | 73 |
1 files changed, 34 insertions, 39 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/ignore/BasicRuleTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/ignore/BasicRuleTest.java index d8a6174475..6983eaa354 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/ignore/BasicRuleTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/ignore/BasicRuleTest.java @@ -1,44 +1,11 @@ /* - * Copyright (C) 2014, Andrey Loskutov <loskutov@gmx.de> - * and other copyright owners as documented in the project's IP log. + * Copyright (C) 2014, Andrey Loskutov <loskutov@gmx.de> 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.ignore; @@ -47,6 +14,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; +import org.eclipse.jgit.ignore.internal.Strings; import org.junit.Test; public class BasicRuleTest { @@ -63,7 +31,7 @@ public class BasicRuleTest { assertFalse(rule1.getNegation()); assertTrue(rule3.getNegation()); assertNotEquals(rule1, null); - assertEquals(rule1, rule1); + assertTrue(rule1.equals(rule1)); assertEquals(rule1, rule2); assertNotEquals(rule1, rule3); assertNotEquals(rule1, rule4); @@ -73,4 +41,31 @@ public class BasicRuleTest { assertNotEquals(rule1.toString(), rule3.toString()); } + @Test + public void testDirectoryPattern() { + assertTrue(Strings.isDirectoryPattern("/")); + assertTrue(Strings.isDirectoryPattern("/ ")); + assertTrue(Strings.isDirectoryPattern("/ ")); + assertFalse(Strings.isDirectoryPattern(" ")); + assertFalse(Strings.isDirectoryPattern("")); + } + + @Test + public void testStripTrailingChar() { + assertEquals("", Strings.stripTrailing("/", '/')); + assertEquals("", Strings.stripTrailing("///", '/')); + assertEquals("a", Strings.stripTrailing("a/", '/')); + assertEquals("a", Strings.stripTrailing("a///", '/')); + assertEquals("a/ ", Strings.stripTrailing("a/ ", '/')); + } + + @Test + public void testStripTrailingWhitespace() { + assertEquals("", Strings.stripTrailingWhitespace("")); + assertEquals("", Strings.stripTrailingWhitespace(" ")); + assertEquals("a", Strings.stripTrailingWhitespace("a")); + assertEquals("a", Strings.stripTrailingWhitespace("a ")); + assertEquals("a", Strings.stripTrailingWhitespace("a ")); + assertEquals("a", Strings.stripTrailingWhitespace("a \t")); + } } |