diff options
author | Christian Halstrick <christian.halstrick@sap.com> | 2013-11-04 07:39:43 -0500 |
---|---|---|
committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2013-11-04 07:39:43 -0500 |
commit | b686fa45b6e4960dfa0ef1b1897505aec98b9bea (patch) | |
tree | 40d122c795b0d7f0adc455c3f0451008ca5d63a9 /org.eclipse.jgit.test/tst | |
parent | 17dc02a579d2e5f7174bb46dbccd636272d41990 (diff) | |
parent | 98bc384d2bd62f3abe7f8b14d8098b3445b6b6e3 (diff) | |
download | jgit-b686fa45b6e4960dfa0ef1b1897505aec98b9bea.tar.gz jgit-b686fa45b6e4960dfa0ef1b1897505aec98b9bea.zip |
Merge "testMaliciousPathEmpty fails on Windows"
Diffstat (limited to 'org.eclipse.jgit.test/tst')
-rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutMaliciousPathTest.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutMaliciousPathTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutMaliciousPathTest.java index d263f629a5..b3219cddb5 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutMaliciousPathTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutMaliciousPathTest.java @@ -54,6 +54,7 @@ import org.eclipse.jgit.util.SystemReader; import org.junit.Test; public class DirCacheCheckoutMaliciousPathTest extends RepositoryTestCase { + protected ObjectId theHead; protected ObjectId theMerge; @@ -230,8 +231,14 @@ public class DirCacheCheckoutMaliciousPathTest extends RepositoryTestCase { } @Test - public void testMaliciousPathEmpty() throws Exception { - ((MockSystemReader) SystemReader.getInstance()).setCurrentPlatform(); + public void testMaliciousPathEmptyUnix() throws Exception { + ((MockSystemReader) SystemReader.getInstance()).setUnix(); + testMaliciousPathBadFirstCheckout("", "no"); + } + + @Test + public void testMaliciousPathEmptyWindows() throws Exception { + ((MockSystemReader) SystemReader.getInstance()).setWindows(); testMaliciousPathBadFirstCheckout("", "no"); } |