Skip to content

Commit 53be5ea

Browse files
namdrenamdre
committed
added test refs #21, #15753, #17598 
1 parent 1e3f843 commit 53be5ea

File tree

8 files changed

+275
-0
lines changed

8 files changed

+275
-0
lines changed

‎tests/complex/traci/trafficlight/getSpentDuration3/errors.complex‎

Whitespace-only changes.

‎tests/complex/traci/trafficlight/getSpentDuration3/input_additional.add.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<add>
2+
3+
<tlLogic id="C" type="static" programID="1" offset="0">
4+
<phase duration="26" state="GGGggrrrrrGGGggrrrrr"/>
5+
<phase duration="3" state="yyyggrrrrryyyggrrrrr"/>
6+
<phase duration="8" state="rrrGGrrrrrrrrGGrrrrr"/>
7+
<phase duration="3" state="rrryyrrrrrrrryyrrrrr"/>
8+
<phase duration="26" state="rrrrrGGGggrrrrrGGGgg"/>
9+
<phase duration="3" state="rrrrryyyggrrrrryyygg"/>
10+
<phase duration="8" state="rrrrrrrrGGrrrrrrrrGG"/>
11+
<phase duration="3" state="rrrrrrrryyrrrrrrrryy"/>
12+
</tlLogic>
13+
</add>

‎tests/complex/traci/trafficlight/getSpentDuration3/input_routes.rou.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
2+
<route id="vertical" edges="NC CS"/>
3+
<vehicle id="0" route="vertical" depart="0"/>
4+
<vehicle id="1" route="vertical" depart="30"/>
5+
</routes>

‎tests/complex/traci/trafficlight/getSpentDuration3/options.complex‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
tests/complex/traci/trafficlight/getSpentDuration3/runner.py

‎tests/complex/traci/trafficlight/getSpentDuration3/output.complex‎

