Mercurial > hg > mercurial
changeset 510:35dabc364558
Merge branch Faradi-7.1.x
| author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
|---|---|
| date | Mon, 12 Nov 2012 21:20:00 +0400 |
| parents | f977639b9a1e (current diff) 94974e3482f6 (diff) |
| children | f2666e817701 |
| files | |
| diffstat | 3 files changed, 22 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgFileUtil.java Mon Nov 12 15:19:11 2012 +0400 +++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgFileUtil.java Mon Nov 12 21:20:00 2012 +0400 @@ -30,7 +30,7 @@ do { suffix++; dir = new File(parentDir, TEMP_DIR_PREFIX + suffix); - } while (!dir.exists() && !dir.createNewFile()); + } while (dir.exists() || !dir.createNewFile()); dir.delete(); dir.mkdir(); return dir;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgFileUtilTest.java Mon Nov 12 21:20:00 2012 +0400 @@ -0,0 +1,20 @@ +package jetbrains.buildServer.buildTriggers.vcs.mercurial; + + +import org.testng.annotations.Test; + +import java.io.File; +import java.io.IOException; + +import static org.testng.AssertJUnit.assertFalse; + +@Test +public class HgFileUtilTest { + + public void createTempFile_should_return_unique_dir() throws IOException { + File tmpDir1 = HgFileUtil.createTempDir(); + File tmpDir2 = HgFileUtil.createTempDir(); + assertFalse(tmpDir1.getCanonicalPath().equals(tmpDir2.getCanonicalPath())); + } + +}
--- a/mercurial-tests/src/testng.xml Mon Nov 12 15:19:11 2012 +0400 +++ b/mercurial-tests/src/testng.xml Mon Nov 12 21:20:00 2012 +0400 @@ -25,6 +25,7 @@ <class name="jetbrains.buildServer.buildTriggers.vcs.mercurial.AgentMirrorCleanerTest"/> <class name="jetbrains.buildServer.buildTriggers.vcs.mercurial.ListFilesSupportTest"/> <class name="jetbrains.buildServer.buildTriggers.vcs.mercurial.RevisionFormatTest"/> + <class name="jetbrains.buildServer.buildTriggers.vcs.mercurial.HgFileUtilTest"/> </classes> </test> </suite>