浏览代码

regenerated cpp generator tests in order to handle name spaces

Axel Terfloth 9 年之前
父节点
当前提交
6180183695

+ 1 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/all C++ generator tests.launch

@@ -30,7 +30,7 @@
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.yakindu.sct.generator.cpp.test.AllTestsTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.yakindu.sct.generator.cpp.test"/>

+ 4 - 4
test-plugins/org.yakindu.sct.generator.cpp.test/gtests/ReadOnlyVariableTest/ReadOnlyVariableTest.cc

@@ -20,20 +20,20 @@ TEST(StatemachineTest, ReadOnlyVariableTest) {
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_myInt()== 0l);
 	EXPECT_TRUE(strcmp(statechart->getDefaultSCI()->get_myString(), "testString") == 0);
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_myBool()== true);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_myReal()== 1.1d);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_myReal()== 1.1);
 	EXPECT_TRUE(statechart->getSCI_A()->get_myInt()== 0l);
 	EXPECT_TRUE(strcmp(statechart->getSCI_A()->get_myString(), "testString") == 0);
 	EXPECT_TRUE(statechart->getSCI_A()->get_myBool()== true);
-	EXPECT_TRUE(statechart->getSCI_A()->get_myReal()== 1.1d);
+	EXPECT_TRUE(statechart->getSCI_A()->get_myReal()== 1.1);
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isStateActive(ReadOnlyVariable::main_region_StateB));
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_myInt()== 100l);
 	EXPECT_TRUE(strcmp(statechart->getDefaultSCI()->get_myString(), "fail") == 0);
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_myBool()== false);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_myReal()== 6.6d);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_myReal()== 6.6);
 	EXPECT_TRUE(statechart->getSCI_A()->get_myInt()== 200l);
 	EXPECT_TRUE(strcmp(statechart->getSCI_A()->get_myString(), "A_fail") == 0);
 	EXPECT_TRUE(statechart->getSCI_A()->get_myBool()== false);
-	EXPECT_TRUE(statechart->getSCI_A()->get_myReal()== 7.7d);
+	EXPECT_TRUE(statechart->getSCI_A()->get_myReal()== 7.7);
 	delete statechart;
 }

+ 1 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/EntryReactionActionTest.java

@@ -18,7 +18,7 @@ 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/EntryReactionActionTest/EntryReactionActionTest.cc", program = "gtests/EntryReactionActionTest/EntryReactionAction", model = "testmodels/SCTUnit/EntryReactionAction.sct")
+@GTest(sourceFile = "gtests/EntryReactionActionTest/EntryReactionActionTest.cc", program = "gtests/EntryReactionActionTest/EntryReactionAction", model = "testmodels/SCTUnit/entries/EntryReactionAction.sct")
 @RunWith(GTestRunner.class)
 public class EntryReactionActionTest {