From 5a3405a23d17b8029639d791fa1612f85df31ad2 Mon Sep 17 00:00:00 2001 From: Samuel Pastva Date: Fri, 25 Nov 2016 14:31:10 +0100 Subject: [PATCH] reenable octave tests turns out it was a bug on my local machine --- .../ftest/lorenz84/TestLorenz84Oscilation.java | 2 +- .../application/model/TestValidityRegionsComputation.java | 2 +- benchmark/benchmarks-simple.txt | 2 +- .../org/sybila/parasim/core/impl/TestDependencies.java | 1 + .../simulation/octave/TestSimulationWithLsode.java | 8 ++++---- .../simulation/octave/TestSimulationWithOders.java | 8 ++++---- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/application/src/test/java/org/sybila/parasim/application/ftest/lorenz84/TestLorenz84Oscilation.java b/application/src/test/java/org/sybila/parasim/application/ftest/lorenz84/TestLorenz84Oscilation.java index e0ed1883..1e9d5ceb 100644 --- a/application/src/test/java/org/sybila/parasim/application/ftest/lorenz84/TestLorenz84Oscilation.java +++ b/application/src/test/java/org/sybila/parasim/application/ftest/lorenz84/TestLorenz84Oscilation.java @@ -59,7 +59,7 @@ */ public class TestLorenz84Oscilation extends ParasimTest { - @Test(enabled = false) + @Test public void testSimple() throws IOException, InterruptedException, ExecutionException, TimeoutException { Experiment experiment = loadExperiment(); Point initialPoint = new ArrayPoint(0f, 0f, 0f, 0f, 1.75f, 0.5625f); diff --git a/application/src/test/java/org/sybila/parasim/application/model/TestValidityRegionsComputation.java b/application/src/test/java/org/sybila/parasim/application/model/TestValidityRegionsComputation.java index 174ec99d..f69c1fa3 100644 --- a/application/src/test/java/org/sybila/parasim/application/model/TestValidityRegionsComputation.java +++ b/application/src/test/java/org/sybila/parasim/application/model/TestValidityRegionsComputation.java @@ -55,7 +55,7 @@ */ public class TestValidityRegionsComputation extends ParasimTest { - @Test(enabled = false) + @Test public void testComputation() throws ExecutionException, InterruptedException, TimeoutException { ValidityRegionsComputation computation = new ValidityRegionsComputation(createOdeSystem(), createPrecisionConfiguration(), createSimulationSpace(), createInitialSpace(), createFutureFormula(-1f), 0); ComputationContainer container = getManager().resolve(ComputationContainer.class, Default.class); diff --git a/benchmark/benchmarks-simple.txt b/benchmark/benchmarks-simple.txt index e042b4ba..3fca6fb3 100644 --- a/benchmark/benchmarks-simple.txt +++ b/benchmark/benchmarks-simple.txt @@ -1 +1 @@ -parasim-shared-1:lotkav-common +parasim-shared-4:lotkav-common diff --git a/core/src/test/java/org/sybila/parasim/core/impl/TestDependencies.java b/core/src/test/java/org/sybila/parasim/core/impl/TestDependencies.java index b18f4af9..e1979eb3 100644 --- a/core/src/test/java/org/sybila/parasim/core/impl/TestDependencies.java +++ b/core/src/test/java/org/sybila/parasim/core/impl/TestDependencies.java @@ -42,6 +42,7 @@ public void testDependencyInOneExtension() { Assert.assertEquals(getManager().resolve(String.class, Default.class), DependencyExtension2.TO_RETURN); } + // FIXME: 25/11/2016 @Test(enabled = false) public void testDependencyInMoreExtensions() { Assert.assertNotNull(getManager().resolve(String.class, DependentQualifier.class)); diff --git a/extensions/computation-simulation-impl/src/test/java/org/sybila/parasim/computation/simulation/octave/TestSimulationWithLsode.java b/extensions/computation-simulation-impl/src/test/java/org/sybila/parasim/computation/simulation/octave/TestSimulationWithLsode.java index 02d01034..2ca533a7 100644 --- a/extensions/computation-simulation-impl/src/test/java/org/sybila/parasim/computation/simulation/octave/TestSimulationWithLsode.java +++ b/extensions/computation-simulation-impl/src/test/java/org/sybila/parasim/computation/simulation/octave/TestSimulationWithLsode.java @@ -34,7 +34,7 @@ public class TestSimulationWithLsode extends AbstractAdaptiveStepSimulationTest private static final SimulationEngineFactory ENGINE_FACTORY = new LsodeEngineFactory(LsodeEngineFactory.IntegrationMethod.NONSTIFF); - @Test(enabled = false) + @Test public void testTimeStep() { if (!ENGINE_FACTORY.isAvailable()) { throw new SkipException("The Octave is not available."); @@ -42,7 +42,7 @@ public void testTimeStep() { super.testTimeStep(10, 10); } - @Test(enabled = false) + @Test public void testMinimalNumberOfPoints() { if (!ENGINE_FACTORY.isAvailable()) { throw new SkipException("The Octave is not available."); @@ -50,7 +50,7 @@ public void testMinimalNumberOfPoints() { super.testMinimalNumberOfPoints(10, 10); } - @Test(enabled = false) + @Test public void testValidNumberOfTrajectories() { if (!ENGINE_FACTORY.isAvailable()) { throw new SkipException("The Octave is not available."); @@ -58,7 +58,7 @@ public void testValidNumberOfTrajectories() { super.testValidNumberOfTrajectories(10, 10); } - @Test(enabled = false) + @Test public void testParameters() { if (!ENGINE_FACTORY.isAvailable()) { throw new SkipException("The Octave is not available."); diff --git a/extensions/computation-simulation-impl/src/test/java/org/sybila/parasim/computation/simulation/octave/TestSimulationWithOders.java b/extensions/computation-simulation-impl/src/test/java/org/sybila/parasim/computation/simulation/octave/TestSimulationWithOders.java index 7e90e3b3..a88a458c 100644 --- a/extensions/computation-simulation-impl/src/test/java/org/sybila/parasim/computation/simulation/octave/TestSimulationWithOders.java +++ b/extensions/computation-simulation-impl/src/test/java/org/sybila/parasim/computation/simulation/octave/TestSimulationWithOders.java @@ -34,7 +34,7 @@ public class TestSimulationWithOders extends AbstractAdaptiveStepSimulationTest private static final SimulationEngineFactory ENGINE_FACTORY = OdePkgEngineFactory.ODERS; - @Test(enabled = false) + @Test public void testTimeStep() { if (!ENGINE_FACTORY.isAvailable()) { throw new SkipException("The Octave is not available."); @@ -42,7 +42,7 @@ public void testTimeStep() { super.testTimeStep(10, 10); } - @Test(enabled = false) + @Test public void testMinimalNumberOfPoints() { if (!ENGINE_FACTORY.isAvailable()) { throw new SkipException("The Octave is not available."); @@ -50,7 +50,7 @@ public void testMinimalNumberOfPoints() { super.testMinimalNumberOfPoints(10, 10); } - @Test(enabled = false) + @Test public void testValidNumberOfTrajectories() { if (!ENGINE_FACTORY.isAvailable()) { throw new SkipException("The Octave is not available."); @@ -58,7 +58,7 @@ public void testValidNumberOfTrajectories() { super.testValidNumberOfTrajectories(10, 10); } - @Test(enabled = false) + @Test public void testParameters() { if (!ENGINE_FACTORY.isAvailable()) { throw new SkipException("The Octave is not available.");