Re: [pdf-devel] patch-mivael-2011-02-11: token write unit tests, proposed fixes and updates

[Michael V. Antosha]

On Fri, 11 Feb 2011 20:53:20 +0100
address@hidden (Jose E. Marchesi) wrote:

> 
>     >     The proposed patch is attached.
>     >     
>     >        bzr send -o ../patch-mivael-2011-02-11
>     > 
>     > I tried to merge the bundle, but I got this strange message from bazaar:
>     > 
>     > $ bzr merge ~/tmp/patch-mivael-2011-02-11 
>     > bzr: ERROR: Bad bzr revision-bundle: "Can't convert to target format"
>     > 
>     > Which version of bazaar are you using?
>     
>     $ bzr version
>     Bazaar (bzr) 1.16.1
> 
> That is quite an old version.  Any odd you can upgrade to bazaar 2.x?

Installed 2.3.0.

Another try of a patch below, instead of the failed one.

Michael V. Antosha
http://identi.ca/mivael


# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
#   98hz213zdqaqaplw
# target_branch: bzr://bzr.savannah.gnu.org/pdf/libgnupdf/trunk/
# testament_sha1: 14efd95e9027266bcc4ed325f029085d58f0bc59
# timestamp: 2011-02-15 19:11:47 +0200
# base_revision_id: address@hidden
# 
# Begin patch
=== modified file 'ChangeLog'
--- ChangeLog   2011-02-14 23:12:13 +0000
+++ ChangeLog   2011-02-15 17:10:07 +0000
@@ -15,6 +15,28 @@
 
        * doc/gnupdf.texi: Several function prototypes reworked.
 
+2011-02-11  Michael V. Antosha  <address@hidden>
+
+       * torture/unit/base/token/pdf-token-read.c (ok_for_escaped_char):
+       False-fail result fixed in unit test
+       pdf_token_regular_char_as_number.
+
+       * torture/unit/base/token/pdf-token-write.c: Time-stamp fixed.
+
+       * torture/unit/base/token/pdf-token-write.c: Copyright years
+       fixed.
+
+2011-02-10  Michael V. Antosha  <address@hidden>
+
+       Bug fixes and minor improvements in token writer unit tests.
+       * torture/unit/base/token/pdf-token-write.c (write_and_check):
+       Give more details when test fails (result string, expected string,
+       number of characters compared).
+       (pdf_token_write_string_octal_readable): Bug fixed (FS#124).
+       (write_and_check): Some trailing space removed.
+       (pdf_token_write_real_positive): Number of compared char's
+       increased to prevent false-pass result.
+
 2011-01-31  Jose E. Marchesi  <address@hidden>
 
        pdf-fsys: use pdf_off_t values for file sizes and offsets.

=== modified file 'torture/unit/base/token/pdf-token-read.c'
--- torture/unit/base/token/pdf-token-read.c    2010-04-06 14:23:36 +0000
+++ torture/unit/base/token/pdf-token-read.c    2011-02-11 19:34:12 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: C -*-
+/* -*- mode: C -*- Time-stamp: "2011-02-11 20:30:55 EET mivael"
  *
  *       File:         pdf-token-read.c
  *       Date:         Wed Jan 14 05:44:48 2009
@@ -7,7 +7,7 @@
  *
  */
 
-/* Copyright (C) 2010 Free Software Foundation, Inc. */
+/* Copyright (C) 2010, 2011 Free Software Foundation, Inc. */
 
 /* This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -165,7 +165,9 @@
   if ('\0' == ch)
     return;
 
-  sprintf (stream_buf, "/#%02x", ch);
+  sprintf (stream_buf,
+           "/#%02hhx", /* assuming 'char' is always one byte in size */
+           (unsigned char) ch);
   INIT_STM_STR (&stm, stream_buf);
   INIT_TOKR (&tokr, stm);
 

=== modified file 'torture/unit/base/token/pdf-token-write.c'
--- torture/unit/base/token/pdf-token-write.c   2010-09-23 18:14:29 +0000
+++ torture/unit/base/token/pdf-token-write.c   2011-02-11 11:21:22 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: C -*- Time-stamp: "2010-09-23 20:13:28 jemarch"
+/* -*- mode: C -*- Time-stamp: "2011-02-11 12:54:59 EET mivael"
  *
  *       File:         pdf-token-write.c
  *       Date:         Tue Sep 21 21:08:07 2010
@@ -7,7 +7,7 @@
  *
  */
 
-/* Copyright (C) 2010 Free Software Foundation, Inc. */
+/* Copyright (C) 2010, 2011 Free Software Foundation, Inc. */
 
 /* This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -51,16 +51,24 @@
 
   /* Create the token writer.  */
   fail_if (pdf_token_writer_new (stm, &writer) != PDF_OK);
-  
+
   /* Write the token.  */
   fail_if (pdf_token_write (writer, flags, token) != PDF_OK);
-  
+
   /* Destroy writer and stream.  */
   fail_if (pdf_token_writer_destroy (writer));
   fail_if (pdf_stm_destroy (stm) != PDF_OK);
 
   /* Compare results.  */
-  fail_unless (strncmp (buffer, expected, expected_size) == 0);
+  fail_unless (strncmp (buffer, expected, expected_size) == 0,
+               "Assertion 'strncmp"
+                 " (\"%.*s\" /*buffer*/, \"%.*s\" /*expected*/, %d)"
+                 " == 0' failed",
+               (int) expected_size,
+               (char*) buffer,
+               (int) expected_size,
+               (char*) expected,
+               (int) expected_size);
 }
 
 /*
@@ -136,7 +144,7 @@
   /* Check.  */
   write_and_check (token,
                    0,  /* Flags.  */
-                   "10.2", 3, 100);
+                   "10.2", 4, 100);
 }
 END_TEST
 
@@ -571,13 +579,13 @@
   pdf_init ();
 
   /* Create the token.  */
-  fail_if (pdf_token_string_new ("a\0007c", 3, &token)
+  fail_if (pdf_token_string_new ("a\007c", 3, &token)
            != PDF_OK);
 
   /* Check.  */
   write_and_check (token,
                    PDF_TOKEN_READABLE_STRINGS,  /* Flags.  */
-                   "(a\\007c)", 9, 100);
+                   "(a\\7c)", 6, 100);
 }
 END_TEST
 

# Begin bundle
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
4A==