Skip to content

Commit

Permalink
adapting test results #21 #15450, removing unnecessary whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
behrisch committed Sep 8, 2024
1 parent 9fa626d commit 8e281d2
Show file tree
Hide file tree
Showing 130 changed files with 533 additions and 915 deletions.
8 changes: 4 additions & 4 deletions src/traci_testclient/TraCITestClient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ TraCITestClient::readAndReportTypeDependent(tcpip::Storage& inMsg, int valueData
double x = inMsg.readDouble();
double y = inMsg.readDouble();
double z = inMsg.readDouble();
answerLog << " Position3DValue: " << std::endl;
answerLog << " Position3DValue:";
answerLog << " x: " << x << " y: " << y
<< " z: " << z << std::endl;
} else if (valueDataType == libsumo::POSITION_ROADMAP) {
Expand All @@ -606,10 +606,10 @@ TraCITestClient::readAndReportTypeDependent(tcpip::Storage& inMsg, int valueData
<< " laneId=" << laneId << std::endl;
} else if (valueDataType == libsumo::TYPE_STRING) {
std::string s = inMsg.readString();
answerLog << " string value: " << s << std::endl;
answerLog << " string value: " << (s.empty() ? "''" : s) << std::endl;
} else if (valueDataType == libsumo::TYPE_STRINGLIST) {
std::vector<std::string> s = inMsg.readStringList();
answerLog << " string list value: [ " << std::endl;
answerLog << " string list value: [ ";
for (std::vector<std::string>::iterator i = s.begin(); i != s.end(); ++i) {
if (i != s.begin()) {
answerLog << ", ";
Expand All @@ -619,7 +619,7 @@ TraCITestClient::readAndReportTypeDependent(tcpip::Storage& inMsg, int valueData
answerLog << " ]" << std::endl;
} else if (valueDataType == libsumo::TYPE_COMPOUND) {
int no = inMsg.readInt();
answerLog << " compound value with " << no << " members: [ " << std::endl;
answerLog << " compound value with " << no << " members: [ ";
for (int i = 0; i < no; ++i) {
int currentValueDataType = inMsg.readUnsignedByte();
answerLog << " valueDataType=" << currentValueDataType;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
TraCITestClient output file. Date: Tue Dec 16 15:25:21 2014
TraCITestClient output file. Date: Sun Sep 8 08:50:00 2024


-> Command sent: <SimulationStep>:
Expand All @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Tue Dec 16 15:25:21 2014
-> Command sent: <GetVariable>:
domID=173 varID=0 objID=dummy
.. Command acknowledged (173), [description: ]
CommandID=189 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [
]
CommandID=189 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ ]

-> Command sent: <SimulationStep>:
.. Command acknowledged (2), [description: ]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
TraCITestClient output file. Date: Tue Dec 16 15:25:22 2014
TraCITestClient output file. Date: Sun Sep 8 08:50:00 2024


-> Command sent: <SimulationStep>:
Expand All @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Tue Dec 16 15:25:22 2014
-> Command sent: <GetVariable>:
domID=173 varID=0 objID=dummy
.. Command acknowledged (173), [description: ]
CommandID=189 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [
"tmp" ]
CommandID=189 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ "tmp" ]

-> Command sent: <SimulationStep>:
.. Command acknowledged (2), [description: ]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
TraCITestClient output file. Date: Tue Dec 16 15:25:23 2014
TraCITestClient output file. Date: Sun Sep 8 08:50:00 2024


-> Command sent: <SimulationStep>:
Expand All @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Tue Dec 16 15:25:23 2014
-> Command sent: <GetVariable>:
domID=173 varID=0 objID=dummy
.. Command acknowledged (173), [description: ]
CommandID=189 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [
"tmp1", "tmp2" ]
CommandID=189 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ "tmp1", "tmp2" ]

-> Command sent: <SimulationStep>:
.. Command acknowledged (2), [description: ]
Expand Down
5 changes: 2 additions & 3 deletions tests/traci/get_variable/Edge/ID_LIST/testclient_out.traci
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
TraCITestClient output file. Date: Mon Jul 01 13:26:46 2013
TraCITestClient output file. Date: Sun Sep 8 08:53:12 2024


-> Command sent: <SimulationStep>:
Expand All @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:26:46 2013
-> Command sent: <GetVariable>:
domID=170 varID=0 objID=xxx
.. Command acknowledged (170), [description: ]
CommandID=186 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [
"0/0to0/1", "0/0to1/0", "0/1to0/0", "0/1to0/2", "0/1to1/1", "0/2to0/1", "0/2to1/2", "1/0to0/0", "1/0to1/1", "1/0to2/0", "1/1to0/1", "1/1to1/0", "1/1to1/2", "1/1to2/1", "1/2to0/2", "1/2to1/1", "1/2to2/2", "2/0to1/0", "2/0to2/1", "2/0to3/0", "2/1to1/1", "2/1to2/0", "2/1to2/2", "2/1to3/1", "2/2to1/2", "2/2to2/1", "2/2to3/2", "3/0to2/0", "3/0to3/1", "3/0to4/0", "3/1to2/1", "3/1to3/0", "3/1to3/2", "3/1to4/1", "3/2to2/2", "3/2to3/1", "3/2to4/2", "4/0to3/0", "4/0to4/1", "4/1to3/1", "4/1to4/0", "4/1to4/2", "4/2to3/2", "4/2to4/1" ]
CommandID=186 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "0/0to0/1", "0/0to1/0", "0/1to0/0", "0/1to0/2", "0/1to1/1", "0/2to0/1", "0/2to1/2", "1/0to0/0", "1/0to1/1", "1/0to2/0", "1/1to0/1", "1/1to1/0", "1/1to1/2", "1/1to2/1", "1/2to0/2", "1/2to1/1", "1/2to2/2", "2/0to1/0", "2/0to2/1", "2/0to3/0", "2/1to1/1", "2/1to2/0", "2/1to2/2", "2/1to3/1", "2/2to1/2", "2/2to2/1", "2/2to3/2", "3/0to2/0", "3/0to3/1", "3/0to4/0", "3/1to2/1", "3/1to3/0", "3/1to3/2", "3/1to4/1", "3/2to2/2", "3/2to3/1", "3/2to4/2", "4/0to3/0", "4/0to4/1", "4/1to3/1", "4/1to4/0", "4/1to4/2", "4/2to3/2", "4/2to4/1" ]

-> Command sent: <SimulationStep>:
.. Command acknowledged (2), [description: ]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
TraCITestClient output file. Date: Mon Jul 01 13:26:46 2013
TraCITestClient output file. Date: Sun Sep 8 08:53:12 2024


-> Command sent: <SimulationStep>:
Expand All @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:26:46 2013
-> Command sent: <GetVariable>:
domID=170 varID=0 objID=xxx
.. Command acknowledged (170), [description: ]
CommandID=186 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [
"0/0to0/1", "0/0to1/0", "0/1to0/0", "0/1to0/2", "0/1to1/1", "0/2to0/1", "0/2to1/2", "1/0to0/0", "1/0to1/1", "1/0to2/0", "1/1to0/1", "1/1to1/0", "1/1to1/2", "1/1to2/1", "1/2to0/2", "1/2to1/1", "1/2to2/2", "2/0to1/0", "2/0to2/1", "2/0to3/0", "2/1to1/1", "2/1to2/0", "2/1to2/2", "2/1to3/1", "2/2to1/2", "2/2to2/1", "2/2to3/2", "3/0to2/0", "3/0to3/1", "3/0to4/0", "3/1to2/1", "3/1to3/0", "3/1to3/2", "3/1to4/1", "3/2to2/2", "3/2to3/1", "3/2to4/2", "4/0to3/0", "4/0to4/1", "4/1to3/1", "4/1to4/0", "4/1to4/2", "4/2to3/2", "4/2to4/1" ]
CommandID=186 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "0/0to0/1", "0/0to1/0", "0/1to0/0", "0/1to0/2", "0/1to1/1", "0/2to0/1", "0/2to1/2", "1/0to0/0", "1/0to1/1", "1/0to2/0", "1/1to0/1", "1/1to1/0", "1/1to1/2", "1/1to2/1", "1/2to0/2", "1/2to1/1", "1/2to2/2", "2/0to1/0", "2/0to2/1", "2/0to3/0", "2/1to1/1", "2/1to2/0", "2/1to2/2", "2/1to3/1", "2/2to1/2", "2/2to2/1", "2/2to3/2", "3/0to2/0", "3/0to3/1", "3/0to4/0", "3/1to2/1", "3/1to3/0", "3/1to3/2", "3/1to4/1", "3/2to2/2", "3/2to3/1", "3/2to4/2", "4/0to3/0", "4/0to4/1", "4/1to3/1", "4/1to4/0", "4/1to4/2", "4/2to3/2", "4/2to4/1" ]

-> Command sent: <SimulationStep>:
.. Command acknowledged (2), [description: ]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
TraCITestClient output file. Date: Wed Apr 15 16:37:47 2015
TraCITestClient output file. Date: Sun Sep 8 08:53:15 2024


-> Command sent: <SimulationStep>:
Expand All @@ -7,17 +7,15 @@ TraCITestClient output file. Date: Wed Apr 15 16:37:47 2015
-> Command sent: <GetVariable>:
domID=170 varID=26 objID=0/0to1/0
.. Command acknowledged (170), [description: ]
CommandID=186 VariableID=26 ObjectID=0/0to1/0 valueDataType=14 string list value: [
"p0" ]
CommandID=186 VariableID=26 ObjectID=0/0to1/0 valueDataType=14 string list value: [ "p0" ]

-> Command sent: <SimulationStep>:
.. Command acknowledged (2), [description: ]

-> Command sent: <GetVariable>:
domID=170 varID=26 objID=0/0to1/0
.. Command acknowledged (170), [description: ]
CommandID=186 VariableID=26 ObjectID=0/0to1/0 valueDataType=14 string list value: [
"p1", "p0" ]
CommandID=186 VariableID=26 ObjectID=0/0to1/0 valueDataType=14 string list value: [ "p1", "p0" ]

-> Command sent: <SimulationStep>:
.. Command acknowledged (2), [description: ]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
TraCITestClient output file. Date: Mon Jul 01 13:26:46 2013
TraCITestClient output file. Date: Sun Sep 8 08:53:12 2024


-> Command sent: <SimulationStep>:
Expand All @@ -7,17 +7,15 @@ TraCITestClient output file. Date: Mon Jul 01 13:26:46 2013
-> Command sent: <GetVariable>:
domID=170 varID=18 objID=1/1to0/1
.. Command acknowledged (170), [description: ]
CommandID=186 VariableID=18 ObjectID=1/1to0/1 valueDataType=14 string list value: [
]
CommandID=186 VariableID=18 ObjectID=1/1to0/1 valueDataType=14 string list value: [ ]

-> Command sent: <SimulationStep>:
.. Command acknowledged (2), [description: ]

-> Command sent: <GetVariable>:
domID=170 varID=18 objID=4/1to3/1
.. Command acknowledged (170), [description: ]
CommandID=186 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [
"0" ]
CommandID=186 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ "0" ]

