Changeset 8543 for trunk/ippdb/tests

Timestamp:

Aug 23, 2006, 5:13:02 PM (20 years ago)

Author:

jhoblitt

Message:

VERSION 0.0.33

Location:

trunk/ippdb/tests

Files:

• alloc.c (modified) (2 diffs)
• insert.c (modified) (1 diff)
• insertobject.c (modified) (1 diff)
• metadatafromobject.c (modified) (2 diffs)
• objectfrommetadata.c (modified) (2 diffs)
• pop.c (modified) (1 diff)

trunk/ippdb/tests/alloc.c

@@ -1007 +1007 @@
         detStackedImfileRow *object;
 
-        object = detStackedImfileRowAlloc(-32, -32, "a string", "a string", "a string", 64.64, 64.64, 64.64    );
+        object = detStackedImfileRowAlloc(-32, -32, "a string", "a string", "a string", 64.64, 64.64, 64.64, true    );
 
         if (!object) {
@@ -1042 +1042 @@
         }
         if (!object->bg_mean_stdev == 64.64) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (!object->normalize == true) {
             psFree(object);
             exit(EXIT_FAILURE);

trunk/ippdb/tests/insert.c

@@ -388 +388 @@
         }
 
-        if (!detStackedImfileInsert(dbh, -32, -32, "a string", "a string", "a string", 64.64, 64.64, 64.64)) {
+        if (!detStackedImfileInsert(dbh, -32, -32, "a string", "a string", "a string", 64.64, 64.64, 64.64, true)) {
             exit(EXIT_FAILURE);
         }

trunk/ippdb/tests/insertobject.c

@@ -564 +564 @@
         }
 
-        object = detStackedImfileRowAlloc(-32, -32, "a string", "a string", "a string", 64.64, 64.64, 64.64);
+        object = detStackedImfileRowAlloc(-32, -32, "a string", "a string", "a string", 64.64, 64.64, 64.64, true);
         if (!object) {
             exit(EXIT_FAILURE);

trunk/ippdb/tests/metadatafromobject.c

@@ -1210 +1210 @@
         bool            status;
 
-        object = detStackedImfileRowAlloc(-32, -32, "a string", "a string", "a string", 64.64, 64.64, 64.64);
+        object = detStackedImfileRowAlloc(-32, -32, "a string", "a string", "a string", 64.64, 64.64, 64.64, true);
         if (!object) {
             exit(EXIT_FAILURE);
@@ -1251 +1251 @@
         }
         if (!psMetadataLookupF64(&status, md, "bg_mean_stdev") == 64.64) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+        if (!psMetadataLookupBool(&status, md, "normalize") == true) {
             psFree(md);
             exit(EXIT_FAILURE);

trunk/ippdb/tests/objectfrommetadata.c

@@ -1839 +1839 @@
             exit(EXIT_FAILURE);
         }
+        if (!psMetadataAdd(md, PS_LIST_TAIL, "normalize", PS_DATA_BOOL, NULL, true)) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
 
         object = detStackedImfileObjectFromMetadata(md);
@@ -1877 +1881 @@
         }
         if (!object->bg_mean_stdev == 64.64) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (!object->normalize == true) {
             psFree(object);
             exit(EXIT_FAILURE);

trunk/ippdb/tests/pop.c

@@ -558 +558 @@
         psF64           bg_stdev;
         psF64           bg_mean_stdev;
-
-        dbh = psDBInit("localhost", "test", NULL, "test");
-        if (!dbh) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!detStackedImfilePop(dbh, &det_id, &iteration, (char **)&class_id, (char **)&uri, (char **)&recipe, &bg, &bg_stdev, &bg_mean_stdev)) { 
+        bool            normalize;
+
+        dbh = psDBInit("localhost", "test", NULL, "test");
+        if (!dbh) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!detStackedImfilePop(dbh, &det_id, &iteration, (char **)&class_id, (char **)&uri, (char **)&recipe, &bg, &bg_stdev, &bg_mean_stdev, &normalize)) { 
             exit(EXIT_FAILURE);
         }