From 1dc836fc3d41ff1eb12b1b49b4fbc127654d2556 Mon Sep 17 00:00:00 2001
From: Christian Thaeter <ct@pipapo.org>
Date: Wed, 13 Aug 2008 10:50:27 +0200
Subject: [PATCH] Fixed configitem_move, first parsing tests pass now

---
 src/backend/configitem.c    | 12 ++++++++----
 tests/20config.tests        |  4 ++--
 tests/backend/test-config.c | 20 +++++++-------------
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/backend/configitem.c b/src/backend/configitem.c
index 7e52f269e..a49694280 100644
--- a/src/backend/configitem.c
+++ b/src/backend/configitem.c
@@ -77,7 +77,7 @@ lumiera_configitem_destroy (LumieraConfigitem self)
       if (self->vtable && self->vtable->destroy)
         self->vtable->destroy (self);
 
-      ENSURE (!llist_is_empty (&self->lookup), "destructor didn't cleaned lookup up");
+      ENSURE (llist_is_empty (&self->lookup), "destructor didn't cleaned lookup up");
       ENSURE (llist_is_empty (&self->childs), "destructor didn't remove childs");
 
       llist_unlink (&self->link);
@@ -122,12 +122,16 @@ lumiera_configitem_move (LumieraConfigitem self, LumieraConfigitem source)
   REQUIRE (self);
   REQUIRE (source);
 
-  llist_move (&self->link, &source->link);
+  llist_init (&self->link);
+  llist_insertlist_next (&self->link, &source->link);
 
   self->parent = source->parent;
 
-  llist_move (&self->childs, &source->childs);
-  llist_move (&self->lookup, &source->lookup);
+  llist_init (&self->childs);
+  llist_insertlist_next (&self->childs, &source->childs);
+
+  llist_init (&self->lookup);
+  llist_insertlist_next (&self->lookup, &source->lookup);
 
   self->line = source->line;
   source->line = NULL;
diff --git a/tests/20config.tests b/tests/20config.tests
index 65dfb5404..7a4ea2517 100644
--- a/tests/20config.tests
+++ b/tests/20config.tests
@@ -135,8 +135,8 @@ END
 PLANNED "bool set"  <<END
 END
 
-TEST "create configitem with empty line" empty_line_configitem <<END
+TEST "create configitem with empty line" configitem_simple_ctor_dtor '' <<END
 END
 
-TEST "create configitem with blank line" blank_line_configitem <<END
+TEST "create configitem with blank line" configitem_simple_ctor_dtor $' \t \t' <<END
 END
diff --git a/tests/backend/test-config.c b/tests/backend/test-config.c
index 784f86743..1369aa8bc 100644
--- a/tests/backend/test-config.c
+++ b/tests/backend/test-config.c
@@ -127,24 +127,18 @@ TEST ("word_get")
   lumiera_config_destroy ();
 }
 
-TEST ("empty_line_configitem")
+TEST ("configitem_simple_ctor_dtor")
 {
+  REQUIRE (argv[2]);
+  lumiera_config_init ("./");
+
   LumieraConfigitem item;
 
-  item = lumiera_configitem_new ( "" );
+  item = lumiera_configitem_new (argv[2]);
 
-  lumiera_configitem_delete(item);
-  item = NULL;
-}
+  lumiera_configitem_delete (item);
 
-TEST ("blank_line_configitem")
-{
-  LumieraConfigitem item;
-
-  item = lumiera_configitem_new ( "	 	" );
-
-  lumiera_configitem_delete(item);
-  item = NULL;
+  lumiera_config_destroy ();
 }