You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by fi...@apache.org on 2010/07/21 18:58:33 UTC

svn commit: r966314 [34/41] - in /incubator/etch/branches/etch-c: ./ binding-c/ binding-c/compiler/ binding-c/compiler/src/ binding-c/compiler/src/main/ binding-c/compiler/src/main/java/ binding-c/compiler/src/main/java/org/ binding-c/compiler/src/main...

Added: incubator/etch/branches/etch-c/binding-c/runtime/c/src/test/transport/test_messagizer.c
URL: http://svn.apache.org/viewvc/incubator/etch/branches/etch-c/binding-c/runtime/c/src/test/transport/test_messagizer.c?rev=966314&view=auto
==============================================================================
--- incubator/etch/branches/etch-c/binding-c/runtime/c/src/test/transport/test_messagizer.c (added)
+++ incubator/etch/branches/etch-c/binding-c/runtime/c/src/test/transport/test_messagizer.c Wed Jul 21 16:58:23 2010
@@ -0,0 +1,1762 @@
+/* $Id$ 
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
+ * contributor license agreements. See the NOTICE file distributed with  
+ * this work for additional information regarding copyright ownership. 
+ * The ASF licenses this file to you under the Apache License, Version  
+ * 2.0 (the "License"); you may not use this file except in compliance  
+ * with the License. You may obtain a copy of the License at 
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0 
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and 
+ * limitations under the License. 
+ */ 
+
+/*
+ * test_messagizer.c 
+ */
+#include "etch_runtime.h"
+#include "etch_messagizer.h"  
+#include "etch_default_value_factory.h"
+#include "etch_thread.h"
+#include "etch_map.h"
+#include "etch_log.h"
+#include "etch_exception.h"
+#include "etch_objecttypes.h"
+#include "etch_general.h"
+#include "etch_mem.h"
+
+#include <stdio.h>
+#include "CUnit.h"
+
+#define IS_DEBUG_CONSOLE FALSE
+
+// extern types
+extern apr_pool_t* g_etch_main_pool;
+
+/* - - - - - - - - - - - - - - 
+ * unit test infrastructure
+ * - - - - - - - - - - - - - -
+ */
+static int init_suite(void)
+{
+    etch_status_t etch_status = ETCH_SUCCESS;
+
+    etch_status = etch_runtime_initialize(NULL);
+    if(etch_status != NULL) {
+        // error
+    }
+    return 0;
+}
+
+static int clean_suite(void)
+{
+    etch_runtime_shutdown();
+    return 0;
+}
+
+/* - - - - - - - - - - - - - - 
+ * unit test support
+ * - - - - - - - - - - - - - -
+ */
+typedef struct test_value_factory test_value_factory;
+
+static etch_messagizer*        g_my_messagizer;
+static i_transportpacket*      g_my_transportpacket;
+static i_sessionmessage*       g_my_sessionmessage; 
+static etch_flexbuffer*        g_flexbuffer;
+static etch_resources*         g_my_resources;
+static vf_idname_map*          g_type_map;
+static class_to_type_map*      g_class_to_type_map;
+static etch_who*               g_who;
+static default_value_factory*  g_my_vf;
+static test_value_factory*     g_my_test_vf;
+static int g_which_valuefactory;
+
+static unsigned short CLASSID_MY_VF;
+static unsigned short CLASSID_MY_VF_VTAB;
+static unsigned short CLASSID_MY_VF_IMPL;
+static unsigned short CLASSID_MY_IMPL_TP;
+static unsigned short CLASSID_MY_IMPL_SM;
+#define OBJTYPE_MY_IMPL_TP 0x5170
+#define OBJTYPE_MY_IMPL_SM 0x5171
+
+#define is_my_impl_tp(x) (x && ((etch_object*)x)->obj_type == OBJTYPE_MY_IMPL_TP) 
+#define is_my_impl_sm(x) (x && ((etch_object*)x)->obj_type == OBJTYPE_MY_IMPL_SM) 
+
+#define THISTEST_HEADERSIZE 8
+#define TAGDATA_VERSION     3
+#define TYPECODE_EOD_MARK   (-127)
+#define THISTEST_WHO_VALUE 0x5151
+#define WHICHVF_TESTVF 1
+#define WHICHVF_MYVF   2
+#define FAKEID_TYPE_ADD         1 
+#define FAKEID_TYPE_ADD_RESULT  2 
+#define FAKEID_FIELD_X          3 
+#define FAKEID_FIELD_Y          4
+#define FAKEID_FIELD_RESULT     5
+
+static default_value_factory* get_current_valuefactory()
+{
+    if (g_my_test_vf) return (default_value_factory*) g_my_test_vf;
+    if (g_my_vf)      return g_my_vf;  
+    return NULL; 
+}
+
+typedef enum etch_what
+{ WHAT_NONE, 
+  TRANSPORT_PACKET, TRANSPORT_QUERY, TRANSPORT_CONTROL, TRANSPORT_NOTIFY,
+  SESSION_MESSAGE,  SESSION_QUERY,   SESSION_CONTROL,   SESSION_NOTIFY
+} etch_what;
+
+
+static int is_equal_who(etch_who* who1, etch_who* who2)
+{
+    int n1 = 0, n2 = 0;
+    if (!who1 || !who2) return FALSE;
+    if (((etch_object*)who1)->class_id != CLASSID_WHO || ((etch_object*)who2)->class_id != CLASSID_WHO) return FALSE;
+    if (!who1->value  || !who2->value) return FALSE;
+    if (!is_etch_int32(who1->value) || !is_etch_int32(who2->value)) return FALSE;
+    n1 = ((etch_int32*)who1->value)->value;
+    n2 = ((etch_int32*)who2->value)->value;
+    return n1 == n2;
+}
+
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+ * my_impl_transportpacket (i_transportpacket implementation) 
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+ */
+
+/**
+ * my_impl_transportpacket
+ * test object implementing i_transportpacket
+ */
+typedef struct my_impl_transportpacket
+{
+    etch_object object;
+
+    /* i_transportpacket interface and methods, plus original destructor
+     * which becomes replaced with a custom destructor to destroy this
+     * object. this is the model for destroying an interface wrapper object
+     * when we do not save and pass around a pointer to the wrapper, but rather
+     * a pointer to the interface. the interface in question, i_transportpacket
+     * in this case, contains a pointer to the wrapper object, in this case a
+     * my_impl_transportpacket*. when the interface is instantiated, its original 
+     * destructor is saved, and is replaced with a destructor which invokes
+     * the wrapper's destructor. the wrapper destructor must then know to 
+     * invoke the interface's original destructor when destroying the interface.
+     */
+    i_transportpacket* ixp;       /* owned */ 
+    etch_object_destructor destroy_transportpacket;  /* i_transportpacket original destructor */
+    etch_transport_packet transport_packet;        /* transport_packet() */
+    etch_transport_packet_headersize  header_size; /* header_size() */
+
+    i_sessionpacket* session;     /* not owned */
+
+    etch_who*       recipient;    /* not owned */
+    etch_what       what;          
+    size_t          bufcount;  
+    char*           buf;          /* owned */    
+    etch_object*    query;        /* owned */
+    etch_object*    query_result; /* owned */
+    etch_object*    control;      /* owned */
+    etch_object*    value;        /* owned */
+    etch_object*    eventx;       /* owned */
+
+} my_impl_transportpacket;
+
+
+/**
+ * destroy_my_impl_transportpacket()
+ * my_impl_transportpacket destructor
+ */
+static int destroy_my_impl_transportpacket(void* data)
+{
+    my_impl_transportpacket* thisx = (my_impl_transportpacket*)data;
+    assert(is_my_impl_tp(thisx));
+
+    if (!is_etchobj_static_content(thisx))
+    {       /* invoke original i_transportpacket destructor */
+        if (thisx->ixp && thisx->destroy_transportpacket)   
+            thisx->destroy_transportpacket(thisx->ixp);
+
+        if (thisx->buf)
+            etch_free(thisx->buf);
+
+        
+        etch_object_destroy(thisx->query);
+        etch_object_destroy(thisx->query_result);
+        etch_object_destroy(thisx->control);
+        etch_object_destroy(thisx->value);
+        etch_object_destroy(thisx->eventx);
+    }
+
+   return destroy_objectex((etch_object*) thisx);
+}
+
+
+/**
+ * impl_transport_packet()
+ * my_impl_transportpacket::transport_packet
+ * @param whoto caller retains, can be null
+ * @param fbuf caller retains
+ */
+static int impl_transport_packet (my_impl_transportpacket* mytp, etch_who* whoto, etch_flexbuffer* fbuf)
+{
+    CU_ASSERT_FATAL(is_my_impl_tp(mytp));
+    mytp->what      = TRANSPORT_PACKET;
+    mytp->recipient = whoto;   
+    /* retrieve the packet data. don't skip over header (0 is skip bytes) */
+    mytp->buf = (char*)etch_flexbuf_get_allfrom(fbuf, 0, &mytp->bufcount); 
+    return 0;
+}
+
+
+/**
+ * my_transport_control()
+ * my_impl_transportpacket::itransport::transport_control 
+ */
+static int my_transport_control (my_impl_transportpacket* mytp, etch_object* control, etch_object* value)
+{
+    CU_ASSERT_FATAL(is_my_impl_tp(mytp));
+    mytp->what    = TRANSPORT_CONTROL;
+    mytp->control = control;
+    mytp->value   = value;
+    return 0;
+}
+
+
+/**
+ * my_transport_notify()
+ * my_impl_transportpacket::itransport::transport_notify 
+ */
+static int my_transport_notify (my_impl_transportpacket* mytp, etch_object* evt)
+{
+    CU_ASSERT_FATAL(is_my_impl_tp(mytp)); 
+    mytp->what   = TRANSPORT_NOTIFY;
+    mytp->eventx = evt;
+    return 0;
+}
+
+
+/**
+ * my_transport_query()
+ * my_impl_transportpacket::itransport::transport_query 
+ */
+static etch_object* my_transport_query (my_impl_transportpacket* mytp, etch_object* query) 
+{
+    etch_object* resultobj = NULL;
+    CU_ASSERT_FATAL(is_my_impl_tp(mytp));
+    resultobj = mytp->query_result; /* set artificially in test */
+    mytp->what  = TRANSPORT_QUERY;
+    mytp->query = query;
+    mytp->query_result = NULL;
+    return (etch_object*) resultobj;  /* caller owns */
+}
+
+
+/**
+ * my_transport_get_session()
+ * my_impl_transportpacket::itransport::get_session 
+ */
+static i_sessionpacket* my_transport_get_session(my_impl_transportpacket* mytp)
+{
+    CU_ASSERT_FATAL(is_my_impl_tp(mytp));
+    return mytp->session;
+}
+
+
+/**
+ * my_transport_set_session()
+ * my_impl_transportpacket::itransport::set_session
+ */
+static void my_transport_set_session(my_impl_transportpacket* mytp, i_sessionpacket* session)
+{   
+    CU_ASSERT_FATAL(is_my_impl_tp(mytp));
+    CU_ASSERT_FATAL(is_etch_sessionpacket(session));
+    mytp->session = session;
+}
+
+
+/*
+ * destroy_my_transportpacket()
+ * i_transportpacket destructor
+ * this destructor will destroy its parent (my_impl_transportpacket), 
+ * which will in turn destroy this object.
+ */
+static int destroy_my_transportpacket(void* data)
+{
+    i_transportpacket* itp = (i_transportpacket*)data;
+    my_impl_transportpacket* mytp = NULL;
+    assert(is_etch_transportpkt(itp));
+
+    mytp = itp->thisx;  
+    assert(is_my_impl_tp(mytp));
+
+    etch_object_destroy(mytp);
+
+    return 0;
+}
+
+
+/**
+ * new_my_impl_transportpacket()
+ * my_impl_transportpacket constructor
+ */
+static my_impl_transportpacket* new_my_impl_transportpacket()
+{
+    i_transportpacket* itp  = NULL;
+    i_transport* itransport = NULL;
+    /* this is a model for dynamic class ID assigment */
+    unsigned short class_id = get_dynamic_classid_unique(&CLASSID_MY_IMPL_TP);
+
+    my_impl_transportpacket* mytp = (my_impl_transportpacket*) new_object
+      (sizeof(my_impl_transportpacket), OBJTYPE_MY_IMPL_TP, class_id);
+
+    ((etch_object*)mytp)->destroy = destroy_my_impl_transportpacket;
+
+    itransport = new_transport_interface_ex(mytp,
+        (etch_transport_control)     my_transport_control, 
+        (etch_transport_notify)      my_transport_notify, 
+        (etch_transport_query)       my_transport_query,
+        (etch_transport_get_session) my_transport_get_session, 
+        (etch_transport_set_session) my_transport_set_session);
+
+    itp = new_transportpkt_interface(mytp, (void*)impl_transport_packet, itransport);
+
+    /* default header_size() will return this value so no need to override */
+    itp->header_size = THISTEST_HEADERSIZE; 
+
+    /* save off i_transportpacket destructor */
+    mytp->destroy_transportpacket = ((etch_object*)itp)->destroy;
+
+    /* replace i_transportpacket destructor with one which will destroy this object */
+    ((etch_object*)itp)->destroy = destroy_my_transportpacket;
+
+    /* g_my_transportpacket will get set to this interface */
+    mytp->ixp = itp;  
+
+    return mytp;
+}
+
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+ * my_impl_sessionmessage (i_sessionmessage implementation) 
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+ */
+
+/**
+ * my_impl_sessionmessage
+ * test object implementing i_sessionmessage
+ */
+typedef struct my_impl_sessionmessage
+{
+    etch_object object;
+    /*
+     * i_sessionmessage interface and methods, plus original destructor
+     * which becomes replaced with a custom destructor to destroy this
+     * object. this is the model for destroying an interface wrapper object
+     * when we do not save and pass around a pointer to the wrapper, but rather
+     * a pointer to the interface. the interface in question, i_sessionmessage
+     * in this case, contains a pointer to the wrapper object, in this case a
+     * my_impl_sessionmessage*. when the interface is instantiated, its original 
+     * destructor is saved, and is replaced with a destructor which invokes
+     * the wrapper's destructor. the wrapper destructor must then know to 
+     * invoke the interface's original destructor when destroying the interface.
+     */
+    i_sessionmessage* ism;          /* owned */
+    etch_object_destructor destroy_sessionmessage; /* i_sessionmessage original destructor */
+    etch_session_message session_message;  /* session_message() method */
+
+    etch_what       what;
+    etch_who*       sender;         /* not owned */
+    etch_message*   msg;            /* not owned */
+    int             is_msg_handled;
+    etch_object*    query;          /* owned */
+    etch_object*    query_result;   /* owned */
+    etch_object*    control;        /* owned */
+    etch_object*    value;          /* owned */
+    etch_object*    eventx;         /* owned */
+
+    i_sessionpacket* session;
+
+} my_impl_sessionmessage;
+
+
+
+/**
+ * destroy_my_impl_sessionmessage()
+ * my_impl_sessionmessage destructor
+ */
+static int destroy_my_impl_sessionmessage(void* data)
+{
+    
+    my_impl_sessionmessage* thisx = (my_impl_sessionmessage*)data;
+    if (!is_etchobj_static_content(thisx))
+    {       /* invoke original i_sessionmessage destructor */
+        if (thisx->ism && thisx->destroy_sessionmessage)
+            thisx->destroy_sessionmessage(thisx->ism);
+
+        /* these are objects which would be destroyed in the binding 
+         * by the last method to touch them */
+        etch_object_destroy(thisx->msg);
+
+        etch_object_destroy(thisx->query);
+
+        etch_object_destroy(thisx->query_result);
+
+        etch_object_destroy(thisx->control);
+
+        etch_object_destroy(thisx->value);
+
+        etch_object_destroy(thisx->eventx);
+    }
+
+   return destroy_objectex((etch_object*) thisx);
+}
+
+
+/**
+ * impl_session_message()
+ * my_impl_sessionmessage::ism::session_message.
+ * @param whofrom caller retains, can be null.
+ * @param msg caller abandons
+ */
+static int impl_session_message (my_impl_sessionmessage* mysm, etch_who* whofrom, etch_message* msg)
+{
+    CU_ASSERT_FATAL(is_my_impl_sm(mysm));
+    mysm->what = SESSION_MESSAGE;
+
+    /* in this emulation we are the session consuming a message. if successful, 
+     * (i.e., the message is handled), the binding will eventually destroy the 
+     * message (the caller relinquishes message memory), and the who object.
+     * if not successful (message not handled) the caller retains message and 
+     * who memory in order to forward the message and who somewhere else
+     * (as an unwanted message). so we model that here: if the message is not 
+     * handled (a manual switch in these tests), we do not save references to
+     * the messaqe and who for cleanup, because the unwanted message, containing
+     * these objects, will be cleaned up instead. 
+     */
+    if (mysm->is_msg_handled)
+    {   
+        mysm->msg = msg;
+        mysm->sender = whofrom;
+        return 0;
+    }
+    
+    mysm->msg = NULL;
+    mysm->sender = NULL;
+    return -1;
+}
+
+
+/**
+ * my_session_control()
+ * my_impl_sessionmessage::ism::isession::session_control 
+ * control and value are always abandoned by caller so mysm must clean them up.
+ */
+static int my_session_control (my_impl_sessionmessage* mysm, etch_object* control, etch_object* value)
+{
+    CU_ASSERT_FATAL(is_my_impl_sm(mysm));
+    mysm->what    = SESSION_CONTROL;
+    mysm->control = control;
+    mysm->value   = value;
+    return 0;
+}
+
+
+/**
+ * my_session_notify()
+ * my_impl_sessionmessage::ism::isession::session_notify 
+ * evt is always abandoned by caller so mysm must clean it up.
+ */
+static int my_session_notify (my_impl_sessionmessage* mysm, etch_object* evt)
+{
+    CU_ASSERT_FATAL(is_my_impl_sm(mysm));
+    mysm->what   = SESSION_NOTIFY;
+    mysm->eventx = evt;
+    return 0;
+}
+
+
+/**
+ * my_session_query()
+ * my_impl_sessionmessage::ism::isession::session_query 
+ * query is always abandoned by caller so mysm must clean it up.
+ */
+static etch_object* my_session_query (my_impl_sessionmessage* mysm, etch_object* query) 
+{
+    etch_object* resultobj = NULL;
+    CU_ASSERT_FATAL(is_my_impl_sm(mysm));
+    resultobj   = mysm->query_result; /* artifically set in test */
+    mysm->what  = SESSION_QUERY;
+    mysm->query = query;
+    mysm->query_result = NULL;
+    return (etch_object*) resultobj; /* caller owns */
+}
+
+
+/*
+ * destroy_my_sessionmessage()
+ * i_sessionmessage destructor
+ * this destructor will destroy its parent (my_impl_sessionmessage), 
+ * which will in turn destroy this object.
+ */
+static int destroy_my_sessionmessage(void* data)
+{
+    i_sessionmessage* ism = (i_sessionmessage*)data;
+    my_impl_sessionmessage* mysm = NULL;
+    if (NULL == ism) return -1;
+
+    mysm = ism->thisx;  
+
+    etch_object_destroy(mysm);
+
+    return 0;
+}
+
+
+/**
+ * new_my_impl_sessionmessage()
+ * my_impl_sessionmessage constructor
+ */
+static my_impl_sessionmessage* new_my_impl_sessionmessage()
+{
+    i_sessionmessage* ism  = NULL;
+    i_session* isession = NULL;
+    /* this is a model for dynamic class ID assigment */
+    unsigned short class_id = CLASSID_MY_IMPL_SM? CLASSID_MY_IMPL_SM: 
+        (CLASSID_MY_IMPL_SM = get_dynamic_classid());
+
+    my_impl_sessionmessage* mysm = (my_impl_sessionmessage*) new_object
+      (sizeof(my_impl_sessionmessage), OBJTYPE_MY_IMPL_SM, class_id);
+
+    ((etch_object*)mysm)->destroy = destroy_my_impl_sessionmessage;
+
+    isession = new_session_interface(mysm,
+        (etch_session_control)     my_session_control, 
+        (etch_session_notify)      my_session_notify, 
+        (etch_session_query)       my_session_query);
+
+    ism = new_sessionmsg_interface(mysm, (void*)impl_session_message, isession);
+
+    /* save off i_sessionmessage destructor */
+    mysm->destroy_sessionmessage = ((etch_object*)ism)->destroy;
+
+    /* custom destructor will destroy the my_impl_sessionmessage */
+    ((etch_object*)ism)->destroy = destroy_my_sessionmessage;
+
+    /* g_my_sessionmessage will get set to this interface */
+    mysm->ism = ism;  
+
+    return mysm;
+}
+
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+ * test value factories
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+ */
+
+/**
+ * test_value_factory
+ * value factory version 1
+ * this version uses inherited data coded into the object, as opposed to 
+ * instantiating an impl object to contain inherited data and methods.
+ */
+//typedef struct test_value_factory
+struct test_value_factory
+{
+    etch_object object;
+    /* - - - - - - - - - - - - - 
+     * default value factory  
+     * - - - - - - - - - - - - - 
+     */
+    etch_object* impl;
+
+    class_to_type_map* class_to_type;
+    vf_idname_map*  types;  
+    etch_arraylist* mixins;
+  
+    unsigned char is_own_types;
+    unsigned char is_own_class_to_type;
+
+    /* - - - - - - - - - - - - - 
+     * test value factory  
+     * - - - - - - - - - - - - - 
+     */
+    etch_type*    mt_add;
+    etch_type*    mt_add_result;
+    etch_field*   mf_x;
+    etch_field*   mf_y;
+    etch_field*   mf_result;
+};
+//} test_value_factory;
+
+
+/**
+ * destroy_test_value_factory()
+ * destructor for value factory version 1 
+ */
+static int destroy_test_value_factory(void* data)
+{
+    test_value_factory* vf = (test_value_factory*)data;
+    if (NULL == vf) return -1;
+
+    if (!is_etchobj_static_content(vf))
+    {
+ 	    destroy_static_type(vf->mt_add);
+        destroy_static_type(vf->mt_add_result);
+        destroy_static_field(vf->mf_x); 
+        destroy_static_field(vf->mf_y); 
+        destroy_static_field(vf->mf_result);  
+    }
+
+    return destroy_default_value_factory((default_value_factory*) vf);
+}
+
+
+/**
+ * new_test_valuefactory()
+ * constructor for value factory version 1 inheriting from default_value_factory
+ */
+static test_value_factory* new_test_valuefactory()
+{
+    etchparentinfo* inheritlist = NULL;
+    test_value_factory* vf = NULL;
+
+    g_type_map = new_vf_types_collection(ETCH_DEFSIZE);
+    /* since we explicitly instantiate a type map, and since we explicitly destroy
+     * the test's custom types, we want the type maps destructor to not destroy
+     * the map content. overriding the map's content clear callback is one way 
+     * to do this. */
+    g_type_map->freehook = etch_noop_clear_handler;  
+    g_class_to_type_map  = new_class_to_type_map(ETCH_DEFSIZE);
+
+    /* instantiate the new value factory.  
+     * this vf does NOT own its type maps since we supply them here. 
+     * however if we wanted to abandon ownership, we could set the   
+     * vf.is_own_types and vf.is_own_class_to_type flags here.
+     */
+    // init typemap and class to type map
+    defvf_initialize_static(g_type_map, g_class_to_type_map);
+    vf = (test_value_factory*) new_default_value_factory_ex(sizeof(test_value_factory), g_type_map, g_class_to_type_map);
+
+    ((etch_object*)vf)->destroy = destroy_test_value_factory;
+
+   /* ensure parent type keys exist in the (one-based) inheritance list. 
+    * parent class of our custom vf is default_value_factory.
+    * inheritance list is used by validators and object assignment logic.
+    */
+    inheritlist = get_vtab_inheritance_list((etch_object*)vf, 2, 1, CLASSID_MY_VF_VTAB);
+    inheritlist[1].o.obj_type = ETCHTYPEB_VALUEFACTORY;  
+    inheritlist[1].c.class_id = CLASSID_VALUEFACTORY;  /* parent class */
+    ((etch_object*)vf)->class_id = CLASSID_MY_VF;  /* our class */
+
+    /* instantiate the custom vf's instance data and assign it to the vf. 
+     */  
+    vf->mt_add = new_static_type(L"add");
+    vf->mt_add_result = new_static_type(L"add_result");
+    vf->mf_x = new_static_field(L"x");
+    vf->mf_y = new_static_field(L"y");
+    vf->mf_result = new_static_field(L"xresult");
+
+    /* we replace generated ids with 1-byte IDs to make test data buffers easier to construct */
+    vf->mt_add->id        = FAKEID_TYPE_ADD;
+    vf->mt_add_result->id = FAKEID_TYPE_ADD_RESULT;
+    vf->mf_x->id          = FAKEID_FIELD_X;
+    vf->mf_y->id          = FAKEID_FIELD_Y;
+    vf->mf_result->id     = FAKEID_FIELD_RESULT;
+
+    ((struct i_value_factory*)((etch_object*)vf)->vtab)->add_type(vf, vf->mt_add);
+    ((struct i_value_factory*)((etch_object*)vf)->vtab)->add_type(vf, vf->mt_add_result);
+
+    etchtype_put_validator(vf->mt_add, clone_field(vf->mf_x), 
+        (etch_object*) etchvtor_int32_get(0));
+    etchtype_put_validator(vf->mt_add, clone_field(vf->mf_y), 
+        (etch_object*) etchvtor_int32_get(0));
+    etchtype_put_validator(vf->mt_add, clone_field(builtins._mf__message_id), 
+        (etch_object*) etchvtor_int64_get(0));
+
+    etchtype_put_validator(vf->mt_add_result, clone_field(vf->mf_result), 
+        (etch_object*) etchvtor_int32_get(0));
+    etchtype_put_validator(vf->mt_add_result, clone_field(builtins._mf__message_id), 
+        (etch_object*) etchvtor_int64_get(0));
+    etchtype_put_validator(vf->mt_add_result, clone_field(builtins._mf__in_reply_to), 
+        (etch_object*) etchvtor_int64_get(0));
+
+    g_my_test_vf = vf;
+    return g_my_test_vf;
+}
+
+
+/**
+ * my_valufactory_impl
+ * value factory version 2 instance data object
+ */
+typedef struct my_valufactory_impl
+{
+    etch_object object;
+
+    etch_type*      mt_add;
+    etch_type*      mt_add_result;
+    etch_field*     mf_x;
+    etch_field*     mf_y;
+    etch_field*     mf_result;
+
+} my_valufactory_impl;
+
+
+/**
+ * destroy_my_valufactory_impl()
+ * destructor for inheriting value factory version 2 instance data
+ */
+static int destroy_my_valufactory_impl(void* data)
+{
+    my_valufactory_impl* impl = (my_valufactory_impl*)data;
+    if (NULL == impl) return -1;
+
+    if (!is_etchobj_static_content(impl))
+    {
+ 	    destroy_static_type(impl->mt_add);
+        destroy_static_type(impl->mt_add_result);
+        destroy_static_field(impl->mf_x); 
+        destroy_static_field(impl->mf_y); 
+        destroy_static_field(impl->mf_result);  
+    }
+
+    return destroy_objectex((etch_object*) impl);
+}
+
+
+/**
+ * new_my_valufactory_impl()
+ * constructor for inheriting value factory version 2 instance data
+ */
+static my_valufactory_impl* new_my_valufactory_impl()
+{
+    unsigned short class_id = CLASSID_MY_VF_IMPL? CLASSID_MY_VF_IMPL: 
+        (CLASSID_MY_VF_IMPL = get_dynamic_classid());
+
+    my_valufactory_impl* impl = (my_valufactory_impl*) new_object
+        (sizeof(my_valufactory_impl), ETCHTYPEB_VALUEFACTIMP, class_id);
+
+    ((etch_object*)impl)->destroy = destroy_my_valufactory_impl;
+
+    impl->mt_add = new_static_type(L"add");
+    impl->mt_add_result = new_static_type(L"add_result");
+    impl->mf_x = new_static_field(L"x");
+    impl->mf_y = new_static_field(L"y");
+    impl->mf_result = new_static_field(L"xresult");
+
+    /* we replace generated ids with 1-byte IDs to make test data buffers easier to construct */
+    impl->mt_add->id        = FAKEID_TYPE_ADD;
+    impl->mt_add_result->id = FAKEID_TYPE_ADD_RESULT;
+    impl->mf_x->id          = FAKEID_FIELD_X;
+    impl->mf_y->id          = FAKEID_FIELD_Y;
+    impl->mf_result->id     = FAKEID_FIELD_RESULT;
+
+    etchtype_put_validator(impl->mt_add, clone_field(impl->mf_x), 
+        (etch_object*) etchvtor_int32_get(0));
+    etchtype_put_validator(impl->mt_add, clone_field(impl->mf_y), 
+        (etch_object*) etchvtor_int32_get(0));
+    etchtype_put_validator(impl->mt_add, clone_field(builtins._mf__message_id), 
+        (etch_object*) etchvtor_int64_get(0));
+
+    etchtype_put_validator(impl->mt_add_result, clone_field(impl->mf_result), 
+        (etch_object*) etchvtor_int32_get(0));
+    etchtype_put_validator(impl->mt_add_result, clone_field(builtins._mf__message_id), 
+        (etch_object*) etchvtor_int64_get(0));
+    etchtype_put_validator(impl->mt_add_result, clone_field(builtins._mf__in_reply_to), 
+        (etch_object*) etchvtor_int64_get(0));
+
+    return impl;
+}
+
+
+/**
+ * new_bogus_valuefactory()
+ * constructor for value factory version 2 inheriting from default_value_factory
+ */
+static default_value_factory* new_bogus_valuefactory()
+{
+    etchparentinfo* inheritlist = NULL;
+    my_valufactory_impl* impl = NULL;
+
+
+    g_type_map = new_vf_types_collection(ETCH_DEFSIZE);
+    /* since we explicitly instantiate a type map, and since we explicitly destroy
+     * the test's custom types, we want the type maps destructor to not destroy
+     * the map content. overriding the map's content clear callback is one way 
+     * to do this. */
+    g_type_map->freehook = etch_noop_clear_handler;
+    g_class_to_type_map  = new_class_to_type_map(ETCH_DEFSIZE);
+
+    /* instantiate the new value factory.  
+     * this vf does NOT own its type maps since we supply them here. 
+     * however if we wanted to abandon ownership, we could clear the   
+     * vf.is_own_types and vf.is_own_class_to_type flags here.
+     */    
+    defvf_initialize_static(g_type_map, g_class_to_type_map);
+    g_my_vf = new_default_value_factory(g_type_map, g_class_to_type_map);
+
+   /* ensure parent type keys exist in the (one-based) inheritance list. 
+    * parent class of our custom vf is default_value_factory.
+    * inheritance list is used by validators and object assignment logic.
+    */
+    inheritlist = get_vtab_inheritance_list((etch_object*)g_my_vf, 2, 1, CLASSID_MY_VF_VTAB);
+    inheritlist[1].o.obj_type = ETCHTYPEB_VALUEFACTORY;  
+    inheritlist[1].c.class_id = CLASSID_VALUEFACTORY;  /* parent class */
+    ((etch_object*)g_my_vf)->class_id = CLASSID_MY_VF;  /* our class */
+
+    /* instantiate the custom vf's instance data and assign it to the vf. 
+     * the impl comprises all data specific to the inheriting class, including 
+     * data and methods if any. the default value factory destructor will call 
+     * the destructor on the vf's impl object.
+     */  
+    impl = new_my_valufactory_impl();
+    g_my_vf->impl = (etch_object*) impl;
+
+    ((struct i_value_factory*)((etch_object*)g_my_vf)->vtab)->add_type(g_my_vf, impl->mt_add);
+    ((struct i_value_factory*)((etch_object*)g_my_vf)->vtab)->add_type(g_my_vf, impl->mt_add_result);
+
+    return g_my_vf;
+}
+
+
+/**
+ * get_vftype()
+ * return a type depending on which version of value factory is instantiated
+ */
+static etch_type* get_vftype(const int typeid)
+{
+    etch_type* type = NULL;
+
+    if (g_my_vf)
+    {
+        my_valufactory_impl* impl = (my_valufactory_impl*) g_my_vf->impl;
+
+        if (typeid == impl->mt_add->id)
+            type = impl->mt_add; 
+        else
+        if (typeid == impl->mt_add_result->id)
+            type = impl->mt_add_result; 
+    }
+    else
+    if (g_my_test_vf)
+    {
+        if (typeid == g_my_test_vf->mt_add->id)
+            type = g_my_test_vf->mt_add; 
+        else
+        if (typeid == g_my_test_vf->mt_add_result->id)
+            type = g_my_test_vf->mt_add_result; 
+    }
+
+    return type;
+}
+
+ 
+/* - - - - - - - - - - - - - - - - -
+ * test messagizer
+ * - - - - - - - - - - - - - - - - -
+ */
+
+/**
+ * new_bogus_messagizer()
+ */
+static etch_messagizer* new_bogus_messagizer(i_transportpacket* transport)
+{
+    g_my_messagizer = new_messagizer(transport, L"foo:?Messagizer.format=binary", g_my_resources);
+    return g_my_messagizer;
+}
+ 
+
+/* - - - - - - - - - - - - - - - - - - - - -
+ *  individual test data setup and teardown
+ * - - - - - - - - - - - - - - - - - - - - -
+ */
+
+/**
+ * setup_this_test()
+ */
+static int setup_this_test(const int which_valuefactory)
+{
+    my_impl_transportpacket* mytp_impl = NULL;
+    my_impl_sessionmessage*  mysm_impl = NULL;
+    default_value_factory*   thisvf = NULL;
+    g_which_valuefactory = which_valuefactory;
+
+    /* two versions of value factory using different inheritance models */
+    if (which_valuefactory == WHICHVF_TESTVF)  /* vf version 1 inline inheritance */
+    {   thisvf = (default_value_factory*) new_test_valuefactory();     
+        set_etchobj_static_all(g_my_test_vf);  /* so resources will not destroy */
+    }
+    else 
+    {   
+        thisvf = new_bogus_valuefactory();     /* vf version 2 impl object inheritance */
+        set_etchobj_static_all(g_my_vf);       /* so resources will not destroy */
+    }
+
+    g_my_resources = new_etch_resources(ETCH_DEFSIZE);
+    etch_resources_add(g_my_resources, ETCH_RESXKEY_MSGIZER_VALUFACT, (etch_object*) thisvf); 
+
+    /* we instantiate a wrapper x which implements and instantiates i_transportpacket.
+     * the instantiation of i_transportpacket will contain a pointer to x.
+     * our global reference g_my_transportpacket is a pointer to the interface.
+     * the purpose of this excercise is that, in the real binding we can pass
+     * around the interface, whose methods can be then invoked without knowing
+     * anything about the wrapper. when we want to reference the wrapper x, 
+     * it is (my_impl_transportpacket) g_my_transportpacket->thisx. 
+     */
+    mytp_impl = new_my_impl_transportpacket();
+    g_my_transportpacket = mytp_impl->ixp;
+
+    /* we instantiate a wrapper y which implements and instantiates i_sessionmessage.
+     * the instantiation of i_sessionmessage will contain a pointer to y.
+     * our global reference g_my_sessionmessage is a pointer to the interface.
+     * the purpose of this excercise is that, in the real binding we can pass
+     * around the interface, whose methods can be then invoked without knowing
+     * anything about the wrapper. when we want to reference the wrapper x, 
+     * it is (my_impl_sessionmessage*) g_my_sessionmessage->thisx. 
+     */
+    mysm_impl = new_my_impl_sessionmessage();
+    g_my_sessionmessage = mysm_impl->ism;
+    
+    g_who = new_who(new_int32(THISTEST_WHO_VALUE));
+
+    /* finally instantiate the test messagizer */
+    new_bogus_messagizer(g_my_transportpacket);
+    CU_ASSERT_PTR_NOT_NULL_FATAL(g_my_messagizer);
+    etch_msgizer_set_session(g_my_messagizer, g_my_sessionmessage);
+  
+    return 0; 
+}
+
+
+/**
+ * teardown_this_test()
+ */
+static int teardown_this_test()
+{
+    etch_object_destroy(g_my_messagizer);
+
+    etch_object_destroy(g_my_transportpacket);
+
+    etch_object_destroy(g_my_sessionmessage);
+
+    etch_object_destroy(g_my_resources);
+
+    if (g_my_vf)
+    {   clear_etchobj_static_all(g_my_vf);
+        etch_object_destroy(g_my_vf);
+    }
+    else  /* can only instantiate one or the other */ 
+    if (g_my_test_vf)
+    {   clear_etchobj_static_all(g_my_test_vf);
+        etch_object_destroy(g_my_test_vf);
+    }
+   
+    etch_object_destroy(g_who);
+
+    etch_object_destroy(g_type_map);    // ************************************************
+    etch_object_destroy(g_class_to_type_map);
+
+    if (g_flexbuffer)
+        etch_object_destroy(g_flexbuffer);
+
+    g_my_transportpacket = NULL;
+    g_my_sessionmessage = NULL; 
+    g_class_to_type_map = NULL;
+    g_my_messagizer = NULL;
+    g_my_resources = NULL;
+    g_flexbuffer = NULL;                  
+    g_my_test_vf = NULL;
+    g_type_map = NULL;
+    g_my_vf = NULL;
+    g_who = NULL;
+
+    etchvf_free_builtins(); 
+
+    return 0; 
+}
+
+
+/* - - - - - - - - - - - - - - 
+ * unit tests 
+ * - - - - - - - - - - - - - -
+ */
+
+/**
+ * test_transportpacket_constructor()
+ */
+static void test_transportpacket_constructor(void)
+{
+    my_impl_transportpacket* mytp_impl = new_my_impl_transportpacket();
+    CU_ASSERT_PTR_NOT_NULL_FATAL(mytp_impl);
+
+    /* the custom interface object destructors are coded to destroy their
+     * implementing objects, so we do that here to verify this functionality.
+     */
+    do 
+    {   i_transportpacket* itp = mytp_impl->ixp;
+        etch_object_destroy(itp);
+
+    } while(0);
+
+#ifdef ETCH_DEBUGALLOC
+   g_bytes_allocated = etch_showmem(0,IS_DEBUG_CONSOLE);  /* verify all memory freed */
+   CU_ASSERT_EQUAL(g_bytes_allocated, 0);
+   // start fresh for next test
+   memtable_clear();
+#endif
+}
+
+
+/**
+ * test_sessionmessage_constructor()
+ */
+static void test_sessionmessage_constructor(void)
+{
+    my_impl_sessionmessage* mysm_impl = new_my_impl_sessionmessage();
+    CU_ASSERT_PTR_NOT_NULL_FATAL(mysm_impl);
+
+    /* the custom interface object destructors are coded to destroy their
+     * implementing objects, so we do that here to verify this functionality.
+     */
+    do 
+    {   i_sessionmessage* ism = mysm_impl->ism;
+        etch_object_destroy(ism);
+
+    } while(0);
+
+#ifdef ETCH_DEBUGALLOC
+   g_bytes_allocated = etch_showmem(0,IS_DEBUG_CONSOLE);  /* verify all memory freed */
+   CU_ASSERT_EQUAL(g_bytes_allocated, 0);
+   // start fresh for next test
+   memtable_clear();
+#endif
+}
+
+
+/**
+ * test_messagizer_constructor()
+ */
+static void test_messagizer_constructor(void)
+{
+    etch_messagizer* mzr = NULL;
+    i_transportpacket* itp = NULL;
+    etch_resources* resxmap = NULL;
+    default_value_factory*  vf      = NULL;
+    vf_idname_map*          typemap = NULL;
+    class_to_type_map*      c2tmap  = NULL;
+    my_impl_transportpacket* mytp_impl = NULL;
+
+    typemap = new_vf_types_collection(ETCH_DEFVF_IDNMAP_DEFINITSIZE);
+    CU_ASSERT_PTR_NOT_NULL(typemap);
+    c2tmap  = new_class_to_type_map(ETCH_DEVVF_C2TMAP_DEFINITSIZE);
+    CU_ASSERT_PTR_NOT_NULL(c2tmap);
+    defvf_initialize_static(typemap, c2tmap);
+    vf = new_default_value_factory(typemap, c2tmap);
+    CU_ASSERT_PTR_NOT_NULL(vf);
+
+    mytp_impl = NULL;
+
+    vf = new_default_value_factory(typemap, c2tmap);
+    CU_ASSERT_PTR_NOT_NULL_FATAL(vf);
+    set_etchobj_static_all(vf); /* so resources will not destroy */
+
+    resxmap = new_etch_resources(ETCH_DEFSIZE);
+    CU_ASSERT_PTR_NOT_NULL_FATAL(resxmap);
+    etch_resources_add(resxmap, ETCH_RESXKEY_MSGIZER_VALUFACT, (etch_object*) vf); 
+
+    mytp_impl = new_my_impl_transportpacket();   
+    CU_ASSERT_PTR_NOT_NULL_FATAL(mytp_impl);
+
+    itp = mytp_impl->ixp;
+    CU_ASSERT_PTR_NOT_NULL_FATAL(itp);
+
+    /* messagizer does not own i_transportpacket* itp */
+    mzr = new_messagizer(itp, L"foo:?Messagizer.format=binary", resxmap);
+    CU_ASSERT_PTR_NOT_NULL_FATAL(mzr);
+
+    etch_object_destroy(mzr);    
+
+    /* i_transportpacket.destroy() will destroy my_impl_transportpacket */
+    etch_object_destroy(itp);    
+
+    etch_object_destroy(resxmap);
+    clear_etchobj_static_all(vf);  /* so we can destroy it now */
+    
+    etch_object_destroy(vf);
+    etch_object_destroy(c2tmap);
+    etch_object_destroy(typemap);
+
+    // TODO: cleanup statics
+    //etchvf_free_builtins();
+
+#ifdef ETCH_DEBUGALLOC
+   g_bytes_allocated = etch_showmem(0,IS_DEBUG_CONSOLE);  /* verify all memory freed */
+   CU_ASSERT_EQUAL(g_bytes_allocated, 0);
+   // start fresh for next test
+   memtable_clear();
+#endif
+}
+
+
+/**
+ * test_testsetup_teardown_a
+ */
+static void test_testsetup_teardown_a(void)
+{
+    setup_this_test(WHICHVF_TESTVF);
+    teardown_this_test();
+
+#ifdef ETCH_DEBUGALLOC
+   g_bytes_allocated = etch_showmem(0,IS_DEBUG_CONSOLE);  /* verify all memory freed */
+   CU_ASSERT_EQUAL(g_bytes_allocated, 0);
+   // start fresh for next test
+   memtable_clear();
+#endif
+}
+
+
+/**
+ * test_testsetup_teardown_b
+ */
+static void test_testsetup_teardown_b(void)
+{
+    setup_this_test(WHICHVF_MYVF);
+    teardown_this_test();
+
+#ifdef ETCH_DEBUGALLOC
+   g_bytes_allocated = etch_showmem(0,IS_DEBUG_CONSOLE);  /* verify all memory freed */
+   CU_ASSERT_EQUAL(g_bytes_allocated, 0);
+   // start fresh for next test
+   memtable_clear();
+#endif
+}
+
+
+/**
+ * test_packet_1
+ * mimics the transport messagizing a packet and delivering the message to the session
+ */
+static void test_packet_1(void)
+{
+    setup_this_test(WHICHVF_TESTVF);
+
+    do          
+    {   int result = 0;
+        etch_type* msgtype = NULL;
+        const int THISTEST_BUFSIZE = 4;
+        char* buf = etch_malloc(THISTEST_BUFSIZE, ETCHTYPEB_BYTES);
+
+        /* g_my_sessionmessage is the i_sessionmessage interface    
+         * my_impl_sessionmessage is the implementing test class */
+        my_impl_sessionmessage* my_session = g_my_sessionmessage->thisx;
+        CU_ASSERT_PTR_NOT_NULL_FATAL(my_session);
+
+        /* load up the packet buffer with test data */
+        buf[0] = TAGDATA_VERSION; buf[1] = FAKEID_TYPE_ADD; buf[2] = 0; buf[3] = TYPECODE_EOD_MARK;
+        g_flexbuffer = new_flexbuffer_from(buf, THISTEST_BUFSIZE, THISTEST_BUFSIZE, 0);
+
+        my_session->is_msg_handled = TRUE;
+
+        /* messagize the packet and deliver the message to the session */
+        result = g_my_messagizer->session_packet (g_my_messagizer, g_who, g_flexbuffer);
+        CU_ASSERT_EQUAL(result, 0); 
+        if (0 != result) break;
+
+        CU_ASSERT_EQUAL(my_session->what, SESSION_MESSAGE); 
+        result = is_equal_who(my_session->sender, g_who);
+        CU_ASSERT_EQUAL(result, TRUE);
+        CU_ASSERT_EQUAL(message_size(my_session->msg), 0);
+        CU_ASSERT_PTR_NULL(my_session->eventx);
+        /* assert that message type is "add" (since we buffered FAKEID_TYPE_ADD above) */
+        msgtype = message_type(my_session->msg); 
+        CU_ASSERT_PTR_NOT_NULL_FATAL(msgtype);
+        CU_ASSERT_EQUAL(msgtype->id, FAKEID_TYPE_ADD);
+
+    } while(0);
+
+    teardown_this_test();
+
+#ifdef ETCH_DEBUGALLOC
+   g_bytes_allocated = etch_showmem(0,IS_DEBUG_CONSOLE);  /* verify all memory freed */
+   CU_ASSERT_EQUAL(g_bytes_allocated, 0);
+   // start fresh for next test
+   memtable_clear();
+#endif
+}
+
+
+/**
+ * test_packet_2
+ * mimics the transport messagizing a packet and delivering the message to the session
+ * which rejects the message and forwards the message as rejected.
+ */
+static void test_packet_2(void)
+{
+    setup_this_test(WHICHVF_TESTVF);
+
+    do          
+    {   int result = 0;
+        etch_type* msgtype = NULL;
+        const int THISTEST_BUFSIZE = 4;
+        etch_message* thismessage = NULL;
+        etch_unwanted_message* uwmsg = NULL;
+        char* buf = etch_malloc(THISTEST_BUFSIZE, ETCHTYPEB_BYTES);
+
+        /* g_my_sessionmessage is the i_sessionmessage interface    
+         * my_impl_sessionmessage is the implementing test class */
+        my_impl_sessionmessage* my_session = g_my_sessionmessage->thisx;
+        CU_ASSERT_PTR_NOT_NULL_FATAL(my_session);
+
+        /* load up the packet buffer with test data */
+        buf[0] = TAGDATA_VERSION; buf[1] = FAKEID_TYPE_ADD; buf[2] = 0; buf[3] = TYPECODE_EOD_MARK;
+        g_flexbuffer = new_flexbuffer_from(buf, THISTEST_BUFSIZE, THISTEST_BUFSIZE, 0);
+
+        /* for the purposes of this test we manually specify that the message was not handled.
+         * when this is the case, the message and who will be wrapped up in an "unwanted message"
+         * which is forwarded to the session as an event. when this is the case, memory for the
+         * message and who is not cleaned up by the session in the normal manner, but is instead
+         * owned by the unwanted message, and destroyed with that object. 
+         */
+        my_session->is_msg_handled = FALSE;
+
+        /* messagize the packet and deliver the message to the session */
+        result = g_my_messagizer->session_packet (g_my_messagizer, g_who, g_flexbuffer);
+        CU_ASSERT_EQUAL(result, -1); 
+        if (-1 != result) break;
+
+        CU_ASSERT_EQUAL(my_session->what, SESSION_NOTIFY); 
+        CU_ASSERT_EQUAL(message_size(my_session->msg), 0);      
+
+        CU_ASSERT_PTR_NOT_NULL_FATAL(my_session->eventx);
+
+        uwmsg = (etch_unwanted_message*) my_session->eventx; 
+        CU_ASSERT_EQUAL_FATAL(((etch_object*)uwmsg)->class_id, CLASSID_EVENT_UNWANTMSG); 
+
+        /* find the message and who in the "unwanted message" wrapper */
+        result = is_equal_who(uwmsg->whofrom, g_who);
+        CU_ASSERT_EQUAL(result, TRUE);
+
+        thismessage = uwmsg->message;
+        CU_ASSERT_PTR_NOT_NULL_FATAL(thismessage);
+
+        /* assert that message type is "add" (since we buffered FAKEID_TYPE_ADD above) */
+        msgtype = message_type(thismessage); 
+        CU_ASSERT_PTR_NOT_NULL_FATAL(msgtype);
+        CU_ASSERT_EQUAL(msgtype->id, FAKEID_TYPE_ADD);
+
+    } while(0);
+
+    teardown_this_test();
+
+#ifdef ETCH_DEBUGALLOC
+   g_bytes_allocated = etch_showmem(0,IS_DEBUG_CONSOLE);  /* verify all memory freed */
+   CU_ASSERT_EQUAL(g_bytes_allocated, 0);
+   // start fresh for next test
+   memtable_clear();
+#endif
+}
+
+
+/**
+ * test_packet_3
+ * mimics the transport messagizing a packet and delivering the message to the session
+ */
+static void test_packet_3(void)
+{
+    setup_this_test(WHICHVF_TESTVF);
+
+    do          
+    {   int result = 0;
+        etch_type* msgtype = NULL;
+        const int THISTEST_BUFSIZE = 4;
+        char* buf = etch_malloc(THISTEST_BUFSIZE, ETCHTYPEB_BYTES);
+
+        /* g_my_sessionmessage is the i_sessionmessage interface    
+         * my_impl_sessionmessage is the implementing test class */
+        my_impl_sessionmessage* my_session = g_my_sessionmessage->thisx;
+        CU_ASSERT_PTR_NOT_NULL_FATAL(my_session);
+
+        /* load up the packet buffer with test data */
+        buf[0] = TAGDATA_VERSION; 
+        buf[1] = FAKEID_TYPE_ADD_RESULT; 
+        buf[2] = 0; 
+        buf[3] = TYPECODE_EOD_MARK;
+
+        g_flexbuffer = new_flexbuffer_from(buf, THISTEST_BUFSIZE, THISTEST_BUFSIZE, 0);
+
+        /* for the purposes of this test we manually specify that the message was handled */
+        my_session->is_msg_handled = TRUE;
+
+        /* messagize the packet and deliver the message to the session */
+        result = g_my_messagizer->session_packet (g_my_messagizer, g_who, g_flexbuffer);
+        CU_ASSERT_EQUAL(result, 0); 
+        if (0 != result) break;
+
+        CU_ASSERT_EQUAL(my_session->what, SESSION_MESSAGE); 
+        CU_ASSERT_EQUAL(message_size(my_session->msg), 0);      
+
+        /* assert that message type is "add_result" (since we buffered FAKEID_TYPE_ADD_RESULT above) */
+        CU_ASSERT_PTR_NOT_NULL_FATAL(my_session->msg);
+        msgtype = message_type(my_session->msg); 
+        CU_ASSERT_PTR_NOT_NULL_FATAL(msgtype);
+        CU_ASSERT_EQUAL(msgtype->id, FAKEID_TYPE_ADD_RESULT);
+
+    } while(0);
+
+    teardown_this_test();
+
+#ifdef ETCH_DEBUGALLOC
+   g_bytes_allocated = etch_showmem(0,IS_DEBUG_CONSOLE);  /* verify all memory freed */
+   CU_ASSERT_EQUAL(g_bytes_allocated, 0);
+   // start fresh for next test
+   memtable_clear();
+#endif
+}
+
+
+/**
+ * test_message_1
+ * mimics the session buffering a message and delivering it to the transport
+ */
+static void test_message_1(void)
+{
+    setup_this_test(WHICHVF_TESTVF);
+
+    do          
+    {   int result = 0;
+        etch_type* msgtype = NULL;
+        etch_value_factory* vf = NULL;
+        const int EXPECTED_BUFSIZE = 4;
+        etch_message* thismessage = NULL;
+
+        /* g_my_transportpacket is the i_transportpacket interface    
+         * my_impl_transportpacket is the implementing test class */
+        my_impl_transportpacket* my_transport = g_my_transportpacket->thisx;
+        CU_ASSERT_PTR_NOT_NULL_FATAL(my_transport);
+
+        vf = (etch_value_factory*) get_current_valuefactory();
+        msgtype = get_vftype(FAKEID_TYPE_ADD);
+
+        g_my_transportpacket->header_size = 0; /* test no header */
+
+        thismessage = new_message(msgtype, ETCH_DEFSIZE, vf);
+
+        /* buffer up the message and deliver to transport */
+        result = g_my_messagizer->transport_message (g_my_messagizer, g_who, thismessage);
+        CU_ASSERT_EQUAL(result, 0); 
+        if (0 != result) break;
+
+        CU_ASSERT_EQUAL(my_transport->what, TRANSPORT_PACKET); 
+        result = is_equal_who(my_transport->recipient, g_who);
+        CU_ASSERT_EQUAL(result, TRUE);
+        CU_ASSERT_PTR_NOT_NULL_FATAL(my_transport->buf); 
+        CU_ASSERT_EQUAL(my_transport->bufcount, EXPECTED_BUFSIZE);
+
+        /* check that packet buffer contains expected serialized message */
+        CU_ASSERT_EQUAL(my_transport->buf[0], TAGDATA_VERSION); 
+        CU_ASSERT_EQUAL(my_transport->buf[1], FAKEID_TYPE_ADD); 
+        CU_ASSERT_EQUAL(my_transport->buf[2], 0); 
+        CU_ASSERT_EQUAL(my_transport->buf[3], TYPECODE_EOD_MARK);
+
+    } while(0);
+
+    teardown_this_test();
+
+#ifdef ETCH_DEBUGALLOC
+   g_bytes_allocated = etch_showmem(0,IS_DEBUG_CONSOLE);  /* verify all memory freed */
+   CU_ASSERT_EQUAL(g_bytes_allocated, 0);
+   // start fresh for next test
+   memtable_clear();
+#endif
+}
+
+
+/**
+ * test_message_2
+ * mimics the session buffering a message and delivering it to the transport
+ */
+static void test_message_2(void)
+{
+    setup_this_test(WHICHVF_TESTVF);
+
+    do          
+    {   int result = 0, i = 0, errs = 0;
+        etch_type* msgtype = NULL;
+        etch_value_factory* vf = NULL;
+        etch_message* thismessage = NULL;
+        const int TEST_HEADER_SIZE = 8, EXPECTED_BUFSIZE = 4 + TEST_HEADER_SIZE;
+
+        /* g_my_transportpacket is the i_transportpacket interface    
+         * my_impl_transportpacket is the implementing test class */
+        my_impl_transportpacket* my_transport = g_my_transportpacket->thisx;
+        CU_ASSERT_PTR_NOT_NULL_FATAL(my_transport);
+
+        vf = (etch_value_factory*) get_current_valuefactory();
+        msgtype = get_vftype(FAKEID_TYPE_ADD_RESULT);
+
+        g_my_transportpacket->header_size = TEST_HEADER_SIZE; /* test with 8-byte header */
+
+        thismessage = new_message(msgtype, ETCH_DEFSIZE, vf);
+
+        /* buffer up the message and deliver to transport */
+        result = g_my_messagizer->transport_message(g_my_messagizer, g_who, thismessage);
+        CU_ASSERT_EQUAL(result, 0); 
+        if (0 != result) break;
+
+        CU_ASSERT_EQUAL(my_transport->what, TRANSPORT_PACKET); 
+        result = is_equal_who(my_transport->recipient, g_who);
+        CU_ASSERT_EQUAL(result, TRUE);
+        CU_ASSERT_PTR_NOT_NULL_FATAL(my_transport->buf); 
+        CU_ASSERT_EQUAL(my_transport->bufcount, EXPECTED_BUFSIZE);
+
+        /* check that packet buffer contains expected serialized message */
+        for(; i < TEST_HEADER_SIZE; i++) if (my_transport->buf[i]) errs++;
+        CU_ASSERT_EQUAL(errs, 0); 
+        CU_ASSERT_EQUAL(my_transport->buf[8], TAGDATA_VERSION); 
+        CU_ASSERT_EQUAL(my_transport->buf[9], FAKEID_TYPE_ADD_RESULT); 
+        CU_ASSERT_EQUAL(my_transport->buf[10],0); 
+        CU_ASSERT_EQUAL(my_transport->buf[11],TYPECODE_EOD_MARK);         
+
+    } while(0);
+
+    teardown_this_test();
+
+#ifdef ETCH_DEBUGALLOC
+   g_bytes_allocated = etch_showmem(0,IS_DEBUG_CONSOLE);  /* verify all memory freed */
+   CU_ASSERT_EQUAL(g_bytes_allocated, 0);
+   // start fresh for next test
+   memtable_clear();
+#endif
+}
+
+
+/**
+ * test_session_control
+ * test the session control notification plumbing
+ */
+static void test_session_control(void)
+{
+    setup_this_test(WHICHVF_TESTVF);
+
+    do          
+    {
+        const int MY_CONTROL_CLASSID = 0x5200, MY_VALUE_CLASSID = 0x5201;
+        etch_object* mycontrolobj = new_object(sizeof(etch_object),ETCHTYPEB_ETCHOBJECT, MY_CONTROL_CLASSID);
+        etch_object* myvalueobj   = new_object(sizeof(etch_object),ETCHTYPEB_ETCHOBJECT, MY_VALUE_CLASSID);
+
+        /* g_my_sessionmessage is the i_sessionmessage interface    
+         * my_impl_sessionmessage is the implementing test class */
+        my_impl_sessionmessage* my_session = g_my_sessionmessage->thisx;
+        CU_ASSERT_PTR_NOT_NULL_FATAL(my_session);
+        CU_ASSERT_EQUAL(my_session->what, WHAT_NONE);
+        CU_ASSERT_PTR_NULL(my_session->control);
+        CU_ASSERT_PTR_NULL(my_session->value);
+
+        /* we relinquish memory for mycontrolobj and myvalueobj here. 
+         * the session_control terminal destination must destroy them, which here
+         * is handled by our session object destructor when we teardown_this_test() */
+        g_my_messagizer->session_control(g_my_messagizer, (etch_event*)mycontrolobj, myvalueobj);
+
+        CU_ASSERT_EQUAL(my_session->what, SESSION_CONTROL);
+        CU_ASSERT_PTR_NOT_NULL_FATAL(my_session->control);
+        CU_ASSERT_EQUAL(((etch_object*)my_session->control)->class_id, MY_CONTROL_CLASSID);
+        CU_ASSERT_EQUAL(((etch_object*)my_session->value)->class_id,   MY_VALUE_CLASSID);
+
+    } while(0);
+
+    teardown_this_test();
+
+#ifdef ETCH_DEBUGALLOC
+   g_bytes_allocated = etch_showmem(0,IS_DEBUG_CONSOLE);  /* verify all memory freed */
+   CU_ASSERT_EQUAL(g_bytes_allocated, 0);
+   // start fresh for next test
+   memtable_clear();
+#endif
+}
+
+
+/**
+ * test_session_notify
+ * test the session notify notification plumbing
+ */
+static void test_session_notify(void)
+{
+    setup_this_test(WHICHVF_TESTVF);
+
+    do          
+    {
+        const int MY_EVENT_CLASSID = 0x5202;
+        etch_object* myeventobj = new_object(sizeof(etch_object),ETCHTYPEB_ETCHOBJECT, MY_EVENT_CLASSID);
+
+        /* g_my_sessionmessage is the i_sessionmessage interface    
+         * my_impl_sessionmessage is the implementing test class */
+        my_impl_sessionmessage* my_session = g_my_sessionmessage->thisx;
+        CU_ASSERT_PTR_NOT_NULL_FATAL(my_session);
+        CU_ASSERT_EQUAL(my_session->what, WHAT_NONE);
+        CU_ASSERT_PTR_NULL(my_session->eventx);
+
+        /* we relinquish memory for myeventobj here. 
+         * the session_control terminal destination must destroy it, which here
+         * is handled by our session object destructor when we teardown_this_test() */
+        g_my_messagizer->session_notify(g_my_messagizer, (etch_event*)myeventobj);
+
+        CU_ASSERT_EQUAL(my_session->what, SESSION_NOTIFY);
+        CU_ASSERT_PTR_NOT_NULL_FATAL(my_session->eventx);
+        CU_ASSERT_EQUAL(((etch_object*)my_session->eventx)->class_id, MY_EVENT_CLASSID);
+
+    } while(0);
+
+    teardown_this_test();
+
+#ifdef ETCH_DEBUGALLOC
+   g_bytes_allocated = etch_showmem(0,IS_DEBUG_CONSOLE);  /* verify all memory freed */
+   CU_ASSERT_EQUAL(g_bytes_allocated, 0);
+   // start fresh for next test
+   memtable_clear();
+#endif
+}
+
+
+/**
+ * test_session_query
+ * test the session query notification plumbing
+ */
+static void test_session_query(void)
+{
+    setup_this_test(WHICHVF_TESTVF);
+
+    do          
+    {
+        const int MY_QUERY_CLASSID = 0x5203, MY_RESULT_CLASSID = 0x5204;
+        etch_object* myqueryobj  = new_object(sizeof(etch_object),ETCHTYPEB_ETCHOBJECT, MY_QUERY_CLASSID);
+        etch_object* myresultobj = new_object(sizeof(etch_object),ETCHTYPEB_ETCHOBJECT, MY_RESULT_CLASSID);
+        etch_object* queryresult = NULL;
+
+        /* g_my_sessionmessage is the i_sessionmessage interface    
+         * my_impl_sessionmessage is the implementing test class */
+        my_impl_sessionmessage* my_session = g_my_sessionmessage->thisx;
+        CU_ASSERT_PTR_NOT_NULL_FATAL(my_session);
+        CU_ASSERT_EQUAL(my_session->what, WHAT_NONE);
+        CU_ASSERT_PTR_NULL(my_session->query);
+
+        /* we relinquish myresultobj here. see comments following */
+        my_session->query_result = myresultobj; 
+
+        /* we relinquish memory for myqueryobj here and assume queryresult. 
+         * the session_control terminal destination must destroy it, which here
+         * is handled by our session object destructor when we teardown_this_test() */
+        queryresult = g_my_messagizer->session_query (g_my_messagizer, (etch_query*)myqueryobj);
+
+        CU_ASSERT_EQUAL(my_session->what, SESSION_QUERY);
+        CU_ASSERT_PTR_NOT_NULL_FATAL(my_session->query);
+        CU_ASSERT_EQUAL(((etch_object*)my_session->query)->class_id, MY_QUERY_CLASSID);
+        CU_ASSERT_PTR_NOT_NULL_FATAL(queryresult);
+        CU_ASSERT_EQUAL(((etch_object*)queryresult)->class_id, MY_RESULT_CLASSID);
+        etch_object_destroy(queryresult);
+
+    } while(0);
+
+    teardown_this_test();
+
+#ifdef ETCH_DEBUGALLOC
+   g_bytes_allocated = etch_showmem(0,IS_DEBUG_CONSOLE);  /* verify all memory freed */
+   CU_ASSERT_EQUAL(g_bytes_allocated, 0);
+   // start fresh for next test
+   memtable_clear();
+#endif
+}
+
+
+/**
+ * test_transport_control
+ * test the transport control notification plumbing
+ */
+static void test_transport_control(void)
+{
+    setup_this_test(WHICHVF_TESTVF);
+
+    do          
+    {
+        my_impl_transportpacket* my_transport = NULL;
+        const int MY_CONTROL_CLASSID = 0x5200, MY_VALUE_CLASSID = 0x5201;
+        etch_object* mycontrolobj = new_object(sizeof(etch_object),ETCHTYPEB_ETCHOBJECT, MY_CONTROL_CLASSID);
+        etch_object* myvalueobj   = new_object(sizeof(etch_object),ETCHTYPEB_ETCHOBJECT, MY_VALUE_CLASSID);
+
+        /* g_my_transportpacket    is the i_transportpacket interface    
+         * my_impl_transportpacket is the implementing test class 
+         */
+        g_my_messagizer->transport = g_my_transportpacket;
+
+        my_transport = g_my_transportpacket->thisx;
+        CU_ASSERT_PTR_NOT_NULL_FATAL(my_transport);
+        CU_ASSERT_EQUAL(my_transport->what, WHAT_NONE);
+        CU_ASSERT_PTR_NULL(my_transport->control);
+        CU_ASSERT_PTR_NULL(my_transport->value);
+
+        /* we relinquish memory for mycontrolobj and myvalueobj here. 
+         * the transport_control terminal destination must destroy them, which here
+         * is handled by our transport object destructor when we teardown_this_test() 
+         */
+        g_my_messagizer->transport_control (g_my_messagizer, (etch_event*)mycontrolobj, myvalueobj);
+
+        CU_ASSERT_EQUAL(my_transport->what, TRANSPORT_CONTROL);
+        CU_ASSERT_PTR_NOT_NULL_FATAL(my_transport->control);
+        CU_ASSERT_EQUAL(((etch_object*)my_transport->control)->class_id, MY_CONTROL_CLASSID);
+        CU_ASSERT_EQUAL(((etch_object*)my_transport->value)->class_id,   MY_VALUE_CLASSID);
+
+    } while(0);
+
+    teardown_this_test();
+
+#ifdef ETCH_DEBUGALLOC
+   g_bytes_allocated = etch_showmem(0,IS_DEBUG_CONSOLE);  /* verify all memory freed */
+   CU_ASSERT_EQUAL(g_bytes_allocated, 0);
+   // start fresh for next test
+   memtable_clear();
+#endif
+}
+
+
+/**
+ * test_transport_notify
+ * test the transport notify notification plumbing
+ */
+static void test_transport_notify(void)
+{
+    setup_this_test(WHICHVF_TESTVF);
+
+    do          
+    {
+        my_impl_transportpacket* my_transport = NULL;
+        const int MY_EVENT_CLASSID = 0x5202;
+        etch_object* myeventobj = new_object(sizeof(etch_object),ETCHTYPEB_ETCHOBJECT, MY_EVENT_CLASSID);
+
+        /* g_my_transportpacket    is the i_transportpacket interface    
+         * my_impl_transportpacket is the implementing test class 
+         */
+        g_my_messagizer->transport = g_my_transportpacket;
+
+        my_transport = g_my_transportpacket->thisx;
+
+        CU_ASSERT_PTR_NOT_NULL_FATAL(my_transport);
+        CU_ASSERT_EQUAL(my_transport->what, WHAT_NONE);
+        CU_ASSERT_PTR_NULL(my_transport->control);
+        CU_ASSERT_PTR_NULL(my_transport->value);
+
+        /* we relinquish memory for myeventobj here. 
+         * the transport_control terminal destination must destroy it, which here
+         * is handled by our transport object destructor when we teardown_this_test() */
+        g_my_messagizer->transport_notify (g_my_messagizer, (etch_event*)myeventobj);
+
+        CU_ASSERT_EQUAL(my_transport->what, TRANSPORT_NOTIFY);
+        CU_ASSERT_PTR_NOT_NULL_FATAL(my_transport->eventx);
+        CU_ASSERT_EQUAL(((etch_object*)my_transport->eventx)->class_id, MY_EVENT_CLASSID);
+
+    } while(0);
+
+    teardown_this_test();
+
+#ifdef ETCH_DEBUGALLOC
+   g_bytes_allocated = etch_showmem(0,IS_DEBUG_CONSOLE);  /* verify all memory freed */
+   CU_ASSERT_EQUAL(g_bytes_allocated, 0);
+   // start fresh for next test
+   memtable_clear();
+#endif
+}
+
+
+/**
+ * test_transport_query
+ * test the transport query notification plumbing
+ */
+static void test_transport_query(void)
+{
+    setup_this_test(WHICHVF_TESTVF);
+
+    do          
+    {
+        my_impl_transportpacket* my_transport = NULL;
+        const int MY_QUERY_CLASSID = 0x5203, MY_RESULT_CLASSID = 0x5204;
+        etch_object* myqueryobj  = new_object(sizeof(etch_object),ETCHTYPEB_ETCHOBJECT, MY_QUERY_CLASSID);
+        etch_object* myresultobj = new_object(sizeof(etch_object),ETCHTYPEB_ETCHOBJECT, MY_RESULT_CLASSID);
+        etch_object* queryresult = NULL;
+
+        /* g_my_transportpacket    is the i_transportpacket interface    
+         * my_impl_transportpacket is the implementing test class 
+         */
+        g_my_messagizer->transport = g_my_transportpacket;
+
+        my_transport = g_my_transportpacket->thisx;
+
+        CU_ASSERT_PTR_NOT_NULL_FATAL(my_transport);
+        CU_ASSERT_EQUAL(my_transport->what, WHAT_NONE);
+        CU_ASSERT_PTR_NULL(my_transport->control);
+        CU_ASSERT_PTR_NULL(my_transport->value);
+
+        /* we relinquish myresultobj here. see comments following */
+        my_transport->query_result = myresultobj; 
+
+        /* we relinquish memory for myqueryobj here and assume queryresult. 
+         * the transport_control terminal destination must destroy it, which here
+         * is handled by our transport object destructor when we teardown_this_test() */
+        queryresult = g_my_messagizer->transport_query (g_my_messagizer, (etch_query*)myqueryobj);
+
+        CU_ASSERT_EQUAL(my_transport->what, TRANSPORT_QUERY);
+        CU_ASSERT_PTR_NOT_NULL_FATAL(my_transport->query);
+        CU_ASSERT_EQUAL(((etch_object*)my_transport->query)->class_id, MY_QUERY_CLASSID);
+        CU_ASSERT_PTR_NOT_NULL_FATAL(queryresult);
+        CU_ASSERT_EQUAL(((etch_object*)queryresult)->class_id, MY_RESULT_CLASSID);
+        etch_object_destroy(queryresult);
+
+    } while(0);
+
+    teardown_this_test();
+
+#ifdef ETCH_DEBUGALLOC
+   g_bytes_allocated = etch_showmem(0,IS_DEBUG_CONSOLE);  /* verify all memory freed */
+   CU_ASSERT_EQUAL(g_bytes_allocated, 0);
+   // start fresh for next test
+   memtable_clear();
+#endif
+}
+
+
+/**
+ * main   
+ */
+//int wmain( int argc, wchar_t* argv[], wchar_t* envp[])
+CU_pSuite test_etch_messagizer_suite()
+{    
+    CU_pSuite pSuite = CU_add_suite("suite messagizer", init_suite, clean_suite);
+
+    CU_add_test(pSuite, "test transportpacket impl constructor", test_transportpacket_constructor); 
+    CU_add_test(pSuite, "test sessionmessage impl constructor",  test_sessionmessage_constructor); 
+    CU_add_test(pSuite, "test messagizer constructor",  test_messagizer_constructor); 
+    CU_add_test(pSuite, "test test setup and teardown v1",  test_testsetup_teardown_a); 
+    CU_add_test(pSuite, "test test setup and teardown v2",  test_testsetup_teardown_b); 
+
+    CU_add_test(pSuite, "test packet 1",  test_packet_1); 
+    CU_add_test(pSuite, "test packet 2",  test_packet_2); 
+    CU_add_test(pSuite, "test packet 3",  test_packet_3); 
+    CU_add_test(pSuite, "test message 1", test_message_1); 
+    CU_add_test(pSuite, "test message 2", test_message_2); 
+
+    CU_add_test(pSuite, "test session control",test_session_control); 
+    CU_add_test(pSuite, "test session notify", test_session_notify); 
+    CU_add_test(pSuite, "test session query",  test_session_query); 
+    CU_add_test(pSuite, "test transport control",test_transport_control); 
+    CU_add_test(pSuite, "test transport notify", test_transport_notify); 
+    CU_add_test(pSuite, "test transport query",  test_transport_query); 
+
+    return pSuite;
+}