Lines changed: 181 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,181 @@
1+
Retrying in 1 seconds
2+
1.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 1.0
3+
2.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 2.0
4+
3.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 3.0
5+
4.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 4.0
6+
5.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 5.0
7+
6.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 6.0
8+
7.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 7.0
9+
8.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 8.0
10+
9.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 9.0
11+
10.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 10.0
12+
11.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 11.0
13+
12.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 12.0
14+
13.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 13.0
15+
14.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 14.0
16+
15.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 15.0
17+
16.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 16.0
18+
17.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 17.0
19+
18.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 18.0
20+
19.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 19.0
21+
20.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 20.0
22+
21.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 21.0
23+
22.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 22.0
24+
23.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 23.0
25+
24.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 24.0
26+
25.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 25.0
27+
26.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 26.0
28+
27.0 prog 1 state yyyggrrrrryyyggrrrrr spent 1.0
29+
28.0 prog 1 state yyyggrrrrryyyggrrrrr spent 2.0
30+
29.0 prog 1 state yyyggrrrrryyyggrrrrr spent 3.0
31+
30.0 prog 1 state rrrGGrrrrrrrrGGrrrrr spent 1.0
32+
31.0 prog 1 state rrrGGrrrrrrrrGGrrrrr spent 2.0
33+
32.0 prog 1 state rrrGGrrrrrrrrGGrrrrr spent 3.0
34+
33.0 prog 1 state rrrGGrrrrrrrrGGrrrrr spent 4.0
35+
34.0 prog 1 state rrrGGrrrrrrrrGGrrrrr spent 5.0
36+
35.0 prog 1 state rrrGGrrrrrrrrGGrrrrr spent 6.0
37+
36.0 prog 1 state rrrGGrrrrrrrrGGrrrrr spent 7.0
38+
37.0 prog 1 state rrrGGrrrrrrrrGGrrrrr spent 8.0
39+
38.0 prog 1 state rrryyrrrrrrrryyrrrrr spent 1.0
40+
39.0 prog 1 state rrryyrrrrrrrryyrrrrr spent 2.0
41+
40.0 prog 1 state rrryyrrrrrrrryyrrrrr spent 3.0
42+
41.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 1.0
43+
42.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 2.0
44+
43.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 3.0
45+
44.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 4.0
46+
45.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 5.0
47+
46.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 6.0
48+
47.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 7.0
49+
48.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 8.0
50+
49.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 9.0
51+
50.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 10.0
52+
51.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 11.0
53+
52.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 12.0
54+
53.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 13.0
55+
54.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 14.0
56+
55.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 15.0
57+
56.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 16.0
58+
57.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 17.0
59+
58.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 18.0
60+
59.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 19.0
61+
60.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 20.0
62+
61.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 21.0
63+
62.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 22.0
64+
63.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 23.0
65+
64.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 24.0
66+
65.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 25.0
67+
66.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 26.0
68+
67.0 prog 1 state rrrrryyyggrrrrryyygg spent 1.0
69+
68.0 prog 1 state rrrrryyyggrrrrryyygg spent 2.0
70+
69.0 prog 1 state rrrrryyyggrrrrryyygg spent 3.0
71+
70.0 prog 1 state rrrrrrrrGGrrrrrrrrGG spent 1.0
72+
71.0 prog 1 state rrrrrrrrGGrrrrrrrrGG spent 2.0
73+
72.0 prog 1 state rrrrrrrrGGrrrrrrrrGG spent 3.0
74+
73.0 prog 1 state rrrrrrrrGGrrrrrrrrGG spent 4.0
75+
74.0 prog 1 state rrrrrrrrGGrrrrrrrrGG spent 5.0
76+
75.0 prog 1 state rrrrrrrrGGrrrrrrrrGG spent 6.0
77+
76.0 prog 1 state rrrrrrrrGGrrrrrrrrGG spent 7.0
78+
77.0 prog 1 state rrrrrrrrGGrrrrrrrrGG spent 8.0
79+
78.0 prog 1 state rrrrrrrryyrrrrrrrryy spent 1.0
80+
79.0 prog 1 state rrrrrrrryyrrrrrrrryy spent 2.0
81+
80.0 prog 1 state rrrrrrrryyrrrrrrrryy spent 3.0
82+
81.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 1.0
83+
82.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 2.0
84+
83.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 3.0
85+
84.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 4.0
86+
85.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 5.0
87+
86.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 6.0
88+
87.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 7.0
89+
88.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 8.0
90+
89.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 9.0
91+
90.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 10.0
92+
91.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 11.0
93+
92.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 12.0
94+
93.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 13.0
95+
94.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 14.0
96+
95.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 15.0
97+
96.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 16.0
98+
97.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 17.0
99+
98.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 18.0
100+
99.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 19.0
101+
100.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 20.0
102+
101.0 prog 0 state GGGggrrrrrGGGggrrrrr spent 11.0
103+
102.0 prog 0 state GGGggrrrrrGGGggrrrrr spent 12.0
104+
103.0 prog 0 state GGGggrrrrrGGGggrrrrr spent 13.0
105+
104.0 prog 0 state GGGggrrrrrGGGggrrrrr spent 14.0
106+
105.0 prog 0 state GGGggrrrrrGGGggrrrrr spent 15.0
107+
106.0 prog 0 state GGGggrrrrrGGGggrrrrr spent 16.0
108+
107.0 prog 0 state GGGggrrrrrGGGggrrrrr spent 17.0
109+
108.0 prog 0 state GGGggrrrrrGGGggrrrrr spent 18.0
110+
109.0 prog 0 state GGGggrrrrrGGGggrrrrr spent 19.0
111+
110.0 prog 0 state GGGggrrrrrGGGggrrrrr spent 20.0
112+
111.0 prog 1 state rrrGGrrrrrrrrGGrrrrr spent 2.0
113+
112.0 prog 1 state rrrGGrrrrrrrrGGrrrrr spent 3.0
114+
113.0 prog 1 state rrrGGrrrrrrrrGGrrrrr spent 4.0
115+
114.0 prog 1 state rrrGGrrrrrrrrGGrrrrr spent 5.0
116+
115.0 prog 1 state rrrGGrrrrrrrrGGrrrrr spent 6.0
117+
116.0 prog 1 state rrrGGrrrrrrrrGGrrrrr spent 7.0
118+
117.0 prog 1 state rrrGGrrrrrrrrGGrrrrr spent 8.0
119+
118.0 prog 1 state rrryyrrrrrrrryyrrrrr spent 1.0
120+
119.0 prog 1 state rrryyrrrrrrrryyrrrrr spent 2.0
121+
120.0 prog 1 state rrryyrrrrrrrryyrrrrr spent 3.0
122+
121.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 1.0
123+
122.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 2.0
124+
123.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 3.0
125+
124.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 4.0
126+
125.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 5.0
127+
126.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 6.0
128+
127.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 7.0
129+
128.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 8.0
130+
129.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 9.0
131+
130.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 10.0
132+
131.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 11.0
133+
132.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 12.0
134+
133.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 13.0
135+
134.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 14.0
136+
135.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 15.0
137+
136.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 16.0
138+
137.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 17.0
139+
138.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 18.0
140+
139.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 19.0
141+
140.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 20.0
142+
141.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 21.0
143+
142.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 22.0
144+
143.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 23.0
145+
144.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 24.0
146+
145.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 25.0
147+
146.0 prog 1 state rrrrrGGGggrrrrrGGGgg spent 26.0
148+
147.0 prog 1 state rrrrryyyggrrrrryyygg spent 1.0
149+
148.0 prog 1 state rrrrryyyggrrrrryyygg spent 2.0
150+
149.0 prog 1 state rrrrryyyggrrrrryyygg spent 3.0
151+
150.0 prog 1 state rrrrrrrrGGrrrrrrrrGG spent 1.0
152+
151.0 prog 1 state rrrrrrrrGGrrrrrrrrGG spent 2.0
153+
152.0 prog 1 state rrrrrrrrGGrrrrrrrrGG spent 3.0
154+
153.0 prog 1 state rrrrrrrrGGrrrrrrrrGG spent 4.0
155+
154.0 prog 1 state rrrrrrrrGGrrrrrrrrGG spent 5.0
156+
155.0 prog 1 state rrrrrrrrGGrrrrrrrrGG spent 6.0
157+
156.0 prog 1 state rrrrrrrrGGrrrrrrrrGG spent 7.0
158+
157.0 prog 1 state rrrrrrrrGGrrrrrrrrGG spent 8.0
159+
158.0 prog 1 state rrrrrrrryyrrrrrrrryy spent 1.0
160+
159.0 prog 1 state rrrrrrrryyrrrrrrrryy spent 2.0
161+
160.0 prog 1 state rrrrrrrryyrrrrrrrryy spent 3.0
162+
161.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 1.0
163+
162.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 2.0
164+
163.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 3.0
165+
164.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 4.0
166+
165.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 5.0
167+
166.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 6.0
168+
167.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 7.0
169+
168.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 8.0
170+
169.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 9.0
171+
170.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 10.0
172+
171.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 11.0
173+
172.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 12.0
174+
173.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 13.0
175+
174.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 14.0
176+
175.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 15.0
177+
176.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 16.0
178+
177.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 17.0
179+
178.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 18.0
180+
179.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 19.0
181+
180.0 prog 1 state GGGggrrrrrGGGggrrrrr spent 20.0

