|
124 | 124 | ;;; Tests of format-time-string padding
|
125 | 125 |
|
126 | 126 | (ert-deftest format-time-string-padding-minimal-deletes-unneeded-zeros ()
|
127 |
| - (let ((ref-time (append (encode-time 0 0 0 15 2 2000) '(123450)))) |
| 127 | + (let ((ref-time (encode-time '((123450 . 1000000) 0 0 15 2 2000 - - t)))) |
128 | 128 | (should (equal (format-time-string "%-:::z" ref-time "FJT-12") "+12"))
|
129 |
| - (should (equal (format-time-string "%-N" ref-time) "12345")) |
130 |
| - (should (equal (format-time-string "%-6N" ref-time) "12345")) |
131 |
| - (should (equal (format-time-string "%-m" ref-time) "2")))) ;not "02" |
| 129 | + (should (equal (format-time-string "%-N" ref-time t) "12345")) |
| 130 | + (should (equal (format-time-string "%-6N" ref-time t) "12345")) |
| 131 | + (should (equal (format-time-string "%-m" ref-time t) "2")))) ;not "02" |
132 | 132 |
|
133 | 133 | (ert-deftest format-time-string-padding-minimal-retains-needed-zeros ()
|
134 |
| - (let ((ref-time (append (encode-time 0 0 0 20 10 2000) '(3450)))) |
| 134 | + (let ((ref-time (encode-time '((3450 . 1000000) 0 0 20 10 2000 - - t)))) |
135 | 135 | (should (equal (format-time-string "%-z" ref-time "IST-5:30") "+530"))
|
136 | 136 | (should (equal (format-time-string "%-4z" ref-time "IST-5:30") "+530"))
|
137 | 137 | (should (equal (format-time-string "%4z" ref-time "IST-5:30") "+530"))
|
138 |
| - (should (equal (format-time-string "%-N" ref-time) "00345")) |
139 |
| - (should (equal (format-time-string "%-3N" ref-time) "003")) |
140 |
| - (should (equal (format-time-string "%3N" ref-time) "003")) |
141 |
| - (should (equal (format-time-string "%-m" ref-time) "10")) ;not "1" |
142 |
| - (should (equal (format-time-string "%-1m" ref-time) "10")) ;not "1" |
143 |
| - (should (equal (format-time-string "%1m" ref-time) "10")))) ;not "1" |
| 138 | + (should (equal (format-time-string "%-N" ref-time t) "00345")) |
| 139 | + (should (equal (format-time-string "%-3N" ref-time t) "003")) |
| 140 | + (should (equal (format-time-string "%3N" ref-time t) "003")) |
| 141 | + (should (equal (format-time-string "%-m" ref-time t) "10")) ;not "1" |
| 142 | + (should (equal (format-time-string "%-1m" ref-time t) "10")) ;not "1" |
| 143 | + (should (equal (format-time-string "%1m" ref-time t) "10")))) ;not "1" |
144 | 144 |
|
145 | 145 | (ert-deftest format-time-string-padding-spaces ()
|
146 |
| - (let ((ref-time (append (encode-time 0 0 0 10 12 2000) '(123000)))) |
| 146 | + (let ((ref-time (encode-time '((123000 . 1000000) 0 0 10 12 2000 - - t)))) |
147 | 147 | (should (equal (format-time-string "%_7z" ref-time "CHA-12:45") " +1245"))
|
148 |
| - (should (equal (format-time-string "%_6N" ref-time) "123 ")) |
149 |
| - (should (equal (format-time-string "%_9N" ref-time) "123 ")) |
150 |
| - (should (equal (format-time-string "%_12N" ref-time) "123 ")) |
151 |
| - (should (equal (format-time-string "%_m" ref-time) "12")) |
152 |
| - (should (equal (format-time-string "%_2m" ref-time) "12")) |
153 |
| - (should (equal (format-time-string "%_3m" ref-time) " 12")))) |
| 148 | + (should (equal (format-time-string "%_6N" ref-time t) "123 ")) |
| 149 | + (should (equal (format-time-string "%_9N" ref-time t) "123 ")) |
| 150 | + (should (equal (format-time-string "%_12N" ref-time t) "123 ")) |
| 151 | + (should (equal (format-time-string "%_m" ref-time t) "12")) |
| 152 | + (should (equal (format-time-string "%_2m" ref-time t) "12")) |
| 153 | + (should (equal (format-time-string "%_3m" ref-time t) " 12")))) |
154 | 154 |
|
155 | 155 | (ert-deftest format-time-string-padding-zeros-adds-on-insignificant-side ()
|
156 | 156 | "Fractional seconds have a fixed place on the left,
|
157 | 157 | and any padding must happen on the right. All other numbers have
|
158 | 158 | a fixed place on the right and are padded on the left."
|
159 |
| - (let ((ref-time (append (encode-time 0 0 0 10 12 2000) '(123000)))) |
160 |
| - (should (equal (format-time-string "%3m" ref-time) "012")) |
| 159 | + (let ((ref-time (encode-time '((123000 . 1000000) 0 0 10 12 2000 - - t)))) |
| 160 | + (should (equal (format-time-string "%3m" ref-time t) "012")) |
161 | 161 | (should (equal (format-time-string "%7z" ref-time "CHA-12:45") "+001245"))
|
162 |
| - (should (equal (format-time-string "%12N" ref-time) "123000000000")) |
163 |
| - (should (equal (format-time-string "%9N" ref-time) "123000000")) |
164 |
| - (should (equal (format-time-string "%6N" ref-time) "123000")))) |
| 162 | + (should (equal (format-time-string "%12N" ref-time t) "123000000000")) |
| 163 | + (should (equal (format-time-string "%9N" ref-time t) "123000000")) |
| 164 | + (should (equal (format-time-string "%6N" ref-time t) "123000")))) |
165 | 165 |
|
166 | 166 |
|
167 | 167 | (ert-deftest time-equal-p-nil-nil ()
|
|
0 commit comments