changeset 316:9ba3f090adbb

Fix tests
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Thu, 15 Sep 2011 11:05:39 +0400
parents 57b3fad43be7
children c247d4637a96
files mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java
diffstat 1 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java	Thu Sep 15 11:01:17 2011 +0400
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java	Thu Sep 15 11:05:39 2011 +0400
@@ -97,21 +97,21 @@
     ModificationData md1 = changes.get(0);
     ModificationData md2 = changes.get(1);
     ModificationData md3 = changes.get(2);
-    assertEquals(md1.getVersion(), "1:1d446e82d356");
+    assertEquals(md1.getVersion(), "1d446e82d356");
     assertEquals(md1.getDescription(), "new file added");
     List<VcsChange> files1 = md1.getChanges();
     assertEquals(1, files1.size());
     assertEquals(VcsChangeInfo.Type.ADDED, files1.get(0).getType());
     assertEquals(normalizePath(files1.get(0).getRelativeFileName()), "dir1/file3.txt");
 
-    assertEquals(md2.getVersion(), "2:7209b1f1d793");
+    assertEquals(md2.getVersion(), "7209b1f1d793");
     assertEquals(md2.getDescription(), "file4.txt added");
     List<VcsChange> files2 = md2.getChanges();
     assertEquals(1, files2.size());
     assertEquals(files2.get(0).getType(), VcsChangeInfo.Type.ADDED);
     assertEquals(normalizePath(files2.get(0).getRelativeFileName()), "dir1/file4.txt");
 
-    assertEquals(md3.getVersion(), "3:9522278aa38d");
+    assertEquals(md3.getVersion(), "9522278aa38d");
     assertEquals(md3.getDescription(), "file removed");
     List<VcsChange> files3 = md3.getChanges();
     assertEquals(1, files3.size());
@@ -267,7 +267,7 @@
     assertEquals(1, changes.size());
 
     ModificationData md1 = changes.get(0);
-    assertEquals(md1.getVersion(), "7:376dcf05cd2a");
+    assertEquals(md1.getVersion(), "376dcf05cd2a");
     assertEquals(md1.getDescription(), "new file added in the test_branch");
     List<VcsChange> files1 = md1.getChanges();
     assertEquals(1, files1.size());
@@ -278,7 +278,7 @@
     assertEquals(1, changes.size());
 
     md1 = changes.get(0);
-    assertEquals(md1.getVersion(), "8:04c3ae4c6312");
+    assertEquals(md1.getVersion(), "04c3ae4c6312");
     assertEquals(md1.getDescription(), "file modified");
   }
 
@@ -358,8 +358,8 @@
     List<ModificationData> changes = myVcs.collectChanges(defaultRoot, "11:48177654181c", branchRoot, "10:fc524efc2bc4", CheckoutRules.DEFAULT);
     assertEquals(changes.size(), 2);
 
-    assertEquals("9:8c44244d6645", changes.get(0).getVersion());
-    assertEquals("10:fc524efc2bc4", changes.get(1).getVersion());
+    assertEquals("8c44244d6645", changes.get(0).getVersion());
+    assertEquals("fc524efc2bc4", changes.get(1).getVersion());
   }
 
   public void collectChanges_should_return_all_changes_from_branch() throws Exception {
@@ -375,9 +375,9 @@
     List<ModificationData> changes = collectChanges(vcsRoot, "1:a3d15477d297", "4:6eeb8974fe67", CheckoutRules.DEFAULT);
     assertEquals(changes.size(), 3);
 
-    assertEquals("2:db8a04d262f3", changes.get(0).getVersion());
-    assertEquals("3:2538c02bafeb", changes.get(1).getVersion());
-    assertEquals("4:6eeb8974fe67", changes.get(2).getVersion());
+    assertEquals("db8a04d262f3", changes.get(0).getVersion());
+    assertEquals("2538c02bafeb", changes.get(1).getVersion());
+    assertEquals("6eeb8974fe67", changes.get(2).getVersion());
 
     assertFiles(Arrays.asList("A dir1/file1.txt"), changes.get(0));
     assertFiles(Arrays.asList("A dir2/file2.txt"), changes.get(1));