[GNUnet-SVN] r25264 - gnunet/src/ats

[gnunet]

Author: wachs
Date: 2012-12-05 17:23:58 +0100 (Wed, 05 Dec 2012)
New Revision: 25264

Modified:
   gnunet/src/ats/Makefile.am
   gnunet/src/ats/test_ats_api_scheduling_destroy_session.c
Log:
changes

Modified: gnunet/src/ats/Makefile.am
===================================================================
--- gnunet/src/ats/Makefile.am  2012-12-05 16:18:25 UTC (rev 25263)
+++ gnunet/src/ats/Makefile.am  2012-12-05 16:23:58 UTC (rev 25264)
@@ -60,9 +60,9 @@
 check_PROGRAMS = \
  test_ats_api_scheduling_init \
  test_ats_api_scheduling_add_address \
- test_ats_api_scheduling_destroy_address
-# test_ats_api_scheduling \
-# test_ats_api_scheduling_destroy_session \
+ test_ats_api_scheduling_destroy_address \
+ test_ats_api_scheduling_destroy_session 
+# test_ats_api_scheduling \ 
 # test_ats_api_reset_backoff \
 # test_ats_api_performance \
 # $(GN_MLP_TEST) \
@@ -89,6 +89,13 @@
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la  
 
+test_ats_api_scheduling_destroy_session_SOURCES = \
+ test_ats_api_scheduling_destroy_session.c
+test_ats_api_scheduling_destroy_session_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/ats/libgnunetats.la
+
 if HAVE_LIBGLPK
 #test_ats_mlp_SOURCES = \
 # $(GN_MLP_SRC) \
@@ -144,13 +151,8 @@
 #  $(top_builddir)/src/testing/libgnunettesting.la \
 #  $(top_builddir)/src/ats/libgnunetats.la
 
-#test_ats_api_scheduling_destroy_session_SOURCES = \
-# test_ats_api_scheduling_destroy_session.c
-#test_ats_api_scheduling_destroy_session_LDADD = \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(top_builddir)/src/testing/libgnunettesting.la \
-#  $(top_builddir)/src/ats/libgnunetats.la
 
+
 #test_ats_api_scheduling_get_type_SOURCES = \
 # test_ats_api_scheduling_get_type.c
 #test_ats_api_scheduling_get_type_LDADD = \

Modified: gnunet/src/ats/test_ats_api_scheduling_destroy_session.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_destroy_session.c    2012-12-05 
16:18:25 UTC (rev 25263)
+++ gnunet/src/ats/test_ats_api_scheduling_destroy_session.c    2012-12-05 
16:23:58 UTC (rev 25264)
@@ -29,8 +29,8 @@
 #include "gnunet_ats_service.h"
 #include "gnunet_testing_lib-new.h"
 #include "ats.h"
+#include "test_ats_api_common.h"
 
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
 
 static GNUNET_SCHEDULER_TaskIdentifier die_task;
 
@@ -40,30 +40,8 @@
 
 static int stage;
 
-struct Address
-{
-  char *plugin;
-  size_t plugin_len;
+static struct Test_Address test_addr;
 
-  void *addr;
-  size_t addr_len;
-
-  struct GNUNET_ATS_Information *ats;
-  int ats_count;
-
-  void *session;
-};
-
-struct PeerContext
-{
-  struct GNUNET_PeerIdentity id;
-
-  struct Address *addr;
-};
-
-
-static struct Address test_addr;
-
 static struct PeerContext p;
 
 static struct GNUNET_HELLO_Address hello_address;