Changeset 358 for trunk/nom

Timestamp:

Jun 7, 2008, 6:08:51 PM (17 years ago)

Author:

cinc

Message:

Improvements to test classes

Location:

trunk/nom

Files:

• class_c/nomtestcase.c (modified) (3 diffs)
• class_c/nomtestresult.c (modified) (2 diffs)
• idl/nomtestcase.idl (modified) (3 diffs)
• idl/nomtestresult.idl (modified) (2 diffs)

trunk/nom/class_c/nomtestcase.c

@@ -49 +49 @@
 
 #include "nomarray.h"
+#include "nomstring.h"
+#include "nomtestresult.h"
 #include "nomtestcase.ih"
-#include "nomstring.ih"
-#include "nommethod.ih"
+#include "nommethod.h"
 
-typedef void* NOMLINK nomProc(void*, void*);
+typedef boolean NOMLINK nomProc(void*, void*);
 
 NOMDLLEXPORT NOM_Scope void NOMLINK impl_NOMTestCase_setUp(NOMTestCase* nomSelf,
@@ -86 +87 @@
     if(0==strstr( methodName, "test"))
     {
+      NOMTestResult* nResult=NOMTestResultNew();
       nomProc* nProc=_queryMethodToken(NOMArray_queryObjectAtIdx(methodArray, a, NULL), NULL);
       
       _setUp(nomSelf, NULL);
       
+      /* The name of this test */
+      _setName(nResult, _getName(NOMArray_queryObjectAtIdx(methodArray, a, NULL), NULL), NULL);
+      
+      /* Call the test method */
       if(NULL!=nProc)
-        nProc(nomSelf, NULL);
+        _setSuccess(nResult, nProc(nomSelf, NULL), NULL); /* TRUE if success */
       
-      _tearDown(nomSelf, NULL);      
-    }
-    
+      /* Clean up */
+      _tearDown(nomSelf, NULL);
+      NOMArray_append(resultArray, nResult, NULL);
+    }    
   }
   
@@ -101 +108 @@
 }
 
-NOMDLLEXPORT NOM_Scope void NOMLINK impl_NOMTestCase_runSingleTest(NOMTestCase* nomSelf,
+NOMDLLEXPORT NOM_Scope NOMTestResult* NOMLINK impl_NOMTestCase_runSingleTest(NOMTestCase* nomSelf,
                                                                    const CORBA_char* chrTestName,
                                                                    CORBA_Environment *ev)
 {
+  NOMTestResult* nResult=NOMTestResultNew();
+  NOMString* nsName;
+  NOMArray* methodArray=NULL;
+  int a;
+  
   /* NOMTestCaseData* nomThis = NOMTestCaseGetData(nomSelf); */
 
-  _setUp(nomSelf, NULL);
+  /* Get list of all methods of this class */
+  methodArray=_nomGetMethodList(nomSelf, FALSE, NULL);
+
+  /* The name of this test */
+  nsName=NOMStringNew();
+  NOMString_assignString(nsName, chrTestName, NULL);
   
-  g_message("%s: This method is not yet implemented.", __FUNCTION__);
+  _setName(nResult, nsName, NULL);
+
+  for(a=0; a<NOMArray_length(methodArray, NULL); a++)
+  {
+    char* methodName=_queryString(_getName(NOMArray_queryObjectAtIdx(methodArray, a, NULL), NULL), NULL);
+    
+    if(0==strcmp( methodName, chrTestName))
+    {
+      nomProc* nProc=_queryMethodToken(NOMArray_queryObjectAtIdx(methodArray, a, NULL), NULL);
+      
+      _setUp(nomSelf, NULL);
+            
+      /* Call the test method */
+      if(NULL!=nProc)
+        _setSuccess(nResult, nProc(nomSelf, NULL), NULL); /* TRUE if success */
+      
+      /* Clean up */
+      _tearDown(nomSelf, NULL);
+    }    
+  }
   
-  _tearDown(nomSelf, NULL);  
+  return nResult;
 }
 

trunk/nom/class_c/nomtestresult.c

@@ -20 +20 @@
 #include <nomtk.h>
 
+#include "nomstring.h"
 #include "nomtestresult.ih"
 
@@ -31 +32 @@
 }
 
+
+NOMDLLEXPORT NOM_Scope void NOMLINK impl_NOMTestResult_setSuccess(NOMTestResult* nomSelf,
+                                                                  const CORBA_boolean fSuccess,
+                                                                  CORBA_Environment *ev)
+{
+  NOMTestResultData* nomThis = NOMTestResultGetData(nomSelf);
+  
+  _fSuccess=fSuccess;
+}
+
+
+NOMDLLEXPORT NOM_Scope void NOMLINK impl_NOMTestResult_setName(NOMTestResult* nomSelf,
+                                                               const NOMString* nsName,
+                                                               CORBA_Environment *ev)
+{
+  NOMTestResultData* nomThis = NOMTestResultGetData(nomSelf);
+  
+  _nsTestName=nsName;
+}
+
+
+NOMDLLEXPORT NOM_Scope NOMString* NOMLINK impl_NOMTestResult_queryName(NOMTestResult* nomSelf,
+                                                                       CORBA_Environment *ev)
+{
+  NOMTestResultData* nomThis = NOMTestResultGetData(nomSelf);
+  
+  return _nsTestName;
+}
+

trunk/nom/idl/nomtestcase.idl

@@ -39 +39 @@
 
 interface NOMArray;
+interface NOMTestResult;
 
 NOMCLASSNAME(NOMTestCase);
@@ -67 +68 @@
   /*boolean assertTrue();*/
   NOMArray*      runTests();
-  void runSingleTest(in string chrTestName);
+  NOMTestResult* runSingleTest(in string chrTestName);
 
   /** 
@@ -74 +75 @@
   //NOMOVERRIDE(nomInit);
 
-  /**
-     The GPtrArray holding the objects
-  */
-  //NOMINSTANCEVAR(GPtrArray* pPtrArray);
 };
 

trunk/nom/idl/nomtestresult.idl

@@ -41 +41 @@
 NOMCLASSNAME(NOMTestResult);
 
-
+interface NOMString;
 
 /** \class NOMTestResult
@@ -63 +63 @@
    */
   boolean success();
+  
+  void setSuccess(in boolean fSuccess);
+
+  void setName(in NOMString* nsName);
+  NOMString* queryName();
+  
+  NOMINSTANCEVAR(boolean fSuccess);
+  NOMINSTANCEVAR(NOMString* nsTestName);
+  
 };