Add test cases for removal of colored boxes

ascii-boxes · Feb 15, 2021 · 352a7b6 · 352a7b6
1 parent beb8696
commit 352a7b6
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/src/remove.c b/src/remove.c
@@ -976,15 +976,20 @@ int remove_box()
                     break;
                 }
             }
-            #ifdef DEBUG
+            #if defined(DEBUG)
                 fprintf(stderr, "memmove(\"%s\", \"%s\", %d);\n",
                         input.lines[j].text, input.lines[j].text + c, (int) (input.lines[j].len - c + 1));
             #endif
             memmove(input.lines[j].text, input.lines[j].text + c,
                     input.lines[j].len - c + 1);         /* +1 for zero byte */
             input.lines[j].len -= c;
 
-            /* TODO the next line may kill an escape code to color the next char */
+            #if defined(DEBUG)
+                fprintf(stderr, "u32_move(\"%s\", \"%s\", %d); // posmap[c]=%d\n",
+                        u32_strconv_to_output(input.lines[j].mbtext),
+                        u32_strconv_to_output(input.lines[j].mbtext + input.lines[j].posmap[c]),
+                        (int) (input.lines[j].num_chars - c + 1), (int) input.lines[j].posmap[c]);
+            #endif
             u32_move(input.lines[j].mbtext, input.lines[j].mbtext + input.lines[j].posmap[c],
                      input.lines[j].num_chars - c + 1);  /* +1 for zero byte */
             input.lines[j].num_chars -= c;

diff --git a/src/tools.c b/src/tools.c
@@ -197,7 +197,7 @@ void concat_strings(char *dst, int max_len, int count, ...)
         /*
          * Concatenate 'src' onto 'dst', as long as we have room.
          */
-        while (*src && max_len > 1) {    // TODO Can this be improved via strcpy
+        while (*src && max_len > 1) {
             *dst++ = *src++;
             max_len--;
         }

diff --git a/test/114_headline_ansi_unicode_remove.txt b/test/114_headline_ansi_unicode_remove.txt
@@ -9,8 +9,10 @@ box was created.
 :INPUT
    /**************************/
    /*   [38;5;44mf [0m[38;5;49mo [0m[38;5;48mo [0m[38;5;83m  [0m[38;5;118m海 [0m[38;5;154m  [0m[38;5;184mb [0m[38;5;214ma [0m[38;5;208mr [0m  */
+   /*   f o o b a r          */
    /**************************/
 :OUTPUT-FILTER
 :EXPECTED
    [38;5;44mf[0m[38;5;49mo[0m[38;5;48mo[0m[38;5;83m [0m[38;5;118m海[0m[38;5;154m [0m[38;5;184mb[0m[38;5;214ma[0m[38;5;208mr[0m
+   foobar
 :EOF
diff --git a/test/121_remove_box_lolcat.txt b/test/121_remove_box_lolcat.txt
@@ -0,0 +1,16 @@
+:DESC
+Remove a box which has been piped through lolcat, including the box itself and the indentation, all of which was
+colored.
+
+:ARGS
+-r
+:INPUT
+[38;5;129m [0m[38;5;93m [0m[38;5;93m [0m[38;5;63m/[0m[38;5;63m*[0m[38;5;33m*[0m[38;5;33m*[0m[38;5;39m*[0m[38;5;39m*[0m[38;5;44m*[0m[38;5;44m*[0m[38;5;49m*[0m[38;5;49m*[0m[38;5;48m*[0m[38;5;48m/[0m
+[38;5;63m [0m[38;5;63m [0m[38;5;33m [0m[38;5;33m/[0m[38;5;39m*[0m[38;5;39m [0m[38;5;44mf[0m[38;5;44mo[0m[38;5;49mo[0m[38;5;49mb[0m[38;5;48ma[0m[38;5;48mr[0m[38;5;83m [0m[38;5;83m*[0m[38;5;83m/[0m
+[38;5;33m [0m[38;5;39m [0m[38;5;39m [0m[38;5;44m/[0m[38;5;44m*[0m[38;5;49m [0m[38;5;49mb[0m[38;5;48mo[0m[38;5;48mo[0m[38;5;83mf[0m[38;5;83ma[0m[38;5;83mr[0m[38;5;118m [0m[38;5;118m*[0m[38;5;154m/[0m
+[38;5;44m [0m[38;5;44m [0m[38;5;49m [0m[38;5;49m/[0m[38;5;48m*[0m[38;5;48m*[0m[38;5;83m*[0m[38;5;83m*[0m[38;5;83m*[0m[38;5;118m*[0m[38;5;118m*[0m[38;5;154m*[0m[38;5;148m*[0m[38;5;184m*[0m[38;5;184m/[0m
+:OUTPUT-FILTER
+:EXPECTED
+ [0m[38;5;39m [0m[38;5;39m [0m[38;5;44mf[0m[38;5;44mo[0m[38;5;49mo[0m[38;5;49mb[0m[38;5;48ma[0m[38;5;48mr[0m
+ [0m[38;5;44m [0m[38;5;49m [0m[38;5;49mb[0m[38;5;48mo[0m[38;5;48mo[0m[38;5;83mf[0m[38;5;83ma[0m[38;5;83mr[0m
+:EOF