trema 0.2.5 → 0.2.6

data/unittests/lib/packet_info_test.c

@@ -84,7 +84,7 @@ static void
 test_calloc_packet_info_fails_if_buffer_is_NULL() {
   expect_string( mock_die, output,
                  "Argument of calloc_packet_info must not be NULL." );
-  expect_assert_failure( calloc_packet_info( NULL ) ) ;
+  expect_assert_failure( calloc_packet_info( NULL ) );
 }
 
 
@@ -105,7 +105,7 @@ static void
 test_packet_type_eth_dix_fails() {
   expect_string( mock_die, output,
                  "Argument of packet_type_eth_dix must not be NULL." );
-  expect_assert_failure( packet_type_eth_dix( NULL ) ) ;
+  expect_assert_failure( packet_type_eth_dix( NULL ) );
 }
 
 

data/unittests/lib/packet_parser_test.c

@@ -18,13 +18,12 @@
  */
 
 
-
 #include <assert.h>
-#include <string.h>
-#include <stdio.h>
-#include <pcap.h>
-#include <netinet/ip.h>
 #include <netinet/igmp.h>
+#include <netinet/ip.h>
+#include <pcap.h>
+#include <stdio.h>
+#include <string.h>
 #include "checks.h"
 #include "cmockery_trema.h"
 #include "packet_info.h"
