~bzr-pqm/bzr/bzr.dev

_expected_rev_v8 = """<revision committer="Martin Pool <mbp@sourcefrog.net>" format="8" inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41" revision_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9" timestamp="1125907235.212" timezone="36000">

152

<message>- start splitting code for xml (de)serialization away from objects

153

preparatory to supporting multiple formats by a single library

154

</message>

155

156

<revision_ref revision_id="mbp@sourcefrog.net-20050905063503-43948f59fa127d92" />

157

</parents>

158

</revision>

159

"""

160

161

_expected_inv_v8 = """<inventory format="8" revision_id="rev_outer">

162

163

164

165

166

</inventory>

167

"""

168

169

150

_revision_utf8_v5 = """<revision committer="Erik Bågfors <erik@foo.net>"

170

151

inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41"

171

152

revision_id="erik@bågfors-02"

349

330

new_rev = s_v5.read_revision_from_string(txt)

350

331

self.assertEqual(props, new_rev.properties)

351

332

352

def get_sample_inventory(self):

333

def test_roundtrip_inventory_v7(self):

353

334

inv = Inventory('tree-root-321', revision_id='rev_outer')

335

inv.add(inventory.TreeReference('nested-id', 'nested', 'tree-root-321',

336

'rev_outer', 'rev_inner'))

354

337

inv.add(inventory.InventoryFile('file-id', 'file', 'tree-root-321'))

355

338

inv.add(inventory.InventoryDirectory('dir-id', 'dir',

356

339

'tree-root-321'))

362

345

inv['file-id'].text_size = 1

363

346

inv['link-id'].revision = 'rev_outer'

364

347

inv['link-id'].symlink_target = 'a'

365

return inv

366

367

def test_roundtrip_inventory_v7(self):

368

inv = self.get_sample_inventory()

369

inv.add(inventory.TreeReference('nested-id', 'nested', 'tree-root-321',

370

'rev_outer', 'rev_inner'))

371

348

txt = xml7.serializer_v7.write_inventory_to_string(inv)

372

349

lines = xml7.serializer_v7.write_inventory_to_lines(inv)

373

350

self.assertEqual(bzrlib.osutils.split_lines(txt), lines)

412

389

s_v5.read_inventory_from_string,

413

390

txt.replace('format="7"', 'format="5"'))

414

391

415

def test_roundtrip_inventory_v8(self):

416

inv = self.get_sample_inventory()

417

txt = xml8.serializer_v8.write_inventory_to_string(inv)

418

inv2 = xml8.serializer_v8.read_inventory_from_string(txt)

419

self.assertEqual(4, len(inv2))

420

for path, ie in inv.iter_entries():

421

self.assertEqual(ie, inv2[ie.file_id])

422

423

def test_inventory_text_v8(self):

424

inv = self.get_sample_inventory()

425

txt = xml8.serializer_v8.write_inventory_to_string(inv)

426

lines = xml8.serializer_v8.write_inventory_to_lines(inv)

427

self.assertEqual(bzrlib.osutils.split_lines(txt), lines)

428

self.assertEqualDiff(_expected_inv_v8, txt)

429

430

def test_revision_text_v6(self):

431

"""Pack revision to XML v6"""

432

rev = bzrlib.xml6.serializer_v6.read_revision_from_string(

433

_expected_rev_v5)

434

serialized = bzrlib.xml6.serializer_v6.write_revision_to_string(rev)

435

self.assertEqualDiff(serialized, _expected_rev_v5)

436

437

def test_revision_text_v7(self):

438

"""Pack revision to XML v7"""

439

rev = bzrlib.xml7.serializer_v7.read_revision_from_string(

440

_expected_rev_v5)

441

serialized = bzrlib.xml7.serializer_v7.write_revision_to_string(rev)

442

self.assertEqualDiff(serialized, _expected_rev_v5)

443

444

def test_revision_text_v8(self):

445

"""Pack revision to XML v8"""

446

rev = bzrlib.xml8.serializer_v8.read_revision_from_string(

447

_expected_rev_v8)

448

serialized = bzrlib.xml8.serializer_v8.write_revision_to_string(rev)

449

self.assertEqualDiff(serialized, _expected_rev_v8)

450

451

392

def test_revision_ids_are_utf8(self):

452

393

"""Parsed revision_ids should all be utf-8 strings, not unicode."""

453

394

s_v5 = bzrlib.xml5.serializer_v5

501

442

xml_serializer.format_registry.get('6'))

502

443

self.assertIs(bzrlib.xml7.serializer_v7,

503

444

xml_serializer.format_registry.get('7'))

504

self.assertIs(bzrlib.xml8.serializer_v8,

505

xml_serializer.format_registry.get('8'))

506

445

507

446

508

447

class TestEncodeAndEscape(TestCase):

510

449

511

450

def setUp(self):

512

451

# Keep the cache clear before and after the test

513

bzrlib.xml8._ensure_utf8_re()

514

bzrlib.xml8._clear_cache()

515

self.addCleanup(bzrlib.xml8._clear_cache)

452

bzrlib.xml5._ensure_utf8_re()

453

bzrlib.xml5._clear_cache()

454

self.addCleanup(bzrlib.xml5._clear_cache)

516

455

517

456

def test_simple_ascii(self):

518

457

# _encode_and_escape always appends a final ", because these parameters

519

458

# are being used in xml attributes, and by returning it now, we have to

520

459

# do fewer string operations later.

521

val = bzrlib.xml8._encode_and_escape('foo bar')

460

val = bzrlib.xml5._encode_and_escape('foo bar')

522

461

self.assertEqual('foo bar"', val)

523

462

# The second time should be cached

524

val2 = bzrlib.xml8._encode_and_escape('foo bar')

463

val2 = bzrlib.xml5._encode_and_escape('foo bar')

525

464

self.assertIs(val2, val)

526

465

527

466

def test_ascii_with_xml(self):

528

467

self.assertEqual('&'"<>"',

529

bzrlib.xml8._encode_and_escape('&\'"<>'))

468

bzrlib.xml5._encode_and_escape('&\'"<>'))

530

469

531

470

def test_utf8_with_xml(self):

532

471

# u'\xb5\xe5&\u062c'

533

472

utf8_str = '\xc2\xb5\xc3\xa5&\xd8\xac'

534

473

self.assertEqual('µå&ج"',

535

bzrlib.xml8._encode_and_escape(utf8_str))

474

bzrlib.xml5._encode_and_escape(utf8_str))

536

475

537

476

def test_unicode(self):

538

477

uni_str = u'\xb5\xe5&\u062c'

539

478

self.assertEqual('µå&ج"',

540

bzrlib.xml8._encode_and_escape(uni_str))

479

bzrlib.xml5._encode_and_escape(uni_str))

Older »