/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_versionedfile.py

  • Committer: Robert Collins
  • Date: 2009-08-04 04:36:34 UTC
  • mfrom: (4583 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4593.
  • Revision ID: robertc@robertcollins.net-20090804043634-2iu9wpcgs273i97s
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_versionedfile.py
1472
1472
            self.addCleanup(lambda:self.cleanup(files))
1473
1473
        return files
1474
1474
 
 
1475
    def get_simple_key(self, suffix):
 
1476
        """Return a key for the object under test."""
 
1477
        if self.key_length == 1:
 
1478
            return (suffix,)
 
1479
        else:
 
1480
            return ('FileA',) + (suffix,)
 
1481
 
 
1482
    def test_add_lines(self):
 
1483
        f = self.get_versionedfiles()
 
1484
        key0 = self.get_simple_key('r0')
 
1485
        key1 = self.get_simple_key('r1')
 
1486
        key2 = self.get_simple_key('r2')
 
1487
        keyf = self.get_simple_key('foo')
 
1488
        f.add_lines(key0, [], ['a\n', 'b\n'])
 
1489
        if self.graph:
 
1490
            f.add_lines(key1, [key0], ['b\n', 'c\n'])
 
1491
        else:
 
1492
            f.add_lines(key1, [], ['b\n', 'c\n'])
 
1493
        keys = f.keys()
 
1494
        self.assertTrue(key0 in keys)
 
1495
        self.assertTrue(key1 in keys)
 
1496
        records = []
 
1497
        for record in f.get_record_stream([key0, key1], 'unordered', True):
 
1498
            records.append((record.key, record.get_bytes_as('fulltext')))
 
1499
        records.sort()
 
1500
        self.assertEqual([(key0, 'a\nb\n'), (key1, 'b\nc\n')], records)
 
1501
 
 
1502
    def test__add_text(self):
 
1503
        f = self.get_versionedfiles()
 
1504
        key0 = self.get_simple_key('r0')
 
1505
        key1 = self.get_simple_key('r1')
 
1506
        key2 = self.get_simple_key('r2')
 
1507
        keyf = self.get_simple_key('foo')
 
1508
        f._add_text(key0, [], 'a\nb\n')
 
1509
        if self.graph:
 
1510
            f._add_text(key1, [key0], 'b\nc\n')
 
1511
        else:
 
1512
            f._add_text(key1, [], 'b\nc\n')
 
1513
        keys = f.keys()
 
1514
        self.assertTrue(key0 in keys)
 
1515
        self.assertTrue(key1 in keys)
 
1516
        records = []
 
1517
        for record in f.get_record_stream([key0, key1], 'unordered', True):
 
1518
            records.append((record.key, record.get_bytes_as('fulltext')))
 
1519
        records.sort()
 
1520
        self.assertEqual([(key0, 'a\nb\n'), (key1, 'b\nc\n')], records)
 
1521
 
1475
1522
    def test_annotate(self):
1476
1523
        files = self.get_versionedfiles()
1477
1524
        self.get_diamond_files(files)
1543
1590
            trailing_eol=trailing_eol, nograph=not self.graph,
1544
1591
            left_only=left_only, nokeys=nokeys)
1545
1592
 
1546
 
    def test_add_lines_nostoresha(self):
 
1593
    def _add_content_nostoresha(self, add_lines):
1547
1594
        """When nostore_sha is supplied using old content raises."""
1548
1595
        vf = self.get_versionedfiles()
1549
1596
        empty_text = ('a', [])
1551
1598
        sample_text_no_nl = ('c', ["foo\n", "bar"])
1552
1599
        shas = []
1553
1600
        for version, lines in (empty_text, sample_text_nl, sample_text_no_nl):
1554
 
            sha, _, _ = vf.add_lines(self.get_simple_key(version), [], lines)
 
1601
            if add_lines:
 
