/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: Canonical.com Patch Queue Manager
  • Date: 2008-12-11 20:23:00 UTC
  • mfrom: (3890.2.18 get_record_stream_chunked)
  • Revision ID: pqm@pqm.ubuntu.com-20081211202300-6dz1vo3phfsc23pj
(jam) Add ContentFactory.get_bytes_as('chunked') and
        osutils.chunks_to_lines()

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_versionedfile.py
1558
1558
        """Assert that storage_kind is a valid storage_kind."""
1559
1559
        self.assertSubset([storage_kind],
1560
1560
            ['mpdiff', 'knit-annotated-ft', 'knit-annotated-delta',
1561
 
             'knit-ft', 'knit-delta', 'fulltext', 'knit-annotated-ft-gz',
1562
 
             'knit-annotated-delta-gz', 'knit-ft-gz', 'knit-delta-gz'])
 
1561
             'knit-ft', 'knit-delta', 'chunked', 'fulltext',
 
1562
             'knit-annotated-ft-gz', 'knit-annotated-delta-gz', 'knit-ft-gz',
 
1563
             'knit-delta-gz'])
1563
1564
 
1564
1565
    def capture_stream(self, f, entries, on_seen, parents):
1565
1566
        """Capture a stream for testing."""
1636
1637
                [None, files.get_sha1s([factory.key])[factory.key]])
1637
1638
            self.assertEqual(parent_map[factory.key], factory.parents)
1638
1639
            # self.assertEqual(files.get_text(factory.key),
1639
 
            self.assertIsInstance(factory.get_bytes_as('fulltext'), str)
1640
 
            self.assertIsInstance(factory.get_bytes_as(factory.storage_kind),
1641
 
                str)
 
1640
            ft_bytes = factory.get_bytes_as('fulltext')
 
1641
            self.assertIsInstance(ft_bytes, str)
 
1642
            chunked_bytes = factory.get_bytes_as('chunked')
 
1643
            self.assertEqualDiff(ft_bytes, ''.join(chunked_bytes))
 
1644
 
1642
1645
        self.assertStreamOrder(sort_order, seen, keys)
1643
1646
 
1644
1647
    def assertStreamOrder(self, sort_order, seen, keys):
2210
2213
        self._lines["A"] = ["FOO", "BAR"]
2211
2214
        it = self.texts.get_record_stream([("A",)], "unordered", True)
2212
2215
        record = it.next()
2213
 
        self.assertEquals("fulltext", record.storage_kind)
 
2216
        self.assertEquals("chunked", record.storage_kind)
2214
2217
        self.assertEquals("FOOBAR", record.get_bytes_as("fulltext"))
 
2218
        self.assertEquals(["FOO", "BAR"], record.get_bytes_as("chunked"))
2215
2219
 
2216
2220
    def test_get_record_stream_absent(self):
2217
2221
        it = self.texts.get_record_stream([("A",)], "unordered", True)