Fixes tests broken by test data for OTWO-1177.

Author: amujumdar

test/unit/bzr_commits_test.rb

@@ -5,9 +5,9 @@ class BzrCommitsTest < Scm::Test
 
 		def test_commit_count
 			with_bzr_repository('bzr') do |bzr|
-				assert_equal 6, bzr.commit_count
-				assert_equal 5, bzr.commit_count(:after => revision_ids.first)
-				assert_equal 1, bzr.commit_count(:after => revision_ids[4])
+				assert_equal 7, bzr.commit_count
+				assert_equal 6, bzr.commit_count(:after => revision_ids.first)
+				assert_equal 1, bzr.commit_count(:after => revision_ids[5])
 				assert_equal 0, bzr.commit_count(:after => revision_ids.last)
 			end
 		end
@@ -36,8 +36,8 @@ def test_commit_count_trunk_only
 		def test_commit_tokens_after
 			with_bzr_repository('bzr') do |bzr|
 				assert_equal revision_ids, bzr.commit_tokens
-				assert_equal revision_ids[1..5], bzr.commit_tokens(:after => revision_ids.first)
-				assert_equal revision_ids[5..5], bzr.commit_tokens(:after => revision_ids[4])
+				assert_equal revision_ids[1..6], bzr.commit_tokens(:after => revision_ids.first)
+				assert_equal revision_ids[6..6], bzr.commit_tokens(:after => revision_ids[5])
 				assert_equal [], bzr.commit_tokens(:after => revision_ids.last)
 			end
 		end
@@ -183,7 +183,7 @@ def test_nested_branches_commits_trunk_only_true
 		def test_commits
 			with_bzr_repository('bzr') do |bzr|
 				assert_equal revision_ids, bzr.commits.collect { |c| c.token }
-				assert_equal revision_ids[5..5], bzr.commits(:after => revision_ids[4]).collect { |c| c.token }
+				assert_equal revision_ids[6..6], bzr.commits(:after => revision_ids[5]).collect { |c| c.token }
 				assert_equal [], bzr.commits(:after => revision_ids.last).collect { |c| c.token }
 
 				# Check that the diffs are not populated
@@ -368,7 +368,8 @@ def revision_ids
 				'obnox@samba.org-20090204002453-u70a3ehf3ae9kay1', # 3
 				'obnox@samba.org-20090204002518-yb0x153oa6mhoodu', # 4
 				'obnox@samba.org-20090204002540-gmana8tk5f9gboq9', # 5
-				'obnox@samba.org-20090204004942-73rnw0izen42f154'  # 6
+				'obnox@samba.org-20090204004942-73rnw0izen42f154', # 6
+        'test@example.com-20111222183733-y91if5npo3pe8ifs', # 7
 			]
 		end
 

test/unit/bzr_head_test.rb

@@ -5,11 +5,11 @@ class BzrHeadTest < Scm::Test
 
 		def test_head_and_parents
 			with_bzr_repository('bzr') do |bzr|
-				assert_equal 'obnox@samba.org-20090204004942-73rnw0izen42f154', bzr.head_token
-				assert_equal 'obnox@samba.org-20090204004942-73rnw0izen42f154', bzr.head.token
+				assert_equal 'test@example.com-20111222183733-y91if5npo3pe8ifs', bzr.head_token
+				assert_equal 'test@example.com-20111222183733-y91if5npo3pe8ifs', bzr.head.token
 				assert bzr.head.diffs.any? # diffs should be populated
 
-				assert_equal 'obnox@samba.org-20090204002540-gmana8tk5f9gboq9', bzr.parents(bzr.head).first.token
+				assert_equal 'obnox@samba.org-20090204004942-73rnw0izen42f154', bzr.parents(bzr.head).first.token
 				assert bzr.parents(bzr.head).first.diffs.any?
 			end
 		end

test/unit/bzr_misc_test.rb

@@ -14,7 +14,8 @@ def test_exist
 
 		def test_ls_tree
 			with_bzr_repository('bzr') do |bzr|
-				assert_equal ['file1.txt',
+				assert_equal ['Cédric.txt',
+                'file1.txt',
 					      'file3.txt',
 					      'file4.txt',
 					      'file5.txt'],
@@ -26,7 +27,7 @@ def test_export
 			with_bzr_repository('bzr') do |bzr|
 				Scm::ScratchDir.new do |dir|
 					bzr.export(dir)
-					assert_equal ['.', '..', 'file1.txt', 'file3.txt', 'file4.txt', 'file5.txt'], Dir.entries(dir).sort
+					assert_equal ['.', '..', 'Cédric.txt', 'file1.txt', 'file3.txt', 'file4.txt', 'file5.txt'], Dir.entries(dir).sort
 				end
 			end
 		end

test/unit/bzrlib_head_test.rb

@@ -5,11 +5,11 @@ class BzrBzrlibHeadTest < Scm::Test
 
 		def test_head_and_parents
 			with_bzrlib_repository('bzr') do |bzr|
-				assert_equal 'obnox@samba.org-20090204004942-73rnw0izen42f154', bzr.head_token
-				assert_equal 'obnox@samba.org-20090204004942-73rnw0izen42f154', bzr.head.token
+				assert_equal 'test@example.com-20111222183733-y91if5npo3pe8ifs', bzr.head_token
+				assert_equal 'test@example.com-20111222183733-y91if5npo3pe8ifs', bzr.head.token
 				assert bzr.head.diffs.any? # diffs should be populated
 
-				assert_equal 'obnox@samba.org-20090204002540-gmana8tk5f9gboq9', bzr.parents(bzr.head).first.token
+				assert_equal 'obnox@samba.org-20090204004942-73rnw0izen42f154', bzr.parents(bzr.head).first.token
 				assert bzr.parents(bzr.head).first.diffs.any?
 			end
 		end