-removing useless/dead/redundant tests, adjusting other tests to fit current API

7 files changed, 132 insertions, 324 deletions

diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index abe61d37e..a165cebb7 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -117,7 +117,6 @@ TESTING_TESTS = \
  test_ats_api_scheduling_add_address_inbound \
  test_ats_api_scheduling_destroy_address \
  test_ats_api_scheduling_add_session \
- test_ats_api_scheduling_destroy_session \
  test_ats_api_delayed_service_scheduling_add_address \
  test_ats_api_performance_list_all_addresses \
  test_ats_api_delayed_service_performance_list_all_addresses \
@@ -224,14 +223,6 @@ test_ats_api_scheduling_add_session_LDADD = \
   libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la
 
-test_ats_api_scheduling_destroy_session_SOURCES = \
- test_ats_api_scheduling_destroy_session.c test_ats_api_common.c
-test_ats_api_scheduling_destroy_session_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la
-
 # performance API tests
 
 test_ats_api_performance_list_all_addresses_SOURCES = \
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index e30e86539..c2010e8d2 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -785,21 +785,25 @@ GAS_addresses_add (const struct GNUNET_PeerIdentity *peer,
   uint32_t previous_session;
   int c1;
 
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Received `%s' for peer `%s'\n",
-             "ADDRESS ADD",
-             GNUNET_i2s (peer));
-
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Received `%s' for peer `%s'\n",
+              "ADDRESS ADD",
+              GNUNET_i2s (peer));
   if (GNUNET_NO == running)
+  {
+    GNUNET_break (0);
     return;
-
-  GNUNET_assert(NULL != addresses);
-
-  new_address = create_address (peer, plugin_name,
-                                plugin_addr, plugin_addr_len,
-                                local_address_info, session_id);
+  }
+  new_address = create_address (peer,
+                                plugin_name,
+                                plugin_addr,
+                                plugin_addr_len,
+                                local_address_info,
+                                session_id);
   atsi_delta = NULL;
-  disassemble_ats_information (new_address, atsi, atsi_count, &atsi_delta,
+  disassemble_ats_information (new_address,
+                               atsi, atsi_count,
+                               &atsi_delta,
                                &atsi_delta_count);
   GNUNET_free_non_null (atsi_delta);
   addr_net = get_performance_info (new_address, GNUNET_ATS_NETWORK_TYPE);
diff --git a/src/ats/test_ats_api_scheduling_add_address_duplicate.c b/src/ats/test_ats_api_scheduling_add_address_duplicate.c
index fc3890f6c..b0d02727f 100644
--- a/src/ats/test_ats_api_scheduling_add_address_duplicate.c
+++ b/src/ats/test_ats_api_scheduling_add_address_duplicate.c
@@ -39,7 +39,7 @@ static struct GNUNET_SCHEDULER_Task * wait_task;
 /**
  * Statistics handle
  */
-struct GNUNET_STATISTICS_Handle *stats;
+static struct GNUNET_STATISTICS_Handle *stats;
 
 /**
  * Scheduling handle
@@ -64,7 +64,7 @@ static struct PeerContext p;
 /**
  * HELLO address
  */
-struct GNUNET_HELLO_Address test_hello_address;
+static struct GNUNET_HELLO_Address test_hello_address;
 
 /**
  * Session
@@ -74,25 +74,30 @@ static void *test_session;
 /**
  * Test ats info
  */
-struct GNUNET_ATS_Information test_ats_info[2];
+static struct GNUNET_ATS_Information test_ats_info[2];
 
 /**
  * Test ats count
  */
-uint32_t test_ats_count;
+static uint32_t test_ats_count;
 
 
-static void end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
-static void end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+static void
+end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+
+
+static void
+end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+
 
 static int
-stat_cb(void *cls, const char *subsystem,
-        const char *name, uint64_t value,
-        int is_persistent)
+stat_cb (void *cls, const char *subsystem,
+         const char *name, uint64_t value,
+         int is_persistent)
 {
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "ATS statistics: `%s' `%s' %llu\n",
-      subsystem,name, value);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "ATS statistics: `%s' `%s' %llu\n",
+              subsystem,name, value);
   if (1 < value)
   {
     if (NULL != wait_task)
@@ -102,7 +107,8 @@ stat_cb(void *cls, const char *subsystem,
   if (1 == value)
   {
     if (NULL == wait_task)
-      wait_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &end, NULL);
+      wait_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+                                                &end, NULL);
   }
   return GNUNET_OK;
 }
@@ -111,15 +117,15 @@ stat_cb(void *cls, const char *subsystem,
 static void
 end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutting down\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Shutting down\n");
   wait_task = NULL;
 
-  if (die_task != NULL)
+  if (NULL != die_task)
   {
     GNUNET_SCHEDULER_cancel (die_task);
     die_task = NULL;
   }
-
   if (NULL != sched_ats)
   {
     GNUNET_ATS_scheduling_done (sched_ats);
@@ -138,6 +144,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   ret = 0;
 }
 
+
 static void
 end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
@@ -155,16 +162,21 @@ address_suggest_cb (void *cls,
                     struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
                     struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Did not expect suggestion callback!\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Did not expect suggestion callback!\n");
   GNUNET_SCHEDULER_add_now (&end_badly, NULL);
 }
 
 
 static int
-dummy_stat (void *cls, const char *subsystem, const char *name, uint64_t value,
+dummy_stat (void *cls,
+            const char *subsystem,
+            const char *name,
+            uint64_t value,
             int is_persistent)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Got dummy stat %s%s:%s = %llu\n",
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Got dummy stat %s%s:%s = %llu\n",
               is_persistent ? "!" : " ", subsystem, name, value);
   return GNUNET_OK;
 }
@@ -174,6 +186,7 @@ static void
 got_initial_value (void *cls, int success)
 {
   struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+  struct GNUNET_ATS_AddressRecord *ar;
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Got initial value\n");
 
@@ -181,14 +194,16 @@ got_initial_value (void *cls, int success)
   sched_ats = GNUNET_ATS_scheduling_init (cfg, &address_suggest_cb, NULL);
   if (sched_ats == NULL)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not connect to ATS scheduling!\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Could not connect to ATS scheduling!\n");
     GNUNET_SCHEDULER_add_now (&end_badly, NULL);
     return;
   }
 
   /* Set up peer */
   memset (&p.id, '1', sizeof (p.id));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n",
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Created peer `%s'\n",
               GNUNET_i2s_full(&p.id));
 
   /* Prepare ATS Information */
@@ -200,17 +215,25 @@ got_initial_value (void *cls, int success)
 
   /* Adding address without session */
   test_session = NULL;
-  create_test_address (&test_addr, "test", test_session, "test", strlen ("test") + 1);
+  create_test_address (&test_addr, "test",
+                       test_session, "test",
+                       strlen ("test") + 1);
   test_hello_address.peer = p.id;
   test_hello_address.transport_name = test_addr.plugin;
   test_hello_address.address = test_addr.addr;
   test_hello_address.address_length = test_addr.addr_len;
 
   /* Adding address */
-  GNUNET_ATS_address_add (sched_ats, &test_hello_address, test_session, test_ats_info, test_ats_count);
+  GNUNET_ATS_address_add (sched_ats,
+                          &test_hello_address, test_session,
+                          test_ats_info, test_ats_count);
   /* Adding duplicate */
-  GNUNET_ATS_address_add (sched_ats, &test_hello_address, test_session, test_ats_info, test_ats_count);
-
+  GNUNET_log_skip (1, GNUNET_NO);
+  ar = GNUNET_ATS_address_add (sched_ats,
+                               &test_hello_address, test_session,
+                               test_ats_info, test_ats_count);
+  GNUNET_log_skip (0, GNUNET_YES);
+  GNUNET_assert (NULL == ar);
 }
 
 
@@ -222,8 +245,6 @@ run (void *cls,
   die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
   stats = GNUNET_STATISTICS_create ("ats", cfg);
   GNUNET_STATISTICS_watch (stats, "ats", "# addresses", &stat_cb, NULL);
-
-
   GNUNET_STATISTICS_get (stats, "ats", "# addresses", TIMEOUT,
                                        &got_initial_value, &dummy_stat,
                                        GNUNET_CONFIGURATION_dup (cfg));
diff --git a/src/ats/test_ats_api_scheduling_add_address_inbound.c b/src/ats/test_ats_api_scheduling_add_address_inbound.c
index 3d0e5b2ca..7f9be45be 100644
--- a/src/ats/test_ats_api_scheduling_add_address_inbound.c
+++ b/src/ats/test_ats_api_scheduling_add_address_inbound.c
@@ -18,7 +18,7 @@
      Boston, MA 02111-1307, USA.
 */
 /**
- * @file ats/test_ats_api_scheduling_add_address.c
+ * @file ats/test_ats_api_scheduling_add_address_inbound.c
  * @brief adding addresses with scheduling API
  * @author Christian Grothoff
  * @author Matthias Wachs
@@ -131,6 +131,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   ret = 0;
 }
 
+
 static void
 end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
@@ -148,7 +149,8 @@ address_suggest_cb (void *cls,
                     struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
                     struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Did not expect suggestion callback!\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Did not expect suggestion callback!\n");
   GNUNET_SCHEDULER_add_now (&end_badly, NULL);
 }
 
@@ -188,16 +190,25 @@ got_initial_value (void *cls, int success)
   test_hello_address.address_length = 0;
 
   /* Adding address */
-  GNUNET_ATS_address_add (sched_ats, &test_hello_address, NULL, test_ats_info, test_ats_count);
-  GNUNET_ATS_address_add (sched_ats, &test_hello_address, NULL, test_ats_info, test_ats_count);
+  GNUNET_ATS_address_add (sched_ats,
+                          &test_hello_address, NULL,
+                          test_ats_info, test_ats_count);
 }
 
+
 static int
-dummy_stat (void *cls, const char *subsystem, const char *name, uint64_t value,
+dummy_stat (void *cls,
+            const char *subsystem,
+            const char *name,
+            uint64_t value,
             int is_persistent)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Got dummy stat %s%s:%s = %llu\n",
-              is_persistent ? "!" : " ", subsystem, name, value);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Got dummy stat %s%s:%s = %llu\n",
+              is_persistent ? "!" : " ",
+              subsystem,
+              name,
+              value);
   return GNUNET_OK;
 }
 
@@ -229,4 +240,4 @@ main (int argc, char *argv[])
   return ret;
 }
 
-/* end of file test_ats_api_scheduling_add_address.c */
+/* end of file test_ats_api_scheduling_add_address_inbound.c */
diff --git a/src/ats/test_ats_api_scheduling_add_session.c b/src/ats/test_ats_api_scheduling_add_session.c
index 2aac84ee5..5a94f9ba5 100644
--- a/src/ats/test_ats_api_scheduling_add_session.c
+++ b/src/ats/test_ats_api_scheduling_add_session.c
@@ -79,6 +79,11 @@ static struct GNUNET_ATS_Information test_ats_info[2];
  */
 static uint32_t test_ats_count;
 
+/**
+ * Address record we will modify with a session later.
+ */
+static struct GNUNET_ATS_AddressRecord *ar;
+
 
 static void
 end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
@@ -89,26 +94,30 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
 
 
 static int
-stat_cb(void *cls, const char *subsystem,
-        const char *name, uint64_t value,
-        int is_persistent)
+stat_cb (void *cls, const char *subsystem,
+         const char *name, uint64_t value,
+         int is_persistent)
 {
   static int first_stat_cb = GNUNET_YES;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "ATS statistics: `%s' `%s' %llu\n",
-      subsystem,name, value);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "ATS statistics: `%s' `%s' %llu\n",
+              subsystem,name, value);
   if ((GNUNET_YES == first_stat_cb) && (1 == value))
   {
-    GNUNET_ATS_address_add (sched_ats, &test_hello_address, (struct Session *) &test_session, test_ats_info, test_ats_count);
+    GNUNET_ATS_address_add_session (ar,
+                                    (struct Session *) &test_session);
     GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &end, NULL);
   }
   if ((GNUNET_NO == first_stat_cb) && (1 == value))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "ATS updated existing address\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "ATS updated existing address\n");
   }
   if (value > 1)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ATS did not update existing address, but added 2nd address!\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "ATS did not update existing address, but added 2nd address!\n");
     GNUNET_SCHEDULER_add_now (&end_badly, NULL);
   }
 
@@ -145,6 +154,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   ret = 0;
 }
 
+
 static void
 end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
@@ -153,6 +163,7 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   ret = GNUNET_SYSERR;
 }
 
+
 static void
 address_suggest_cb (void *cls,
                     const struct GNUNET_PeerIdentity *peer,
@@ -187,7 +198,8 @@ run (void *cls,
 
   /* Set up peer */
   memset (&p.id, '1', sizeof (p.id));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n",
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Created peer `%s'\n",
               GNUNET_i2s_full(&p.id));
 
   /* Prepare ATS Information */
@@ -205,7 +217,9 @@ run (void *cls,
   test_hello_address.address_length = test_addr.addr_len;
 
   /* Adding address */
-  GNUNET_ATS_address_add (sched_ats, &test_hello_address, NULL, test_ats_info, test_ats_count);
+  ar = GNUNET_ATS_address_add (sched_ats,
+                               &test_hello_address, NULL,
+                               test_ats_info, test_ats_count);
 }
 
 
diff --git a/src/ats/test_ats_api_scheduling_destroy_session.c b/src/ats/test_ats_api_scheduling_destroy_session.c
deleted file mode 100644
index 2b46bdc88..000000000
--- a/src/ats/test_ats_api_scheduling_destroy_session.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2010,2011 Christian Grothoff (and other contributing authors)
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-/**
- * @file ats/test_ats_api_scheduling_destroy_session.c
- * @brief test destroying sessions: first add an address with a session,
- *        request the address and compare, delete the session, request and
- *        compare again, delete whole address, request and wait for timeout,
- *        shutdown
- * @author Christian Grothoff
- * @author Matthias Wachs
- *
- */
-#include "platform.h"
-#include "gnunet_ats_service.h"
-#include "gnunet_testing_lib.h"
-#include "ats.h"
-#include "test_ats_api_common.h"
-
-/**
- * Timeout task
- */
-static struct GNUNET_SCHEDULER_Task * die_task;
-
-/**
- * Statistics handle
- */
-static struct GNUNET_STATISTICS_Handle *stats;
-
-/**
- * Scheduling handle
- */
-static struct GNUNET_ATS_SchedulingHandle *sched_ats;
-
-/**
- * Return value
- */
-static int ret;
-
-/**
- * Test address
- */
-static struct Test_Address test_addr;
-
-/**
- * Test peer
- */
-static struct PeerContext p;
-
-/**
- * HELLO address
- */
-static struct GNUNET_HELLO_Address test_hello_address;
-
-/**
- * Session
- */
-static void *test_session;
-
-/**
- * Test ats info
- */
-static struct GNUNET_ATS_Information test_ats_info[2];
-
-/**
- * Test ats count
- */
-static uint32_t test_ats_count;
-
-
-static void
-end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
-
-
-static void
-end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
-
-
-static int
-stat_cb(void *cls, const char *subsystem,
-        const char *name, uint64_t value,
-        int is_persistent)
-{
-  static int first_stat_cb = GNUNET_YES;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "ATS statistics: `%s' `%s' %llu\n",
-      subsystem,name, value);
-  if ((GNUNET_YES == first_stat_cb) && (1 == value))
-  {
-    GNUNET_ATS_address_add (sched_ats, &test_hello_address, (struct Session *) &test_session, test_ats_info, test_ats_count);
-    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &end, NULL);
-  }
-  if ((GNUNET_NO == first_stat_cb) && (1 == value))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "ATS updated existing address\n");
-  }
-  if (value > 1)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ATS did not update existing address, but added 2nd address!\n");
-    GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-  }
-
-  return GNUNET_OK;
-}
-
-
-static void
-end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutting down\n");
-
-  if (die_task != NULL)
-  {
-    GNUNET_SCHEDULER_cancel (die_task);
-    die_task = NULL;
-  }
-
-  if (NULL != sched_ats)
-  {
-    GNUNET_ATS_scheduling_done (sched_ats);
-    sched_ats = NULL;
-  }
-
-  GNUNET_STATISTICS_watch_cancel (stats, "ats", "# addresses", &stat_cb, NULL);
-  if (NULL != stats)
-  {
-    GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
-    stats = NULL;
-  }
-
-  free_test_address (&test_addr);
-
-  ret = 0;
-}
-
-static void
-end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  die_task = NULL;
-  end ( NULL, NULL);
-  ret = GNUNET_SYSERR;
-}
-
-static void
-address_suggest_cb (void *cls,
-                    const struct GNUNET_PeerIdentity *peer,
-                    const struct GNUNET_HELLO_Address *address,
-                    struct Session *session,
-                    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
-                    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Did not expect suggestion callback!\n");
-  GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-}
-
-static void
-got_initial_value (void *cls, int success)
-{
-  struct GNUNET_CONFIGURATION_Handle *cfg = cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Got initial value\n");
-
-  /* Connect to ATS scheduling */
-  sched_ats = GNUNET_ATS_scheduling_init (cfg, &address_suggest_cb, NULL);
-  if (sched_ats == NULL)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not connect to ATS scheduling!\n");
-    GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-    return;
-  }
-
-  /* Set up peer */
-  memset (&p.id, '1', sizeof (p.id));
-  /* Prepare ATS Information */
-  test_ats_info[0].type = htonl (GNUNET_ATS_NETWORK_TYPE);
-  test_ats_info[0].value = htonl(GNUNET_ATS_NET_WAN);
-  test_ats_info[1].type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE);
-  test_ats_info[1].value = htonl(1);
-  test_ats_count = 2;
-
-  /* Adding address without session */
-  create_test_address (&test_addr, "test", test_session, "test", strlen ("test") + 1);
-  test_hello_address.peer = p.id;
-  test_hello_address.transport_name = test_addr.plugin;
-  test_hello_address.address = test_addr.addr;
-  test_hello_address.address_length = test_addr.addr_len;
-
-  /* Adding address */
-  GNUNET_ATS_address_add (sched_ats, &test_hello_address, NULL, test_ats_info, test_ats_count);
-
-}
-
-static int
-dummy_stat (void *cls, const char *subsystem, const char *name, uint64_t value,
-            int is_persistent)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Got dummy stat %s%s:%s = %llu\n",
-              is_persistent ? "!" : " ", subsystem, name, value);
-  return GNUNET_OK;
-}
-
-
-
-static void
-run (void *cls,
-     const struct GNUNET_CONFIGURATION_Handle *cfg,
-     struct GNUNET_TESTING_Peer *peer)
-{
-  die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
-  stats = GNUNET_STATISTICS_create ("ats", cfg);
-  GNUNET_STATISTICS_watch (stats, "ats", "# addresses", &stat_cb, NULL);
-
-
-  GNUNET_STATISTICS_get (stats, "ats", "# addresses", TIMEOUT,
-                                       &got_initial_value, &dummy_stat,
-                                       GNUNET_CONFIGURATION_dup (cfg));
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  ret = 0;
-  if (0 != GNUNET_TESTING_peer_run ("test-ats-api",
-                                    "test_ats_api.conf",
-                                    &run, NULL))
-    return 1;
-  return ret;
-}
-/* end of file test_ats_api_scheduling_destroy_session.c */
diff --git a/src/ats/test_ats_solver_add_address_and_request.c b/src/ats/test_ats_solver_add_address_and_request.c
index df7cdae70..a0965c915 100644
--- a/src/ats/test_ats_solver_add_address_and_request.c
+++ b/src/ats/test_ats_solver_add_address_and_request.c
@@ -38,7 +38,7 @@
 /**
  * Timeout task
  */
