瀏覽代碼

fixed error regading setting variable values in sct unit c code generator

terfloth@itemis.de 13 年之前
父節點
當前提交
7fff191d3e

+ 5 - 5
test-plugins/org.yakindu.sct.generator.c.test/gtests/GuardedEntry/GuardedEntry.cc

@@ -23,7 +23,7 @@ TEST(StatemachineTest, EntryTakenOnStatechartEnter) {
 	GuardedEntry handle;
 	guardedEntry_init(&handle);
 	guardedEntry_enter(&handle);
-	guardedEntryIface_set_guard(true);
+	guardedEntryIface_set_guard(&handle, true);
 	EXPECT_TRUE(false);
 	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_main_region_A));
 	EXPECT_TRUE(guardedEntryIface_get_done(&handle) == true);
@@ -36,8 +36,8 @@ TEST(StatemachineTest, EntryTakenInTransition) {
 	guardedEntryIface_raise_e(&handle);
 	guardedEntry_runCycle(&handle);
 	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_main_region_B));
-	guardedEntryIface_set_guard(true);
-	guardedEntryIface_set_done(false);
+	guardedEntryIface_set_guard(&handle, true);
+	guardedEntryIface_set_done(&handle, false);
 	guardedEntryIface_raise_e(&handle);
 	guardedEntry_runCycle(&handle);
 	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_main_region_A));
@@ -51,8 +51,8 @@ TEST(StatemachineTest, EntryNotTakenInTransition) {
 	guardedEntryIface_raise_e(&handle);
 	guardedEntry_runCycle(&handle);
 	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_main_region_B));
-	guardedEntryIface_set_guard(false);
-	guardedEntryIface_set_done(false);
+	guardedEntryIface_set_guard(&handle, false);
+	guardedEntryIface_set_done(&handle, false);
 	guardedEntryIface_raise_e(&handle);
 	guardedEntry_runCycle(&handle);
 	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_main_region_A));

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

@@ -28,7 +28,7 @@ TEST(StatemachineTest, ExitNotTaken) {
 	guardedExit_init(&handle);
 	guardedExit_enter(&handle);
 	EXPECT_TRUE(guardedExit_isActive(&handle, GuardedExit_main_region_A));
-	guardedExitIface_set_guard(true);
+	guardedExitIface_set_guard(&handle, true);
 	guardedExitIface_raise_e(&handle);
 	guardedExit_runCycle(&handle);
 	EXPECT_TRUE(guardedExit_isActive(&handle, GuardedExit_main_region_B));

+ 10 - 10
test-plugins/org.yakindu.sct.generator.c.test/src/org/yakindu/sct/generator/c/gtest/GTestHelper.java

@@ -156,7 +156,7 @@ public class GTestHelper {
 	}
 
 	protected List<String> createCommand() {
-		//String gTestDirectory = getGTestDirectory();
+		String gTestDirectory = getGTestDirectory();
 
 		List<String> includes = new ArrayList<String>();
 		getIncludes(includes);
@@ -168,11 +168,11 @@ public class GTestHelper {
 		command.add(getCompilerCommand());
 		command.add("-o");
 		command.add(getFileName(getTestProgram()));
-		//command.add("-I" + gTestDirectory + "/include");
+		if (gTestDirectory != null) command.add("-I" + gTestDirectory + "/include");
 		for (String include : includes) {
 			command.add("-I" + include);
 		}
-		//command.add("-L" + gTestDirectory);
+		if (gTestDirectory != null) command.add("-L" + gTestDirectory);
 		for (String sourceFile : sourceFiles) {
 			command.add(sourceFile);
 		}
@@ -190,16 +190,16 @@ public class GTestHelper {
 		return "gcc";
 	}
 
-//	/**
-//	 * @return
-//	 */
-//	private String getGTestDirectory() {
-//		String gTestDirectory = System.getenv("GTEST_DIR");
+	/**
+	 * @return
+	 */
+	private String getGTestDirectory() {
+		String gTestDirectory = System.getenv("GTEST_DIR");
 //		if (gTestDirectory == null) {
 //			throw new RuntimeException("GTEST_DIR environment variable not set");
 //		}
-//		return gTestDirectory;
-//	}
+		return gTestDirectory;
+	}
 
 	protected String getFileName(String path) {
 		return new Path(path).lastSegment();

+ 2 - 0
test-plugins/org.yakindu.sct.generator.c.test/src/org/yakindu/sct/generator/c/gtest/GTestRunner.java

@@ -105,6 +105,8 @@ public class GTestRunner extends Runner {
 		while ((count = reader.read(buffer)) != -1) {
 			sb.append(buffer, 0, count);
 		}
+		reader.close();
+		is.close();
 		return sb;
 	}