Просмотр исходного кода

merge branch Bugfix_2_0_x into main trunk ...

terfloth@itemis.de 12 лет назад
Родитель
Сommit
33e7ce667e

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/gtests/SimpleHietachy/SimpleHietachy.cc

@@ -1,5 +1,5 @@
 /**
 /**
-* Copyright (c) 2012 committers of YAKINDU and others.
+* Copyright (c) 2013 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * which accompanies this distribution, and is available at

+ 1 - 1
test-plugins/org.yakindu.sct.generator.c.test/src-gen/org/yakindu/sct/generator/c/test/SimpleHietachy.java

@@ -1,5 +1,5 @@
 /**
 /**
- * Copyright (c) 2012 committers of YAKINDU and others.
+ * Copyright (c) 2013 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * which accompanies this distribution, and is available at

+ 0 - 39
test-plugins/org.yakindu.sct.generator.c.test/src-gen/org/yakindu/sct/generator/c/test/StextKeywords.java

@@ -1,39 +0,0 @@
-/**
- * Copyright (c) 2012 committers of YAKINDU and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     committers of YAKINDU - initial API and implementation
- */
-package org.yakindu.sct.generator.c.test;
-
-import java.util.Collection;
-
-import org.junit.Before;
-import org.junit.runner.RunWith;
-import org.yakindu.sct.generator.c.gtest.GTest;
-import org.yakindu.sct.generator.c.gtest.GTestRunner;
-import org.yakindu.sct.generator.c.gtest.GTestHelper;
-
-@GTest(sourceFile = "gtests/StextKeywords/StextKeywords.cc", program = "gtests/StextKeywords/STextKeywordsInStatesAndRegions", model = "testmodels/STextKeywordsInStatesAndRegions.sct")
-@RunWith(GTestRunner.class)
-public class StextKeywords {
-
-	protected final GTestHelper helper = new GTestHelper(this) {
-
-		@Override
-		protected void getSourceFiles(Collection<String> files) {
-			super.getSourceFiles(files);
-			files.add(getFileName(getTestProgram()) + ".c");
-		}
-	};
-
-	@Before
-	public void setUp() {
-		helper.generate();
-		helper.compile();
-	}
-}

+ 0 - 502
test-plugins/org.yakindu.sct.generator.java.test/src-gen/org/yakindu/sct/generator/java/test/StextKeywordsTest.java

@@ -1,502 +0,0 @@
-/**
- * Copyright (c) 2012 committers of YAKINDU and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     committers of YAKINDU - initial API and implementation
- */
-package org.yakindu.sct.generator.java.test;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.*;
-import org.yakindu.scr.stextkeywordsinstatesandregions.STextKeywordsInStatesAndRegionsStatemachine;
-import org.yakindu.scr.stextkeywordsinstatesandregions.STextKeywordsInStatesAndRegionsStatemachine.State;
-/**
- *  Unit TestCase for STextKeywordsInStatesAndRegions
- */
-@SuppressWarnings("all")
-public class StextKeywordsTest {
-
-	private STextKeywordsInStatesAndRegionsStatemachine statemachine;
-
-	@Before
-	public void setUp() {
-		statemachine = new STextKeywordsInStatesAndRegionsStatemachine();
-		statemachine.init();
-	}
-
-	@After
-	public void tearDown() {
-		statemachine = null;
-	}
-
-	@Test
-	public void testactiveCheckWithSTextNamedStates() {
-		statemachine.enter();
-		assertTrue(statemachine.isStateActive(State.default_namespace));
-		assertTrue(statemachine.isStateActive(State.operation_interface));
-		assertTrue(statemachine.isStateActive(State.namespace_event));
-		assertTrue(statemachine.isStateActive(State.local_in));
-		assertTrue(statemachine.isStateActive(State.interface_var));
-		assertTrue(statemachine.isStateActive(State.internal_external));
-		assertTrue(statemachine.isStateActive(State.event_default));
-		assertTrue(statemachine.isStateActive(State.in_entry));
-		assertTrue(statemachine.isStateActive(State.out_always));
-		assertTrue(statemachine.isStateActive(State.var_raise));
-		assertTrue(statemachine.isStateActive(State.readonly_active));
-		assertTrue(statemachine.isStateActive(State.external_interface));
-		assertTrue(statemachine.isStateActive(State.else_event));
-		assertTrue(statemachine.isStateActive(State.entry_in));
-		assertTrue(statemachine.isStateActive(State.exit_var));
-		assertTrue(statemachine.isStateActive(State.always_external));
-		assertTrue(statemachine.isStateActive(State.oncycle_default));
-		assertTrue(statemachine.isStateActive(State.raise_entry));
-		assertTrue(statemachine.isStateActive(State.valueof_always));
-		assertTrue(statemachine.isStateActive(State.active_raise));
-		statemachine.raiseE1();
-		statemachine.runCycle();
-		assertTrue(statemachine.isStateActive(State.default_namespace));
-		assertTrue(statemachine.isStateActive(State.operation_internal));
-		assertTrue(statemachine.isStateActive(State.namespace_event));
-		assertTrue(statemachine.isStateActive(State.local_in));
-		assertTrue(statemachine.isStateActive(State.interface_var));
-		assertTrue(statemachine.isStateActive(State.internal_external));
-		assertTrue(statemachine.isStateActive(State.event_default));
-		assertTrue(statemachine.isStateActive(State.in_entry));
-		assertTrue(statemachine.isStateActive(State.out_always));
-		assertTrue(statemachine.isStateActive(State.var_raise));
-		assertTrue(statemachine.isStateActive(State.readonly_active));
-		assertTrue(statemachine.isStateActive(State.external_interface));
-		assertTrue(statemachine.isStateActive(State.else_event));
-		assertTrue(statemachine.isStateActive(State.entry_in));
-		assertTrue(statemachine.isStateActive(State.exit_var));
-		assertTrue(statemachine.isStateActive(State.always_external));
-		assertTrue(statemachine.isStateActive(State.oncycle_default));
-		assertTrue(statemachine.isStateActive(State.raise_entry));
-		assertTrue(statemachine.isStateActive(State.valueof_always));
-		assertTrue(statemachine.isStateActive(State.active_raise));
-		statemachine.raiseE2();
-		statemachine.runCycle();
-		assertTrue(statemachine.isStateActive(State.default_namespace));
-		assertTrue(statemachine.isStateActive(State.operation_internal));
-		assertTrue(statemachine.isStateActive(State.namespace_local));
-		assertTrue(statemachine.isStateActive(State.local_in));
-		assertTrue(statemachine.isStateActive(State.interface_var));
-		assertTrue(statemachine.isStateActive(State.internal_external));
-		assertTrue(statemachine.isStateActive(State.event_default));
-		assertTrue(statemachine.isStateActive(State.in_entry));
-		assertTrue(statemachine.isStateActive(State.out_always));
-		assertTrue(statemachine.isStateActive(State.var_raise));
-		assertTrue(statemachine.isStateActive(State.readonly_active));
-		assertTrue(statemachine.isStateActive(State.external_interface));
-		assertTrue(statemachine.isStateActive(State.else_event));
-		assertTrue(statemachine.isStateActive(State.entry_in));
-		assertTrue(statemachine.isStateActive(State.exit_var));
-		assertTrue(statemachine.isStateActive(State.always_external));
-		assertTrue(statemachine.isStateActive(State.oncycle_default));
-		assertTrue(statemachine.isStateActive(State.raise_entry));
-		assertTrue(statemachine.isStateActive(State.valueof_always));
-		assertTrue(statemachine.isStateActive(State.active_raise));
-		statemachine.raiseE1();
-		statemachine.runCycle();
-		assertTrue(statemachine.isStateActive(State.default_namespace));
-		assertTrue(statemachine.isStateActive(State.operation_internal));
-		assertTrue(statemachine.isStateActive(State.namespace_local));
-		assertTrue(statemachine.isStateActive(State.local_out));
-		assertTrue(statemachine.isStateActive(State.interface_var));
-		assertTrue(statemachine.isStateActive(State.internal_external));
-		assertTrue(statemachine.isStateActive(State.event_default));
-		assertTrue(statemachine.isStateActive(State.in_entry));
-		assertTrue(statemachine.isStateActive(State.out_always));
-		assertTrue(statemachine.isStateActive(State.var_raise));
-		assertTrue(statemachine.isStateActive(State.readonly_active));
-		assertTrue(statemachine.isStateActive(State.external_interface));
-		assertTrue(statemachine.isStateActive(State.else_event));
-		assertTrue(statemachine.isStateActive(State.entry_in));
-		assertTrue(statemachine.isStateActive(State.exit_var));
-		assertTrue(statemachine.isStateActive(State.always_external));
-		assertTrue(statemachine.isStateActive(State.oncycle_default));
-		assertTrue(statemachine.isStateActive(State.raise_entry));
-		assertTrue(statemachine.isStateActive(State.valueof_always));
-		assertTrue(statemachine.isStateActive(State.active_raise));
-		statemachine.raiseE2();
-		statemachine.runCycle();
-		assertTrue(statemachine.isStateActive(State.default_namespace));
-		assertTrue(statemachine.isStateActive(State.operation_internal));
-		assertTrue(statemachine.isStateActive(State.namespace_local));
-		assertTrue(statemachine.isStateActive(State.local_out));
-		assertTrue(statemachine.isStateActive(State.interface_readonly));
-		assertTrue(statemachine.isStateActive(State.internal_external));
-		assertTrue(statemachine.isStateActive(State.event_default));
-		assertTrue(statemachine.isStateActive(State.in_entry));
-		assertTrue(statemachine.isStateActive(State.out_always));
-		assertTrue(statemachine.isStateActive(State.var_raise));
-		assertTrue(statemachine.isStateActive(State.readonly_active));
-		assertTrue(statemachine.isStateActive(State.external_interface));
-		assertTrue(statemachine.isStateActive(State.else_event));
-		assertTrue(statemachine.isStateActive(State.entry_in));
-		assertTrue(statemachine.isStateActive(State.exit_var));
-		assertTrue(statemachine.isStateActive(State.always_external));
-		assertTrue(statemachine.isStateActive(State.oncycle_default));
-		assertTrue(statemachine.isStateActive(State.raise_entry));
-		assertTrue(statemachine.isStateActive(State.valueof_always));
-		assertTrue(statemachine.isStateActive(State.active_raise));
-		statemachine.raiseE1();
-		statemachine.runCycle();
-		assertTrue(statemachine.isStateActive(State.default_namespace));
-		assertTrue(statemachine.isStateActive(State.operation_internal));
-		assertTrue(statemachine.isStateActive(State.namespace_local));
-		assertTrue(statemachine.isStateActive(State.local_out));
-		assertTrue(statemachine.isStateActive(State.interface_readonly));
-		assertTrue(statemachine.isStateActive(State.internal_operation));
-		assertTrue(statemachine.isStateActive(State.event_default));
-		assertTrue(statemachine.isStateActive(State.in_entry));
-		assertTrue(statemachine.isStateActive(State.out_always));
-		assertTrue(statemachine.isStateActive(State.var_raise));
-		assertTrue(statemachine.isStateActive(State.readonly_active));
-		assertTrue(statemachine.isStateActive(State.external_interface));
-		assertTrue(statemachine.isStateActive(State.else_event));
-		assertTrue(statemachine.isStateActive(State.entry_in));
-		assertTrue(statemachine.isStateActive(State.exit_var));
-		assertTrue(statemachine.isStateActive(State.always_external));
-		assertTrue(statemachine.isStateActive(State.oncycle_default));
-		assertTrue(statemachine.isStateActive(State.raise_entry));
-		assertTrue(statemachine.isStateActive(State.valueof_always));
-		assertTrue(statemachine.isStateActive(State.active_raise));
-		statemachine.raiseE2();
-		statemachine.runCycle();
-		assertTrue(statemachine.isStateActive(State.default_namespace));
-		assertTrue(statemachine.isStateActive(State.operation_internal));
-		assertTrue(statemachine.isStateActive(State.namespace_local));
-		assertTrue(statemachine.isStateActive(State.local_out));
-		assertTrue(statemachine.isStateActive(State.interface_readonly));
-		assertTrue(statemachine.isStateActive(State.internal_operation));
-		assertTrue(statemachine.isStateActive(State.event_else));
-		assertTrue(statemachine.isStateActive(State.in_entry));
-		assertTrue(statemachine.isStateActive(State.out_always));
-		assertTrue(statemachine.isStateActive(State.var_raise));
-		assertTrue(statemachine.isStateActive(State.readonly_active));
-		assertTrue(statemachine.isStateActive(State.external_interface));
-		assertTrue(statemachine.isStateActive(State.else_event));
-		assertTrue(statemachine.isStateActive(State.entry_in));
-		assertTrue(statemachine.isStateActive(State.exit_var));
-		assertTrue(statemachine.isStateActive(State.always_external));
-		assertTrue(statemachine.isStateActive(State.oncycle_default));
-		assertTrue(statemachine.isStateActive(State.raise_entry));
-		assertTrue(statemachine.isStateActive(State.valueof_always));
-		assertTrue(statemachine.isStateActive(State.active_raise));
-		statemachine.raiseE1();
-		statemachine.runCycle();
-		assertTrue(statemachine.isStateActive(State.default_namespace));
-		assertTrue(statemachine.isStateActive(State.operation_internal));
-		assertTrue(statemachine.isStateActive(State.namespace_local));
-		assertTrue(statemachine.isStateActive(State.local_out));
-		assertTrue(statemachine.isStateActive(State.interface_readonly));
-		assertTrue(statemachine.isStateActive(State.internal_operation));
-		assertTrue(statemachine.isStateActive(State.event_else));
-		assertTrue(statemachine.isStateActive(State.in_exit));
-		assertTrue(statemachine.isStateActive(State.out_always));
-		assertTrue(statemachine.isStateActive(State.var_raise));
-		assertTrue(statemachine.isStateActive(State.readonly_active));
-		assertTrue(statemachine.isStateActive(State.external_interface));
-		assertTrue(statemachine.isStateActive(State.else_event));
-		assertTrue(statemachine.isStateActive(State.entry_in));
-		assertTrue(statemachine.isStateActive(State.exit_var));
-		assertTrue(statemachine.isStateActive(State.always_external));
-		assertTrue(statemachine.isStateActive(State.oncycle_default));
-		assertTrue(statemachine.isStateActive(State.raise_entry));
-		assertTrue(statemachine.isStateActive(State.valueof_always));
-		assertTrue(statemachine.isStateActive(State.active_raise));
-		statemachine.raiseE2();
-		statemachine.runCycle();
-		assertTrue(statemachine.isStateActive(State.default_namespace));
-		assertTrue(statemachine.isStateActive(State.operation_internal));
-		assertTrue(statemachine.isStateActive(State.namespace_local));
-		assertTrue(statemachine.isStateActive(State.local_out));
-		assertTrue(statemachine.isStateActive(State.interface_readonly));
-		assertTrue(statemachine.isStateActive(State.internal_operation));
-		assertTrue(statemachine.isStateActive(State.event_else));
-		assertTrue(statemachine.isStateActive(State.in_exit));
-		assertTrue(statemachine.isStateActive(State.out_oncycle));
-		assertTrue(statemachine.isStateActive(State.var_raise));
-		assertTrue(statemachine.isStateActive(State.readonly_active));
-		assertTrue(statemachine.isStateActive(State.external_interface));
-		assertTrue(statemachine.isStateActive(State.else_event));
-		assertTrue(statemachine.isStateActive(State.entry_in));
-		assertTrue(statemachine.isStateActive(State.exit_var));
-		assertTrue(statemachine.isStateActive(State.always_external));
-		assertTrue(statemachine.isStateActive(State.oncycle_default));
-		assertTrue(statemachine.isStateActive(State.raise_entry));
-		assertTrue(statemachine.isStateActive(State.valueof_always));
-		assertTrue(statemachine.isStateActive(State.active_raise));
-		statemachine.raiseE1();
-		statemachine.runCycle();
-		assertTrue(statemachine.isStateActive(State.default_namespace));
-		assertTrue(statemachine.isStateActive(State.operation_internal));
-		assertTrue(statemachine.isStateActive(State.namespace_local));
-		assertTrue(statemachine.isStateActive(State.local_out));
-		assertTrue(statemachine.isStateActive(State.interface_readonly));
-		assertTrue(statemachine.isStateActive(State.internal_operation));
-		assertTrue(statemachine.isStateActive(State.event_else));
-		assertTrue(statemachine.isStateActive(State.in_exit));
-		assertTrue(statemachine.isStateActive(State.out_oncycle));
-		assertTrue(statemachine.isStateActive(State.var_valueof));
-		assertTrue(statemachine.isStateActive(State.readonly_active));
-		assertTrue(statemachine.isStateActive(State.external_interface));
-		assertTrue(statemachine.isStateActive(State.else_event));
-		assertTrue(statemachine.isStateActive(State.entry_in));
-		assertTrue(statemachine.isStateActive(State.exit_var));
-		assertTrue(statemachine.isStateActive(State.always_external));
-		assertTrue(statemachine.isStateActive(State.oncycle_default));
-		assertTrue(statemachine.isStateActive(State.raise_entry));
-		assertTrue(statemachine.isStateActive(State.valueof_always));
-		assertTrue(statemachine.isStateActive(State.active_raise));
-		statemachine.raiseE2();
-		statemachine.runCycle();
-		assertTrue(statemachine.isStateActive(State.default_namespace));
-		assertTrue(statemachine.isStateActive(State.operation_internal));
-		assertTrue(statemachine.isStateActive(State.namespace_local));
-		assertTrue(statemachine.isStateActive(State.local_out));
-		assertTrue(statemachine.isStateActive(State.interface_readonly));
-		assertTrue(statemachine.isStateActive(State.internal_operation));
-		assertTrue(statemachine.isStateActive(State.event_else));
-		assertTrue(statemachine.isStateActive(State.in_exit));
-		assertTrue(statemachine.isStateActive(State.out_oncycle));
-		assertTrue(statemachine.isStateActive(State.var_valueof));
-		assertTrue(statemachine.isStateActive(State.readonly_namespace));
-		assertTrue(statemachine.isStateActive(State.external_interface));
-		assertTrue(statemachine.isStateActive(State.else_event));
-		assertTrue(statemachine.isStateActive(State.entry_in));
-		assertTrue(statemachine.isStateActive(State.exit_var));
-		assertTrue(statemachine.isStateActive(State.always_external));
-		assertTrue(statemachine.isStateActive(State.oncycle_default));
-		assertTrue(statemachine.isStateActive(State.raise_entry));
-		assertTrue(statemachine.isStateActive(State.valueof_always));
-		assertTrue(statemachine.isStateActive(State.active_raise));
-		statemachine.raiseE1();
-		statemachine.runCycle();
-		assertTrue(statemachine.isStateActive(State.default_namespace));
-		assertTrue(statemachine.isStateActive(State.operation_internal));
-		assertTrue(statemachine.isStateActive(State.namespace_local));
-		assertTrue(statemachine.isStateActive(State.local_out));
-		assertTrue(statemachine.isStateActive(State.interface_readonly));
-		assertTrue(statemachine.isStateActive(State.internal_operation));
-		assertTrue(statemachine.isStateActive(State.event_else));
-		assertTrue(statemachine.isStateActive(State.in_exit));
-		assertTrue(statemachine.isStateActive(State.out_oncycle));
-		assertTrue(statemachine.isStateActive(State.var_valueof));
-		assertTrue(statemachine.isStateActive(State.readonly_namespace));
-		assertTrue(statemachine.isStateActive(State.external_internal));
-		assertTrue(statemachine.isStateActive(State.else_event));
-		assertTrue(statemachine.isStateActive(State.entry_in));
-		assertTrue(statemachine.isStateActive(State.exit_var));
-		assertTrue(statemachine.isStateActive(State.always_external));
-		assertTrue(statemachine.isStateActive(State.oncycle_default));
-		assertTrue(statemachine.isStateActive(State.raise_entry));
-		assertTrue(statemachine.isStateActive(State.valueof_always));
-		assertTrue(statemachine.isStateActive(State.active_raise));
-		statemachine.raiseE2();
-		statemachine.runCycle();
-		assertTrue(statemachine.isStateActive(State.default_namespace));
-		assertTrue(statemachine.isStateActive(State.operation_internal));
-		assertTrue(statemachine.isStateActive(State.namespace_local));
-		assertTrue(statemachine.isStateActive(State.local_out));
-		assertTrue(statemachine.isStateActive(State.interface_readonly));
-		assertTrue(statemachine.isStateActive(State.internal_operation));
-		assertTrue(statemachine.isStateActive(State.event_else));
-		assertTrue(statemachine.isStateActive(State.in_exit));
-		assertTrue(statemachine.isStateActive(State.out_oncycle));
-		assertTrue(statemachine.isStateActive(State.var_valueof));
-		assertTrue(statemachine.isStateActive(State.readonly_namespace));
-		assertTrue(statemachine.isStateActive(State.external_internal));
-		assertTrue(statemachine.isStateActive(State.else_local));
-		assertTrue(statemachine.isStateActive(State.entry_in));
-		assertTrue(statemachine.isStateActive(State.exit_var));
-		assertTrue(statemachine.isStateActive(State.always_external));
-		assertTrue(statemachine.isStateActive(State.oncycle_default));
-		assertTrue(statemachine.isStateActive(State.raise_entry));
-		assertTrue(statemachine.isStateActive(State.valueof_always));
-		assertTrue(statemachine.isStateActive(State.active_raise));
-		statemachine.raiseE1();
-		statemachine.runCycle();
-		assertTrue(statemachine.isStateActive(State.default_namespace));
-		assertTrue(statemachine.isStateActive(State.operation_internal));
-		assertTrue(statemachine.isStateActive(State.namespace_local));
-		assertTrue(statemachine.isStateActive(State.local_out));
-		assertTrue(statemachine.isStateActive(State.interface_readonly));
-		assertTrue(statemachine.isStateActive(State.internal_operation));
-		assertTrue(statemachine.isStateActive(State.event_else));
-		assertTrue(statemachine.isStateActive(State.in_exit));
-		assertTrue(statemachine.isStateActive(State.out_oncycle));
-		assertTrue(statemachine.isStateActive(State.var_valueof));
-		assertTrue(statemachine.isStateActive(State.readonly_namespace));
-		assertTrue(statemachine.isStateActive(State.external_internal));
-		assertTrue(statemachine.isStateActive(State.else_local));
-		assertTrue(statemachine.isStateActive(State.entry_out));
-		assertTrue(statemachine.isStateActive(State.exit_var));
-		assertTrue(statemachine.isStateActive(State.always_external));
-		assertTrue(statemachine.isStateActive(State.oncycle_default));
-		assertTrue(statemachine.isStateActive(State.raise_entry));
-		assertTrue(statemachine.isStateActive(State.valueof_always));
-		assertTrue(statemachine.isStateActive(State.active_raise));
-		statemachine.raiseE2();
-		statemachine.runCycle();
-		assertTrue(statemachine.isStateActive(State.default_namespace));
-		assertTrue(statemachine.isStateActive(State.operation_internal));
-		assertTrue(statemachine.isStateActive(State.namespace_local));
-		assertTrue(statemachine.isStateActive(State.local_out));
-		assertTrue(statemachine.isStateActive(State.interface_readonly));
-		assertTrue(statemachine.isStateActive(State.internal_operation));
-		assertTrue(statemachine.isStateActive(State.event_else));
-		assertTrue(statemachine.isStateActive(State.in_exit));
-		assertTrue(statemachine.isStateActive(State.out_oncycle));
-		assertTrue(statemachine.isStateActive(State.var_valueof));
-		assertTrue(statemachine.isStateActive(State.readonly_namespace));
-		assertTrue(statemachine.isStateActive(State.external_internal));
-		assertTrue(statemachine.isStateActive(State.else_local));
-		assertTrue(statemachine.isStateActive(State.entry_out));
-		assertTrue(statemachine.isStateActive(State.exit_readonly));
-		assertTrue(statemachine.isStateActive(State.always_external));
-		assertTrue(statemachine.isStateActive(State.oncycle_default));
-		assertTrue(statemachine.isStateActive(State.raise_entry));
-		assertTrue(statemachine.isStateActive(State.valueof_always));
-		assertTrue(statemachine.isStateActive(State.active_raise));
-		statemachine.raiseE1();
-		statemachine.runCycle();
-		assertTrue(statemachine.isStateActive(State.default_namespace));
-		assertTrue(statemachine.isStateActive(State.operation_internal));
-		assertTrue(statemachine.isStateActive(State.namespace_local));
-		assertTrue(statemachine.isStateActive(State.local_out));
-		assertTrue(statemachine.isStateActive(State.interface_readonly));
-		assertTrue(statemachine.isStateActive(State.internal_operation));
-		assertTrue(statemachine.isStateActive(State.event_else));
-		assertTrue(statemachine.isStateActive(State.in_exit));
-		assertTrue(statemachine.isStateActive(State.out_oncycle));
-		assertTrue(statemachine.isStateActive(State.var_valueof));
-		assertTrue(statemachine.isStateActive(State.readonly_namespace));
-		assertTrue(statemachine.isStateActive(State.external_internal));
-		assertTrue(statemachine.isStateActive(State.else_local));
-		assertTrue(statemachine.isStateActive(State.entry_out));
-		assertTrue(statemachine.isStateActive(State.exit_readonly));
-		assertTrue(statemachine.isStateActive(State.always_operation));
-		assertTrue(statemachine.isStateActive(State.oncycle_default));
-		assertTrue(statemachine.isStateActive(State.raise_entry));
-		assertTrue(statemachine.isStateActive(State.valueof_always));
-		assertTrue(statemachine.isStateActive(State.active_raise));
-		statemachine.raiseE2();
-		statemachine.runCycle();
-		assertTrue(statemachine.isStateActive(State.default_namespace));
-		assertTrue(statemachine.isStateActive(State.operation_internal));
-		assertTrue(statemachine.isStateActive(State.namespace_local));
-		assertTrue(statemachine.isStateActive(State.local_out));
-		assertTrue(statemachine.isStateActive(State.interface_readonly));
-		assertTrue(statemachine.isStateActive(State.internal_operation));
-		assertTrue(statemachine.isStateActive(State.event_else));
-		assertTrue(statemachine.isStateActive(State.in_exit));
-		assertTrue(statemachine.isStateActive(State.out_oncycle));
-		assertTrue(statemachine.isStateActive(State.var_valueof));
-		assertTrue(statemachine.isStateActive(State.readonly_namespace));
-		assertTrue(statemachine.isStateActive(State.external_internal));
-		assertTrue(statemachine.isStateActive(State.else_local));
-		assertTrue(statemachine.isStateActive(State.entry_out));
-		assertTrue(statemachine.isStateActive(State.exit_readonly));
-		assertTrue(statemachine.isStateActive(State.always_operation));
-		assertTrue(statemachine.isStateActive(State.oncycle_else));
-		assertTrue(statemachine.isStateActive(State.raise_entry));
-		assertTrue(statemachine.isStateActive(State.valueof_always));
-		assertTrue(statemachine.isStateActive(State.active_raise));
-		statemachine.raiseE1();
-		statemachine.runCycle();
-		assertTrue(statemachine.isStateActive(State.default_namespace));
-		assertTrue(statemachine.isStateActive(State.operation_internal));
-		assertTrue(statemachine.isStateActive(State.namespace_local));
-		assertTrue(statemachine.isStateActive(State.local_out));
-		assertTrue(statemachine.isStateActive(State.interface_readonly));
-		assertTrue(statemachine.isStateActive(State.internal_operation));
-		assertTrue(statemachine.isStateActive(State.event_else));
-		assertTrue(statemachine.isStateActive(State.in_exit));
-		assertTrue(statemachine.isStateActive(State.out_oncycle));
-		assertTrue(statemachine.isStateActive(State.var_valueof));
-		assertTrue(statemachine.isStateActive(State.readonly_namespace));
-		assertTrue(statemachine.isStateActive(State.external_internal));
-		assertTrue(statemachine.isStateActive(State.else_local));
-		assertTrue(statemachine.isStateActive(State.entry_out));
-		assertTrue(statemachine.isStateActive(State.exit_readonly));
-		assertTrue(statemachine.isStateActive(State.always_operation));
-		assertTrue(statemachine.isStateActive(State.oncycle_else));
-		assertTrue(statemachine.isStateActive(State.raise_exit));
-		assertTrue(statemachine.isStateActive(State.valueof_always));
-		assertTrue(statemachine.isStateActive(State.active_raise));
-		statemachine.raiseE2();
-		statemachine.runCycle();
-		assertTrue(statemachine.isStateActive(State.default_namespace));
-		assertTrue(statemachine.isStateActive(State.operation_internal));
-		assertTrue(statemachine.isStateActive(State.namespace_local));
-		assertTrue(statemachine.isStateActive(State.local_out));
-		assertTrue(statemachine.isStateActive(State.interface_readonly));
-		assertTrue(statemachine.isStateActive(State.internal_operation));
-		assertTrue(statemachine.isStateActive(State.event_else));
-		assertTrue(statemachine.isStateActive(State.in_exit));
-		assertTrue(statemachine.isStateActive(State.out_oncycle));
-		assertTrue(statemachine.isStateActive(State.var_valueof));
-		assertTrue(statemachine.isStateActive(State.readonly_namespace));
-		assertTrue(statemachine.isStateActive(State.external_internal));
-		assertTrue(statemachine.isStateActive(State.else_local));
-		assertTrue(statemachine.isStateActive(State.entry_out));
-		assertTrue(statemachine.isStateActive(State.exit_readonly));
-		assertTrue(statemachine.isStateActive(State.always_operation));
-		assertTrue(statemachine.isStateActive(State.oncycle_else));
-		assertTrue(statemachine.isStateActive(State.raise_exit));
-		assertTrue(statemachine.isStateActive(State.valueof_oncycle));
-		assertTrue(statemachine.isStateActive(State.active_raise));
-		statemachine.raiseE1();
-		statemachine.runCycle();
-		assertTrue(statemachine.isStateActive(State.default_namespace));
-		assertTrue(statemachine.isStateActive(State.operation_internal));
-		assertTrue(statemachine.isStateActive(State.namespace_local));
-		assertTrue(statemachine.isStateActive(State.local_out));
-		assertTrue(statemachine.isStateActive(State.interface_readonly));
-		assertTrue(statemachine.isStateActive(State.internal_operation));
-		assertTrue(statemachine.isStateActive(State.event_else));
-		assertTrue(statemachine.isStateActive(State.in_exit));
-		assertTrue(statemachine.isStateActive(State.out_oncycle));
-		assertTrue(statemachine.isStateActive(State.var_valueof));
-		assertTrue(statemachine.isStateActive(State.readonly_namespace));
-		assertTrue(statemachine.isStateActive(State.external_internal));
-		assertTrue(statemachine.isStateActive(State.else_local));
-		assertTrue(statemachine.isStateActive(State.entry_out));
-		assertTrue(statemachine.isStateActive(State.exit_readonly));
-		assertTrue(statemachine.isStateActive(State.always_operation));
-		assertTrue(statemachine.isStateActive(State.oncycle_else));
-		assertTrue(statemachine.isStateActive(State.raise_exit));
-		assertTrue(statemachine.isStateActive(State.valueof_oncycle));
-		assertTrue(statemachine.isStateActive(State.active_valueof));
-		statemachine.raiseE2();
-		statemachine.runCycle();
-		assertTrue(statemachine.isStateActive(State.default_namespace));
-		assertTrue(statemachine.isStateActive(State.operation_internal));
-		assertTrue(statemachine.isStateActive(State.namespace_local));
-		assertTrue(statemachine.isStateActive(State.local_out));
-		assertTrue(statemachine.isStateActive(State.interface_readonly));
-		assertTrue(statemachine.isStateActive(State.internal_operation));
-		assertTrue(statemachine.isStateActive(State.event_else));
-		assertTrue(statemachine.isStateActive(State.in_exit));
-		assertTrue(statemachine.isStateActive(State.out_oncycle));
-		assertTrue(statemachine.isStateActive(State.var_valueof));
-		assertTrue(statemachine.isStateActive(State.readonly_namespace));
-		assertTrue(statemachine.isStateActive(State.external_internal));
-		assertTrue(statemachine.isStateActive(State.else_local));
-		assertTrue(statemachine.isStateActive(State.entry_out));
-		assertTrue(statemachine.isStateActive(State.exit_readonly));
-		assertTrue(statemachine.isStateActive(State.always_operation));
-		assertTrue(statemachine.isStateActive(State.oncycle_else));
-		assertTrue(statemachine.isStateActive(State.raise_exit));
-		assertTrue(statemachine.isStateActive(State.valueof_oncycle));
-		assertTrue(statemachine.isStateActive(State.active_valueof));
-	}
-}

