motiejus
/
jgit
1
Fork 0
Code Releases Activity

Clarify error message for invalid Windows characters 

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
Change-Id: I20c37d70fc78d745f83b9ce702777535b16b8dfe
This commit is contained in:
Han-Wen Nienhuys 2019-03-26 11:22:56 +01:00 committed by Matthias Sohn
parent dae26b43d1
commit bbff3ff008
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ObjectCheckerTest.java
View File

@ -1678,7 +1678,6 @@ public void testRejectInvalidWindowsCharacters() {
rejectName('>');
rejectName(':');
rejectName('"');
rejectName('/');
rejectName('\\');
rejectName('|');
rejectName('?');
@ -1693,7 +1692,8 @@ private void rejectName(char c) {
checkOneName("te" + c + "st");
fail("incorrectly accepted with " + c);
} catch (CorruptObjectException e) {
assertEquals("name contains '" + c + "'", e.getMessage());
assertEquals("char '" + c + "' not allowed in Windows filename", e.getMessage());
}
}
@ -1703,7 +1703,19 @@ private void rejectName(byte c) {
checkOneName("te" + ((char) c) + "st");
fail("incorrectly accepted with 0x" + h);
} catch (CorruptObjectException e) {
assertEquals("name contains byte 0x" + h, e.getMessage());
assertEquals("byte 0x" + h + " not allowed in Windows filename", e.getMessage());
}
}
@Test
public void testRejectInvalidCharacter() {
try {
checkOneName("te/st");
fail("incorrectly accepted with /");
} catch (CorruptObjectException e) {
assertEquals("name contains '/'", e.getMessage());
}
}

4
org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
View File

@ -175,8 +175,8 @@ corruptObjectInvalidType=invalid type
corruptObjectInvalidType2=invalid type {0}
corruptObjectMalformedHeader=malformed header: {0}
corruptObjectMissingEmail=missing email
corruptObjectNameContainsByte=name contains byte 0x%x
corruptObjectNameContainsChar=name contains '%c'
corruptObjectNameContainsByte=byte 0x%x not allowed in Windows filename
corruptObjectNameContainsChar=char '%c' not allowed in Windows filename
corruptObjectNameContainsNullByte=name contains byte 0x00
corruptObjectNameContainsSlash=name contains '/'
corruptObjectNameDot=invalid name '.'