Added two replay tests and InfTextChunk error detection to inf-test-t…

…ext-replay 2008-09-22 Armin Burgmeier <[email protected]> * test/inf-test-text-replay.c: Added functionality to check for InfTextChunk errors by performing all the buffer operations on an (ascii-only) GString and comparing the result with the buffer. * libinfinity/adopted/inf-adopted-algorithm.c: Documented a missing parameter in InfAdoptedAlgorithm::execute-request. * test/replay/replay-01.record.xml: * test/replay/replay-02.record.xml: Added two records that currently fail to replay correctly.
pkern · Sep 22, 2008 · de5881d · de5881d
1 parent a24d5b5
commit de5881d
Show file tree

Hide file tree

Showing 6 changed files with 27,163 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,16 @@
+2008-09-22  Armin Burgmeier  <[email protected]>
+
+	* test/inf-test-text-replay.c: Added functionality to check for
+	InfTextChunk errors by performing all the buffer operations on an
+	(ascii-only) GString and comparing the result with the buffer.
+
+	* libinfinity/adopted/inf-adopted-algorithm.c: Documented a missing
+	parameter in InfAdoptedAlgorithm::execute-request.
+
+	* test/replay/replay-01.record.xml:
+	* test/replay/replay-02.record.xml: Added two records that currently
+	fail to replay correctly.
+
 2008-09-22  Armin Burgmeier  <[email protected]>
 
 	* libinftext/inf-text-session.h:

