|
From: <tho...@us...> - 2014-04-10 12:20:10
|
Revision: 546
http://sourceforge.net/p/cgreen/code/546
Author: thomasnilsson
Date: 2014-04-10 12:20:01 +0000 (Thu, 10 Apr 2014)
Log Message:
-----------
Minor formatting adjustment to ensure that a single empty line is printed after assertion errors regardless of combinations of presence of expected and actual values
Modified Paths:
--------------
trunk/cgreen/src/message_formatting.c
Modified: trunk/cgreen/src/message_formatting.c
===================================================================
--- trunk/cgreen/src/message_formatting.c 2014-04-08 06:41:22 UTC (rev 545)
+++ trunk/cgreen/src/message_formatting.c 2014-04-10 12:20:01 UTC (rev 546)
@@ -117,9 +117,9 @@
char actual_value_string[32];
const char *actual_value_constraint_name = "Expected [%s] to [%s]";
const char *expected_value_name = "[%s]\n";
- const char *actual_value_as_string = "\t\tactual value:\t\t\t[\"%s\"]\n";
+ const char *actual_value_as_string = "\t\tactual value:\t\t\t[\"%s\"]";
const char *at_offset = "\t\tat offset:\t\t\t[%d]";
- const char *actual_value_message = "\t\tactual value:\t\t\t[%" PRIdPTR "]\n";
+ const char *actual_value_message = "\t\tactual value:\t\t\t[%" PRIdPTR "]";
char *message;
size_t message_size = strlen(actual_value_constraint_name) +
strlen(expected_value_name) +
@@ -170,6 +170,7 @@
actual_value_as_string,
(const char *)actual);
if (strstr(constraint->name, "not ") == NULL || strstr(constraint->name, "contain ") != NULL) {
+ strcat(message, "\n");
snprintf(message + strlen(message), message_size - strlen(message) - 1,
constraint->expected_value_message,
(const char *)constraint->expected_value);
@@ -191,6 +192,7 @@
actual);
if (strstr(constraint->name, "not ") == NULL) {
+ strcat(message, "\n");
snprintf(message + strlen(message), message_size - strlen(message) - 1,
constraint->expected_value_message,
constraint->expected_value);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|