Changeset 12607 for trunk/psLib/test/types

Timestamp:

Mar 27, 2007, 12:52:03 PM (19 years ago)

Author:

jhoblitt

Message:

s/is_float/is_float/g
s/is_float_tol/is_float_tol/g
s/is_double/is_double/g
s/is_double_tol/is_double_tol/g
s/is_str/is_str/g
s/is_strn/is_strn/g

Location:

trunk/psLib/test/types

Files:

• tap_psLookupTable_all.c (modified) (1 diff)
• tap_psMetadataConfigFormat.c (modified) (3 diffs)
• tap_psMetadataConfigParse.c (modified) (4 diffs)
• tap_psMetadataConfigPrint.c (modified) (1 diff)
• tap_psMetadataConfigWrite.c (modified) (1 diff)
• tap_psMetadataConfig_input.c (modified) (3 diffs)
• tap_psMetadataItemParse.c (modified) (11 diffs)
• tap_psMetadata_copying.c (modified) (1 diff)
• tap_psMetadata_polynomials.c (modified) (4 diffs)

trunk/psLib/test/types/tap_psLookupTable_all.c

@@ -273 +273 @@
         skip_start(  vec == NULL, 1,
                      "Skipping 1 tests because psLookupTableInterpolateAll failed");
-        ok_double(vec->data.F64[0], 1.0,
+        is_double(vec->data.F64[0], 1.0,
                   "psLookupTableInterpolateAll:     return correct output vector for valid inputs.");
         skip_end();

trunk/psLib/test/types/tap_psMetadataConfigFormat.c

@@ -102 +102 @@
         char configTest[32];
         strncpy(configTest, "time             TAI       NULL", 31);
-        ok_strn(configTest, out, 31,
+        is_strn(configTest, out, 31,
                 "psMetadataConfigFormat:         return correct output string.");
         psFree(time);
@@ -124 +124 @@
         char configTest[62];
         strncpy(configTest, "new_S32 MULTI\nnew_S32          S32       666", 61);
-        ok_strn(configTest, out, strlen(configTest),
+        is_strn(configTest, out, strlen(configTest),
                 "psMetadataConfigFormat:         return correct output string.");
         psFree(out);
@@ -150 +150 @@
                 "\nf32              S32       666              # f32_3"
                 "\nf32              S32       665              # f32_2", 200);
-        ok_strn(configTest, out, strlen(configTest),
+        is_strn(configTest, out, strlen(configTest),
                 "psMetadataConfigFormat:         return correct output string.");
         psFree(out);

trunk/psLib/test/types/tap_psMetadataConfigParse.c

@@ -61 +61 @@
         ok(item->type == PS_TYPE_S32, "return correcot metdataItem type");
         is_int(item->data.S32, 666, "return correct metadataItem data");
-        ok_str(item->name, "new", "return correct metadataItem name");
-        ok_str(item->comment, "", "return correct metadataItem comment");
+        is_str(item->name, "new", "return correct metadataItem name");
+        is_str(item->comment, "", "return correct metadataItem comment");
         skip_end();
 
@@ -81 +81 @@
                 "Skipping 1 tests because metadata container is empty!");
         ok(item->type == PS_DATA_F64, "return correct metadataItem type");
-        ok_float(6.28, item->data.F64, "return correct metadataItem data");
-        ok_str(item->name, "item4", "return correct metadataItem name");
-        ok_str(item->comment, "", "return correct metadataItem comment");
+        is_float(6.28, item->data.F64, "return correct metadataItem data");
+        is_str(item->name, "item4", "return correct metadataItem name");
+        is_str(item->comment, "", "return correct metadataItem comment");
         skip_end();
 
@@ -106 +106 @@
         ok(item->type == PS_TYPE_S8, "metdataItem type");
         is_int(item->data.S8, 3, "metdataItem value");
-        ok_str(item->name, "item8", "return correct metadataItem name");
-        ok_str(item->comment, "", "return correct metadataItem comment");
+        is_str(item->name, "item8", "return correct metadataItem name");
+        is_str(item->comment, "", "return correct metadataItem comment");
         skip_end();
         psFree(md);
@@ -128 +128 @@
         is_int(((psVector*)(item->data.V))->data.U8[0], 1,
                 "return correct metadataItem data (Vector)");
-        ok_str(item->name, "vector6",
+        is_str(item->name, "vector6",
                 "return correct metadataItem name (Vector)");
-        ok_str(item->comment, "I am a vector", "return correct metadataItem comment");
+        is_str(item->comment, "I am a vector", "return correct metadataItem comment");
         skip_end();
 

trunk/psLib/test/types/tap_psMetadataConfigPrint.c

@@ -96 +96 @@
         fread(fileStr2, 1, 31, mdcfg);
 
-        ok_strn(fileStr2, "\nnew S32          S32       666 ", 30,
+        is_strn(fileStr2, "\nnew S32          S32       666 ", 30,
                 "return correct output.");
 

trunk/psLib/test/types/tap_psMetadataConfigWrite.c

@@ -62 +62 @@
         strncpy(configTest,
                 "item1-1          BOOL      T                # I am a boolean", 60);
-        ok_strn(configTest, fileStr, 60,
+        is_strn(configTest, fileStr, 60,
                 "return correct output.");
         fclose(mdcfg);

trunk/psLib/test/types/tap_psMetadataConfig_input.c

@@ -88 +88 @@
         psMetadataItem *item = psMetadataGet(md, PS_LIST_HEAD);
         // XXX shouldn't assume item isn't NULL
-        ok_str(item->name, "item1", "metadataItem name");
+        is_str(item->name, "item1", "metadataItem name");
         ok(item->type == PS_DATA_BOOL, "metadataItem type");
         is_bool(item->data.B, true, "metdataItem value");
-        ok_str(item->comment, "I am a boolean", "metadataItem comment.");
+        is_str(item->comment, "I am a boolean", "metadataItem comment.");
 
         // look at the last item
         item = psMetadataGet(md, PS_LIST_TAIL);
         // XXX shouldn't assume item isn't NULL
-        ok_str(item->name, "M2", "metadataItem name");
+        is_str(item->name, "M2", "metadataItem name");
         ok(item->type == PS_DATA_S32, "metdataItem type");
         is_int(item->data.S32, 666, "metdataItem value");
-        ok_str(item->comment, "this line is \"GOOD\" but parsed in the top level", "metadataItem comment.");
+        is_str(item->comment, "this line is \"GOOD\" but parsed in the top level", "metadataItem comment.");
 
         skip_end();
@@ -123 +123 @@
         // note that item1 gets added to the "tail" of the metdata was it's
         // replaced
-        ok_str(item->name, "item2", "metadataItem name");
+        is_str(item->name, "item2", "metadataItem name");
         ok(item->type == PS_DATA_S32, "metdataItem type");
         is_bool(item->data.S32, 55, "metadataItem value");
-        ok_str(item->comment, "I am int", "metadataItem value");
+        is_str(item->comment, "I am int", "metadataItem value");
 
         // look at the last item
@@ -132 +132 @@
         // XXX shouldn't assume item isn't NULL
         // meta1 is from "the bad section"
-        ok_str(item->name, "meta1", "metadataItem name");
+        is_str(item->name, "meta1", "metadataItem name");
         ok(item->type == PS_DATA_METADATA, "metadataItem type");
 
-        ok_str(item->comment, "", "metadataItem comment");
+        is_str(item->comment, "", "metadataItem comment");
 
         skip_end();

trunk/psLib/test/types/tap_psMetadataItemParse.c

@@ -110 +110 @@
              "psMetadataItem input." );
         //Return 1.666 for string with "1.666"
-        ok_float( psMetadataItemParseF32(itemString2), 1.666,
+        is_float( psMetadataItemParseF32(itemString2), 1.666,
                   "psMetadataItemParse:     return 1.666 in F32 for string-item with "
                   "value '1.666'." );
         //Return 0.0 for F32 value 0.0
-        ok_float( psMetadataItemParseF32(itemF32), 0.0,
+        is_float( psMetadataItemParseF32(itemF32), 0.0,
                   "psMetadataItemParse:     return 0.0 in F32 for F32-item with "
                   "value '0.0'." );
         //Return 0.5 for F64 value 0.5
-        ok_float( psMetadataItemParseF32(itemF64), 0.5,
+        is_float( psMetadataItemParseF32(itemF64), 0.5,
                   "psMetadataItemParse:     return 0.5 in F32 for F64-item with "
                   "value '0.5'." );
         //Return 1.0 for S8 value 1
-        ok_float( psMetadataItemParseF32(itemS8), 1.0,
+        is_float( psMetadataItemParseF32(itemS8), 1.0,
                   "psMetadataItemParse:     return 1.0 in F32 for S8-item with "
                   "value '1'." );
         //Return 0.0 for S16 value 0
-        ok_float( psMetadataItemParseF32(itemS16), 0.0,
+        is_float( psMetadataItemParseF32(itemS16), 0.0,
                   "psMetadataItemParse:     return 0.0 in F32 for S16-item with "
                   "value '0'." );
         //Return 1.0 for S32 value 1
-        ok_float( psMetadataItemParseF32(itemS32), 1.0,
+        is_float( psMetadataItemParseF32(itemS32), 1.0,
                   "psMetadataItemParse:     return 1.0 in F32 for S32-item with "
                   "value '1'." );
         //Return 2.0 for U8 value 2
-        ok_float( psMetadataItemParseF32(itemU8), 2.0,
+        is_float( psMetadataItemParseF32(itemU8), 2.0,
                   "psMetadataItemParse:     return 2.0 in F32 for U8-item with "
                   "value '2'." );
         //Return 0.0 for U16 value 0
-        ok_float( psMetadataItemParseF32(itemU16), 0.0,
+        is_float( psMetadataItemParseF32(itemU16), 0.0,
                   "psMetadataItemParse:     return 0.0 in F32 for U16-item with "
                   "value '0'." );
         //Return 1.0 for U32 value 1
-        ok_float( psMetadataItemParseF32(itemU32), 1.0,
+        is_float( psMetadataItemParseF32(itemU32), 1.0,
                   "psMetadataItemParse:     return 1.0 in F32 for U32-item with "
                   "value '1'." );
@@ -157 +157 @@
              "psMetadataItem input." );
         //Return 1.666 for string with "1.666"
-        ok_double_tol( psMetadataItemParseF64(itemString2), 1.666, 0.00001,
+        is_double_tol( psMetadataItemParseF64(itemString2), 1.666, 0.00001,
                        "psMetadataItemParse:     return 1.666 in F64 for string-item with "
                        "value '1.666'." );
         //Return 0.0 for F32 value 0.0
-        ok_double( psMetadataItemParseF64(itemF32), 0.0,
+        is_double( psMetadataItemParseF64(itemF32), 0.0,
                    "psMetadataItemParse:     return 0.0 in F64 for F32-item with "
                    "value '0.0'." );
         //Return 0.5 for F64 value 0.5
-        ok_double( psMetadataItemParseF64(itemF64), 0.5,
+        is_double( psMetadataItemParseF64(itemF64), 0.5,
                    "psMetadataItemParse:     return 0.5 in F64 for F64-item with "
                    "value '0.5'." );
         //Return 1.0 for S8 value 1
-        ok_double( psMetadataItemParseF64(itemS8), 1.0,
+        is_double( psMetadataItemParseF64(itemS8), 1.0,
                    "psMetadataItemParse:     return 1.0 in F64 for S8-item with "
                    "value '1'." );
         //Return 0.0 for S16 value 0
-        ok_double( psMetadataItemParseF64(itemS16), 0.0,
+        is_double( psMetadataItemParseF64(itemS16), 0.0,
                    "psMetadataItemParse:     return 0.0 in F64 for S16-item with "
                    "value '0'." );
         //Return 1.0 for S32 value 1
-        ok_double( psMetadataItemParseF64(itemS32), 1.0,
+        is_double( psMetadataItemParseF64(itemS32), 1.0,
                    "psMetadataItemParse:     return 1.0 in F64 for S32-item with "
                    "value '1'." );
         //Return 2.0 for U8 value 2
-        ok_double( psMetadataItemParseF64(itemU8), 2.0,
+        is_double( psMetadataItemParseF64(itemU8), 2.0,
                    "psMetadataItemParse:     return 2.0 in F64 for U8-item with "
                    "value '2'." );
         //Return 0.0 for U16 value 0
-        ok_double( psMetadataItemParseF64(itemU16), 0.0,
+        is_double( psMetadataItemParseF64(itemU16), 0.0,
                    "psMetadataItemParse:     return 0.0 in F64 for U16-item with "
                    "value '0'." );
         //Return 1.0 for U32 value 1
-        ok_double( psMetadataItemParseF64(itemU32), 1.0,
+        is_double( psMetadataItemParseF64(itemU32), 1.0,
                    "psMetadataItemParse:     return 1.0 in F64 for U32-item with "
                    "value '1'." );
@@ -448 +448 @@
         //Return "true" for STRING of value "true"
         psString tempString = psMetadataItemParseString(itemString1);
-        ok_strn( tempString, "true", 6,
+        is_strn( tempString, "true", 6,
                  "psMetadataItemParse:    return 'true' in STRING for STRING with "
                  "value 'true'." );
@@ -455 +455 @@
         //Return 0.000000 for F32 of value 0.000000
         tempString = psMetadataItemParseString(itemF32);
-        ok_strn( tempString, "0.000000", 4,
+        is_strn( tempString, "0.000000", 4,
                  "psMetadataItemParse:    return '0.000000' in STRING for F32 with "
                  "value '0.000000'.   (actual result=%s)", tempString);
@@ -462 +462 @@
         //Return 0.500000 for F64 value 0.5
         tempString = psMetadataItemParseString(itemF64);
-        ok_strn( tempString, "0.500000", 10,
+        is_strn( tempString, "0.500000", 10,
                  "psMetadataItemParse:    return '0.500000' in STRING for F64 with "
                  "value '0.5'.   (actual result=%s)", tempString);
@@ -469 +469 @@
         //Return 1 for S8 value 1
         tempString = psMetadataItemParseString(itemS8);
-        ok_strn( tempString, "1", 3,
+        is_strn( tempString, "1", 3,
                  "psMetadataItemParse:    return '1' in STRING for S8 with "
                  "value '1'.   (actual result=%s)", tempString);
@@ -476 +476 @@
         //Return 0 for S16 value 0
         tempString = psMetadataItemParseString(itemS16);
-        ok_strn( tempString, "0", 3,
+        is_strn( tempString, "0", 3,
                  "psMetadataItemParse:    return '0' in STRING for S8 with "
                  "value '0'.   (actual result=%s)", tempString);
@@ -483 +483 @@
         //Return 1 for S32 value 1
         tempString = psMetadataItemParseString(itemS32);
-        ok_strn( tempString, "1", 3,
+        is_strn( tempString, "1", 3,
                  "psMetadataItemParse:    return '1' in STRING for S8 with "
                  "value '1'.   (actual result=%s)", tempString);
@@ -490 +490 @@
         //Return 2 for U8 value 2
         tempString = psMetadataItemParseString(itemU8);
-        ok_strn( tempString, "2", 3,
+        is_strn( tempString, "2", 3,
                  "psMetadataItemParse:    return '2' in STRING for S8 with "
                  "value '2'.   (actual result=%s)", tempString);
@@ -497 +497 @@
         //Return 0 for U16 value 0
         tempString = psMetadataItemParseString(itemU16);
-        ok_strn( tempString, "0", 3,
+        is_strn( tempString, "0", 3,
                  "psMetadataItemParse:    return '0' in STRING for S8 with "
                  "value '0'.   (actual result=%s)", tempString);
@@ -504 +504 @@
         //Return 1 for U32 value 1
         tempString = psMetadataItemParseString(itemU32);
-        ok_strn( tempString, "1", 3,
+        is_strn( tempString, "1", 3,
                  "psMetadataItemParse:    return '1' in STRING for S8 with "
                  "value '1'.   (actual result=%s)", tempString);

trunk/psLib/test/types/tap_psMetadata_copying.c

@@ -221 +221 @@
 
         ok(copy->type == PS_DATA_S64, "item type");
-        ok_str(copy->name, "itemS64", "item name");
+        is_str(copy->name, "itemS64", "item name");
         is_long(copy->data.S64, 4, "item data");
-        ok_str(copy->comment, "", "item comment");
+        is_str(copy->comment, "", "item comment");
 
         psFree(copy);

trunk/psLib/test/types/tap_psMetadata_polynomials.c

@@ -69 +69 @@
         ok(status,
            "psPolynomial1DtoMetadata:      found VAL_X00");
-        ok_double(val, 1.1,
+        is_double(val, 1.1,
                   "psPolynomial1DtoMetadata:      VAL_X00 is %lf", val);
 
@@ -75 +75 @@
         ok(status,
            "psPolynomial1DtoMetadata:      found VAL_X01");
-        ok_double(val, 2.2,
+        is_double(val, 2.2,
                   "psPolynomial1DtoMetadata:      VAL_X01 is %lf", val);
         skip_end();
@@ -278 +278 @@
         ok(status,
            "psPolynomial2DtoMetadata:     found VAL_X00_Y00");
-        ok_double(val, 1.1,
+        is_double(val, 1.1,
                   "psPolynomial2DtoMetadata:     VAL_X00_Y00 is %lf", val);
 
@@ -284 +284 @@
         ok(status,
            "psPolynomial2DtoMetadata:     found VAL_X01_Y01");
-        ok_double(val, 4.4,
+        is_double(val, 4.4,
                   "psPolynomial2DtoMetadata:     VAL_X01_Y01 is %lf", val);