Changeset 24849

Timestamp:

Jul 17, 2009, 4:39:47 PM (17 years ago)

Author:

giebink

Message:

Added a constructor for dummyConceptCopier, an arg for the pmSpecAlloc() test

File:

• trunk/psModules/test/concepts/tap_pmConcepts.c (modified) (4 diffs)

trunk/psModules/test/concepts/tap_pmConcepts.c

@@ -77 +77 @@
 }
 
+psMetadataItem *dummyConceptCopier(
+    const psMetadataItem *source,
+    const psMetadataItem *target,
+    const psMetadata *cameraFormat,
+    const pmFPA *fpa,
+    const pmChip *chip,
+    const pmCell *cell)
+{
+    if (target == NULL ||
+        source == PM_CONCEPT_SOURCE_NONE ||
+        cameraFormat == NULL ||
+        fpa == NULL ||
+        chip == NULL ||
+        cell == NULL) {
+        printf("dummyConceptCopier() args are NULL\n");
+    }
+    return(NULL);
+}
 
 int main(int argc, char* argv[])
@@ -92 +110 @@
         psMetadataItem *blank = psMetadataItemAlloc("myItem1", PS_DATA_BOOL, "I am a boolean", true);
         pmConceptSpec *tmp = pmConceptSpecAlloc(blank, dummyConceptParser,
-            dummyConceptFormatter, true);
+            dummyConceptFormatter, dummyConceptCopier, true);
         ok(tmp != NULL, "pmConceptSpecAlloc() returned non-NULL");
         skip_start(tmp == NULL, 4, "Skipping tests because pmConceptSpecAlloc() returned NULL");
@@ -98 +116 @@
         ok(tmp->parse == dummyConceptParser, "pmConceptSpecAlloc() set the ->parse member correctly");
         ok(tmp->format == dummyConceptFormatter, "pmConceptSpecAlloc() set the ->format member correctly");
+        ok(tmp->copy == dummyConceptCopier, "pmConceptSpecAlloc() set the ->copy member correctly");
         ok(tmp->required == true, "pmConceptSpecAlloc() set the ->required member correctly");
         skip_end();
@@ -109 +128 @@
     {
         psMemId id = psMemGetId();
-        pmConceptSpec *tmp = pmConceptSpecAlloc(NULL, NULL, NULL, false);
+        pmConceptSpec *tmp = pmConceptSpecAlloc(NULL, NULL, NULL, NULL, false);
         ok(tmp != NULL, "pmConceptSpecAlloc() returned non-NULL with NULL inputs");
         psFree(tmp);