Rev 4329: Clarify LogCatcher purpose. in file:///home/vila/src/bzr/experimental/log-tests/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/log-tests/

------------------------------------------------------------
revno: 4329
revision-id: v.ladeuil+lp at free.fr-20090506081744-cddmmug2gl2wm7ex
parent: v.ladeuil+lp at free.fr-20090506081037-095pb9q9zq42gv0o
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: log-tests
timestamp: Wed 2009-05-06 10:17:44 +0200
message:
  Clarify LogCatcher purpose.
  
  * bzrlib/tests/test_log.py:
  (LogCatcher.__init__): We are catching revisions, not their
  formatted logs.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_log.py'
--- a/bzrlib/tests/test_log.py	2009-05-06 08:10:37 +0000
+++ b/bzrlib/tests/test_log.py	2009-05-06 08:17:44 +0000
@@ -54,10 +54,10 @@
 
     def __init__(self):
         super(LogCatcher, self).__init__(to_file=None)
-        self.logs = []
+        self.revisions = []
 
     def log_revision(self, revision):
-        self.logs.append(revision)
+        self.revisions.append(revision)
 
 
 class TestShowLog(tests.TestCaseWithTransport):
@@ -104,7 +104,7 @@
         lf = LogCatcher()
         log.show_log(wt.branch, lf)
         # no entries yet
-        self.assertEqual([], lf.logs)
+        self.assertEqual([], lf.revisions)
 
     def test_empty_commit(self):
         wt = self.make_branch_and_tree('.')
@@ -112,10 +112,11 @@
         wt.commit('empty commit')
         lf = LogCatcher()
         log.show_log(wt.branch, lf, verbose=True)
-        self.assertEqual(1, len(lf.logs))
-        self.assertEqual('1', lf.logs[0].revno)
-        self.assertEqual('empty commit', lf.logs[0].rev.message)
-        self.checkDelta(lf.logs[0].delta)
+        revs = lf.revisions
+        self.assertEqual(1, len(revs))
+        self.assertEqual('1', revs[0].revno)
+        self.assertEqual('empty commit', revs[0].rev.message)
+        self.checkDelta(revs[0].delta)
 
     def test_simple_commit(self):
         wt = self.make_branch_and_tree('.')
@@ -127,9 +128,9 @@
                             u'<test at example.com>')
         lf = LogCatcher()
         log.show_log(wt.branch, lf, verbose=True)
-        self.assertEqual(2, len(lf.logs))
+        self.assertEqual(2, len(lf.revisions))
         # first one is most recent
-        log_entry = lf.logs[0]
+        log_entry = lf.revisions[0]
         self.assertEqual('2', log_entry.revno)
         self.assertEqual('add one file', log_entry.rev.message)
         self.checkDelta(log_entry.delta, added=['hello'])
@@ -141,7 +142,7 @@
         wt.commit(msg)
         lf = LogCatcher()
         log.show_log(wt.branch, lf, verbose=True)
-        committed_msg = lf.logs[0].rev.message
+        committed_msg = lf.revisions[0].rev.message
         self.assertNotEqual(msg, committed_msg)
         self.assertTrue(len(committed_msg) > len(msg))
 
@@ -155,7 +156,7 @@
         wt.commit(msg)
         lf = LogCatcher()
         log.show_log(wt.branch, lf, verbose=True)
-        committed_msg = lf.logs[0].rev.message
+        committed_msg = lf.revisions[0].rev.message
         self.assertEqual(msg, committed_msg)
 
     def test_deltas_in_merge_revisions(self):
@@ -179,19 +180,20 @@
         lf.supports_merge_revisions = True
         log.show_log(b, lf, verbose=True)
 
-        self.assertEqual(3, len(lf.logs))
+        revs = lf.revisions
+        self.assertEqual(3, len(revs))
 
-        logentry = lf.logs[0]
+        logentry = revs[0]
         self.assertEqual('2', logentry.revno)
         self.assertEqual('merge child branch', logentry.rev.message)
         self.checkDelta(logentry.delta, removed=['file1'], modified=['file2'])
 
-        logentry = lf.logs[1]
+        logentry = revs[1]
         self.assertEqual('1.1.1', logentry.revno)
         self.assertEqual('remove file1 and modify file2', logentry.rev.message)
         self.checkDelta(logentry.delta, removed=['file1'], modified=['file2'])
 
-        logentry = lf.logs[2]
+        logentry = revs[2]
         self.assertEqual('1', logentry.revno)
         self.assertEqual('add file1 and file2', logentry.rev.message)
         self.checkDelta(logentry.delta, added=['file1', 'file2'])