‎tests/complex/traci/trafficlight/getSpentDuration3/runner.py‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
#!/usr/bin/env python
2+
# -*- coding: utf-8 -*-
3+
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
4+
# Copyright (C) 2023-2026 German Aerospace Center (DLR) and others.
5+
# This program and the accompanying materials are made available under the
6+
# terms of the Eclipse Public License 2.0 which is available at
7+
# https://www.eclipse.org/legal/epl-2.0/
8+
# This Source Code may also be made available under the following Secondary
9+
# Licenses when the conditions for such availability set forth in the Eclipse
10+
# Public License 2.0 are satisfied: GNU General Public License, version 2
11+
# or later which is available at
12+
# https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
13+
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
14+
15+
# @file runner.py
16+
# @author Mirko Barthauer
17+
# @date 2023-01-12
18+
19+
20+
from __future__ import absolute_import
21+
import os
22+
import sys
23+
24+
if "SUMO_HOME" in os.environ:
25+
sys.path.append(os.path.join(os.environ["SUMO_HOME"], "tools"))
26+
import traci # noqa
27+
import sumolib # noqa
28+
29+
traci.start([sumolib.checkBinary('sumo'), "-c", "sumo.sumocfg"] + sys.argv[1:])
30+
tlsID = "C"
31+
step = 0
32+
while traci.simulation.getMinExpectedNumber() > 0 or step < 180:
33+
if step == 100:
34+
traci.trafficlight.setProgram(tlsID, "0")
35+
if step == 110:
36+
traci.trafficlight.setProgram(tlsID, "1")
37+
traci.simulationStep()
38+
step += 1
39+
print(traci.simulation.getTime(),
40+
"prog", traci.trafficlight.getProgram(tlsID),
41+
"state", traci.trafficlight.getRedYellowGreenState(tlsID),
42+
"spent", traci.trafficlight.getSpentDuration(tlsID))
43+
traci.close()

‎tests/complex/traci/trafficlight/getSpentDuration3/sumo.sumocfg‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<!-- generated on 2024-06-12 18:31:59 by Eclipse SUMO sumo Version v1_20_0+0443-233e48e5c88
4+
-->
5+
6+
<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
7+
8+
<input>
9+
<net-file value="input_net2.net.xml"/>
10+
<route-files value="input_routes.rou.xml"/>
11+
<additional-files value="input_additional.add.xml"/>
12+
</input>
13+
14+
<processing>
15+
<time-to-teleport value="-1"/>
16+
<default.speeddev value="0"/>
17+
</processing>
18+
19+
<report>
20+
<duration-log.disable value="true"/>
21+
<no-step-log value="true"/>
22+
</report>
23+
24+
<gui_only>
25+
<window-size value="500,500"/>
26+
<window-pos value="50,50"/>
27+
</gui_only>
28+
29+
</sumoConfiguration>

‎tests/complex/traci/trafficlight/testsuite.complex‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,6 @@ getSpentDuration
4242

4343
# the function should still work after calling setRedYellowGreenState (#17598)
4444
getSpentDuration2
45+
46+
# the function should reset when switching between programs
47+
getSpentDuration3

0 commit comments

Comments
 (0)