changeset 269:f8f67a96b892

Better test for parents
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Wed, 20 Jul 2011 13:34:00 +0400
parents 497174281fa8
children 0af40adc4791
files mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java
diffstat 1 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java	Wed Jul 20 12:26:16 2011 +0400
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java	Wed Jul 20 13:34:00 2011 +0400
@@ -457,11 +457,16 @@
 
 
   public void collected_changes_should_contain_parents() throws Exception {
-    VcsRootImpl vcsRoot = createVcsRoot(simpleRepo());
-    List<ModificationData> changes = collectChanges(vcsRoot, "1:9875b412a788", "3:9522278aa38d", new CheckoutRules(""));
+    VcsRootImpl vcsRoot = createVcsRoot(mergeCommittsRepo());
+    List<ModificationData> changes = collectChanges(vcsRoot, "0:e0ad3ddde5aa", "4:6eeb8974fe67", new CheckoutRules(""));
+    Map<String, List<String>> child2parent = new HashMap<String, List<String>>();
     for (ModificationData change : changes) {
-      assertFalse(change.getParentRevisions().isEmpty());
+      child2parent.put(change.getVersion(), change.getParentRevisions());
     }
+    assertEquals(Arrays.asList("0:e0ad3ddde5aa"), child2parent.get("1:a3d15477d297"));
+    assertEquals(Arrays.asList("0:e0ad3ddde5aa"), child2parent.get("2:db8a04d262f3"));
+    assertEquals(Arrays.asList("2:db8a04d262f3"), child2parent.get("3:2538c02bafeb"));
+    assertEquals(Arrays.asList("1:a3d15477d297", "3:2538c02bafeb"), child2parent.get("4:6eeb8974fe67"));
   }