-static struct GNUNET_SCHEDULER_Task * die_task;
+static struct GNUNET_SCHEDULER_Task *die_task;
 
 /**
  * Statistics handle
@@ -90,6 +90,7 @@ static int
 stat_cb(void *cls, const char *subsystem, const char *name, uint64_t value,
         int is_persistent);
 
+
 static void
 end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
@@ -127,6 +128,7 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   ret = GNUNET_SYSERR;
 }
 
+
 static void
 address_suggest_cb (void *cls,
                     const struct GNUNET_PeerIdentity *peer,
@@ -148,20 +150,27 @@ address_suggest_cb (void *cls,
 
 
 static int
-stat_cb(void *cls, const char *subsystem,
-        const char *name, uint64_t value,
-        int is_persistent)
+stat_cb (void *cls, const char *subsystem,
+         const char *name, uint64_t value,
+         int is_persistent)
 {
+  struct GNUNET_ATS_SuggestHandle *sh;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "ATS statistics: `%s' `%s' %llu\n",
-      subsystem,name, value);
-  GNUNET_ATS_suggest_address (sched_ats, &p.id);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "ATS statistics: `%s' `%s' %llu\n",
+              subsystem,
+              name,
+              value);
+  if (NULL == sh)
+    sh = GNUNET_ATS_suggest_address (sched_ats, &p.id);
   return GNUNET_OK;
 }
 
+
 static void
-run (void *cls, const struct GNUNET_CONFIGURATION_Handle *mycfg,
-    struct GNUNET_TESTING_Peer *peer)
+run (void *cls,
+     const struct GNUNET_CONFIGURATION_Handle *mycfg,
+     struct GNUNET_TESTING_Peer *peer)
 {
   die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
   stats = GNUNET_STATISTICS_create ("ats", mycfg);
@@ -172,14 +181,16 @@ run (void *cls, const struct GNUNET_CONFIGURATION_Handle *mycfg,
   sched_ats = GNUNET_ATS_scheduling_init (mycfg, &address_suggest_cb, NULL);
   if (sched_ats == NULL)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not connect to ATS scheduling!\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Could not connect to ATS scheduling!\n");
     GNUNET_SCHEDULER_add_now (&end_badly, NULL);
     return;
   }
 
   /* Set up peer */
   memset (&p.id, '1', sizeof (p.id));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n",
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Created peer `%s'\n",
               GNUNET_i2s_full(&p.id));
 
   /* Prepare ATS Information */
@@ -198,7 +209,9 @@ run (void *cls, const struct GNUNET_CONFIGURATION_Handle *mycfg,
   test_hello_address.address_length = test_addr.addr_len;
 
   /* Adding address */
-  GNUNET_ATS_address_add (sched_ats, &test_hello_address, NULL, test_ats_info, test_ats_count);
+  GNUNET_ATS_address_add (sched_ats,
+                          &test_hello_address, NULL,
+                          test_ats_info, test_ats_count);
 }