From 09e2fb3b0ba067356b80aa2beb28d2f2780511ee Mon Sep 17 00:00:00 2001 From: Pablo Alvarez Lopez Date: Fri, 5 May 2017 11:30:58 +0000 Subject: [PATCH] Added netedit test volatileRecomputing\abort-recomputing. Refs #3045 git-svn-id: file:///home/behr_mi/git/sumo_synched/trunk@24197 afbd958f-9f77-42d5-a016-97a22340ccf4 --- .../abort-recomputing/additionals.netedit | 16 + .../abort-recomputing/errors.netedit | 0 .../input_additionals.add.xml | 16 + .../abort-recomputing/input_net.con.xml | 113 ++++ .../abort-recomputing/input_net.edg.xml | 66 ++ .../abort-recomputing/input_net.net.xml | 548 +++++++++++++++++ .../abort-recomputing/input_net.netccfg | 15 + .../abort-recomputing/input_net.nod.xml | 50 ++ .../abort-recomputing/input_net.tll.xml | 29 + .../abort-recomputing/log.netedit | 28 + .../abort-recomputing/net.netedit | 564 ++++++++++++++++++ .../abort-recomputing/output.netedit | 0 .../abort-recomputing/test.sikuli/test.py | 42 ++ .../volatileRecomputing/testsuite.netedit | 35 ++ 14 files changed, 1522 insertions(+) create mode 100644 sumo/tests/netedit/volatileRecomputing/abort-recomputing/additionals.netedit create mode 100644 sumo/tests/netedit/volatileRecomputing/abort-recomputing/errors.netedit create mode 100644 sumo/tests/netedit/volatileRecomputing/abort-recomputing/input_additionals.add.xml create mode 100644 sumo/tests/netedit/volatileRecomputing/abort-recomputing/input_net.con.xml create mode 100644 sumo/tests/netedit/volatileRecomputing/abort-recomputing/input_net.edg.xml create mode 100644 sumo/tests/netedit/volatileRecomputing/abort-recomputing/input_net.net.xml create mode 100644 sumo/tests/netedit/volatileRecomputing/abort-recomputing/input_net.netccfg create mode 100644 sumo/tests/netedit/volatileRecomputing/abort-recomputing/input_net.nod.xml create mode 100644 sumo/tests/netedit/volatileRecomputing/abort-recomputing/input_net.tll.xml create mode 100644 sumo/tests/netedit/volatileRecomputing/abort-recomputing/log.netedit create mode 100644 sumo/tests/netedit/volatileRecomputing/abort-recomputing/net.netedit create mode 100644 sumo/tests/netedit/volatileRecomputing/abort-recomputing/output.netedit create mode 100644 sumo/tests/netedit/volatileRecomputing/abort-recomputing/test.sikuli/test.py diff --git a/sumo/tests/netedit/volatileRecomputing/abort-recomputing/additionals.netedit b/sumo/tests/netedit/volatileRecomputing/abort-recomputing/additionals.netedit new file mode 100644 index 00000000000..10ec84042dc --- /dev/null +++ b/sumo/tests/netedit/volatileRecomputing/abort-recomputing/additionals.netedit @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/sumo/tests/netedit/volatileRecomputing/abort-recomputing/errors.netedit b/sumo/tests/netedit/volatileRecomputing/abort-recomputing/errors.netedit new file mode 100644 index 00000000000..e69de29bb2d diff --git a/sumo/tests/netedit/volatileRecomputing/abort-recomputing/input_additionals.add.xml b/sumo/tests/netedit/volatileRecomputing/abort-recomputing/input_additionals.add.xml new file mode 100644 index 00000000000..13f7bc0c763 --- /dev/null +++ b/sumo/tests/netedit/volatileRecomputing/abort-recomputing/input_additionals.add.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/sumo/tests/netedit/volatileRecomputing/abort-recomputing/input_net.con.xml b/sumo/tests/netedit/volatileRecomputing/abort-recomputing/input_net.con.xml new file mode 100644 index 00000000000..6d970168e5a --- /dev/null +++ b/sumo/tests/netedit/volatileRecomputing/abort-recomputing/input_net.con.xml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sumo/tests/netedit/volatileRecomputing/abort-recomputing/input_net.edg.xml b/sumo/tests/netedit/volatileRecomputing/abort-recomputing/input_net.edg.xml new file mode 100644 index 00000000000..85f4b4642f7 --- /dev/null +++ b/sumo/tests/netedit/volatileRecomputing/abort-recomputing/input_net.edg.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sumo/tests/netedit/volatileRecomputing/abort-recomputing/input_net.net.xml b/sumo/tests/netedit/volatileRecomputing/abort-recomputing/input_net.net.xml new file mode 100644 index 00000000000..c36272a3545 --- /dev/null +++ b/sumo/tests/netedit/volatileRecomputing/abort-recomputing/input_net.net.xml @@ -0,0 +1,548 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sumo/tests/netedit/volatileRecomputing/abort-recomputing/input_net.netccfg b/sumo/tests/netedit/volatileRecomputing/abort-recomputing/input_net.netccfg new file mode 100644 index 00000000000..bc35431c619 --- /dev/null +++ b/sumo/tests/netedit/volatileRecomputing/abort-recomputing/input_net.netccfg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/sumo/tests/netedit/volatileRecomputing/abort-recomputing/input_net.nod.xml b/sumo/tests/netedit/volatileRecomputing/abort-recomputing/input_net.nod.xml new file mode 100644 index 00000000000..a4e411c2807 --- /dev/null +++ b/sumo/tests/netedit/volatileRecomputing/abort-recomputing/input_net.nod.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sumo/tests/netedit/volatileRecomputing/abort-recomputing/input_net.tll.xml b/sumo/tests/netedit/volatileRecomputing/abort-recomputing/input_net.tll.xml new file mode 100644 index 00000000000..a981c0cf4df --- /dev/null +++ b/sumo/tests/netedit/volatileRecomputing/abort-recomputing/input_net.tll.xml @@ -0,0 +1,29 @@ + + + + + + diff --git a/sumo/tests/netedit/volatileRecomputing/abort-recomputing/log.netedit b/sumo/tests/netedit/volatileRecomputing/abort-recomputing/log.netedit new file mode 100644 index 00000000000..620f0fa5839 --- /dev/null +++ b/sumo/tests/netedit/volatileRecomputing/abort-recomputing/log.netedit @@ -0,0 +1,28 @@ +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: Opening FXMessageBox of type 'question' +Warning: Closed FXMessageBox of type 'question' with 'No' +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/volatileRecomputing/abort-recomputing/net.netedit b/sumo/tests/netedit/volatileRecomputing/abort-recomputing/net.netedit new file mode 100644 index 00000000000..ff43d955043 --- /dev/null +++ b/sumo/tests/netedit/volatileRecomputing/abort-recomputing/net.netedit @@ -0,0 +1,564 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sumo/tests/netedit/volatileRecomputing/abort-recomputing/output.netedit b/sumo/tests/netedit/volatileRecomputing/abort-recomputing/output.netedit new file mode 100644 index 00000000000..e69de29bb2d diff --git a/sumo/tests/netedit/volatileRecomputing/abort-recomputing/test.sikuli/test.py b/sumo/tests/netedit/volatileRecomputing/abort-recomputing/test.sikuli/test.py new file mode 100644 index 00000000000..01a685cfcba --- /dev/null +++ b/sumo/tests/netedit/volatileRecomputing/abort-recomputing/test.sikuli/test.py @@ -0,0 +1,42 @@ +#!/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, False, True, ['--sidewalks.guess']) + +# Recompute with volatile options +netedit.rebuildNetworkWithVolatileOptions(False) + +# save additionals +netedit.saveAdditionals() + +# save newtork +netedit.saveNetwork() + +# quit netedit +netedit.quit(neteditProcess) diff --git a/sumo/tests/netedit/volatileRecomputing/testsuite.netedit b/sumo/tests/netedit/volatileRecomputing/testsuite.netedit index e69de29bb2d..f3cd440e1d7 100644 --- a/sumo/tests/netedit/volatileRecomputing/testsuite.netedit +++ b/sumo/tests/netedit/volatileRecomputing/testsuite.netedit @@ -0,0 +1,35 @@ +# abort recomputing with volatile options +abort-recomputing + +# remove isolated edges +remove-edges.isolated + +# ramps guess +ramps.guess + +# roundabout guess +roundabouts.guess + +# junction join +junctions.join + +# geometry remove +geometry.remove + +# edges join +edges.join + +# opposites guess +opposites.guess + +# geometry split +geometry.split + +# sidewalks guess +sidewalks.guess + +# crossing guess +crossings.guess + +# sidewalks and crossings.guess +sidewalks-and-crossings.guess \ No newline at end of file