← 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-17 21:54:17 UTC
  • mto: This revision was merged to the branch mainline in revision 2298.
  • Revision ID: john@arbash-meinel.com-20070217215417-fpufrf0o749ce85d
Include parent_id checks in the xml serializer tests.

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
 
        expected = [(u'', u'TRE\xe9_ROOT', None),
309
 
                    (u'b\xe5r', u'b\xe5r-01', rev_id_1),
310
 
                    (u's\xb5bdir', u's\xb5bdir-01', rev_id_1),
311
 
                    (u's\xb5bdir/b\xe5r', u'b\xe5r-02', rev_id_2),
 
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'
 
312
        expected = [(u'', fid_root, None, None),
 
313
                    (u'b\xe5r', fid_bar1, fid_root, rev_id_1),
 
314
                    (u's\xb5bdir', fid_sub, fid_root, rev_id_1),
 
315
                    (u's\xb5bdir/b\xe5r', fid_bar2, fid_sub, rev_id_2),
312
316
                   ]
313
317
        self.assertEqual(rev_id_2, inv.revision_id)
314
318
        self.assertIsInstance(inv.revision_id, str)
315
319
 
316
320
        actual = list(inv.iter_entries_by_dir())
317
 
        for (exp_path, exp_file_id, exp_rev_id), (act_path, act_ie) in \
318
 
                                                    zip(expected, actual):
 
321
        for ((exp_path, exp_file_id, exp_parent_id, exp_rev_id),
 
322
             (act_path, act_ie)) in zip(expected, actual):
319
323
            self.assertEqual(exp_path, act_path)
320
324
            self.assertIsInstance(act_path, unicode)
321
325
            self.assertEqual(exp_file_id, act_ie.file_id)
322
326
            self.assertIsInstance(act_ie.file_id, unicode)
 
327
            self.assertEqual(exp_parent_id, act_ie.parent_id)
 
328
            if exp_parent_id is not None:
 
329
                self.assertIsInstance(act_ie.parent_id, unicode)
323
330
            self.assertEqual(exp_rev_id, act_ie.revision)
324
331
            if exp_rev_id is not None:
325
332
                self.assertIsInstance(act_ie.revision, str)