new tests-cases

shackspace · Mar 31, 2013 · b0a1782 · b0a1782
1 parent bcb8c67
commit b0a1782
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/firmware/Interpreter.c b/firmware/Interpreter.c
@@ -322,7 +322,7 @@ int decode_command_to_frame(char* token, word* output)
 				return _MODE_SIMPLE_;
 			else return ret;
 		}
-		return _ERR_PARSE_ERROR_;
+		return _ERR_PARAMETER_MISSING_;
 	}
 
 	if(!strcmp_P(command, command_arc_group))
@@ -334,7 +334,7 @@ int decode_command_to_frame(char* token, word* output)
 				return _MODE_SIMPLE_;
 			else return ret;
 		}
-		return _ERR_PARSE_ERROR_;
+		return _ERR_PARAMETER_MISSING_;
 	}
 
 
@@ -350,7 +350,7 @@ int decode_command_to_frame(char* token, word* output)
 				else
 					return ret;
 			}
-			return _ERR_PARSE_ERROR_;
+			return _ERR_PARAMETER_MISSING_;
 		}
 	}
 
@@ -369,23 +369,23 @@ int decode_command_to_frame(char* token, word* output)
 				else
 					return ret;
 			}
-			return _ERR_PARSE_ERROR_;
+			return _ERR_PARAMETER_MISSING_;
 		}
 	}
 
 	for(i = 0; i < COUNT_COMMANDS_WITH_PARAM; i++)
 	{
 		if(!strcmp_P(command, command_with_param_list[i].key))
 		{
-			if(has_param1)
+			if(has_param1 && has_param2)
 			{
 				ret = dali_slave_command(output, (byte)param1, command_with_param_list[i].value);
 				if(ret == _ERR_OK_)
 					return command_with_param_list[i].mode;
 				else
 					return ret;
 			}
-			return _ERR_PARSE_ERROR_;
+			return _ERR_PARAMETER_MISSING_;
 		}
 	}
 
@@ -396,15 +396,15 @@ int decode_command_to_frame(char* token, word* output)
 		strcat(groupify, group_postfix);
 		if(!strcmp(groupify, command))
 		{
-			if(has_param1)
+			if(has_param1 && has_param2)
 			{			
 				ret = dali_group_command(output, (byte)param1, command_with_param_list[i].value);
 				if(ret == _ERR_OK_)
 					return command_with_param_list[i].mode;
 				else
 					return ret;
 			}
-			return _ERR_PARSE_ERROR_;
+			return _ERR_PARAMETER_MISSING_;
 		}
 	}
 

diff --git a/firmware/Interpreter.h b/firmware/Interpreter.h
@@ -14,6 +14,7 @@ extern "C"
 #define MAX_BUFFER_LENGTH 256
 #define _ERR_PARSE_ERROR_ -253
 #define _ERR_BUFFER_FULL_ -254
+#define _ERR_PARAMETER_MISSING_ -255
 #define _ERR_UNIMPLEMENTED_ -256
 
 inline char nibble_to_ascii(uint8_t nibble);

diff --git a/firmware/tests/firmware_test/firmware_tests.cpp b/firmware/tests/firmware_test/firmware_tests.cpp
@@ -151,6 +151,10 @@ TEST(ParserTestInvalidInputString, POSITIVE)
     EXPECT_EQ(_ERR_PARSE_ERROR_, decode_command_to_frame("up 1000\n", &frame));
 
     EXPECT_EQ(_ERR_UNIMPLEMENTED_, decode_command_to_frame("updown 10 39\n", &frame));
+
+    EXPECT_EQ(_ERR_UNIMPLEMENTED_, decode_command_to_frame("up10 39\n", &frame));
+
+    EXPECT_EQ(_ERR_PARAMETER_MISSING_, decode_command_to_frame("scene 7\n", &frame));
 }