1602
                sha, _, _ = vf.add_lines(self.get_simple_key(version), [],
 
1603
                                         lines)
 
1604
            else:
 
1605
                sha, _, _ = vf._add_text(self.get_simple_key(version), [],
 
1606
                                         ''.join(lines))
1555
1607
            shas.append(sha)
1556
1608
        # we now have a copy of all the lines in the vf.
1557
1609
        for sha, (version, lines) in zip(
1560
1612
            self.assertRaises(errors.ExistingContent,
1561
1613
                vf.add_lines, new_key, [], lines,
1562
1614
                nostore_sha=sha)
 
1615
            self.assertRaises(errors.ExistingContent,
 
1616
                vf._add_text, new_key, [], ''.join(lines),
 
1617
                nostore_sha=sha)
1563
1618
            # and no new version should have been added.
1564
1619
            record = vf.get_record_stream([new_key], 'unordered', True).next()
1565
1620
            self.assertEqual('absent', record.storage_kind)
1566
1621
 
 
1622
    def test_add_lines_nostoresha(self):
 
1623
        self._add_content_nostoresha(add_lines=True)
 
1624
 
 
1625
    def test__add_text_nostoresha(self):
 
1626
        self._add_content_nostoresha(add_lines=False)
 
1627
 
1567
1628
    def test_add_lines_return(self):
1568
1629
        files = self.get_versionedfiles()
1569
1630
        # save code by using the stock data insertion helper.
1718
1779
        self.capture_stream(files, entries, seen.add, parent_map)
1719
1780
        self.assertEqual(set(keys), seen)
1720
1781
 
1721
 
    def get_simple_key(self, suffix):
1722
 
        """Return a key for the object under test."""
1723
 
        if self.key_length == 1:
1724
 
            return (suffix,)
1725
 
        else:
1726
 
            return ('FileA',) + (suffix,)
1727
 
 
1728
1782
    def get_keys_and_sort_order(self):
1729
1783
        """Get diamond test keys list, and their sort ordering."""
1730
1784
        if self.key_length == 1:
2093
2147
        else:
2094
2148
            return None
2095
2149
 
 
2150
    def test_get_annotator(self):
 
2151
        files = self.get_versionedfiles()
 
2152
        self.get_diamond_files(files)
 
2153
        origin_key = self.get_simple_key('origin')
 
2154
        base_key = self.get_simple_key('base')
 
2155
        left_key = self.get_simple_key('left')
 
2156
        right_key = self.get_simple_key('right')
 
2157
        merged_key = self.get_simple_key('merged')
 
2158
        # annotator = files.get_annotator()
 
2159
        # introduced full text
 
2160
        origins, lines = files.get_annotator().annotate(origin_key)
 
2161
        self.assertEqual([(origin_key,)], origins)
 
2162
        self.assertEqual(['origin\n'], lines)
 
2163
        # a delta
 
2164
        origins, lines = files.get_annotator().annotate(base_key)
 
2165
        self.assertEqual([(base_key,)], origins)
 
2166
        # a merge
 
2167
        origins, lines = files.get_annotator().annotate(merged_key)
 
2168
        if self.graph:
 
2169
            self.assertEqual([
 
2170
                (base_key,),
 
2171
                (left_key,),
 
2172
                (right_key,),
 
2173
                (merged_key,),
 
2174
                ], origins)
 
2175
        else:
 
2176
            # Without a graph everything is new.
 
2177
            self.assertEqual([
 
2178
                (merged_key,),
 
2179
                (merged_key,),
 
2180
                (merged_key,),
 
2181
                (merged_key,),
 
2182
                ], origins)
 
2183
        self.assertRaises(RevisionNotPresent,
 
2184
            files.get_annotator().annotate, self.get_simple_key('missing-key'))
 
2185
 
2096
2186
    def test_get_parent_map(self):
2097
2187
        files = self.get_versionedfiles()
2098
2188
        if self.key_length == 1: