Fix tests

eclipse · Nov 18, 2019 · 1899a41 · 1899a41
1 parent bd87405
commit 1899a41
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/...org.eclipse.mita.program.tests/src/org/eclipse/mita/program/generator/tests/AllTests.java b/...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/...ogram.tests/src/org/eclipse/mita/program/generator/tests/BasicControlStructuresTest.xtend b/...ogram.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/...se.mita.program.tests/src/org/eclipse/mita/program/generator/tests/SensorAccessTest.xtend b/...se.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/...ta.program.tests/src/org/eclipse/mita/program/generator/tests/TryCatchGeneratorTest.xtend b/...ta.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;