[certi-cvs] applications/HLA_TestsSuite CMakeLists.txt test...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    applications
Changes by:     Eric NOULARD <erk>      08/10/20 21:21:42

Modified files:
        HLA_TestsSuite : CMakeLists.txt test_FOMParse.cc 

Log message:
        Elementary FOMParse is working

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/applications/HLA_TestsSuite/CMakeLists.txt?cvsroot=certi&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/applications/HLA_TestsSuite/test_FOMParse.cc?cvsroot=certi&r1=1.1&r2=1.2

Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/applications/HLA_TestsSuite/CMakeLists.txt,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- CMakeLists.txt      20 Oct 2008 21:06:06 -0000      1.21
+++ CMakeLists.txt      20 Oct 2008 21:21:42 -0000      1.22
@@ -184,9 +184,9 @@
 #########################################################################
 # ADD TEST Parse FOM file 
 #########################################################################      
             
-#HLATestsSuite_ADD_TEST(test_FOMParse
-#                      FED_FILE test_NotificationSwitches.fed
-#                      SOURCE_FILES test_FOMParse.cc test_FOMParse_cmdline.h 
test_FOMParse_cmdline.c 
-#                      COMMENTS "A FOM parsing test")
+HLATestsSuite_ADD_TEST(test_FOMParse
+                      FED_FILE test_NotificationSwitches.fed
+                      SOURCE_FILES test_FOMParse.cc test_FOMParse_cmdline.h 
test_FOMParse_cmdline.c 
+                      COMMENTS "A FOM parsing test")
 
 MESSAGE(STATUS "*** ${CMAKE_PROJECT_NAME} has been successfully configured 
***")

Index: test_FOMParse.cc
===================================================================
RCS file: /sources/certi/applications/HLA_TestsSuite/test_FOMParse.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test_FOMParse.cc    20 Oct 2008 21:06:06 -0000      1.1
+++ test_FOMParse.cc    20 Oct 2008 21:21:42 -0000      1.2
@@ -28,11 +28,17 @@
 private:
     string federationName;
     string federationFile;
+    bool   verbose;
 
 public:
-    ParseFederate(std::string federationFile, std::string federationName) {
-       federationFile = federationFile;
-        federationName = federationName;
+    ParseFederate(std::string federationFile, std::string federationName, bool 
verbose=false) {
+       this->verbose        = verbose;
+       if (verbose) {
+               cout << "federationFile = " << federationFile <<endl;
+               cout << "federationName = " << federationName <<endl;
+       }
+       this->federationFile = federationFile;
+        this->federationName = federationName;
     };
 
     virtual ~ParseFederate() throw (RTI::FederateInternalError) {
@@ -101,7 +107,7 @@
     }
 
 protected:
-    RTI::myRTIambassador myRTIamb;
+    RTI::RTIambassador myRTIamb;
 };
 
 int main(int argc, char **argv) {
@@ -111,7 +117,7 @@
        if (cmdline_parser(argc, argv, &args))
                    exit(EXIT_FAILURE);
 
-    ParseFederate parseFederate(std::string(args.fedfile),
-                                                               
std::string(args.fedname));
-    return testFed.main();
+    ParseFederate parseFederate(std::string(args.fedfile_arg),
+                                                               
std::string(args.fedname_arg),args.verbose_arg);
+    return parseFederate.main();
 }