From fcbe169119e31383a60a4fba46ade1acf1ae0aa6 Mon Sep 17 00:00:00 2001
From: Nadya Zabrodina <Nadya.Zabrodina@jetbrains.com>
Date: Wed, 21 Aug 2013 16:19:01 +0400
Subject: [PATCH] HgLogTest updated for bash execution

---
 .../testSrc/hg4idea/test/history/HgLogTest.java | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/plugins/hg4idea/testSrc/hg4idea/test/history/HgLogTest.java b/plugins/hg4idea/testSrc/hg4idea/test/history/HgLogTest.java
index 4e1638e00ff1..7436367ac9b1 100644
--- a/plugins/hg4idea/testSrc/hg4idea/test/history/HgLogTest.java
+++ b/plugins/hg4idea/testSrc/hg4idea/test/history/HgLogTest.java
@@ -33,20 +33,21 @@ public class HgLogTest extends HgPlatformTest {
 
   public void testParseCopiedWithoutBraces() throws HgCommandException {
     parseCopied("f.txt");
+    if (!SystemInfo.isWindows) {
+      myVcs.getGlobalSettings().setRunViaBash(true);
+      try {
+        parseCopied("f1.txt");
+      }
+      finally {
+        myVcs.getGlobalSettings().setRunViaBash(false);
+      }
+    }
   }
 
   public void testParseCopiedWithBraces() throws HgCommandException {
     parseCopied("(f.txt)");
   }
 
-  public void testLogCommandViaBash() throws HgCommandException {
-    if (SystemInfo.isWindows) {
-      return;
-    }
-    myVcs.getGlobalSettings().setRunViaBash(true);
-    parseCopied("f.txt");
-  }
-
   public void testParseFileCopiesWithWhitespaces() {
     Map<String, String> filesMap = HgLogCommand.parseCopiesFileList("/a/b c/d.txt (a/b a/d.txt)\u0001/a/b c/(d).txt (/a/b c/(f).txt)");
     assertTrue(filesMap.containsKey("a/b a/d.txt"));