2001-10-22 Marcus Brinkmann <marcus@g10code.de>

	* t-data.c (write_test): New function.
	(main): Invoke write_test for all rounds except TEST_OUT_CB.

diff --git a/trunk/tests/ChangeLog b/trunk/tests/ChangeLog
index a90637fff223bfbc11a2541f32b92beb8cd7a2d3..53b9c516269fc4b5085730b24fc58bda6498ef62 100644 (file)
--- a/trunk/tests/ChangeLog
+++ b/trunk/tests/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-22  Marcus Brinkmann  <marcus@g10code.de>
+
+       * t-data.c (write_test): New function.
+       (main): Invoke write_test for all rounds except TEST_OUT_CB.
+
 2001-10-22  Marcus Brinkmann  <marcus@g10code.de>
 
        * Makefile.am (INCLUDES): Remove spurious duplicate to silence

diff --git a/trunk/tests/t-data.c b/trunk/tests/t-data.c
index f7d6e4cc263b5129161aeac1c2ed57aff6f5d072..47a8926bfaae93023b20b79765b0f9561875fbed 100644 (file)
--- a/trunk/tests/t-data.c
+++ b/trunk/tests/t-data.c
@@ -71,13 +71,14 @@ typedef enum
   } round_t;
 
 const char *text = "Just GNU it!\n";
+const char *text2 = "Just GNU it!\nJust GNU it!\n";
 
 int
 read_cb (void *cb_value, char *buffer, size_t count, size_t *nread)
 {
   static int off = 0;
-  round_t round = *((round_t *) cb_value);
   int amount = strlen (text) - off;
+  /*  round_t round = *((round_t *) cb_value);  */
 
   if (!buffer && !count && !nread)
     {
@@ -152,6 +153,44 @@ read_test (round_t round, GpgmeData data)
   read_once_test (round, data);
 }
 
+void
+write_test (round_t round, GpgmeData data)
+{
+  GpgmeError err;
+  char buffer[1024];
+  int read;
+
+  err = gpgme_data_write (data, text, strlen (text));
+  fail_if_err (err);
+
+  read_once_test (round, data);
+  err = gpgme_data_rewind (data);
+  fail_if_err (err);
+
+  if (round == TEST_INOUT_NONE)
+    read_once_test (round, data);
+  else
+    {
+      err = gpgme_data_read (data, buffer, sizeof (buffer), &read);
+      fail_if_err (err);
+
+      if (read != strlen (text2) || strncmp (buffer, text2, strlen (text2)))
+       {
+         fprintf (stderr, "%s:%d: (%i) gpgme_data_read returned wrong data\n",
+                  __FILE__, __LINE__, round);
+         exit (1);
+       }
+
+      err = gpgme_data_read (data, buffer, sizeof (buffer), &read);
+      if (err != GPGME_EOF)
+       {
+         fprintf (stderr, "%s:%d: (%i) gpgme_data_read did not signal EOF\n",
+                  __FILE__, __LINE__, round);
+         exit (1);
+       }
+    }
+}
+
 int 
 main (int argc, char **argv )
 {
@@ -276,7 +315,8 @@ main (int argc, char **argv )
          exit (1);
        }
       read_test (round, data);
-
+      if (round != TEST_OUT_CB)
+       write_test (round, data);
       gpgme_data_release (data);
     }
   return 0;