undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vcs-svn: tweak test-line-buffer to not assume line-oriented input

Browse Source 
Do not expect an implicit newline after each input record.
Use a separate command to exercise buffer_skip_bytes.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
This commit is contained in:
Jonathan Nieder 2011-01-02 18:52:28 -06:00
parent 232087fd99
commit 7b990c9051
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
t/t0081-line-buffer.sh
View File

@ -7,45 +7,44 @@ test_description="Test the svn importer's input handling routines.
test_expect_success 'read greeting' '
echo HELLO >expect &&
test-line-buffer <<-\EOF >actual &&
read 5
read 6
HELLO
EOF
test_cmp expect actual
'
test_expect_success '0-length read, send along greeting' '
printf "%s\n" "" HELLO >expect &&
echo HELLO >expect &&
test-line-buffer <<-\EOF >actual &&
read 0
copy 5
copy 6
HELLO
EOF
test_cmp expect actual
'
test_expect_success 'buffer_read_string copes with trailing null byte' '
echo >expect &&
test_expect_success 'buffer_read_string copes with null byte' '
>expect &&
q_to_nul <<-\EOF | test-line-buffer >actual &&
read 1
read 2
Q
EOF
test_cmp expect actual
'
test_expect_success '0-length read, copy null byte' '
printf "%s\n" "" Q | q_to_nul >expect &&
test_expect_success 'skip, copy null byte' '
echo Q | q_to_nul >expect &&
q_to_nul <<-\EOF | test-line-buffer >actual &&
read 0
copy 1
skip 2
Q
copy 2
Q
EOF
test_cmp expect actual
'
test_expect_success 'long reads are truncated' '
printf "%s\n" foo "" >expect &&
echo foo >expect &&
test-line-buffer <<-\EOF >actual &&
read 5
foo
@ -56,7 +55,7 @@ test_expect_success 'long reads are truncated' '
test_expect_success 'long copies are truncated' '
printf "%s\n" "" foo >expect &&
test-line-buffer <<-\EOF >actual &&
read 0
read 1
copy 5
foo

10
test-line-buffer.c
View File

@ -19,14 +19,18 @@ static void handle_command(const char *command, const char *arg, struct line_buf
switch (*command) {
case 'c':
if (!prefixcmp(command, "copy ")) {
buffer_copy_bytes(buf, strtouint32(arg) + 1);
buffer_copy_bytes(buf, strtouint32(arg));
return;
}
case 'r':
if (!prefixcmp(command, "read ")) {
const char *s = buffer_read_string(buf, strtouint32(arg));
printf("%s\n", s);
buffer_skip_bytes(buf, 1); /* consume newline */
fputs(s, stdout);
return;
}
case 's':
if (!prefixcmp(command, "skip ")) {
buffer_skip_bytes(buf, strtouint32(arg));
return;
}
default: