[cmor] 166/190: message with tests, and removed unecessary code
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Jul 21 12:54:51 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository cmor.
commit f2be6805a2f33ca9784bd69628aac91918d57779
Author: Jamie Kettleborough <jamie.kettleborough at metoffice.gov.uk>
Date: Tue Nov 19 14:20:42 2013 +0000
message with tests, and removed unecessary code
---
Src/cmor.c | 15 ++++++++-------
Src/cmor_variables.c | 10 ----------
Test/test_unit_cat_unique.c | 40 ++++++++++++++++++++++++----------------
3 files changed, 32 insertions(+), 33 deletions(-)
diff --git a/Src/cmor.c b/Src/cmor.c
index a1fcd18..c527223 100644
--- a/Src/cmor.c
+++ b/Src/cmor.c
@@ -55,12 +55,7 @@ int CMOR_CREATE_SUBDIRECTORIES = 1;
char cmor_input_path[CMOR_MAX_STRING];
char cmor_traceback_info[CMOR_MAX_STRING];
-/* Test routines implemented out of the way at the end of this code */
-int test_cat_unique_string(void);
-
-
/* is src in dest? Negative=src already in dest */
-
int cmor_stringinstring (char* dest, char* src) {
char* pstr=dest;
while (pstr=strstr(pstr, src)) {
@@ -82,17 +77,23 @@ int cmor_stringinstring (char* dest, char* src) {
void cmor_cat_unique_string (char* dest, char* src) {
int offset;
int spare_space;
+
/* if this string is in msg */
if (cmor_stringinstring(dest, src)) {
/* do nothing */
- } else if (offset=strlen(dest)) {
+
+ } else if (offset = strlen(dest)) {
dest[offset]=' ';
offset++;
spare_space=CMOR_MAX_STRING-offset-1;
strncat(dest+offset, src, spare_space);
- } else if (offset=0) {
+
+ } else if (offset==0) {
+
strncpy(dest, src, CMOR_MAX_STRING);
+
}
+
}
void cmor_check_forcing_validity(int table_id,char *value) {
diff --git a/Src/cmor_variables.c b/Src/cmor_variables.c
index 95bf462..4a76194 100644
--- a/Src/cmor_variables.c
+++ b/Src/cmor_variables.c
@@ -554,7 +554,6 @@ int cmor_update_history(int var_id,char *add){
char tmp2[CMOR_MAX_STRING];
/* first figures out time */
- cmor_add_traceback("cmor_update_history");
lt = time(NULL);
ptr = gmtime(<);
snprintf(date,CMOR_MAX_STRING,"%.4i-%.2i-%.2iT%.2i:%.2i:%.2iZ",ptr->tm_year+1900,ptr->tm_mon+1,ptr->tm_mday,ptr->tm_hour,ptr->tm_min,ptr->tm_sec);
@@ -571,17 +570,8 @@ int cmor_update_history(int var_id,char *add){
}
int cmor_history_contains(int var_id,char *add){
- struct tm *ptr;
- time_t lt;
- char date[CMOR_MAX_STRING];
char tmp[CMOR_MAX_STRING];
- char tmp2[CMOR_MAX_STRING];
- /* first figures out time */
- cmor_add_traceback("cmor_update_history");
- lt = time(NULL);
- ptr = gmtime(<);
- snprintf(date,CMOR_MAX_STRING,"%.4i-%.2i-%.2iT%.2i:%.2i:%.2iZ",ptr->tm_year+1900,ptr->tm_mon+1,ptr->tm_mday,ptr->tm_hour,ptr->tm_min,ptr->tm_sec);
if (cmor_has_variable_attribute(var_id,"history")==0) {
cmor_get_variable_attribute(var_id,"history",&tmp[0]);
if (cmor_stringinstring(tmp, add)) {
diff --git a/Test/test_unit_cat_unique.c b/Test/test_unit_cat_unique.c
index 973a1e1..7e72fa9 100644
--- a/Test/test_unit_cat_unique.c
+++ b/Test/test_unit_cat_unique.c
@@ -1,12 +1,16 @@
#include <string.h>
#include "cmor.h"
+#include "cmor_func_def.h"
-extern void cmor_cat_unique_string (char* dest, char* src);
+int fail(int code, char *expect, char *got) {
+ printf("failed test %d, expect '%s' got '%s'\n", code, expect, got);
+ return code;
+}
int test_cat_unique_string(void) {
- char dest[128];
- char src[128];
- char expected[128];
+ char dest[CMOR_MAX_STRIN];
+ char src[CMOR_MAX_STRING];
+ char expected[CMOR_MAX_STRING];
strcpy(dest, "");
strcpy(src, "rumble");
strcpy(expected, "rumble");
@@ -15,13 +19,17 @@ int test_cat_unique_string(void) {
printf("running tests\n");
cmor_cat_unique_string(dest,src);
if (strcmp(dest,expected)) {
- return 1;
+ return fail(1, expected, dest);
}
/* 2. simple test: add string to itself. Should be identical to above */
+ strcpy(dest, "rumble");
+ strcpy(src, "rumble");
+ strcpy(expected, "rumble");
+
cmor_cat_unique_string(dest,src);
if (strcmp(dest,expected)) {
- return 2;
+ return fail(2, expected, dest);
}
/* 3. simple test: add string to non-blank, unique*/
@@ -29,7 +37,7 @@ int test_cat_unique_string(void) {
strcpy(expected, "rumble jungle");
cmor_cat_unique_string(dest,src);
if (strcmp(dest,expected)) {
- return 3;
+ return fail(3, expected, dest);
}
/* 4. simple test: add string that exists within another word */
@@ -38,7 +46,7 @@ int test_cat_unique_string(void) {
strcpy(expected, "rumble jungle umb");
cmor_cat_unique_string(dest,src);
if (strcmp(dest,expected)) {
- return 4;
+ return fail(4, expected, dest);
}
/* 5. simple test: add string to blank */
@@ -47,7 +55,7 @@ int test_cat_unique_string(void) {
strcpy(expected, "rumble rum");
cmor_cat_unique_string(dest,src);
if (strcmp(dest,expected)) {
- return 5;
+ return fail(5, expected, dest);
}
/* 6. simple test: add string to blank */
@@ -56,7 +64,7 @@ int test_cat_unique_string(void) {
strcpy(expected, "rumble ble");
cmor_cat_unique_string(dest,src);
if (strcmp(dest,expected)) {
- return 6;
+ return fail(6, expected, dest);
}
/* 7. simple test: add string to blank */
@@ -65,7 +73,7 @@ int test_cat_unique_string(void) {
strcpy(expected, "rumble jungle happy ppy");
cmor_cat_unique_string(dest,src);
if (strcmp(dest,expected)) {
- return 7;
+ return fail(7, expected, dest);
}
/* 8. simple test: add string to blank */
@@ -74,7 +82,7 @@ int test_cat_unique_string(void) {
strcpy(expected, "rumble jungle happy gle");
cmor_cat_unique_string(dest,src);
if (strcmp(dest,expected)) {
- return 8;
+ return fail(8, expected, dest);
}
/* 9. simple test: add string to blank */
@@ -83,7 +91,7 @@ int test_cat_unique_string(void) {
strcpy(expected, "rumble jungle happy jung");
cmor_cat_unique_string(dest,src);
if (strcmp(dest,expected)) {
- return 9;
+ return fail(9, expected, dest);
}
/* 10. simple test: add string to blank */
strcpy(dest, "rumble jumble ble");
@@ -91,7 +99,7 @@ int test_cat_unique_string(void) {
strcpy(expected, "rumble jumble ble");
cmor_cat_unique_string(dest,src);
if (strcmp(dest,expected)) {
- return 9;
+ return fail(10, expected, dest);
}
/* 11. simple test: add latest */
@@ -100,7 +108,7 @@ int test_cat_unique_string(void) {
strcpy(expected, "rumble jumble");
cmor_cat_unique_string(dest,src);
if (strcmp(dest,expected)) {
- return 10;
+ return fail(11, expected, dest);
}
/* 12. simple test: add latest */
@@ -109,7 +117,7 @@ int test_cat_unique_string(void) {
strcpy(expected, "rumble jumble");
cmor_cat_unique_string(dest,src);
if (strcmp(dest,expected)) {
- return 11;
+ return fail(12, expected, dest);
}
return 0;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cmor.git
More information about the debian-science-commits
mailing list