Commit 6cdb213b authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Combine test_helpers.[ch] and testhelper.[ch]

parent 96211bcf

src/test/include.am

+0 −2
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ src_test_test_SOURCES = \ 
	src/test/test_util.c \

	src/test/test_helpers.c \

	src/test/testing_common.c \

	src/test/testhelper.c \

	src/ext/tinytest.c



src_test_test_slow_SOURCES = \
@@ -122,7 +121,6 @@ src_test_test_workqueue_LDADD = src/or/libtor-testing.a \ 
noinst_HEADERS+= \

	src/test/fakechans.h \

	src/test/test.h \

	src/test/testhelper.h \

	src/test/test_helpers.h \

	src/test/test_descriptors.inc \

	src/test/example_extrainfo.inc \

src/test/test_entrynodes.c

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include "statefile.h"

#include "config.h"



#include "testhelper.h"

#include "test_helpers.h"



/* TODO:

src/test/test_helpers.c

+63 −0
Original line number Diff line number Diff line
@@ -6,11 +6,18 @@ 
 * \brief Some helper functions to avoid code duplication in unit tests.

 */



#define ROUTERLIST_PRIVATE

#include "orconfig.h"

#include "or.h"



#include "routerlist.h"

#include "nodelist.h"



#include "test.h"

#include "test_helpers.h"



#include "test_descriptors.inc"



/* Return a statically allocated string representing yesterday's date

 * in ISO format. We use it so that state file items are not found to

 * be outdated. */
@@ -24,3 +31,59 @@ get_yesterday_date_str(void) 
  return buf;

}





/* NOP replacement for router_descriptor_is_older_than() */

static int

router_descriptor_is_older_than_replacement(const routerinfo_t *router,

                                            int seconds)

{

  (void) router;

  (void) seconds;

  return 0;

}



/** Parse a file containing router descriptors and load them to our

    routerlist. This function is used to setup an artificial network

    so that we can conduct tests on it. */

void

helper_setup_fake_routerlist(void)

{

  int retval;

  routerlist_t *our_routerlist = NULL;

  smartlist_t *our_nodelist = NULL;



  /* Read the file that contains our test descriptors. */



  /* We need to mock this function otherwise the descriptors will not

     accepted as they are too old. */

  MOCK(router_descriptor_is_older_than,

       router_descriptor_is_older_than_replacement);



  /* Load all the test descriptors to the routerlist. */

  retval = router_load_routers_from_string(TEST_DESCRIPTORS,

                                           NULL, SAVED_IN_JOURNAL,

                                           NULL, 0, NULL);

  tt_int_op(retval, ==, HELPER_NUMBER_OF_DESCRIPTORS);



  /* Sanity checking of routerlist and nodelist. */

  our_routerlist = router_get_routerlist();

  tt_int_op(smartlist_len(our_routerlist->routers), ==,

              HELPER_NUMBER_OF_DESCRIPTORS);

  routerlist_assert_ok(our_routerlist);



  our_nodelist = nodelist_get_list();

  tt_int_op(smartlist_len(our_nodelist), ==, HELPER_NUMBER_OF_DESCRIPTORS);



  /* Mark all routers as non-guards but up and running! */

  SMARTLIST_FOREACH_BEGIN(our_nodelist, node_t *, node) {

    node->is_running = 1;

    node->is_valid = 1;

    node->is_possible_guard = 0;

  } SMARTLIST_FOREACH_END(node);



 done:

  UNMOCK(router_descriptor_is_older_than);

}

src/test/test_helpers.h

+8 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2014, The Tor Project, Inc. */

/* Copyright (c) 2014-2015, The Tor Project, Inc. */

/* See LICENSE for licensing information */



#ifndef TOR_TEST_HELPERS_H
@@ -6,5 +6,12 @@ 


const char *get_yesterday_date_str(void);



/* Number of descriptors contained in test_descriptors.txt. */

#define HELPER_NUMBER_OF_DESCRIPTORS 8



void helper_setup_fake_routerlist(void);



extern const char TEST_DESCRIPTORS[];



#endif

src/test/test_hs.c

+1 −1
Original line number Diff line number Diff line
@@ -12,10 +12,10 @@ 
#include "or.h"

#include "test.h"

#include "control.h"

#include "testhelper.h"

#include "config.h"

#include "routerset.h"

#include "circuitbuild.h"

#include "test_helpers.h"



/* mock ID digest and longname for node that's in nodelist */

#define HSDIR_EXIST_ID "\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA" \