diff mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java @ 143:0587a0235612 Eluru-6.0.x

Fix TW-15008. Show changed files in all merge commits.
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Thu, 23 Dec 2010 16:51:28 +0300
parents 43dd4142b0f5
children 2e90ef872b68 bcc04a74783d
line wrap: on
line diff
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java	Wed Dec 22 17:56:41 2010 +0300
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java	Thu Dec 23 16:51:28 2010 +0300
@@ -39,7 +39,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Locale;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 
@@ -361,7 +360,7 @@
 
     assertFiles(Arrays.asList("A dir1/file1.txt"), changes.get(0));
     assertFiles(Arrays.asList("A dir2/file2.txt"), changes.get(1));
-    Assert.assertEquals(changes.get(2).getChanges().toString(), 0, changes.get(2).getChangeCount());
+    assertFiles(Arrays.asList("A dir1/file1.txt", "A dir2/file2.txt"), changes.get(2));
   }
 
   public void test_collect_changes_merge_conflict() throws Exception {