Skip to content

Commit

Permalink
Add extended character tests
Browse files Browse the repository at this point in the history
  • Loading branch information
rbong committed Jul 31, 2024
1 parent 879b663 commit 59c7317
Show file tree
Hide file tree
Showing 23 changed files with 344 additions and 36 deletions.
16 changes: 16 additions & 0 deletions t/data/graph_branch_end_extended_out
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
 1-e

    2-b
    3-b
    4-b
    2-a

   1-c
   3-a
  
   4-a
 
  1-b

 1-a

13 changes: 13 additions & 0 deletions t/data/graph_merge_complex_extended_out
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
 1-d

   3-b
   2-b
   1-c

   3-a
   2-a
 
  1-b

 1-a

16 changes: 16 additions & 0 deletions t/data/graph_merge_cross_extended_out
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
 1-e

   1-d
   2-c
   3-b
   2-b

   2-a
   1-c
 
  3-a
 
  1-b

 1-a

10 changes: 10 additions & 0 deletions t/data/graph_merge_extended_out
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
 1-e
 1-d

  2-b
  2-a
  1-c

 1-b
 1-a

17 changes: 17 additions & 0 deletions t/data/graph_merge_multiline_extended_out
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
 1-e
 1-e
 1-d
 1-d

  2-b
  2-b
  2-a
  2-a
  1-c
  1-c

 1-b
 1-b
 1-a
1-a

13 changes: 13 additions & 0 deletions t/data/graph_octopus_crossover_extended_out
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
 1-b
  2-b
 
     5-a

    4-a

   3-a

  2-a

 1-a

12 changes: 12 additions & 0 deletions t/data/graph_octopus_crossover_left_extended_out
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
 1-c
  2-b

    1-b
    4-a

   3-a

  2-a

 1-a

11 changes: 11 additions & 0 deletions t/data/graph_octopus_extended_out
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
 1-c

    4-a
    3-a
  
   2-a
 
  1-b

 1-a

12 changes: 12 additions & 0 deletions t/data/graph_octopus_left_extended_out
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
 1-c
  2-b

    4-a
    3-a
  
   2-a
 
  1-b

 1-a

5 changes: 5 additions & 0 deletions t/data/graph_simple_extended_out
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
 1-d
 1-c
 1-b
 1-a

34 changes: 34 additions & 0 deletions t/data/graph_tangle_extended_out
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
 1-l

  1-k

    2-d
    1-j
  
   3-c
 
  4-a

 1-i

  1-h

   2-c
 
    1-g
    3-b
  
   2-b
 
    1-f

   3-a
   2-a
   1-e
   1-d

  1-c

 1-b
 1-a

16 changes: 16 additions & 0 deletions t/data/graph_tangle_range_extended_out
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
 2-d
 1-i

 
 1-h

  3-b
 
 
 1-g
 1-f

17 changes: 14 additions & 3 deletions t/t_graph_branch_end.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,21 @@ git_commit_tag 2-b
git_checkout 1-c
git_merge -m 1-e 2-b 3-b 4-b

VIM_OUT="$TMP/out"
FLOG_CMD="Flog -order=date -format=%s"

VIM_OUT="$TMP/basic_out"
run_vim_command <<EOF
$FLOG_CMD
silent w $VIM_OUT
EOF

diff_data "$VIM_OUT" "graph_branch_end_out"

VIM_OUT="$TMP/extended_out"
run_vim_command <<EOF
Flog -order=date -format=%s
let g:flog_enable_extended_chars = 1
$FLOG_CMD
silent w $VIM_OUT
EOF

diff_data "$TMP/out" "graph_branch_end_out"
diff_data "$VIM_OUT" "graph_branch_end_extended_out"
17 changes: 14 additions & 3 deletions t/t_graph_merge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,21 @@ git_checkout 1-c
git_merge -m 1-d 2-b
git_commit -m 1-e

VIM_OUT="$TMP/out"
FLOG_CMD="Flog -format=%s"

VIM_OUT="$TMP/basic_out"
run_vim_command <<EOF
$FLOG_CMD
silent w $VIM_OUT
EOF

diff_data "$VIM_OUT" "graph_merge_out"

VIM_OUT="$TMP/extended_out"
run_vim_command <<EOF
Flog -format=%s
let g:flog_enable_extended_chars = 1
$FLOG_CMD
silent w $VIM_OUT
EOF

diff_data "$TMP/out" "graph_merge_out"
diff_data "$VIM_OUT" "graph_merge_extended_out"
17 changes: 14 additions & 3 deletions t/t_graph_merge_complex.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,21 @@ git_checkout 1-b
git_merge -m 1-c 2-a 3-a
git_merge -m 1-d 2-b 3-b

VIM_OUT="$TMP/out"
FLOG_CMD="Flog -format=%s"

VIM_OUT="$TMP/basic_out"
run_vim_command <<EOF
$FLOG_CMD
silent w $VIM_OUT
EOF

