[certi-cvs] applications/HLA_TestsSuite dtest_test_FOMParse.py

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    applications
Changes by:     Eric NOULARD <erk>      08/11/01 20:25:55

Modified files:
        HLA_TestsSuite : dtest_test_FOMParse.py 

Log message:
        Add interaction class (flat and hierarchical) test for XML FOM

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/applications/HLA_TestsSuite/dtest_test_FOMParse.py?cvsroot=certi&r1=1.4&r2=1.5

Patches:
Index: dtest_test_FOMParse.py
===================================================================
RCS file: /sources/certi/applications/HLA_TestsSuite/dtest_test_FOMParse.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- dtest_test_FOMParse.py      30 Oct 2008 11:00:41 -0000      1.4
+++ dtest_test_FOMParse.py      1 Nov 2008 20:25:55 -0000       1.5
@@ -113,7 +113,7 @@
 
 # Describe a generic successful FOM sequence federate run steps
 def addFOMFedSequence(shouldBeSuccessfull,federate, 
specificLaunchParameters,barrierStart,barrierStop):
-    federate.timeout = globals()['nbfederate']*20
+    federate.timeout = globals()['nbfederate']*10
     globals()['nbfederate']  += 1
     federate.stdout  = file(federate.name + ".out",'w+')
     federate.stdin   = file(federate.name + ".in",'w+')
@@ -137,14 +137,14 @@
 addFOMFedSequence(True,firstFederate," -v -f TestFed.fed -n TestFed -j 
FOMParse1" , "RTIG started", "FOM1")
 addFOMFedSequence(True,FOMFed2, " -v -f RPR-FOM.fed -n FederationName -j 
FOMFed2 -o PhysicalEntity -a DamageState","FOM1","FOM2")
 addFOMFedSequence(True,FOMFed3, " -v -f RPR-FOM.fed -n FederationName -j 
FOMFed2 -o BaseEntity.PhysicalEntity -a DamageState","FOM2","FOM3")
-addFOMFedSequence(True,FOMFed4, " -v -f aviationsimnetV3.1.xml -n 
AviationSimNet -j FOMFed4 -o Federate -a FederateType","FOM3","FOM4")
-addFOMFedSequence(True,FOMFed5, " -v -f aviationsimnetV3.1.xml -n 
AviationSimNet -j FOMFed4 -o Manager.Federate -a FederateType","FOM4","FOM5")
+addFOMFedSequence(True,FOMFed4, " -v -f aviationsimnetV3.1.xml -n 
AviationSimNet -j FOMFed4 -o Federate -a FederateType -i Federate -p 
Federate","FOM3","FOM4")
+addFOMFedSequence(True,FOMFed5, " -v -f aviationsimnetV3.1.xml -n 
AviationSimNet -j FOMFed4 -o Manager.Federate -a FederateType -i 
Manager.Federate -p Federate","FOM4","FOM5")
 addFOMFedSequence(False,FOMFed6, " -v -f BuggyFed -n BuggyFed","FOM5","All 
Federate(s) ended")
 
 def goTest():
     myDTestMaster = dtest.DTestMaster("HLA test test_FOMParse Starts","Launch 
RTIG + several test_FOMParse federates for testing several FOM file parsing.")
-    myDTestMaster.timeout = globals()['nbfederate']*20+30
-    rtig.timeout = globals()['nbfederate']*20
+    myDTestMaster.timeout = globals()['nbfederate']*10+30
+    rtig.timeout = globals()['nbfederate']*10
     myDTestMaster.register(rtig)
     myDTestMaster.register(firstFederate)
     myDTestMaster.register(FOMFed2)