From ecbb9f26d925d702ad4f3178c84dd7cda9b726ea Mon Sep 17 00:00:00 2001 From: Simon Wegendt Date: Mon, 18 Nov 2019 16:14:05 +0100 Subject: [PATCH] Fix tests --- .../mita/program/generator/tests/AllTests.java | 12 ++++++------ .../generator/tests/BasicControlStructuresTest.xtend | 2 +- .../program/generator/tests/SensorAccessTest.xtend | 2 +- .../generator/tests/TryCatchGeneratorTest.xtend | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bundles/org.eclipse.mita.program.tests/src/org/eclipse/mita/program/generator/tests/AllTests.java b/bundles/org.eclipse.mita.program.tests/src/org/eclipse/mita/program/generator/tests/AllTests.java index dd98b5fa..c3bee2bc 100644 --- a/bundles/org.eclipse.mita.program.tests/src/org/eclipse/mita/program/generator/tests/AllTests.java +++ b/bundles/org.eclipse.mita.program.tests/src/org/eclipse/mita/program/generator/tests/AllTests.java @@ -18,18 +18,18 @@ import org.junit.runners.Suite.SuiteClasses; @SuiteClasses({ + ArraysTest.class, BasicControlStructuresTest.class, EnumsTest.class, FunctionOverloadingTest.class, + GlobalAndLocalVariables.class, + PrepareLoopForFunctionUnvravelingStageTest.class, SensorAccessTest.class, + SetupTest.class, StructsTest.class, - TryCatchGeneratorTest.class, - UnravelFunctionCallsTest.class, SumTypesTest.class, - SetupTest.class, - GlobalAndLocalVariables.class, - ArraysTest.class, - SetupTest.class + TryCatchGeneratorTest.class, + UnravelFunctionCallsTest.class }) @RunWith(Suite.class) public class AllTests { diff --git a/bundles/org.eclipse.mita.program.tests/src/org/eclipse/mita/program/generator/tests/BasicControlStructuresTest.xtend b/bundles/org.eclipse.mita.program.tests/src/org/eclipse/mita/program/generator/tests/BasicControlStructuresTest.xtend index 4494ef75..adee066b 100644 --- a/bundles/org.eclipse.mita.program.tests/src/org/eclipse/mita/program/generator/tests/BasicControlStructuresTest.xtend +++ b/bundles/org.eclipse.mita.program.tests/src/org/eclipse/mita/program/generator/tests/BasicControlStructuresTest.xtend @@ -40,7 +40,7 @@ class BasicControlStructuresTest extends AbstractGeneratorTest { ''') ast.assertNoCompileErrors(); - val generatedFunction = ast.value.findFunction("HandleEvery100Millisecond1_worker"); + val generatedFunction = ast.value.findFunction("HandleEvery100Millisecond_1_worker"); assertNotNull("No event handler was generated", generatedFunction); val body = generatedFunction.body as IASTCompoundStatement; diff --git a/bundles/org.eclipse.mita.program.tests/src/org/eclipse/mita/program/generator/tests/SensorAccessTest.xtend b/bundles/org.eclipse.mita.program.tests/src/org/eclipse/mita/program/generator/tests/SensorAccessTest.xtend index d26925fb..a6b79ded 100644 --- a/bundles/org.eclipse.mita.program.tests/src/org/eclipse/mita/program/generator/tests/SensorAccessTest.xtend +++ b/bundles/org.eclipse.mita.program.tests/src/org/eclipse/mita/program/generator/tests/SensorAccessTest.xtend @@ -34,7 +34,7 @@ class SensorAccessTest extends AbstractGeneratorTest { '''); ast.assertNoCompileErrors(); - val eventHandler = ast.value.findFunction("HandleEvery100Millisecond1_worker") + val eventHandler = ast.value.findFunction("HandleEvery100Millisecond_1_worker") assertNotNull("No event handler was generated", eventHandler); val body = eventHandler.body as IASTCompoundStatement; /* diff --git a/bundles/org.eclipse.mita.program.tests/src/org/eclipse/mita/program/generator/tests/TryCatchGeneratorTest.xtend b/bundles/org.eclipse.mita.program.tests/src/org/eclipse/mita/program/generator/tests/TryCatchGeneratorTest.xtend index 48d73d13..59f67cb6 100644 --- a/bundles/org.eclipse.mita.program.tests/src/org/eclipse/mita/program/generator/tests/TryCatchGeneratorTest.xtend +++ b/bundles/org.eclipse.mita.program.tests/src/org/eclipse/mita/program/generator/tests/TryCatchGeneratorTest.xtend @@ -53,7 +53,7 @@ class TryCatchGeneratorTest extends AbstractGeneratorTest { '''); ast.assertNoCompileErrors(); - val eventHandler = ast.value.findFunction("HandleEvery100Millisecond1_worker") + val eventHandler = ast.value.findFunction("HandleEvery100Millisecond_1_worker") assertNotNull("No event handler was generated", eventHandler); val body = eventHandler.body as IASTCompoundStatement; @@ -110,7 +110,7 @@ class TryCatchGeneratorTest extends AbstractGeneratorTest { '''); ast.assertNoCompileErrors(); - val eventHandler = ast.value.findFunction("HandleEvery100Millisecond1_worker") + val eventHandler = ast.value.findFunction("HandleEvery100Millisecond_1_worker") assertNotNull("No event handler was generated", eventHandler); val body = eventHandler.body as IASTCompoundStatement; @@ -225,7 +225,7 @@ class TryCatchGeneratorTest extends AbstractGeneratorTest { '''); ast.assertNoCompileErrors(); - val eventHandler = ast.value.findFunction("HandleEvery100Millisecond1_worker") + val eventHandler = ast.value.findFunction("HandleEvery100Millisecond_1_worker") assertNotNull("No event handler was generated", eventHandler); val body = eventHandler.body as IASTCompoundStatement;