Skip to content

Fix test suite for duration formatting, not assuming locale #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix test suite for duration formatting, not assuming locale #114

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/cljstyle/task/util.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,15 +166,15 @@
(cond
;; 100 ms
(< elapsed 100)
(format "%.2f ms" (double elapsed))
(String/format java.util.Locale/US "%.2f ms" (to-array [(double elapsed)]))

;; 1 second
(< elapsed 1000)
(format "%d ms" (int elapsed))

;; 1 minute
(< elapsed (* 60 1000))
(format "%.2f sec" (/ elapsed 1000.0))
(String/format java.util.Locale/US "%.2f sec" (to-array [(/ elapsed 1000.0)]))

;; any longer
:else
Expand All @@ -197,7 +197,7 @@
"subrule" (name rule-key)
"elapsed" (duration-str (/ duration 1e6))
"percent" (if (pos? total)
(format "%.1f%%" (* 100.0 (/ duration total)))
(String/format java.util.Locale/US "%.1f%%" (to-array [(* 100.0 (/ duration total))]))
"--")})))))


Expand All @@ -223,16 +223,16 @@
(assoc :durations durations))]
(log (pr-str stats))
(when (or (option :report) (option :verbose))
(printf "Checked %d of %d files in %s (%.1f fps)\n"
(printf "Checked %d of %d files in %s (%s fps)\n"
total-processed
total-files
(if elapsed
(duration-str elapsed)
"some amount of time")
(* 1e3 (/ total-processed elapsed)))
(printf "Checked %.1f KB of source files (%.1f KBps)\n"
(/ total-size 1024.0)
(* 1e3 (/ total-size 1024 elapsed)))
(String/format java.util.Locale/US "%.1f" (to-array [(* 1e3 (/ total-processed elapsed))])))
(printf "Checked %s KB of source files (%s KBps)\n"
(String/format java.util.Locale/US "%.1f" (to-array [(/ total-size 1024.0)]))
(String/format java.util.Locale/US "%.1f" (to-array [(* 1e3 (/ total-size 1024 elapsed))])))
(doseq [[type-key file-count] (sort-by val (comp - compare) (:files stats))]
(printf "%6d %s\n" file-count (name type-key)))
(when (pos? diff-lines)
Expand Down