diff_data "$VIM_OUT" "graph_merge_complex_out"

VIM_OUT="$TMP/extended_out"
run_vim_command <<EOF
Flog -format=%s
let g:flog_enable_extended_chars = 1
$FLOG_CMD
silent w $VIM_OUT
EOF

diff_data "$TMP/out" "graph_merge_complex_out"
diff_data "$VIM_OUT" "graph_merge_complex_extended_out"
17 changes: 14 additions & 3 deletions t/t_graph_merge_cross.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,21 @@ git_checkout 1-c
git_commit_tag 1-d
git_merge -m 1-e 2-c 3-b

VIM_OUT="$TMP/out"
FLOG_CMD="Flog -order=date -format=%s"

VIM_OUT="$TMP/basic_out"
run_vim_command <<EOF
$FLOG_CMD
silent w $VIM_OUT
EOF

diff_data "$VIM_OUT" "graph_merge_cross_out"

VIM_OUT="$TMP/extended_out"
run_vim_command <<EOF
Flog -order=date -format=%s
let g:flog_enable_extended_chars = 1
$FLOG_CMD
silent w $VIM_OUT
EOF

diff_data "$TMP/out" "graph_merge_cross_out"
diff_data "$VIM_OUT" "graph_merge_cross_extended_out"
17 changes: 14 additions & 3 deletions t/t_graph_merge_multiline.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,21 @@ git_checkout 1-c
git_merge -m 1-d 2-b
git_commit_tag 1-e

VIM_OUT="$TMP/out"
FLOG_CMD="Flog -format=%s%n%s"

VIM_OUT="$TMP/basic_out"
run_vim_command <<EOF
$FLOG_CMD
silent w $VIM_OUT
EOF

diff_data "$VIM_OUT" "graph_merge_multiline_out"

VIM_OUT="$TMP/extended_out"
run_vim_command <<EOF
Flog -format=%s%n%s
let g:flog_enable_extended_chars = 1
$FLOG_CMD
silent w $VIM_OUT
EOF

diff_data "$TMP/out" "graph_merge_multiline_out"
diff_data "$VIM_OUT" "graph_merge_multiline_extended_out"
17 changes: 14 additions & 3 deletions t/t_graph_octopus.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,21 @@ git_commit_tag 4-a
git_checkout 1-b
git_merge -m 1-c 2-a 3-a 4-a

VIM_OUT="$TMP/out"
FLOG_CMD="Flog -format=%s"

VIM_OUT="$TMP/basic_out"
run_vim_command <<EOF
$FLOG_CMD
silent w $VIM_OUT
EOF

diff_data "$VIM_OUT" "graph_octopus_out"

VIM_OUT="$TMP/extended_out"
run_vim_command <<EOF
Flog -format=%s
let g:flog_enable_extended_chars = 1
$FLOG_CMD
silent w $VIM_OUT
EOF

diff_data "$TMP/out" "graph_octopus_out"
diff_data "$VIM_OUT" "graph_octopus_extended_out"
17 changes: 14 additions & 3 deletions t/t_graph_octopus_crossover.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,21 @@ git_tag 2-b
git_checkout 1-a
git_commit_tag 1-b

VIM_OUT="$TMP/out"
FLOG_CMD="Flog -format=%s -rev=1-b -rev=2-b"

VIM_OUT="$TMP/basic_out"
run_vim_command <<EOF
$FLOG_CMD
silent w $VIM_OUT
EOF

diff_data "$VIM_OUT" "graph_octopus_crossover_out"

VIM_OUT="$TMP/extended_out"
run_vim_command <<EOF
Flog -format=%s -rev=1-b -rev=2-b
let g:flog_enable_extended_chars = 1
$FLOG_CMD
silent w $VIM_OUT
EOF

diff_data "$TMP/out" "graph_octopus_crossover_out"
diff_data "$VIM_OUT" "graph_octopus_crossover_extended_out"
17 changes: 14 additions & 3 deletions t/t_graph_octopus_crossover_left.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,21 @@ sleep 1
git_checkout 1-b
git_commit_tag 1-c

VIM_OUT="$TMP/out"
FLOG_CMD="Flog -format=%s -rev=1-c -rev=2-b"

VIM_OUT="$TMP/basic_out"
run_vim_command <<EOF
$FLOG_CMD
silent w $VIM_OUT
EOF

diff_data "$VIM_OUT" "graph_octopus_crossover_left_out"

VIM_OUT="$TMP/extended_out"
run_vim_command <<EOF
Flog -format=%s -rev=1-c -rev=2-b
let g:flog_enable_extended_chars = 1
$FLOG_CMD
silent w $VIM_OUT
EOF

diff_data "$TMP/out" "graph_octopus_crossover_left_out"
diff_data "$VIM_OUT" "graph_octopus_crossover_left_extended_out"
Loading

0 comments on commit 59c7317

Please sign in to comment.