Config: Handle leading/trailing single whitespaces

Change-Id: I468106acd2006d0a174c76dfd4bce231f1c7a6f8

1 files changed, 52 insertions, 0 deletions

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ConfigTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ConfigTest.java
index e9505f67d0..748848e97f 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ConfigTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ConfigTest.java
@@ -965,4 +965,56 @@ public class ConfigTest {
 		expectedEx.expect(IllegalArgumentException.class);
 		parseTime("-1", MILLISECONDS);
 	}
+
+	@Test
+	public void testEscapeSpacesOnly() throws ConfigInvalidException {
+		assertEquals("", Config.escapeValue(""));
+		assertEquals("\" \"", Config.escapeValue(" "));
+		assertEquals("\"  \"", Config.escapeValue("  "));
+
+		assertParseRoundTrip(" ");
+		assertParseRoundTrip("  ");
+	}
+
+	@Test
+	public void testEscapeLeadingSpace() throws ConfigInvalidException {
+		assertEquals("x", Config.escapeValue("x"));
+		assertEquals("\" x\"", Config.escapeValue(" x"));
+		assertEquals("\"  x\"", Config.escapeValue("  x"));
+
+		assertParseRoundTrip("x");
+		assertParseRoundTrip(" x");
+		assertParseRoundTrip("  x");
+	}
+
+	@Test
+	public void testEscapeTrailingSpace() throws ConfigInvalidException {
+		assertEquals("x", Config.escapeValue("x"));
+		assertEquals("\"x  \"", Config.escapeValue("x  "));
+		assertEquals("x\" \"", Config.escapeValue("x "));
+
+		assertParseRoundTrip("x");
+		assertParseRoundTrip("x ");
+		assertParseRoundTrip("x  ");
+	}
+
+	@Test
+	public void testEscapeLeadingAndTrailingSpace()
+			throws ConfigInvalidException {
+		assertEquals("\" x \"", Config.escapeValue(" x "));
+		assertEquals("\"  x \"", Config.escapeValue("  x "));
+		assertEquals("\" x  \"", Config.escapeValue(" x  "));
+		assertEquals("\"  x  \"", Config.escapeValue("  x  "));
+
+		assertParseRoundTrip(" x ");
+		assertParseRoundTrip(" x  ");
+		assertParseRoundTrip("  x ");
+		assertParseRoundTrip("  x  ");
+	}
+
+	private static void assertParseRoundTrip(String value)
+			throws ConfigInvalidException {
+		Config c = parse("[foo]\nbar = " + Config.escapeValue(value));
+		assertEquals(value, c.getString("foo", null, "bar"));
+	}
 }