branch: elpa/logview
commit 77bb7963e35c1c013e5fab3e79375e3866ce2a00
Author: Paul Pogonyshev <pogonys...@gmail.com>
Commit: Paul Pogonyshev <pogonys...@gmail.com>
Fix after the latest merge: tweak the new tests to be byte-compilable
without warnings (required since using Eldev).
---
test/logview.el | 79 +++++++++++++++++++++++++++------------------------------
1 file changed, 37 insertions(+), 42 deletions(-)
diff --git a/test/logview.el b/test/logview.el
index 7889389fca..c8b064e3b0 100644
--- a/test/logview.el
+++ b/test/logview.el
@@ -205,38 +205,35 @@
(ert-deftest logview-test-apache-submode-match-a-message ()
(logview--test-with-file "apache/error.log" ()
- (logview--locate-current-entry entry start
- (logview-go-to-message-beginning)
- (should (looking-at "Emergency message.$")))))
+ (logview-go-to-message-beginning)
+ (should (looking-at "Emergency message.$"))))
(ert-deftest logview-test-apache-submode-match-a-message-after-undefined-lines
()
(logview--test-with-file "apache/error.log" ()
- (logview--locate-current-entry entry start
- (logview-next-entry 8)
- (logview-go-to-message-beginning)
- (should (looking-at "Info message after some undefined lines.")))))
+ (logview-next-entry 8)
+ (logview-go-to-message-beginning)
+ (should (looking-at "Info message after some undefined lines."))))
;; TODO: This, or something should test the eventual final levels
;; LogView Mode works with. With that transition, maybe the RFC 5424
;; and RFC 5424 lowercase level definitions could be merged.
(ert-deftest logview-test-apache-submode-match-all-levels ()
(logview--test-with-file "apache/error.log" ()
- (logview--locate-current-entry entry start
- (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 0))
- (logview-next-entry)
- (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 1))
- (logview-next-entry)
- (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 2))
- (logview-next-entry)
- (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 3))
- (logview-next-entry)
- (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 4))
- (logview-next-entry)
- (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 5))
- (logview-next-entry)
- (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 6))
- (logview-next-entry)
- (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 7)))))
+ (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 0))
+ (logview-next-entry)
+ (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 1))
+ (logview-next-entry)
+ (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 2))
+ (logview-next-entry)
+ (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 3))
+ (logview-next-entry)
+ (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 4))
+ (logview-next-entry)
+ (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 5))
+ (logview-next-entry)
+ (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 6))
+ (logview-next-entry)
+ (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 7))))
;; Monolog submode
(ert-deftest logview-test-monolog-submode-recognition ()
@@ -250,25 +247,23 @@
(ert-deftest logview-test-monolog-submode-match-a-message ()
(logview--test-with-file "monolog/1.log" ()
- (logview--locate-current-entry entry start
- (logview-go-to-message-beginning)
- (should (looking-at "Emergency message.$")))))
+ (logview-go-to-message-beginning)
+ (should (looking-at "Emergency message.$"))))
(ert-deftest logview-test-monolog-submode-match-all-levels ()
(logview--test-with-file "monolog/1.log" ()
- (logview--locate-current-entry entry start
- (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 0))
- (logview-next-entry)
- (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 1))
- (logview-next-entry)
- (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 2))
- (logview-next-entry)
- (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 3))
- (logview-next-entry)
- (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 4))
- (logview-next-entry)
- (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 5))
- (logview-next-entry)
- (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 6))
- (logview-next-entry)
- (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 7)))))
+ (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 0))
+ (logview-next-entry)
+ (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 1))
+ (logview-next-entry)
+ (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 2))
+ (logview-next-entry)
+ (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 3))
+ (logview-next-entry)
+ (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 4))
+ (logview-next-entry)
+ (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 5))
+ (logview-next-entry)
+ (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 6))
+ (logview-next-entry)
+ (should (equal (logview--locate-current-entry entry nil
(logview--entry-level entry)) 7))))
