From: Ulf Jasper <ulf.jasper@web.de>
Date: Thu, 24 Nov 2022 17:56:50 +0000 (+0100)
Subject: icalendar: Adjust tests after fixing parsing of sexp entries (bug#56241)
X-Git-Tag: emacs-29.0.90~1534
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b604bef915e3ec2f2a08f50e5f4799bacdf057da;p=emacs.git

icalendar: Adjust tests after fixing parsing of sexp entries (bug#56241)

* test/lisp/calendar/icalendar-tests.el
(icalendar-export-bug-56241-nested-sexps): New.
* test/lisp/calendar/icalendar-tests.el (icalendar-real-world):
Disable testcase for exporting sexp entries that has now become invalid.
---

diff --git a/test/lisp/calendar/icalendar-tests.el b/test/lisp/calendar/icalendar-tests.el
index d9631310ae3..fa55eea95e2 100644
--- a/test/lisp/calendar/icalendar-tests.el
+++ b/test/lisp/calendar/icalendar-tests.el
@@ -1014,15 +1014,15 @@ END:VALARM
 ;;                                  diary-string))))
 ;;           '("%%(diary-float 7 0 1) First Sunday in July 1"
 ;;             "%%(icalendar-tests--diary-float 7 0 1) First Sunday in July 2"))))
-;; 
-;; (ert-deftest icalendar-export-bug-56241-nested-sexps ()
-;;   "Reported in #bug56241 -- needs to be fixed!"
-;;   (let ((icalendar-export-sexp-enumeration-days 366))
-;;     (mapc (lambda (diary-string)
-;;             (should (string= "" (icalendar-tests--get-error-string-for-export
-;;                                  diary-string))))
-;;           '("%%(= (calendar-day-of-week date) 0) Sunday 1"
-;;             "%%(= 0 (calendar-day-of-week date)) Sunday 2"))))
+
+(ert-deftest icalendar-export-bug-56241-nested-sexps ()
+  "Reported in #bug56241 -- needs to be fixed!"
+  (let ((icalendar-export-sexp-enumeration-days 366))
+    (mapc (lambda (diary-string)
+            (should (string= "" (icalendar-tests--get-error-string-for-export
+                                 diary-string))))
+          '("%%(= (calendar-day-of-week date) 0) Sunday 1"
+            "%%(= 0 (calendar-day-of-week date)) Sunday 2"))))
 
 ;; ======================================================================
 ;; Import tests
@@ -1482,12 +1482,15 @@ DTEND;VALUE=DATE:19570922
 RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=09;BYMONTHDAY=21
 SUMMARY:ff birthday (%d years old)")
 
-
-  (icalendar-tests--test-export
-   nil
-   nil
-   "%%(diary-offset '(diary-float t 3 4) 1) asdf"
-   nil)
+  ;; FIXME: this testcase verifies that icalendar-export fails to
+  ;; export the nested sexp. After repairing bug56241 icalendar-export
+  ;; works correctly for this sexp but now the testcase fails.
+  ;; Therefore this testcase is disabled for the time being.
+  ;;  (icalendar-tests--test-export
+  ;;   nil
+  ;;   nil
+  ;;   "%%(diary-offset '(diary-float t 3 4) 1) asdf"
+  ;;   nil)
 
 
   ;; FIXME!