From 1c57d340952a045b676233b4e31c54462304fb01 Mon Sep 17 00:00:00 2001 From: Michael Behrisch Date: Fri, 17 Jan 2014 23:36:00 +0000 Subject: [PATCH] added failing test, refs #1128, #21 git-svn-id: file:///home/behr_mi/git/sumo_synched/trunk@15431 afbd958f-9f77-42d5-a016-97a22340ccf4 --- .../ChangeTarget/OnInternal/errors.traci | 0 .../OnInternal/net.edg.xml | 0 .../OnInternal/net.net.xml | 0 .../OnInternal/net.netccfg | 0 .../OnInternal/net.nod.xml | 0 .../ChangeTarget/OnInternal/options.traci | 1 + .../ChangeTarget/OnInternal/output.traci | 1 + .../OnInternal/routes.rou.xml | 6 +- .../ChangeTarget/OnInternal/testclient.prog | 3 + .../OnInternal/testclient_out.traci | 162 ++++++++++++++++++ .../ChangeTarget/OnInternal/vehroutes.traci | 37 ++++ .../Vehicle/ChangeTarget/testsuite.traci | 3 + 12 files changed, 210 insertions(+), 3 deletions(-) create mode 100644 sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/errors.traci rename sumo/tests/traci/set_variable/Vehicle/{ChangeRoute => ChangeTarget}/OnInternal/net.edg.xml (100%) rename sumo/tests/traci/set_variable/Vehicle/{ChangeRoute => ChangeTarget}/OnInternal/net.net.xml (100%) rename sumo/tests/traci/set_variable/Vehicle/{ChangeRoute => ChangeTarget}/OnInternal/net.netccfg (100%) rename sumo/tests/traci/set_variable/Vehicle/{ChangeRoute => ChangeTarget}/OnInternal/net.nod.xml (100%) create mode 100644 sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/options.traci create mode 100644 sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/output.traci rename sumo/tests/traci/set_variable/Vehicle/{ChangeRoute => ChangeTarget}/OnInternal/routes.rou.xml (55%) create mode 100644 sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/testclient.prog create mode 100644 sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/testclient_out.traci create mode 100644 sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/vehroutes.traci diff --git a/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/errors.traci b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/errors.traci new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sumo/tests/traci/set_variable/Vehicle/ChangeRoute/OnInternal/net.edg.xml b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/net.edg.xml similarity index 100% rename from sumo/tests/traci/set_variable/Vehicle/ChangeRoute/OnInternal/net.edg.xml rename to sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/net.edg.xml diff --git a/sumo/tests/traci/set_variable/Vehicle/ChangeRoute/OnInternal/net.net.xml b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/net.net.xml similarity index 100% rename from sumo/tests/traci/set_variable/Vehicle/ChangeRoute/OnInternal/net.net.xml rename to sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/net.net.xml diff --git a/sumo/tests/traci/set_variable/Vehicle/ChangeRoute/OnInternal/net.netccfg b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/net.netccfg similarity index 100% rename from sumo/tests/traci/set_variable/Vehicle/ChangeRoute/OnInternal/net.netccfg rename to sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/net.netccfg diff --git a/sumo/tests/traci/set_variable/Vehicle/ChangeRoute/OnInternal/net.nod.xml b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/net.nod.xml similarity index 100% rename from sumo/tests/traci/set_variable/Vehicle/ChangeRoute/OnInternal/net.nod.xml rename to sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/net.nod.xml diff --git a/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/options.traci b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/options.traci new file mode 100644 index 000000000000..cca498cbe888 --- /dev/null +++ b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/options.traci @@ -0,0 +1 @@ +--vehroute-output=vehroutes.xml --no-step-log --net-file net.net.xml --route-files routes.rou.xml --remote-port 8815 TraCITestClient.exe -def testclient.prog -p 8815 -h localhost -o testclient_out.txt \ No newline at end of file diff --git a/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/output.traci b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/output.traci new file mode 100644 index 000000000000..9eb1ecf9aaae --- /dev/null +++ b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/output.traci @@ -0,0 +1 @@ +***Starting server on port 8815 *** diff --git a/sumo/tests/traci/set_variable/Vehicle/ChangeRoute/OnInternal/routes.rou.xml b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/routes.rou.xml similarity index 55% rename from sumo/tests/traci/set_variable/Vehicle/ChangeRoute/OnInternal/routes.rou.xml rename to sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/routes.rou.xml index 92edaf15916e..23a1ad32b41c 100644 --- a/sumo/tests/traci/set_variable/Vehicle/ChangeRoute/OnInternal/routes.rou.xml +++ b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/routes.rou.xml @@ -1,8 +1,8 @@ - + - - + + diff --git a/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/testclient.prog b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/testclient.prog new file mode 100644 index 000000000000..4bf16c5bfcc7 --- /dev/null +++ b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/testclient.prog @@ -0,0 +1,3 @@ +repeat 5 simstep2 0 +setvalue 0xc4 0x31 veh0 3fi +simstep2 600 diff --git a/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/testclient_out.traci b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/testclient_out.traci new file mode 100644 index 000000000000..fdce40866015 --- /dev/null +++ b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/testclient_out.traci @@ -0,0 +1,162 @@ +TraCITestClient output file. Date: Mon Jul 01 13:28:01 2013 + + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : + domID=196 varID=49 objID=veh0 +.. Command acknowledged (196), [description: ] + +-> Command sent: : +.. Command acknowledged (2), [description: ] + +-> Command sent: : +.. Command acknowledged (127), [description: ] diff --git a/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/vehroutes.traci b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/vehroutes.traci new file mode 100644 index 000000000000..aa4da27f2003 --- /dev/null +++ b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/vehroutes.traci @@ -0,0 +1,37 @@ + + + + + + + + + + + + + diff --git a/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/testsuite.traci b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/testsuite.traci index 1752d454ba56..e5771d075c41 100644 --- a/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/testsuite.traci +++ b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/testsuite.traci @@ -1,6 +1,9 @@ # Test basic functionality of Basic +# Test rerouting on an internal edge +OnInternal + # Test behaviour when specifying unreachable target UnreachableTarget