-> Command sent: <SimulationStep>:
.. Command acknowledged (2), [description: ]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
TraCITestClient output file. Date: Mon Jul 01 13:26:46 2013
TraCITestClient output file. Date: Sun Sep 8 08:53:13 2024


-> Command sent: <SimulationStep>:
Expand All @@ -7,17 +7,15 @@ TraCITestClient output file. Date: Mon Jul 01 13:26:46 2013
-> Command sent: <GetVariable>:
domID=170 varID=18 objID=1/1to0/1
.. Command acknowledged (170), [description: ]
CommandID=186 VariableID=18 ObjectID=1/1to0/1 valueDataType=14 string list value: [
]
CommandID=186 VariableID=18 ObjectID=1/1to0/1 valueDataType=14 string list value: [ ]

-> Command sent: <SimulationStep>:
.. Command acknowledged (2), [description: ]

-> Command sent: <GetVariable>:
domID=170 varID=18 objID=4/1to3/1
.. Command acknowledged (170), [description: ]
CommandID=186 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [
"0" ]
CommandID=186 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ "0" ]

-> Command sent: <SimulationStep>:
.. Command acknowledged (2), [description: ]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
TraCITestClient output file. Date: Mon Jul 01 13:26:50 2013
TraCITestClient output file. Date: Sun Sep 8 08:53:13 2024


