Changeset 6772d19

Timestamp:

Jul 31, 2010, 7:11:42 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

e0e0e5a

Parents:

35a30f9

git-author:

David Benjamin <davidben@mit.edu> (07/25/10 17:28:27)

git-committer:

David Benjamin <davidben@mit.edu> (07/31/10 19:11:42)

Message:

Add a test case for owl_fmtext with two failures

When appending text, we get the textlen wrong. We also fail to correctly
consider attributes in owl_fmtext_num_lines. This also adds tests for
owl_fmtext_truncate_cols and owl_fmtext_truncate_lines as they are
finicky.

Files:

• fmtext.c (modified) (1 diff)
• tester.c (modified) (3 diffs)

fmtext.c

@@ -521 +521 @@
 }
 
+int owl_fmtext_num_bytes(const owl_fmtext *f)
+{
+  return(f->textlen);
+}
+
 /* set the charater at 'index' to be 'char'.  If index is out of
  * bounds don't do anything. If c or char at index is not ASCII, don't

tester.c

@@ -21 +21 @@
 int owl_obarray_regtest(void);
 int owl_editwin_regtest(void);
+int owl_fmtext_regtest(void);
 
 extern void owl_perl_xs_init(pTHX);
@@ -106 +107 @@
   numfailures += owl_filter_regtest();
   numfailures += owl_editwin_regtest();
+  numfailures += owl_fmtext_regtest();
   if (numfailures) {
       fprintf(stderr, "# *** WARNING: %d failures total\n", numfailures);
@@ -407 +409 @@
   return numfailed;
 }
+
+int owl_fmtext_regtest(void) {
+  int numfailed = 0;
+  owl_fmtext fm1;
+  owl_fmtext fm2;
+  char *str;
+
+  printf("# BEGIN testing owl_fmtext\n");
+
+  owl_fmtext_init_null(&fm1);
+  owl_fmtext_init_null(&fm2);
+
+  /* Verify text gets correctly appended. */
+  owl_fmtext_append_normal(&fm1, "1234567898");
+  owl_fmtext_append_fmtext(&fm2, &fm1);
+  FAIL_UNLESS("string lengths correct",
+              owl_fmtext_num_bytes(&fm2) == strlen(owl_fmtext_get_text(&fm2)));
+
+  /* Test owl_fmtext_num_lines. */
+  owl_fmtext_clear(&fm1);
+  FAIL_UNLESS("empty line correct", owl_fmtext_num_lines(&fm1) == 0);
+  owl_fmtext_append_normal(&fm1, "12345\n67898");
+  FAIL_UNLESS("trailing chars correct", owl_fmtext_num_lines(&fm1) == 2);
+  owl_fmtext_append_normal(&fm1, "\n");
+  FAIL_UNLESS("trailing newline correct", owl_fmtext_num_lines(&fm1) == 2);
+  owl_fmtext_append_bold(&fm1, "");
+  FAIL_UNLESS("trailing attributes correct", owl_fmtext_num_lines(&fm1) == 2);
+
+  /* Test owl_fmtext_truncate_lines */
+  owl_fmtext_clear(&fm1);
+  owl_fmtext_append_normal(&fm1, "0\n1\n2\n3\n4\n");
+
+  owl_fmtext_clear(&fm2);
+  owl_fmtext_truncate_lines(&fm1, 1, 3, &fm2);
+  str = owl_fmtext_print_plain(&fm2);
+  FAIL_UNLESS("lines corrected truncated",
+              str && !strcmp(str, "1\n2\n3\n"));
+  owl_free(str);
+
+  owl_fmtext_clear(&fm2);
+  owl_fmtext_truncate_lines(&fm1, 1, 5, &fm2);
+  str = owl_fmtext_print_plain(&fm2);
+  FAIL_UNLESS("lines corrected truncated",
+              str && !strcmp(str, "1\n2\n3\n4\n"));
+  owl_free(str);
+
+  /* Test owl_fmtext_truncate_cols. */
+  owl_fmtext_clear(&fm1);
+  owl_fmtext_append_normal(&fm1, "123456789012345\n");
+  owl_fmtext_append_normal(&fm1, "123456789\n");
+  owl_fmtext_append_normal(&fm1, "1234567890\n");
+
+  owl_fmtext_clear(&fm2);
+  owl_fmtext_truncate_cols(&fm1, 4, 9, &fm2);
+  str = owl_fmtext_print_plain(&fm2);
+  FAIL_UNLESS("columns correctly truncated",
+              str && !strcmp(str, "567890"
+                                  "56789\n"
+                                  "567890"));
+  owl_free(str);
+
+  owl_fmtext_cleanup(&fm1);
+  owl_fmtext_cleanup(&fm2);
+
+  printf("# END testing owl_fmtext (%d failures)\n", numfailed);
+
+  return numfailed;
+}