← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/tree_implementations/test_inv.py

  • Committer: Lukáš Lalinský
  • Date: 2007-12-17 17:28:25 UTC
  • mfrom: (3120 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3123.
  • Revision ID: lalinsky@gmail.com-20071217172825-tr3pqm1mhvs3gwnn
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/tree_implementations/test_inv.py
23
23
from bzrlib.diff import internal_diff
24
24
from bzrlib.mutabletree import MutableTree
25
25
from bzrlib.osutils import has_symlinks
26
 
from bzrlib.symbol_versioning import zero_ninetyone
 
26
from bzrlib.symbol_versioning import zero_ninetyone, zero_ninetythree
27
27
from bzrlib.tests import SymlinkFeature, TestSkipped
28
28
from bzrlib.tests.tree_implementations import TestCaseWithTree
29
29
from bzrlib.uncommit import uncommit
64
64
 
65
65
    def test_file_diff_deleted(self):
66
66
        output = StringIO()
67
 
        self.file_1.diff(internal_diff, 
68
 
                          "old_label", self.tree_1,
69
 
                          "/dev/null", None, None,
70
 
                          output)
 
67
        self.applyDeprecated(zero_ninetythree,
 
68
                             self.file_1.diff,
 
69
                             internal_diff,
 
70
                             "old_label", self.tree_1,
 
71
                             "/dev/null", None, None,
 
72
                             output)
71
73
        self.assertEqual(output.getvalue(), "--- old_label\n"
72
74
                                            "+++ /dev/null\n"
73
75
                                            "@@ -1,1 +0,0 @@\n"
76
78
 
77
79
    def test_file_diff_added(self):
78
80
        output = StringIO()
79
 
        self.file_1.diff(internal_diff, 
80
 
                          "new_label", self.tree_1,
81
 
                          "/dev/null", None, None,
82
 
                          output, reverse=True)
 
81
        self.applyDeprecated(zero_ninetythree,
 
82
                             self.file_1.diff,
 
83
                             internal_diff,
 
84
                             "new_label", self.tree_1,
 
85
                             "/dev/null", None, None,
 
86
                             output, reverse=True)
83
87
        self.assertEqual(output.getvalue(), "--- /dev/null\n"
84
88
                                            "+++ new_label\n"
85
89
                                            "@@ -0,0 +1,1 @@\n"
88
92
 
89
93
    def test_file_diff_changed(self):
90
94
        output = StringIO()
91
 
        self.file_1.diff(internal_diff, 
92
 
                          "/dev/null", self.tree_1, 
93
 
                          "new_label", self.file_2, self.tree_2,
94
 
                          output)
 
95
        self.applyDeprecated(zero_ninetythree,
 
96
                             self.file_1.diff,
 
97
                             internal_diff,
 
98
                             "/dev/null", self.tree_1,
 
99
                             "new_label", self.file_2, self.tree_2,
 
100
                             output)
95
101
        self.assertEqual(output.getvalue(), "--- /dev/null\n"
96
102
                                            "+++ new_label\n"
97
103
                                            "@@ -1,1 +1,1 @@\n"
101
107
        
102
108
    def test_file_diff_binary(self):
103
109
        output = StringIO()
104
 
        self.file_1.diff(internal_diff, 
105
 
                          "/dev/null", self.tree_1, 
106
 
                          "new_label", self.file_2b, self.tree_2,
107
 
                          output)
 
110
        self.applyDeprecated(zero_ninetythree,
 
111
                             self.file_1.diff,
 
112
                             internal_diff,
 
113
                             "/dev/null", self.tree_1,
 
114
                             "new_label", self.file_2b, self.tree_2,
 
115
                             output)
108
116
        self.assertEqual(output.getvalue(), 
109
117
                         "Binary files /dev/null and new_label differ\n")
110
118
 
111
119
    def test_link_diff_deleted(self):
112
120
        self.requireFeature(SymlinkFeature)
113
121
        output = StringIO()
114
 
        self.link_1.diff(internal_diff, 
115
 
                          "old_label", self.tree_1,
116
 
                          "/dev/null", None, None,
117
 
                          output)
 
122
        self.applyDeprecated(zero_ninetythree,
 
123
                             self.link_1.diff,
 
124
                             internal_diff, "old_label",
 
125
                             self.tree_1, "/dev/null", None, None,
 
126
                             output)
118
127
        self.assertEqual(output.getvalue(),
119
128
                         "=== target was 'target1'\n")
120
129
 
121
130
    def test_link_diff_added(self):
122
131
        self.requireFeature(SymlinkFeature)
123
132
        output = StringIO()
124
 
        self.link_1.diff(internal_diff, 
125
 
                          "new_label", self.tree_1,
126
 
                          "/dev/null", None, None,
127
 
                          output, reverse=True)
 
133
        self.applyDeprecated(zero_ninetythree,
 
134
                             self.link_1.diff,
 
135
                             internal_diff,
 
136
                             "new_label", self.tree_1,
 
137
                             "/dev/null", None, None,
 
138
                             output, reverse=True)
128
139
        self.assertEqual(output.getvalue(),
129
140
                         "=== target is 'target1'\n")
130
141
 
131
142
    def test_link_diff_changed(self):
132
143
        self.requireFeature(SymlinkFeature)
133
144
        output = StringIO()
134
 
        self.link_1.diff(internal_diff, 
135
 
                          "/dev/null", self.tree_1, 
136
 
                          "new_label", self.link_2, self.tree_2,
137
 
                          output)
 
145
        self.applyDeprecated(zero_ninetythree,
 
146
                             self.link_1.diff,
 
147
                             internal_diff,
 
148
                             "/dev/null", self.tree_1,
 
149
                             "new_label", self.link_2, self.tree_2,
 
150
                             output)
138
151
        self.assertEqual(output.getvalue(),
139
152
                         "=== target changed 'target1' => 'target2'\n")
140
153