diff --git a/input/test.config.xml b/input/test.config.xml index 6be56a0..d3176d8 100644 --- a/input/test.config.xml +++ b/input/test.config.xml @@ -28,7 +28,7 @@ - + diff --git a/input/test.with-drt.config.xml b/input/test.with-drt.config.xml index feaca1e..ec27b92 100644 --- a/input/test.with-drt.config.xml +++ b/input/test.with-drt.config.xml @@ -28,7 +28,7 @@ - + diff --git a/src/test/java/org/matsim/run/RunKelheimIntegrationTest.java b/src/test/java/org/matsim/run/RunKelheimIntegrationTest.java index f7584e8..a9c59c9 100644 --- a/src/test/java/org/matsim/run/RunKelheimIntegrationTest.java +++ b/src/test/java/org/matsim/run/RunKelheimIntegrationTest.java @@ -6,7 +6,6 @@ import org.matsim.core.config.ConfigUtils; import org.matsim.core.controler.OutputDirectoryHierarchy; import org.matsim.simwrapper.SimWrapperConfigGroup; -import org.matsim.testcases.MatsimTestUtils; /** * integration test. @@ -16,6 +15,10 @@ public class RunKelheimIntegrationTest { @Test public final void runExamplePopulationTest() { Config config = ConfigUtils.loadConfig("input/test.config.xml"); + config.plans().setInputFile( + String.format("https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/kelheim/kelheim-v%s/input/kelheim-v%s-test.plans.xml", + RunKelheimScenario.VERSION, RunKelheimScenario.VERSION)); + config.controller().setLastIteration(1); config.global().setNumberOfThreads(1); config.qsim().setNumberOfThreads(1); @@ -30,6 +33,10 @@ public final void runExamplePopulationTest() { @Test public final void runDrtExamplePopulationTest() { Config config = ConfigUtils.loadConfig("input/test.with-drt.config.xml"); + config.plans().setInputFile( + String.format("https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/kelheim/kelheim-v%s/input/kelheim-v%s-test.with-drt.plans.xml", + RunKelheimScenario.VERSION, RunKelheimScenario.VERSION)); + config.controller().setLastIteration(1); config.controller().setOverwriteFileSetting(OutputDirectoryHierarchy.OverwriteFileSetting.deleteDirectoryIfExists);