fix/add DBGetIndex tests

LLNL · Jul 30, 2024 · 5caa18e · 5caa18e
1 parent f5f2d18
commit 5caa18e
Showing 1 changed file with 34 additions and 23 deletions.
diff --git a/tests/namescheme.c b/tests/namescheme.c
@@ -64,6 +64,7 @@ be used for advertising or product endorsement purposes.
 #include <silo.h>
 #include <std.c>
 #include <string.h>
+#include <limits.h>
 
 #define TEST_GET_NAME(NS,I,EXP)                                                                            \
 if (!NS)                                                                                                   \
@@ -81,20 +82,13 @@ else
     }                                                                                                      \
 }
 
-#define TEST_GET_INDEX(NS,I,IND)                                                                           \
-if (!NS)                                                                                                   \
+/* Uses a hard-coded min field width of 3 */
+#define TEST_GET_INDEX(STR, FLD, BASE, EXP)                                                                \
+if (DBGetIndex(STR, FLD, 3, BASE) != (long long) EXP)                                                      \
 {                                                                                                          \
-    fprintf(stderr, "Got NULL namescheme from DBMakeNamescheme at line %d\n", __LINE__);                   \
+    fprintf(stderr, "DBGetIndex() at line %d failed for field %d of \"%s\". Expected %lld, got %lld\n",    \
+        __LINE__, FLD, STR, (long long) EXP, DBGetIndex(STR,FLD,3,BASE));                                  \
     return 1;                                                                                              \
-}                                                                                                          \
-else                                                                                                       \
-{                                                                                                          \
-    if (DBGetIndex(NS, I) != IND)                                                                          \
-    {                                                                                                      \
-        fprintf(stderr, "DBGetIndex() at line %d failed for field %d of \"%s\". Expected %lld, got %lld\n",\
-            __LINE__, FLD, STR, (long long) IND, DBGetIndex(STR,FLD,BASE));                                \
-        return 1;                                                                                          \
-    }                                                                                                      \
 }
 
 #define TEST_STR(A,B)                                                                                      \
@@ -412,11 +406,11 @@ int main(int argc, char **argv)
 
     /* Test using namescheme as a simple integer mapping */
     ns = DBMakeNamescheme("|chemA_%04X|n%3");
-    TEST_GET_INDEX(ns, 0, 0);
-    TEST_GET_INDEX(ns, 1, 1);
-    TEST_GET_INDEX(ns, 2, 2);
-    TEST_GET_INDEX(ns, 3, 0);
-    TEST_GET_INDEX(ns, 4, 1);
+    TEST_GET_INDEX(DBGetName(ns, 0), 0, 0, 0);
+    TEST_GET_INDEX(DBGetName(ns, 1), 0, 0, 1);
+    TEST_GET_INDEX(DBGetName(ns, 2), 0, 0, 2);
+    TEST_GET_INDEX(DBGetName(ns, 3), 0, 0, 0);
+    TEST_GET_INDEX(DBGetName(ns, 4), 0, 0, 1);
     DBFreeNamescheme(ns);
 
     /* simple offset by -2 mapping */
@@ -430,10 +424,10 @@ int main(int argc, char **argv)
 
     /* Get different fields as indices from nameschemed strings */
     ns = DBMakeNamescheme("|foo_%03d_%03d|n/5|n%5");
-    TEST_GET_INDEX(DBGetName(ns,0), 0, 0, 0);
-    TEST_GET_INDEX(DBGetName(ns,0), 1, 0, 0);
-    TEST_GET_INDEX(DBGetName(ns,18), 0, 2, 0);
-    TEST_GET_INDEX(DBGetName(ns,18), 1, 3, 0);
+    TEST_GET_INDEX(DBGetName(ns,0),  0, 0, 0);
+    TEST_GET_INDEX(DBGetName(ns,0),  1, 0, 0);
+    TEST_GET_INDEX(DBGetName(ns,18), 0, 0, 3);
+    TEST_GET_INDEX(DBGetName(ns,17), 1, 0, 2);
     DBFreeNamescheme(ns);
 
     /* Case where index is bigger than an int */
@@ -442,13 +436,30 @@ int main(int argc, char **argv)
     TEST_GET_INDEX(DBGetName(ns,0x7FFFFFFFF), 0, 0, 0x7FFFFFFFF); /* make sure another `F` works */
     DBFreeNamescheme(ns);
 
+    /* Test inferring base 2 (binary, leading '0b') */
+    TEST_GET_INDEX("block_0b0101", 0, 0, 5);
+    TEST_GET_INDEX("block_0b0101_0b1100", 1, 0, 12);
+
+    /* Test inferring base 8 (octal, leading '0') */
+    TEST_GET_INDEX("slice1_035", 0, 0, 29);
+
+    /* Test non-standard base 5 */
+    TEST_GET_INDEX("VisIt_docs_section_0002_chapter_1234", 1, 5, 194);
+
+    /* Test negative values */
+    TEST_GET_INDEX("block_-0b0101", 0, 0, -5);
+
+    /* Test some cases that could lead to error */
+    TEST_GET_INDEX("block_0b0", 1, 0, LLONG_MAX);
+    TEST_GET_INDEX("block_+", 1, 0, LLONG_MAX);
+    TEST_GET_INDEX("block_0x", 1, 0, LLONG_MAX);
+    TEST_GET_INDEX("VisIt_docs_section_0002_chapter_1234", 5, 5, LLONG_MAX);
+
     /* Test the convenience method, DBSPrintf */
-#if 0
     snprintf(teststr, sizeof(teststr), "%s, %s",
         DBSPrintf("block_%d,level_%04d", 505, 17),
         DBSPrintf("side_%s_%cx%g", "master",'z',1.0/3));
     TEST_STR(teststr, "block_505,level_0017, side_master_zx0.333333")
-#endif
 
     /* Test case where fewer expressions that conversion specs */
     ns = DBMakeNamescheme("|/domain_%03d/laser_beam_power_%d|n/1|");