-> Command sent: <SimulationStep>:
Expand All @@ -7,17 +7,15 @@ TraCITestClient output file. Date: Mon Jul 01 13:26:50 2013
-> Command sent: <GetVariable>:
domID=170 varID=18 objID=3/1to2/1
.. Command acknowledged (170), [description: ]
CommandID=186 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [
]
CommandID=186 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ]

-> Command sent: <SimulationStep>:
.. Command acknowledged (2), [description: ]

-> Command sent: <GetVariable>:
domID=170 varID=18 objID=3/1to2/1
.. Command acknowledged (170), [description: ]
CommandID=186 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [
"0" ]
CommandID=186 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ "0" ]

-> Command sent: <SimulationStep>:
.. Command acknowledged (2), [description: ]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
TraCITestClient output file. Date: Mon Jul 01 13:26:50 2013
TraCITestClient output file. Date: Sun Sep 8 08:53:13 2024


-> Command sent: <SimulationStep>:
Expand All @@ -7,17 +7,15 @@ TraCITestClient output file. Date: Mon Jul 01 13:26:50 2013
-> Command sent: <GetVariable>:
domID=170 varID=18 objID=3/1to2/1
.. Command acknowledged (170), [description: ]
CommandID=186 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [
]
CommandID=186 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ]

-> Command sent: <SimulationStep>:
.. Command acknowledged (2), [description: ]

-> Command sent: <GetVariable>:
domID=170 varID=18 objID=3/1to2/1
.. Command acknowledged (170), [description: ]
CommandID=186 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [
"0" ]
CommandID=186 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ "0" ]

