1 files changed, 75 insertions, 4 deletions
diff --git a/test/test_suite.cpp b/test/test_suite.cpp
index 00e5f48..a113db0 100644
--- a/test/test_suite.cpp
+++ b/test/test_suite.cpp
@@ -346,6 +346,13 @@ TEST_CASE("- flag", "[]" ) {
 
   test::sprintf(buffer, "%0-15d", -42);
   REQUIRE(!strcmp(buffer, "-42            "));
+  
+  test::sprintf(buffer, "%0-15.3e", -42.);
+  REQUIRE(!strcmp(buffer, "-4.200e+01     "));
+  
+  test::sprintf(buffer, "%0-15.3g", -42.);
+  REQUIRE(!strcmp(buffer, "-42.0          "));
+  
 }
 
 
@@ -915,6 +922,15 @@ TEST_CASE("float padding neg numbers", "[]" ) {
   test::sprintf(buffer, "% 5.1f", -5.);
   REQUIRE(!strcmp(buffer, " -5.0"));
   
+  test::sprintf(buffer, "% 6.1g", -5.);
+  REQUIRE(!strcmp(buffer, "    -5"));
+  
+  test::sprintf(buffer, "% 6.1e", -5.);
+  REQUIRE(!strcmp(buffer, "-5.0e+00"));
+  
+  test::sprintf(buffer, "% 10.1e", -5.);
+  REQUIRE(!strcmp(buffer, "  -5.0e+00"));
+  
   // zero padding
   
   test::sprintf(buffer, "%03.1f", -5.);
@@ -925,6 +941,9 @@ TEST_CASE("float padding neg numbers", "[]" ) {
   
   test::sprintf(buffer, "%05.1f", -5.);
   REQUIRE(!strcmp(buffer, "-05.0"));
+  
+  test::sprintf(buffer, "%010.1e", -5.);
+  REQUIRE(!strcmp(buffer, "-005.0e+00"));
       
   // zero padding no decimal point
   
@@ -936,6 +955,12 @@ TEST_CASE("float padding neg numbers", "[]" ) {
   
   test::sprintf(buffer, "%03.0f", -5.);
   REQUIRE(!strcmp(buffer, "-05"));
+  
+  test::sprintf(buffer, "%07.0E", -5.);
+  REQUIRE(!strcmp(buffer, "-05E+00"));
+  
+  test::sprintf(buffer, "%03.0g", -5.);
+  REQUIRE(!strcmp(buffer, "-05"));
 }
 
 TEST_CASE("length", "[]" ) {
@@ -1024,9 +1049,19 @@ TEST_CASE("length", "[]" ) {
 TEST_CASE("float", "[]" ) {
   char buffer[100];
 
-  test::sprintf(buffer, "%.4f", NAN);   // using the NAN macro of math.h
-  REQUIRE(!strcmp(buffer, "nan"));
+  // test special-case floats using math.h macros
+  test::sprintf(buffer, "%8f", NAN);
+  REQUIRE(!strcmp(buffer, "     nan"));
+
+  test::sprintf(buffer, "%8f", INFINITY);
+  REQUIRE(!strcmp(buffer, "     inf"));
 
+  test::sprintf(buffer, "%-8f", -INFINITY);
+  REQUIRE(!strcmp(buffer, "-inf    "));
+
+  test::sprintf(buffer, "%+8e", INFINITY);
+  REQUIRE(!strcmp(buffer, "    +inf"));
+  
   test::sprintf(buffer, "%.4f", 3.1415354);
   REQUIRE(!strcmp(buffer, "3.1415"));
 
@@ -1106,9 +1141,39 @@ TEST_CASE("float", "[]" ) {
   test::sprintf(buffer, "a%-5.1fend", 0.5);
   REQUIRE(!strcmp(buffer, "a0.5  end"));
 
-  // out of range in the moment, need to be fixed by someone
+  test::sprintf(buffer, "%G", 12345.678);
+  REQUIRE(!strcmp(buffer, "12345.7"));
+  
+  test::sprintf(buffer, "%.7G", 12345.678);
+  REQUIRE(!strcmp(buffer, "12345.68"));
+  
+  test::sprintf(buffer, "%.5G", 123456789.);
+  REQUIRE(!strcmp(buffer, "1.2346E+08"));
+  
+  test::sprintf(buffer, "%.6G", 12345.);
+  REQUIRE(!strcmp(buffer, "12345.0"));
+  
+  test::sprintf(buffer, "%+12.4g", 123456789.);
+  REQUIRE(!strcmp(buffer, "  +1.235e+08"));
+  
+  test::sprintf(buffer, "%.2G", 0.001234);
+  REQUIRE(!strcmp(buffer, "0.0012"));
+  
+  test::sprintf(buffer, "%+10.4G", 0.001234);
+  REQUIRE(!strcmp(buffer, " +0.001234"));
+  
+  test::sprintf(buffer, "%+012.4g", 0.00001234);
+  REQUIRE(!strcmp(buffer, "+001.234e-05"));
+  
+  test::sprintf(buffer, "%.3g", -1.2345e-308);
+  REQUIRE(!strcmp(buffer, "-1.23e-308"));
+  
+  test::sprintf(buffer, "%+.3E", 1.23e+308);
+  REQUIRE(!strcmp(buffer, "+1.230E+308"));
+  
+  // out of range for float: should switch to exp notation
   test::sprintf(buffer, "%.1f", 1E20);
-  REQUIRE(!strcmp(buffer, ""));
+  REQUIRE(!strcmp(buffer, "1.0e+20"));
 }
 
 
@@ -1362,6 +1427,12 @@ TEST_CASE("misc", "[]" ) {
   test::sprintf(buffer, "%.*f", 2, 0.33333333);
   REQUIRE(!strcmp(buffer, "0.33"));
 
+  test::sprintf(buffer, "%.*g", 2, 0.33333333);
+  REQUIRE(!strcmp(buffer, "0.33"));
+  
+  test::sprintf(buffer, "%.*e", 2, 0.33333333);
+  REQUIRE(!strcmp(buffer, "3.33e-01"));
+  
   test::sprintf(buffer, "%.*d", -1, 1);
   REQUIRE(!strcmp(buffer, "1"));