Index: App/Common.h
===================================================================
diff -u -rcb47c5f896477ceae7597cb1a4191b3972e93f0d -r38ff7a6fbf82b86ab1bac3b7b24c4ea33d5419f9
--- App/Common.h	(.../Common.h)	(revision cb47c5f896477ceae7597cb1a4191b3972e93f0d)
+++ App/Common.h	(.../Common.h)	(revision 38ff7a6fbf82b86ab1bac3b7b24c4ea33d5419f9)
@@ -59,8 +59,8 @@
 {
     STATE_CLOSED = 0,
     STATE_OPEN,
-    NUM_OF_TWO_WAY_STATES
-} TWO_WAY_STATE_T;
+    NUM_OF_OPN_CLS_STATES
+} OPN_CLS_STATE_T;
 
 // **** Common Definitions ****
 
@@ -113,6 +113,35 @@
     return result; \
 }
 
+// DATA_OVERRIDE_FUNC - creates an override and a reset override function for a DATA
+// t        = data's type
+// o_name   = name for override function
+// r_name   = name for reset override function
+// d_name   = name of data's variable
+#define DATA_OVERRIDE_FUNC( t, o_name, r_name, d_name ) \
+BOOL o_name( t value ) \
+{ \
+    BOOL result = FALSE; \
+    if ( TRUE == isTestingActivated() ) \
+    { \
+        result = TRUE; \
+        d_name.ovData = value; \
+        d_name.override = OVERRIDE_KEY; \
+    } \
+    return result; \
+} \
+BOOL r_name( void ) \
+{ \
+    BOOL result = FALSE; \
+    if ( TRUE == isTestingActivated() ) \
+    { \
+        result = TRUE; \
+        d_name.override = OVERRIDE_RESET; \
+        d_name.ovData = d_name.ovInitData; \
+    } \
+    return result; \
+}
+
 // **** VectorCAST Definitions ****
 
 #ifdef _VECTORCAST_