-> Command sent: <SimulationStep>:
.. Command acknowledged (2), [description: ]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
TraCITestClient output file. Date: Mon Jul 01 13:24:17 2013
TraCITestClient output file. Date: Sun Sep 8 08:52:49 2024


-> Command sent: <SimulationStep>:
Expand All @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:17 2013
-> Command sent: <GetVariable>:
domID=160 varID=0 objID=dummy
.. Command acknowledged (160), [description: ]
CommandID=176 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [
]
CommandID=176 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ ]

-> Command sent: <SimulationStep>:
.. Command acknowledged (2), [description: ]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
TraCITestClient output file. Date: Mon Jul 01 13:24:18 2013
TraCITestClient output file. Date: Sun Sep 8 08:52:49 2024


-> Command sent: <SimulationStep>:
Expand All @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:18 2013
-> Command sent: <GetVariable>:
domID=160 varID=0 objID=dummy
.. Command acknowledged (160), [description: ]
CommandID=176 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [
"3/1to2/1" ]
CommandID=176 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ "3/1to2/1" ]

-> Command sent: <SimulationStep>:
.. Command acknowledged (2), [description: ]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
TraCITestClient output file. Date: Mon Jul 01 13:24:19 2013
TraCITestClient output file. Date: Sun Sep 8 08:52:49 2024


-> Command sent: <SimulationStep>:
Expand All @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:19 2013
-> Command sent: <GetVariable>:
domID=160 varID=0 objID=dummy
.. Command acknowledged (160), [description: ]
CommandID=176 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [
"3/1to2/1", "4/1to3/1" ]
CommandID=176 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ "3/1to2/1", "4/1to3/1" ]

-> Command sent: <SimulationStep>:
.. Command acknowledged (2), [description: ]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024
TraCITestClient output file. Date: Sun Sep 8 08:52:49 2024


-> Command sent: <SimulationStep>:
Expand All @@ -17,8 +17,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024
-> Command sent: <GetVariable>:
domID=160 varID=18 objID=3/1to2/1
.. Command acknowledged (160), [description: ]
CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [
]
CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ]

-> Command sent: <GetVariable>:
domID=160 varID=19 objID=3/1to2/1
Expand All @@ -38,8 +37,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024
-> Command sent: <GetVariable>:
domID=160 varID=23 objID=3/1to2/1
.. Command acknowledged (160), [description: ]
CommandID=176 VariableID=23 ObjectID=3/1to2/1 valueDataType=15 compound value with 1 members: [
valueDataType=9 Int value: 0
CommandID=176 VariableID=23 ObjectID=3/1to2/1 valueDataType=15 compound value with 1 members: [ valueDataType=9 Int value: 0
]

-> Command sent: <SimulationStep>:
Expand All @@ -58,8 +56,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024
-> Command sent: <GetVariable>:
domID=160 varID=18 objID=3/1to2/1
.. Command acknowledged (160), [description: ]
CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [
"0" ]
CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ "0" ]

-> Command sent: <GetVariable>:
domID=160 varID=19 objID=3/1to2/1
Expand All @@ -79,8 +76,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024
-> Command sent: <GetVariable>:
domID=160 varID=23 objID=3/1to2/1
.. Command acknowledged (160), [description: ]
CommandID=176 VariableID=23 ObjectID=3/1to2/1 valueDataType=15 compound value with 6 members: [
valueDataType=9 Int value: 1
CommandID=176 VariableID=23 ObjectID=3/1to2/1 valueDataType=15 compound value with 6 members: [ valueDataType=9 Int value: 1
valueDataType=12 string value: 0
valueDataType=11 Double value: 3.00
valueDataType=11 Double value: 51.00
Expand All @@ -104,8 +100,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024
-> Command sent: <GetVariable>:
domID=160 varID=18 objID=3/1to2/1
.. Command acknowledged (160), [description: ]
CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [
"0" ]
CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ "0" ]

-> Command sent: <GetVariable>:
domID=160 varID=19 objID=3/1to2/1
Expand All @@ -125,8 +120,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024
-> Command sent: <GetVariable>:
domID=160 varID=23 objID=3/1to2/1
.. Command acknowledged (160), [description: ]
CommandID=176 VariableID=23 ObjectID=3/1to2/1 valueDataType=15 compound value with 6 members: [
valueDataType=9 Int value: 1
CommandID=176 VariableID=23 ObjectID=3/1to2/1 valueDataType=15 compound value with 6 members: [ valueDataType=9 Int value: 1
valueDataType=12 string value: 0
valueDataType=11 Double value: 3.00
valueDataType=11 Double value: 51.00
Expand Down
Loading

0 comments on commit 8e281d2

Please sign in to comment.