fixed tests (SPR-7779)

7af890cc · Juergen Hoeller · f4a2282d · 7af890cc
隐藏空白更改
内联并排

Showing with 7 addition and 2 deletion

org.springframework.core/src/test/java/org/springframework/util/StringUtilsTests.java .../test/java/org/springframework/util/StringUtilsTests.java +7 -2

未找到文件。
--- a/org.springframework.core/src/test/java/org/springframework/util/StringUtilsTests.java
+++ b/org.springframework.core/src/test/java/org/springframework/util/StringUtilsTests.java
@@ -268,21 +268,26 @@ public class StringUtilsTests extends TestCase {
 		assertEquals(null, StringUtils.getFilenameExtension(""));
 		assertEquals(null, StringUtils.getFilenameExtension("myfile"));
 		assertEquals(null, StringUtils.getFilenameExtension("myPath/myfile"));
+		assertEquals(null, StringUtils.getFilenameExtension("/home/user/.m2/settings"));
 		assertEquals("", StringUtils.getFilenameExtension("myfile."));
 		assertEquals("", StringUtils.getFilenameExtension("myPath/myfile."));
 		assertEquals("txt", StringUtils.getFilenameExtension("myfile.txt"));
 		assertEquals("txt", StringUtils.getFilenameExtension("mypath/myfile.txt"));
+		assertEquals("txt", StringUtils.getFilenameExtension("/home/user/.m2/settings/myfile.txt"));
 	}

 	public void testStripFilenameExtension() {
 		assertEquals(null, StringUtils.stripFilenameExtension(null));
 		assertEquals("", StringUtils.stripFilenameExtension(""));
 		assertEquals("myfile", StringUtils.stripFilenameExtension("myfile"));
-		assertEquals("mypath/myfile", StringUtils.stripFilenameExtension("mypath/myfile"));
 		assertEquals("myfile", StringUtils.stripFilenameExtension("myfile."));
-		assertEquals("mypath/myfile", StringUtils.stripFilenameExtension("mypath/myfile."));
 		assertEquals("myfile", StringUtils.stripFilenameExtension("myfile.txt"));
+		assertEquals("mypath/myfile", StringUtils.stripFilenameExtension("mypath/myfile"));
+		assertEquals("mypath/myfile", StringUtils.stripFilenameExtension("mypath/myfile."));
 		assertEquals("mypath/myfile", StringUtils.stripFilenameExtension("mypath/myfile.txt"));
+		assertEquals("/home/user/.m2/settings", StringUtils.stripFilenameExtension("/home/user/.m2/settings"));
+		assertEquals("/home/user/.m2/settings", StringUtils.stripFilenameExtension("/home/user/.m2/settings/myfile."));
+		assertEquals("/home/user/.m2/settings", StringUtils.stripFilenameExtension("/home/user/.m2/settings/myfile.txt"));
 	}

 	public void testCleanPath() {