@@ -103,7 +102,7 @@ test_parse_packet_snap_succeeds() {
   assert_memory_equal( packet_info->snap_oui, oui, SNAP_OUI_LENGTH );
   assert_int_equal( packet_info->snap_type, 0xb700 );
 
-  uint16_t sample = ntohs( * ( uint16_t * ) packet_info->l2_payload );
+  uint16_t sample = ntohs( *( uint16_t * ) packet_info->l2_payload );
   assert_int_equal( sample, 0x0400 );
 
   assert_int_equal( packet_info->l2_payload_length, 0xb2 );
@@ -213,7 +212,7 @@ test_parse_packet_udp_succeeds() {
   assert_int_equal( packet_info->udp_len, 0x38 );
   assert_int_equal( packet_info->udp_checksum, 0x04a1 );
 
-  uint16_t sample = ntohs( * ( uint16_t * ) packet_info->l4_payload );
+  uint16_t sample = ntohs( *( uint16_t * ) packet_info->l4_payload );
   assert_int_equal( sample, 0xf937 );
 
   assert_int_equal( packet_info->l4_payload_length, 48 );
@@ -260,7 +259,7 @@ test_parse_packet_udp_fragmented_head_succeeds() {
   assert_int_equal( packet_info->udp_len, 0x2330 );
   assert_int_equal( packet_info->udp_checksum, 0x8749 );
 
-  uint16_t sample = ntohs( * ( uint16_t * ) packet_info->l4_payload );
+  uint16_t sample = ntohs( *( uint16_t * ) packet_info->l4_payload );
   assert_int_equal( sample, 0x8020 );
 
   assert_int_equal( packet_info->l4_payload_length, 1472 );
@@ -300,7 +299,7 @@ test_parse_packet_udp_fragmented_next_succeeds() {
   assert_int_equal( packet_info->ipv4_saddr, 0xc0a8642c );
   assert_int_equal( packet_info->ipv4_daddr, 0xc0a8642b );
 
-  uint16_t sample = ntohs( * ( uint16_t * ) packet_info->l3_payload );
+  uint16_t sample = ntohs( *( uint16_t * ) packet_info->l3_payload );
   assert_int_equal( sample, 0x9102 );
 
   assert_int_equal( packet_info->l3_payload_length, 1480 );
@@ -411,7 +410,7 @@ test_parse_packet_tcp_succeeds() {
   assert_int_equal( packet_info->tcp_checksum, 0x4c2d );
   assert_int_equal( packet_info->tcp_urgent, 0 );
 
-  uint16_t sample = ntohs( * ( uint16_t * ) packet_info->l4_payload );
+  uint16_t sample = ntohs( *( uint16_t * ) packet_info->l4_payload );
   assert_int_equal( sample, 0x4854 );
 
   assert_int_equal( packet_info->l4_payload_length, 30 );
@@ -458,7 +457,7 @@ test_parse_packet_icmpv4_echo_request_succeeds() {
   assert_int_equal( packet_info->icmpv4_id, 1076 );
   assert_int_equal( packet_info->icmpv4_seq, 1 );
 
-  uint16_t sample = ntohs( * ( uint16_t * ) packet_info->l4_payload );
+  uint16_t sample = ntohs( *( uint16_t * ) packet_info->l4_payload );
   assert_int_equal( sample, 0xa0a9 );
 
   assert_int_equal( packet_info->l4_payload_length, 56 );
@@ -517,7 +516,7 @@ test_parse_packet_vtag_icmpv4_echo_request_succeeds() {
   assert_int_equal( packet_info->icmpv4_id, 1024 );
   assert_int_equal( packet_info->icmpv4_seq, 24576 );
 
-  uint16_t sample = ntohs( * ( uint16_t * ) packet_info->l4_payload );
+  uint16_t sample = ntohs( *( uint16_t * ) packet_info->l4_payload );
   assert_int_equal( sample, 0x6162 );
   assert_int_equal( packet_info->l4_payload_length, 32 );
 
@@ -575,7 +574,7 @@ test_parse_packet_vtag_icmpv4_echo_reply_succeeds() {
   assert_int_equal( packet_info->icmpv4_id, 1024 );
   assert_int_equal( packet_info->icmpv4_seq, 24576 );
 
-  uint16_t sample = ntohs( * ( uint16_t * ) packet_info->l4_payload );
+  uint16_t sample = ntohs( *( uint16_t * ) packet_info->l4_payload );
   assert_int_equal( sample, 0x6162 );
   assert_int_equal( packet_info->l4_payload_length, 32 );
 
@@ -633,7 +632,7 @@ test_parse_packet_lldp_succeeds() {
   assert_memory_equal( packet_info->eth_macda, macda, ETH_ADDRLEN );
   assert_memory_equal( packet_info->eth_macsa, macsa, ETH_ADDRLEN );
 
-  uint16_t sample = ntohs( * ( uint16_t * ) packet_info->l3_payload );
+  uint16_t sample = ntohs( *( uint16_t * ) packet_info->l3_payload );
   assert_int_equal( sample, 0x0205 );
   assert_int_equal( packet_info->l3_payload_length, 46 );
 
@@ -670,7 +669,7 @@ test_parse_packet_lldp_over_ip_succeeds() {
   assert_int_equal( packet_info->ipv4_saddr, 0x0a2a7aca );
   assert_int_equal( packet_info->ipv4_daddr, 0x0a2a7ad4 );
 
-  uint16_t sample = ntohs( * ( uint16_t * ) packet_info->l4_payload );
+  uint16_t sample = ntohs( *( uint16_t * ) packet_info->l4_payload );
   assert_int_equal( sample, 0x0180 );
   assert_int_equal( packet_info->l4_payload_length, 31 );
 
@@ -695,7 +694,7 @@ test_parse_packet_lldp_over_ip_succeeds() {
   assert_memory_equal( packet_info->eth_macda, lldp_macda, ETH_ADDRLEN );
   assert_memory_equal( packet_info->eth_macsa, lldp_macsa, ETH_ADDRLEN );
 
-  sample = ntohs( * ( uint16_t * ) packet_info->l3_payload );
+  sample = ntohs( *( uint16_t * ) packet_info->l3_payload );
   assert_int_equal( sample, 0x0205 );
   assert_int_equal( packet_info->l3_payload_length, 17 );
 

data/unittests/lib/packetin_filter_interface_test.c

@@ -1,6 +1,6 @@
 /*
  * Unit tests for packetin_filter_interface.[ch]
- * 
+ *
  * Author: Yasunobu Chiba
  *
  * Copyright (C) 2008-2012 NEC Corporation
@@ -42,17 +42,17 @@ typedef struct {
 } handler_data;
 
 
-static pid_t ( *original_getpid ) ( void );
+static pid_t ( *original_getpid )( void );
 static void ( *original_warn )( const char *format, ... );
 static void ( *original_error )( const char *format, ... );
-static bool ( *original_add_message_replied_callback ) ( const char *service_name,
+static bool ( *original_add_message_replied_callback )( const char *service_name,
                                                          void ( *callback )( uint16_t tag, void *data, size_t len, void *user_data ) );
-static bool ( *original_delete_message_replied_callback) ( const char *service_name,
+static bool ( *original_delete_message_replied_callback )( const char *service_name,
                                                          void ( *callback )( uint16_t tag, void *data, size_t len, void *user_data ) );
-static bool ( *original_send_request_message ) ( const char *to_service_name, const char *from_service_name,
+static bool ( *original_send_request_message )( const char *to_service_name, const char *from_service_name,
                                                  const uint16_t tag, const void *data, size_t len, void *user_data );
 
-static void ( *handle_reply ) ( uint16_t tag, void *data, size_t length, void *user_data ) = NULL;
+static void ( *handle_reply )( uint16_t tag, void *data, size_t length, void *user_data ) = NULL;
 
 static void *HANDLER = ( void * ) 0x12345678;
 static void *USER_DATA = ( void * ) 0x87654321;

data/unittests/lib/persistent_storage_test.c

@@ -1,6 +1,6 @@
 /*
  * Unit tests for persistent_storage.[ch]
- * 
+ *
  * Author: Yasunobu Chiba
  *
  * Copyright (C) 2008-2012 NEC Corporation
@@ -65,7 +65,7 @@ mock_sqlite3_close( sqlite3 *db ) {
 static char error_message[] = "ERROR";
 
 static int
-mock_sqlite3_exec( sqlite3 *db, const char *sql, int ( *callback ) ( void *, int, char **, char ** ), void *argument, char **errmsg ) {
+mock_sqlite3_exec( sqlite3 *db, const char *sql, int ( *callback )( void *, int, char **, char ** ), void *argument, char **errmsg ) {
   sqlite3_exec( db, sql, callback, argument, errmsg );
   *errmsg = error_message;
   return ( int ) mock();
@@ -334,7 +334,7 @@ test_set_value_fails_with_too_long_key() {
   char *expected_error = xasprintf( "Too long key ( length = %u ) specified. Maximum length is %u.",
                                     key_length, _get_max_key_length() );
 
-  expect_string( mock_error, message, expected_error );  
+  expect_string( mock_error, message, expected_error );
   assert_false( set_value( key, "VALUE" ) );
 
   xfree( key );
@@ -351,7 +351,7 @@ test_set_value_fails_with_too_long_value() {
   char *expected_error = xasprintf( "Too long value ( length = %u ) specified. Maximum length is %u.",
                                     value_length, _get_max_value_length() );
 
-  expect_string( mock_error, message, expected_error );  
+  expect_string( mock_error, message, expected_error );
   assert_false( set_value( "KEY", value ) );
 
   xfree( value );
@@ -361,14 +361,14 @@ test_set_value_fails_with_too_long_value() {
 
 static void
 test_set_value_fails_with_NULL_key() {
-  expect_string( mock_error, message, "'key' must be specified." );  
+  expect_string( mock_error, message, "'key' must be specified." );
   assert_false( set_value( NULL, "VALUE" ) );
 }
 
 
 static void
 test_set_value_fails_with_NULL_value() {
-  expect_string( mock_error, message, "'value' must be specified." );  
+  expect_string( mock_error, message, "'value' must be specified." );
   assert_false( set_value( "KEY", NULL ) );
 }
 
@@ -515,7 +515,7 @@ test_get_value_fails_with_too_long_key() {
   char *expected_error = xasprintf( "Too long key ( length = %u ) specified. Maximum length is %u.",
                                     key_length, _get_max_key_length() );
 
-  expect_string( mock_error, message, expected_error );  
+  expect_string( mock_error, message, expected_error );
   char buf[ 256 ];
   assert_false( get_value( key, buf, sizeof( buf ) ) );
 
@@ -539,14 +539,14 @@ test_get_value_fails_with_insufficient_buffer() {
 static void
 test_get_value_fails_with_NULL_key() {
   char buf[ 256 ];
-  expect_string( mock_error, message, "'key' must be specified." );  
+  expect_string( mock_error, message, "'key' must be specified." );
   assert_false( get_value( NULL, buf, sizeof( buf ) ) );
 }
 
 
 static void
 test_get_value_fails_with_NULL_value() {
-  expect_string( mock_error, message, "'value' must be specified." );  
+  expect_string( mock_error, message, "'value' must be specified." );
   assert_false( get_value( "KEY", NULL, 128 ) );
 }
 
@@ -643,7 +643,7 @@ test_delete_key_value_fails_with_too_long_key() {
   char *expected_error = xasprintf( "Too long key ( length = %u ) specified. Maximum length is %u.",
                                     key_length, _get_max_key_length() );
 
-  expect_string( mock_error, message, expected_error );  
+  expect_string( mock_error, message, expected_error );
   assert_false( delete_key_value( key ) );
 
   xfree( key );
@@ -678,7 +678,7 @@ test_delete_key_value_escapes_string() {
   set_value( "THIS \"IS\", A, 'KEY'", "VALUE" );
 
   assert_true( delete_key_value( "THIS \"IS\", A, 'KEY'" ) );
-  expect_string( mock_error, message, "Failed to retrieve a value for 'THIS \"IS\", A, 'KEY''." );  
+  expect_string( mock_error, message, "Failed to retrieve a value for 'THIS \"IS\", A, 'KEY''." );
   char buf[ 256 ];
   assert_false( get_value( "THIS \"IS\", A, 'KEY'", buf, sizeof( buf ) ) );
 }

data/unittests/lib/stat_test.c

@@ -1,6 +1,6 @@
 /*
  * Unit tests for stat.[ch]
- * 
+ *
  * Author: Yasunobu Chiba
  *
  * Copyright (C) 2008-2012 NEC Corporation
@@ -37,11 +37,6 @@ extern hash_table *stats;
 void create_stats_table();
 void delete_stats_table();
 
-typedef struct {
-  char key[ STAT_KEY_LENGTH ];
-  uint64_t value;  
-} stat_entry;
-
 
 /********************************************************************************
  * Mock functions.
@@ -77,6 +72,14 @@ mock_error( const char *format, ... ) {
 }
 
 
+void
+mock_callback( const char *key, const uint64_t value, void *user_data ) {
+  check_expected( key );
+  check_expected( value );
+  check_expected( user_data );
+}
+
+
 /********************************************************************************
  * Setup and teardown.
  ********************************************************************************/
@@ -212,6 +215,135 @@ test_increment_stat_fails_if_not_initialized() {
 }
 
 
+/********************************************************************************
+ * reset_stats() tests.
+ ********************************************************************************/
+
+static void
+test_reset_stats_succeeds_with_single_entry() {
+  assert_true( init_stat() );
+
+  const char *key = "key";
+  increment_stat( key );
+
+  reset_stats();
+
+  hash_iterator iter;
+  hash_entry *e = NULL;
+  init_hash_iterator( stats, &iter );
+  int n_entries = 0;
+  while ( ( e = iterate_hash_next( &iter ) ) != NULL ) {
+    n_entries++;
+  }
+  assert_int_equal( n_entries, 0 );
+
+  assert_true( finalize_stat() );
+}
+
+
+static void
+test_reset_stats_succeeds_with_multiple_entries() {
+  assert_true( init_stat() );
+
+  const char *keys[] = { "key0", "key1" };
+  increment_stat( keys[ 0 ] );
+  increment_stat( keys[ 1 ] );
+
+  reset_stats();
+
+  hash_iterator iter;
+  hash_entry *e = NULL;
+  init_hash_iterator( stats, &iter );
+  int n_entries = 0;
+  while ( ( e = iterate_hash_next( &iter ) ) != NULL ) {
+    n_entries++;
+  }
+  assert_int_equal( n_entries, 0 );
+
+  assert_true( finalize_stat() );
+}
+
+
+static void
+test_reset_stats_succeeds_without_entries() {
+  assert_true( init_stat() );
+
+  reset_stats();
+
+  hash_iterator iter;
+  hash_entry *e = NULL;
+  init_hash_iterator( stats, &iter );
+  int n_entries = 0;
+  while ( ( e = iterate_hash_next( &iter ) ) != NULL ) {
+    n_entries++;
+  }
+  assert_int_equal( n_entries, 0 );
+
+  assert_true( finalize_stat() );
+}
+
+
+static void
+test_reset_stats_fails_if_not_initialized() {
+  expect_assert_failure( reset_stats() );
+}
+
+
+/********************************************************************************
+ * foreach_stat() tests.
+ ********************************************************************************/
+
+static void
+test_foreach_stat_succeeds() {
+  assert_true( init_stat() );
+
+  const char *keys[] = { "key0", "key1" };
+  increment_stat( keys[ 0 ] );
+  increment_stat( keys[ 1 ] );
+  increment_stat( keys[ 1 ] );
+
+  void *user_data = ( void * ) ( intptr_t ) 0x1;
+
+  expect_string( mock_callback, key, keys[ 1 ] );
+  expect_value( mock_callback, value, 2 );
+  expect_value( mock_callback, user_data, user_data );
+
+  expect_string( mock_callback, key, keys[ 0 ] );
+  expect_value( mock_callback, value, 1 );
+  expect_value( mock_callback, user_data, user_data );
+
+  foreach_stat( mock_callback, user_data );
+
+  assert_true( finalize_stat() );
+}
+
+
+static void
+test_foreach_stat_succeeds_without_entries() {
+  assert_true( init_stat() );
+
+  foreach_stat( mock_callback, NULL );
+
+  assert_true( finalize_stat() );
+}
+
+
+static void
+test_foreach_stat_fails_if_callback_function_is_NULL() {
+  assert_true( init_stat() );
+
+  expect_assert_failure( foreach_stat( NULL, NULL ) );
+
+  assert_true( finalize_stat() );
+}
+
+
+static void
+test_foreach_stat_fails_if_not_initialized() {
+  expect_assert_failure( foreach_stat( mock_callback, NULL ) );
+}
+
+
 /********************************************************************************
  * dump_stats() tests.
  ********************************************************************************/
@@ -274,7 +406,19 @@ main() {
     unit_test_setup_teardown( test_increment_stat_fails_if_key_is_NULL, reset, reset ),
     unit_test_setup_teardown( test_increment_stat_fails_if_not_initialized, reset, reset ),
 
-    // dump_sats() tests.
+    // reset_stats() tests.
+    unit_test_setup_teardown( test_reset_stats_succeeds_with_single_entry, reset, reset ),
+    unit_test_setup_teardown( test_reset_stats_succeeds_with_multiple_entries, reset, reset ),
+    unit_test_setup_teardown( test_reset_stats_succeeds_without_entries, reset, reset ),
+    unit_test_setup_teardown( test_reset_stats_fails_if_not_initialized, reset, reset ),
+
+    // foreach_stat() tests.
+    unit_test_setup_teardown( test_foreach_stat_succeeds, reset, reset ),
+    unit_test_setup_teardown( test_foreach_stat_succeeds_without_entries, reset, reset ),
+    unit_test_setup_teardown( test_foreach_stat_fails_if_callback_function_is_NULL, reset, reset ),
+    unit_test_setup_teardown( test_foreach_stat_fails_if_not_initialized, reset, reset ),
+
+    // dump_stats() tests.
     unit_test_setup_teardown( test_dump_stats_succeeds, reset, reset ),
     unit_test_setup_teardown( test_dump_stats_succeeds_without_entries, reset, reset ),
     unit_test_setup_teardown( test_dump_stats_fails_if_not_initialized, reset, reset ),

data/unittests/lib/timer_test.c

@@ -1,6 +1,6 @@
 /*
  * Unit tests for timer.[ch]
- * 
+ *
  * Author: Yasuhito Takamiya <yasuhito@gmail.com>
  *
  * Copyright (C) 2008-2012 NEC Corporation