diff options
| author | Shawn Pearce <spearce@spearce.org> | 2011-04-01 15:20:37 -0400 |
|---|---|---|
| committer | Code Review <codereview-daemon@eclipse.org> | 2011-04-01 15:20:37 -0400 |
| commit | a4c142286e99529cd3707473db0ccea362d84545 (patch) | |
| tree | 65620d4441cb6a428d0c36f1dd9a8ca936c079a6 /org.eclipse.jgit.test | |
| parent | bc42a780eb1a1b28eeb3034ff05d21a166644751 (diff) | |
| parent | d1718a34d3f2c258a166b563c477b268ac8002ed (diff) | |
| download | jgit-a4c142286e99529cd3707473db0ccea362d84545.tar.gz jgit-a4c142286e99529cd3707473db0ccea362d84545.zip | |
Merge changes I2c8e917a,Ica9e50c0
* changes:
Do not normalize URIishes
Use Ignore to bypass unused test
Diffstat (limited to 'org.eclipse.jgit.test')
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/URIishTest.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/URIishTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/URIishTest.java index e6990fb83f..c86869d088 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/URIishTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/URIishTest.java @@ -55,6 +55,7 @@ import java.io.File; import java.io.IOException; import java.net.URISyntaxException; +import org.junit.Ignore; import org.junit.Test; public class URIishTest { @@ -89,8 +90,8 @@ public class URIishTest { URIish u = new URIish(str); assertNull(u.getScheme()); assertFalse(u.isRemote()); - assertEquals("D:/m y", u.getPath()); - assertEquals("D:/m y", u.toString()); + assertEquals("D:\\m y", u.getPath()); + assertEquals("D:\\m y", u.toString()); assertEquals(u, new URIish(str)); } @@ -111,8 +112,8 @@ public class URIishTest { URIish u = new URIish(str); assertNull(u.getScheme()); assertFalse(u.isRemote()); - assertEquals("//some/place", u.getPath()); - assertEquals("//some/place", u.toString()); + assertEquals("\\\\some\\place", u.getPath()); + assertEquals("\\\\some\\place", u.toString()); assertEquals(u, new URIish(str)); } @@ -315,8 +316,8 @@ public class URIishTest { assertEquals(u, new URIish(str)); } - /* Resolving ~user is beyond standard Java API and need more support @Test + @Ignore("Resolving ~user is beyond standard Java API and need more support") public void testFileWithUserHome() throws Exception { final String str = "~some/p ath"; URIish u = new URIish(str); @@ -331,7 +332,6 @@ public class URIishTest { assertEquals(u.setPass(null).toPrivateString(), u.toString()); assertEquals(u, new URIish(str)); } - */ @Test public void testFileWithNoneUserHomeWithTilde() throws Exception { |