Rev 1374: use new commit editor in more tests. in http://people.samba.org/bzr/jelmer/bzr-svn/0.4

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/0.4

------------------------------------------------------------
revno: 1374
revision-id: jelmer at samba.org-20080627153705-hw31usrbrap2r6et
parent: jelmer at samba.org-20080627131147-8i7kasn0nyv61zwf
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-06-27 17:37:05 +0200
message:
  use new commit editor in more tests.
modified:
  tests/test_fetch.py            test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
=== modified file 'tests/test_fetch.py'
--- a/tests/test_fetch.py	2008-06-26 16:28:29 +0000
+++ b/tests/test_fetch.py	2008-06-27 15:37:05 +0000
@@ -180,19 +180,23 @@
         self.assertEquals("bla", tree.path2id("bdir"))
 
     def test_fetch_complex_ids_files(self):
-        repos_url = self.make_client('d', 'dc')
-        self.build_tree({'dc/dir/adir': 'contents'})
-        self.client_add("dc/dir")
-        self.client_set_prop("dc", "bzr:revision-info", "")
-        self.client_set_prop("dc", "bzr:file-ids", "dir\tbloe\ndir/adir\tbla\n")
-        self.client_commit("dc", "My Message")
-        self.client_update("dc")
-        self.client_copy("dc/dir/adir", "dc/bdir")
-        self.client_delete("dc/dir/adir")
-        self.client_set_prop("dc", "bzr:revision-info", "properties: \n")
-        self.client_set_prop("dc", "bzr:file-ids", "bdir\tbla\n")
-        self.client_commit("dc", "My Message")
-        self.client_update("dc")
+        repos_url = self.make_repository('d')
+
+        dc = self.get_commit_editor(repos_url)
+        dir = dc.add_dir("dir")
+        dir.add_file("dir/adir").modify("contents")
+        dc.change_prop("bzr:revision-info", "")
+        dc.change_prop("bzr:file-ids", "dir\tbloe\ndir/adir\tbla\n")
+        dc.close()
+
+        dc = self.get_commit_editor(repos_url)
+        dc.add_file("bdir", "dir/adir")
+        dir = dc.open_dir("dir")
+        dir.delete("dir/adir")
+        dc.change_prop("bzr:revision-info", "properties: \n")
+        dc.change_prop("bzr:file-ids", "bdir\tbla\n")
+        dc.close()
+
         oldrepos = Repository.open(repos_url)
         dir = BzrDir.create("f", format.get_rich_root_format())
         newrepos = dir.create_repository()
@@ -309,28 +313,39 @@
         oldrepos.copy_content_into(newrepos)
 
     def test_fetch_delete(self):
-        repos_url = self.make_client('d', 'dc')
-        self.build_tree({'dc/foo/bla': "data"})
-        self.client_add("dc/foo")
-        self.client_commit("dc", "My Message")
+        repos_url = self.make_repository('d')
+
+        dc = self.get_commit_editor(repos_url)
+        foo = dc.add_dir("foo")
+        foo.add_file("foo/bla").modify("data")
+        dc.close()
         oldrepos = Repository.open(repos_url)
         dir = BzrDir.create("f", format.get_rich_root_format())
         newrepos = dir.create_repository()
         oldrepos.copy_content_into(newrepos)
-        self.client_delete("dc/foo/bla")
-        self.client_commit("dc", "Second Message")
+
+        dc = self.get_commit_editor(repos_url)
+        foo = dc.open_dir("foo")
+        foo.delete('foo/bla')
+        dc.close()
+
         newrepos = Repository.open("f")
         oldrepos.copy_content_into(newrepos)
         mapping = oldrepos.get_mapping()
         self.assertTrue(oldrepos.has_revision(oldrepos.generate_revision_id(2, "", mapping)))
 
     def test_fetch_delete_recursive(self):
-        repos_url = self.make_client('d', 'dc')
-        self.build_tree({'dc/foo/bla': "data"})
-        self.client_add("dc/foo")
-        self.client_commit("dc", "My Message")
-        self.client_delete("dc/foo")
-        self.client_commit("dc", "Second Message")
+        repos_url = self.make_repository('d')
+
+        dc = self.get_commit_editor(repos_url)
+        foo = dc.add_dir("foo")
+        foo.add_file("foo/bla").modify("data")
+        dc.close()
+
+        dc = self.get_commit_editor(repos_url)
+        dc.delete('foo')
+        dc.close()
+
         oldrepos = Repository.open(repos_url)
         dir = BzrDir.create("f", format.get_rich_root_format())
         newrepos = dir.create_repository()
@@ -1559,19 +1574,16 @@
         self.assertEqual('bla', inv1[inv1.path2id("mylink")].symlink_target)
 
     def test_fetch_symlink_kind_change(self):
-        repos_url = self.make_client('d', 'dc')
-        self.build_tree({'dc/bla': "data", "dc/mylink": "link bla"})
-        self.client_add("dc/bla")
-        self.client_add("dc/mylink")
-        self.client_commit("dc", "My Message")
+        repos_url = self.make_repository('d')
+
+        dc = self.get_commit_editor(repos_url)
+        dc.add_file("bla").modify("data")
+        dc.add_file("mylink").modify("link bla")
+        dc.close()
         ra = SvnRaTransport(repos_url)
-        editor = ra.get_commit_editor({"svn:log": "msg"}, None, None, False)
-        root_baton = editor.open_root(1)
-        baton = root_baton.open_file("mylink", 1)
-        baton.change_prop("svn:special", "*")
-        baton.close()
-        root_baton.close()
-        editor.close()
+        dc = self.get_commit_editor(repos_url)
+        dc.open_file("mylink").change_prop("svn:special", "*")
+        dc.close()
         oldrepos = Repository.open("svn+"+repos_url)
         dir = BzrDir.create("f", format.get_rich_root_format())
         newrepos = dir.create_repository()