diff --git a/libinfinity/adopted/inf-adopted-algorithm.c b/libinfinity/adopted/inf-adopted-algorithm.c
@@ -1723,6 +1723,7 @@ inf_adopted_algorithm_class_init(gpointer g_class,
   /**
    * InfAdoptedAlgorithm::execute-request:
    * @algorithm: The #InfAdoptedAlgorithm executing a request.
+   * @user: The #InfAdoptedUser executing the request.
    * @request: The #InfAdoptedRequest being executed.
    * @apply: Whether the request will be applied after execution.
    *

diff --git a/test/README b/test/README
@@ -42,3 +42,7 @@ NI inf-test-text-cleanup:
    issue Undo/Redo in the current situation. This is to ensure that the 
    algorithm correctly shrinks the request log.
 
+NI inf-test-text-replay
+   Replays a record as recorded with InfAdoptedSessionRecord. A few records
+   that should play without problems are contained in the replay/
+   subdirectory.
diff --git a/test/inf-test-text-replay.c b/test/inf-test-text-replay.c
@@ -20,6 +20,9 @@
 
 #include <libinftext/inf-text-session.h>
 #include <libinftext/inf-text-default-buffer.h>
+#include <libinftext/inf-text-default-insert-operation.h>
+#include <libinftext/inf-text-insert-operation.h>
+#include <libinftext/inf-text-delete-operation.h>
 #include <libinftext/inf-text-buffer.h>
 
 #include <libinfinity/common/inf-connection-manager.h>
@@ -100,6 +103,94 @@ G_DEFINE_TYPE_WITH_CODE(
   )
 )
 
+/* TODO: These functions assume that the buffer contains ASCII-only text.
+ * It will fail with UTF-8! */
+static GString*
+inf_test_text_replay_load_buffer(InfTextBuffer* buffer)
+{
+  InfTextBufferIter* iter;
+  GString* result;
+  gchar* text;
+  gsize bytes;
+
+  result = g_string_sized_new(inf_text_buffer_get_length(buffer));
+
+  iter = inf_text_buffer_create_iter(buffer);
+  if(iter != NULL)
+  {
+    do
+    {
+      text = inf_text_buffer_iter_get_text(buffer, iter);
+      bytes = inf_text_buffer_iter_get_bytes(buffer, iter);
+      g_string_append_len(result, text, bytes);
+      g_free(text);
+    } while(inf_text_buffer_iter_next(buffer, iter));
+
+    inf_text_buffer_destroy_iter(buffer, iter);
+  }
+
+  return result;
+}
+
+static void
+inf_test_text_replay_apply_operation_to_string(GString* string,
+                                               InfAdoptedOperation* operation)
+{
+  InfTextChunk* chunk;
+  InfTextChunkIter iter;
+  guint position;
+
+  if(INF_TEXT_IS_INSERT_OPERATION(operation))
+  {
+    g_assert(INF_TEXT_IS_DEFAULT_INSERT_OPERATION(operation));
+
+    chunk = inf_text_default_insert_operation_get_chunk(
+      INF_TEXT_DEFAULT_INSERT_OPERATION(operation)
+    );
+
+    position = inf_text_insert_operation_get_position(
+      INF_TEXT_INSERT_OPERATION(operation)
+    );
+
+    if(inf_text_chunk_iter_init(chunk, &iter))
+    {
+      do
+      {
+        g_string_insert_len(
+          string,
+          position,
+          inf_text_chunk_iter_get_text(&iter),
+          inf_text_chunk_iter_get_bytes(&iter)
+        );
+
+        position += inf_text_chunk_iter_get_bytes(&iter);
+      } while(inf_text_chunk_iter_next(&iter));
+    }
+  }
+  else if(INF_TEXT_IS_DELETE_OPERATION(operation))
+  {
+    g_string_erase(
+      string,
+      inf_text_delete_operation_get_position(
+        INF_TEXT_DELETE_OPERATION(operation)
+      ),
+      inf_text_delete_operation_get_length(
+        INF_TEXT_DELETE_OPERATION(operation)
+      )
+    );
+  }
+}
+
+static void
+inf_test_text_replay_print_buffer(InfTextBuffer* buffer)
+{
+  GString* text;
+  text = inf_test_text_replay_load_buffer(buffer);
+
+  printf("%s\n", text->str);
+  g_string_free(text, TRUE);
+}
+
 static xmlNodePtr
 inf_test_text_replay_read_current(xmlTextReaderPtr reader,
                                   GError** error)
@@ -217,6 +308,37 @@ inf_test_text_replay_advance_skip_whitespace_required(xmlTextReaderPtr reader,
   return TRUE;
 }
 
+static void
+inf_test_text_replay_apply_request_cb(InfAdoptedAlgorithm* algorithm,
+                                      InfAdoptedUser* user,
+                                      InfAdoptedRequest* request,
+                                      gpointer user_data)
+{
+  InfTextBuffer* buffer;
+  GString* own_content;
+  GString* buffer_content;
+
+  g_object_get(G_OBJECT(algorithm), "buffer", &buffer, NULL);
+  own_content = (GString*)user_data;
+
+  g_assert(
+    inf_adopted_request_get_request_type(request) == INF_ADOPTED_REQUEST_DO
+  );
+
+  /* Apply operation to own string */
+  inf_test_text_replay_apply_operation_to_string(
+    own_content,
+    inf_adopted_request_get_operation(request)
+  );
+
+  /* Compare with buffer content */
+  buffer_content = inf_test_text_replay_load_buffer(buffer);
+  g_object_unref(buffer);
+
+  g_assert(strcmp(buffer_content->str, own_content->str) == 0);
+  g_string_free(buffer_content, TRUE);
+}
+
 static gboolean
 inf_test_text_replay_play_initial(xmlTextReaderPtr reader,
                                   InfConnectionManagerGroup* publisher_group,
@@ -308,7 +430,7 @@ inf_test_text_replay_play_requests(xmlTextReaderPtr reader,
         inf_test_text_replay_error_quark,
         INF_TEST_TEXT_REPLAY_UNEXPECTED_NODE,
         "Unexpected node: '%s'",
-	cur->name
+        cur->name
       );
 
       return FALSE;
@@ -328,11 +450,14 @@ static gboolean
 inf_test_text_replay_play(xmlTextReaderPtr reader,
                           InfSession* session,
                           InfConnectionManagerGroup* publisher_group,
-			  InfXmlConnection* publisher,
-			  GError** error)
+                          InfXmlConnection* publisher,
+                          GError** error)
 {
   gboolean result;
 
+  /* Used to find InfTextChunk errors */
+  GString* content;
+
   /* Advance to root node */
   if(xmlTextReaderNodeType(reader) != XML_READER_TYPE_ELEMENT)
     if(inf_test_text_replay_advance_required(reader, error) == FALSE)
@@ -393,6 +518,17 @@ inf_test_text_replay_play(xmlTextReaderPtr reader,
   if(!inf_test_text_replay_advance_skip_whitespace_required(reader, error))
     return FALSE;
 
+  content = inf_test_text_replay_load_buffer(
+    INF_TEXT_BUFFER(inf_session_get_buffer(session))
+  );
+
+  g_signal_connect_after(
+    G_OBJECT(inf_adopted_session_get_algorithm(INF_ADOPTED_SESSION(session))),
+    "apply-request",
+    G_CALLBACK(inf_test_text_replay_apply_request_cb),
+    content
+  );
+
   result = inf_test_text_replay_play_requests(
     reader,
     session,
@@ -401,6 +537,8 @@ inf_test_text_replay_play(xmlTextReaderPtr reader,
     error
   );
 
+  g_string_free(content, TRUE);
+
   if(!result) return FALSE;
 
   if(!inf_test_text_replay_skip_whitespace_required(reader, error))
@@ -492,7 +630,6 @@ inf_test_text_replay_process(xmlTextReaderPtr reader)
     INF_XML_CONNECTION(client)
   );
 
-  g_object_unref(buffer);
   g_object_unref(io);
 
   inf_connection_manager_group_set_object(
@@ -543,8 +680,11 @@ inf_test_text_replay_process(xmlTextReaderPtr reader)
   }
   else
   {
+    inf_test_text_replay_print_buffer(buffer);
     printf("Replayed record successfully\n");
   }
+
+  g_object_unref(buffer);
 }
 
 int main(int argc, char* argv[])
@@ -584,3 +724,4 @@ int main(int argc, char* argv[])
   xmlFreeTextReader(reader);
   return 0;
 }
+/* vim:set et sw=2 ts=2: */