+ 12 - 0
test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src-gen/org/yakindu/sct/model/sexec/interpreter/test/SyncJoinTest.java

@@ -106,4 +106,16 @@ public class SyncJoinTest extends AbstractExecutionFlowTest {
 		assertTrue(isActive("C2"));
 		assertTrue(isActive("C2"));
 		assertTrue(isActive("D2"));
 		assertTrue(isActive("D2"));
 	}
 	}
+	@Test
+	public void doubleEntryActionBug() throws Exception {
+		interpreter.enter();
+		raiseEvent("e");
+		raiseEvent("f");
+		interpreter.runCycle();
+		raiseEvent("jc");
+		raiseEvent("jd");
+		interpreter.runCycle();
+		assertTrue(isActive("A"));
+		assertTrue(getInteger("x") == 1);
+	}
 }
 }

+ 5 - 0
test-plugins/org.yakindu.sct.test.models/tests/StringExpressions.sctunit

@@ -1,15 +1,20 @@
 testgroup StringExpressions for statechart StringExpressions	{
 testgroup StringExpressions for statechart StringExpressions	{
 	test StringExpressionsTest {
 	test StringExpressionsTest {
 		
 		
+		assert quotedString == '"x"'
 		enter
 		enter
 		
 		
 		assert active (StringExpressions.main_region.StateA)
 		assert active (StringExpressions.main_region.StateA)
 		assert myString == "hello"
 		assert myString == "hello"
 		assert myString2 == "world"
 		assert myString2 == "world"
+		assert quotedString == "'y'"
+		
 		raise e1
 		raise e1
 		cycle
 		cycle
 		assert active (StringExpressions.main_region.StateB)
 		assert active (StringExpressions.main_region.StateB)
 		assert equals == false
 		assert equals == false
 		assert notEqual == true
 		assert notEqual == true
+		assert quotedString == "\"z\"" 
+		
 	}
 	}
 }
 }

+ 18 - 0
test-plugins/org.yakindu.sct.test.models/tests/SyncJoin.sctunit

@@ -93,5 +93,23 @@ testgroup SyncJoin for statechart SyncJoin {
 				
 				
 	}
 	}
 	
 	
+	/* Entry actions of a join target should only be called once. 
+	 * 
+	 * There was a bug that lead to a multiple entry action call depending on the number of joined transitions.
+	 */
+	test doubleEntryActionBug {
+		enter
+		
+		raise e
+		raise f
+		cycle
+		
+		raise jc
+		raise jd
+		cycle
+		
+		assert active (SyncJoin.main_region.A)
+		assert x == 1
+	}
 	
 	
 }
 }