← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_xml.py

  • Committer: John Arbash Meinel
  • Date: 2007-02-18 00:22:24 UTC
  • mto: This revision was merged to the branch mainline in revision 2298.
  • Revision ID: john@arbash-meinel.com-20070218002224-nfsw9ubivr178ahn
Switch all apis over to utf8 file ids. All tests pass

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_xml.py
305
305
        inv = s_v5.read_inventory_from_string(_inventory_utf8_v5)
306
306
        rev_id_1 = u'erik@b\xe5gfors-01'.encode('utf8')
307
307
        rev_id_2 = u'erik@b\xe5gfors-02'.encode('utf8')
308
 
        fid_root = u'TRE\xe9_ROOT'
309
 
        fid_bar1 = u'b\xe5r-01'
310
 
        fid_sub = u's\xb5bdir-01'
311
 
        fid_bar2 = u'b\xe5r-02'
 
308
        fid_root = u'TRE\xe9_ROOT'.encode('utf8')
 
309
        fid_bar1 = u'b\xe5r-01'.encode('utf8')
 
310
        fid_sub = u's\xb5bdir-01'.encode('utf8')
 
311
        fid_bar2 = u'b\xe5r-02'.encode('utf8')
312
312
        expected = [(u'', fid_root, None, None),
313
313
                    (u'b\xe5r', fid_bar1, fid_root, rev_id_1),
314
314
                    (u's\xb5bdir', fid_sub, fid_root, rev_id_1),
323
323
            self.assertEqual(exp_path, act_path)
324
324
            self.assertIsInstance(act_path, unicode)
325
325
            self.assertEqual(exp_file_id, act_ie.file_id)
326
 
            self.assertIsInstance(act_ie.file_id, unicode)
 
326
            self.assertIsInstance(act_ie.file_id, str)
327
327
            self.assertEqual(exp_parent_id, act_ie.parent_id)
328
328
            if exp_parent_id is not None:
329
 
                self.assertIsInstance(act_ie.parent_id, unicode)
 
329
                self.assertIsInstance(act_ie.parent_id, str)
330
330
            self.assertEqual(exp_rev_id, act_ie.revision)
331
331
            if exp_rev_id is not None:
332
332
                self.assertIsInstance(act_ie.revision, str)