← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_selftest.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_selftest.py
354
354
            return_parameter,
355
355
            revision_tree_from_workingtree
356
356
            )
357
 
        from bzrlib.workingtree import WorkingTreeFormat
 
357
        from bzrlib.workingtree import WorkingTreeFormat, WorkingTreeFormat3
358
358
        input_test = TestTreeProviderAdapter(
359
359
            "test_adapted_tests")
360
360
        server1 = "a"
363
363
        adapter = TreeTestProviderAdapter(server1, server2, formats)
364
364
        suite = adapter.adapt(input_test)
365
365
        tests = list(iter(suite))
366
 
        self.assertEqual(3, len(tests))
367
 
        default_format = WorkingTreeFormat.get_default_format()
 
366
        self.assertEqual(4, len(tests))
 
367
        # this must match the default format setp up in
 
368
        # TreeTestProviderAdapter.adapt
 
369
        default_format = WorkingTreeFormat3
368
370
        self.assertEqual(tests[0].workingtree_format, formats[0][0])
369
371
        self.assertEqual(tests[0].bzrdir_format, formats[0][1])
370
372
        self.assertEqual(tests[0].transport_server, server1)
375
377
        self.assertEqual(tests[1].transport_server, server1)
376
378
        self.assertEqual(tests[1].transport_readonly_server, server2)
377
379
        self.assertEqual(tests[1].workingtree_to_test_tree, return_parameter)
378
 
        self.assertEqual(tests[2].workingtree_format, default_format)
379
 
        self.assertEqual(tests[2].bzrdir_format, default_format._matchingbzrdir)
 
380
        self.assertIsInstance(tests[2].workingtree_format, default_format)
 
381
        #self.assertEqual(tests[2].bzrdir_format,
 
382
        #                 default_format._matchingbzrdir)
380
383
        self.assertEqual(tests[2].transport_server, server1)
381
384
        self.assertEqual(tests[2].transport_readonly_server, server2)
382
385
        self.assertEqual(tests[2].workingtree_to_test_tree,
410
413
        server2 = "b"
411
414
        format1 = WorkingTreeFormat2()
412
415
        format2 = WorkingTreeFormat3()
413
 
        formats = [(str, format1, format2, False, True),
414
 
            (int, format2, format1, False, True)]
 
416
        formats = [(str, format1, format2, "converter1"),
 
417
            (int, format2, format1, "converter2")]
415
418
        adapter = InterTreeTestProviderAdapter(server1, server2, formats)
416
419
        suite = adapter.adapt(input_test)
417
420
        tests = list(iter(suite))
418
421
        self.assertEqual(2, len(tests))
419
422
        self.assertEqual(tests[0].intertree_class, formats[0][0])
420
423
        self.assertEqual(tests[0].workingtree_format, formats[0][1])
421
 
        self.assertEqual(tests[0].workingtree_to_test_tree, formats[0][2])
422
 
        self.assertEqual(tests[0].workingtree_format_to, formats[0][3])
423
 
        self.assertEqual(tests[0].workingtree_to_test_tree_to, formats[0][4])
 
424
        self.assertEqual(tests[0].workingtree_format_to, formats[0][2])
 
425
        self.assertEqual(tests[0].mutable_trees_to_test_trees, formats[0][3])
 
426
        self.assertEqual(tests[0].workingtree_to_test_tree, return_parameter)
424
427
        self.assertEqual(tests[0].transport_server, server1)
425
428
        self.assertEqual(tests[0].transport_readonly_server, server2)
426
429
        self.assertEqual(tests[1].intertree_class, formats[1][0])
427
430
        self.assertEqual(tests[1].workingtree_format, formats[1][1])
428
 
        self.assertEqual(tests[1].workingtree_to_test_tree, formats[1][2])
429
 
        self.assertEqual(tests[1].workingtree_format_to, formats[1][3])
430
 
        self.assertEqual(tests[1].workingtree_to_test_tree_to, formats[1][4])
 
431
        self.assertEqual(tests[1].workingtree_format_to, formats[1][2])
 
432
        self.assertEqual(tests[1].mutable_trees_to_test_trees, formats[1][3])
 
433
        self.assertEqual(tests[1].workingtree_to_test_tree, return_parameter)
431
434
        self.assertEqual(tests[1].transport_server, server1)
432
435
        self.assertEqual(tests[1].transport_readonly_server, server2)
433
436