diff --git a/sumo/tests/netedit/bugs/ticket2327/additionals.netedit b/sumo/tests/netedit/bugs/ticket2327/additionals.netedit new file mode 100644 index 00000000000..1593f462d53 --- /dev/null +++ b/sumo/tests/netedit/bugs/ticket2327/additionals.netedit @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/sumo/tests/netedit/bugs/ticket2327/errors.netedit b/sumo/tests/netedit/bugs/ticket2327/errors.netedit new file mode 100644 index 00000000000..e69de29bb2d diff --git a/sumo/tests/netedit/bugs/ticket2327/input_additionals.add.xml b/sumo/tests/netedit/bugs/ticket2327/input_additionals.add.xml new file mode 100644 index 00000000000..13f7bc0c763 --- /dev/null +++ b/sumo/tests/netedit/bugs/ticket2327/input_additionals.add.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/sumo/tests/netedit/bugs/ticket2327/input_net.con.xml b/sumo/tests/netedit/bugs/ticket2327/input_net.con.xml new file mode 100644 index 00000000000..b2883edfe76 --- /dev/null +++ b/sumo/tests/netedit/bugs/ticket2327/input_net.con.xml @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sumo/tests/netedit/bugs/ticket2327/input_net.edg.xml b/sumo/tests/netedit/bugs/ticket2327/input_net.edg.xml new file mode 100644 index 00000000000..28a83038595 --- /dev/null +++ b/sumo/tests/netedit/bugs/ticket2327/input_net.edg.xml @@ -0,0 +1,178 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sumo/tests/netedit/bugs/ticket2327/input_net.net.xml b/sumo/tests/netedit/bugs/ticket2327/input_net.net.xml new file mode 100644 index 00000000000..6658c17b1cf --- /dev/null +++ b/sumo/tests/netedit/bugs/ticket2327/input_net.net.xml @@ -0,0 +1,956 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sumo/tests/netedit/bugs/ticket2327/input_net.netccfg b/sumo/tests/netedit/bugs/ticket2327/input_net.netccfg new file mode 100644 index 00000000000..bc35431c619 --- /dev/null +++ b/sumo/tests/netedit/bugs/ticket2327/input_net.netccfg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/sumo/tests/netedit/bugs/ticket2327/input_net.nod.xml b/sumo/tests/netedit/bugs/ticket2327/input_net.nod.xml new file mode 100644 index 00000000000..79c53de608e --- /dev/null +++ b/sumo/tests/netedit/bugs/ticket2327/input_net.nod.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sumo/tests/netedit/bugs/ticket2327/input_net.tll.xml b/sumo/tests/netedit/bugs/ticket2327/input_net.tll.xml new file mode 100644 index 00000000000..4b3cd9bb415 --- /dev/null +++ b/sumo/tests/netedit/bugs/ticket2327/input_net.tll.xml @@ -0,0 +1,30 @@ + + + + + + diff --git a/sumo/tests/netedit/bugs/ticket2327/log.netedit b/sumo/tests/netedit/bugs/ticket2327/log.netedit new file mode 100644 index 00000000000..acef6bed4c8 --- /dev/null +++ b/sumo/tests/netedit/bugs/ticket2327/log.netedit @@ -0,0 +1,47 @@ +Warning: Inserting busStop 'busStop_-gneE3_0_1' +Warning: Inserting busStop 'busStop_-gneE4_0_2' +Warning: Inserting busStop 'busStop_-gneE5_0_3' +Warning: Inserting busStop 'busStop_-gneE6_0_4' +Warning: Inserting busStop 'busStop_-gneE7_0_5' +Warning: Inserting busStop 'busStop_gneE2_0_0' +Warning: Inserting busStop 'busStop_gneE4_0_7' +Warning: Inserting busStop 'busStop_gneE5_0_8' +Warning: Inserting busStop 'busStop_gneE6_0_9' +Warning: Inserting busStop 'busStop_gneE7_0_6' +Warning: Inserting e3Detector 'e3Detector_0' +Warning: Inserting detEntry 'e3Detector_0detEntry0' +Warning: Inserting detExit 'e3Detector_0detExit0' +Warning: Adding junction 'gneJ20' +Warning: Deleting edge 'gneE0' +Warning: Adding edge 'gneE0' +Warning: Deleting edge 'gneE0' +Warning: Deleting junction 'gneJ0' +Warning: Deleting junction 'gneJ1' +Warning: Adding junction 'gneJ21' +Warning: Deleting busStop 'busStop_gneE2_0_0' +Warning: Deleting connection 'gneE1_1 -> gneE2_1' +Warning: Deleting connection 'gneE2_1 -> gneE1_1' +Warning: Deleting edge 'gneE2' +Warning: Adding edge 'gneE2' +Warning: Deleting edge 'gneE1' +Warning: Adding edge 'gneE1' +Warning: Deleting edge 'gneE1' +Warning: Deleting edge 'gneE2' +Warning: Deleting junction 'gneJ2' +Warning: Deleting junction 'gneJ3' +Warning: Deleting unreferenced edge 'gneE1' +Warning: Deleting unreferenced edge 'gneE2' +Warning: Deleting unreferenced edge 'gneE0' +Warning: Deleting unreferenced detExit 'e3Detector_0detExit0' +Warning: Deleting unreferenced detEntry 'e3Detector_0detEntry0' +Warning: Deleting unreferenced e3Detector 'e3Detector_0' +Warning: Deleting unreferenced busStop 'busStop_gneE7_0_6' +Warning: Deleting unreferenced busStop 'busStop_gneE6_0_9' +Warning: Deleting unreferenced busStop 'busStop_gneE5_0_8' +Warning: Deleting unreferenced busStop 'busStop_gneE4_0_7' +Warning: Deleting unreferenced busStop 'busStop_gneE2_0_0' +Warning: Deleting unreferenced busStop 'busStop_-gneE7_0_5' +Warning: Deleting unreferenced busStop 'busStop_-gneE6_0_4' +Warning: Deleting unreferenced busStop 'busStop_-gneE5_0_3' +Warning: Deleting unreferenced busStop 'busStop_-gneE4_0_2' +Warning: Deleting unreferenced busStop 'busStop_-gneE3_0_1' diff --git a/sumo/tests/netedit/bugs/ticket2327/net.netedit b/sumo/tests/netedit/bugs/ticket2327/net.netedit new file mode 100644 index 00000000000..461eee1297b --- /dev/null +++ b/sumo/tests/netedit/bugs/ticket2327/net.netedit @@ -0,0 +1,917 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sumo/tests/netedit/bugs/ticket2327/output.netedit b/sumo/tests/netedit/bugs/ticket2327/output.netedit new file mode 100644 index 00000000000..e69de29bb2d diff --git a/sumo/tests/netedit/bugs/ticket2327/test.sikuli/test.py b/sumo/tests/netedit/bugs/ticket2327/test.sikuli/test.py new file mode 100644 index 00000000000..9482139d6bd --- /dev/null +++ b/sumo/tests/netedit/bugs/ticket2327/test.sikuli/test.py @@ -0,0 +1,117 @@ +#!/usr/bin/env python +""" +@file test.py +@author Pablo Alvarez Lopez +@date 2016-11-25 +@version $Id: test.py 24066 2017-04-25 17:19:15Z palcraft $ + +python script used by sikulix for testing netedit + +SUMO, Simulation of Urban MObility; see http://sumo.dlr.de/ +Copyright (C) 2009-2017 DLR/TS, Germany + +This file is part of SUMO. +SUMO is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. +""" +# import common functions for netedit tests +import os +import sys + +testRoot = os.path.join(os.environ.get('SUMO_HOME', '.'), 'tests') +neteditTestRoot = os.path.join( + os.environ.get('TEXTTEST_HOME', testRoot), 'netedit') +sys.path.append(neteditTestRoot) +import neteditTestFunctions as netedit + +# Open netedit +neteditProcess, match = netedit.setupAndStart(neteditTestRoot) + +# Focus netedit window +netedit.leftClick(match, 0, -105) + +# rebuild network +netedit.rebuildNetwork() + +# go to select mode +netedit.selectMode() + +# select node 1 +netedit.leftClick(match, 50, 50) + +# select node 2 +netedit.leftClick(match, 160, 50) + +# join selected junctions +netedit.joinSelectedJunctions() + +# rebuild network +netedit.rebuildNetwork() + +# select node 3 +netedit.leftClick(match, 265, 50) + +# select node 4 +netedit.leftClick(match, 380, 50) + +# join selected junctions +netedit.joinSelectedJunctions() + +# rebuild network +netedit.rebuildNetwork() + +# select node 5 +netedit.leftClick(match, 55, 178) + +# select node 6 +netedit.leftClick(match, 150, 178) + +# join selected junctions +netedit.joinSelectedJunctions() + +# rebuild network +netedit.rebuildNetwork() + +# select node 8 +netedit.leftClick(match, 340, 170) + +# select node 9 +netedit.leftClick(match, 450, 170) + +# select node 10 +netedit.leftClick(match, 550, 170) + +# inspect node 11 +netedit.leftClick(match, 340, 275) + +# inspect node 12 +netedit.leftClick(match, 450, 275) + +# inspect node 13 +netedit.leftClick(match, 550, 275) + +# inspect node 14 +netedit.leftClick(match, 340, 390) + +# inspect node 15 +netedit.leftClick(match, 450, 390) + +# inspect node 16 +netedit.leftClick(match, 550, 390) + +# join selected junctions +netedit.joinSelectedJunctions() + +# rebuild network +netedit.rebuildNetwork() + +# save additionals +netedit.saveAdditionals() + +# save newtork +netedit.saveNetwork() + +# quit netedit +netedit.quit(neteditProcess)