summary refs log tree commit diff stats
path: root/tests
diff options
context:
space:
mode:
authorAndreas Rumpf <rumpf_a@web.de>2020-04-30 06:48:57 +0200
committerGitHub <noreply@github.com>2020-04-30 06:48:57 +0200
commitcc60caedb3a1c7043b0f7ef2db5c741ecaa1482f (patch)
tree92589110580fe4fb6cba0bdab6270b8a887de433 /tests
parentd6e1b5c070bf58449bf4af210ec099418d496aa5 (diff)
downloadNim-cc60caedb3a1c7043b0f7ef2db5c741ecaa1482f.tar.gz
fixes #14054 [backport:1.2] (#14061)
* fixes #14054

* make tests green again

* more tests are green

* maybe now
Diffstat (limited to 'tests')
-rw-r--r--tests/destructor/tnewruntime_strutils.nim2
-rw-r--r--tests/stdlib/tstrformat.nim31
2 files changed, 32 insertions, 1 deletions
diff --git a/tests/destructor/tnewruntime_strutils.nim b/tests/destructor/tnewruntime_strutils.nim
index 9afb507f7..b0bceb4b5 100644
--- a/tests/destructor/tnewruntime_strutils.nim
+++ b/tests/destructor/tnewruntime_strutils.nim
@@ -37,7 +37,7 @@ bug12899()
 
 proc nonStaticTests =
   doAssert formatBiggestFloat(1234.567, ffDecimal, -1) == "1234.567000"
-  doAssert formatBiggestFloat(1234.567, ffDecimal, 0) == "1235" # bugs 8242, 12586
+  doAssert formatBiggestFloat(1234.567, ffDecimal, 0) == "1235." # bugs 8242, 12586
   doAssert formatBiggestFloat(1234.567, ffDecimal, 1) == "1234.6"
   doAssert formatBiggestFloat(0.00000000001, ffDecimal, 11) == "0.00000000001"
   doAssert formatBiggestFloat(0.00000000001, ffScientific, 1, ',') in
diff --git a/tests/stdlib/tstrformat.nim b/tests/stdlib/tstrformat.nim
index 403372aed..7db001979 100644
--- a/tests/stdlib/tstrformat.nim
+++ b/tests/stdlib/tstrformat.nim
@@ -173,3 +173,34 @@ block:
               y = 234
               z = true
            """
+
+
+# tests from the very own strformat documentation!
+
+let msg = "hello"
+doAssert fmt"{msg}\n" == "hello\\n"
+
+doAssert &"{msg}\n" == "hello\n"
+
+doAssert fmt"{msg}{'\n'}" == "hello\n"
+doAssert fmt("{msg}\n") == "hello\n"
+doAssert "{msg}\n".fmt == "hello\n"
+
+doAssert &"""{"abc":>4}""" == " abc"
+doAssert &"""{"abc":<4}""" == "abc "
+
+doAssert fmt"{-12345:08}" == "-0012345"
+doAssert fmt"{-1:3}" == " -1"
+doAssert fmt"{-1:03}" == "-01"
+doAssert fmt"{16:#X}" == "0x10"
+
+doAssert fmt"{123.456}" == "123.456"
+doAssert fmt"{123.456:>9.3f}" == "  123.456"
+doAssert fmt"{123.456:9.3f}" == "  123.456"
+doAssert fmt"{123.456:9.4f}" == " 123.4560"
+doAssert fmt"{123.456:>9.0f}" == "     123."
+doAssert fmt"{123.456:<9.4f}" == "123.4560 "
+
+doAssert fmt"{123.456:e}" == "1.234560e+02"
+doAssert fmt"{123.456:>13e}" == " 1.234560e+02"
+doAssert fmt"{123.456:13e}" == " 1.234560e+02"