trema 0.2.5 → 0.2.6

data/unittests/lib/daemon_test.c

@@ -1,7 +1,5 @@
 /*
  * Unit tests for daemon functions.
- * 
- * Author: Yasuhito Takamiya <yasuhito@gmail.com>
  *
  * Copyright (C) 2008-2012 NEC Corporation
  *
@@ -22,6 +20,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -128,7 +127,7 @@ mock_unlink( char *pathname ) {
 
 
 int
-mock_access( char *pathname, int mode) {
+mock_access( char *pathname, int mode ) {
   check_expected( pathname );
   check_expected( mode );
   return ( int ) mock();
@@ -158,6 +157,28 @@ mock_kill( pid_t pid, int sig ) {
 }
 
 
+static size_t link_length = 0;
+static char *link_buffer = NULL;
+
+ssize_t
+mock_readlink( const char *path, char *buf, size_t bufsiz ) {
+  check_expected( path );
+  check_expected( buf );
+  check_expected( bufsiz );
+  if ( link_length > 0 ) {
+    memcpy( buf, link_buffer, link_length );
+  }
+  return ( ssize_t ) mock();
+}
+
+
+char *
+mock_basename( char *path ) {
+  check_expected( path );
+  return ( char * )( intptr_t )  mock();
+}
+
+
 int
 mock_rename( char *oldpath, char *newpath ) {
   check_expected( oldpath );
@@ -198,7 +219,7 @@ test_daemonize_fail_if_chdir_fail() {
 
   errno = EACCES;
   expect_string( mock_die, message, "Could not cd to /: Permission denied." );
-  
+
   expect_assert_failure( daemonize( "/" ) );
   errno = 0;
 }
@@ -348,7 +369,7 @@ test_read_pid_successed() {
   read_length = strlen( valid_pid_string );
   will_return( mock_read, read_length );
 
-  // Test if correctly read.
+  // Test if correctly kill.
   expect_value( mock_kill, pid, valid_pid );
   expect_value( mock_kill, sig, 0 );
   will_return( mock_kill, 0 );
@@ -356,6 +377,20 @@ test_read_pid_successed() {
   // Test if correctly close.
   expect_value( mock_close, fd, pid_file_fd );
 
+  // Test if correctly readlink.
+  char proc_path[] = "/proc/123/exe";
+  expect_string( mock_readlink, path, proc_path );
+  expect_not_value( mock_readlink, buf, NULL );
+  expect_value( mock_readlink, bufsiz, PATH_MAX - 1 );
+  char valid_exe_path[] = "/home/yasuhito/trema/bin/chess";
+  link_buffer = valid_exe_path;
+  link_length = strlen( valid_exe_path );
+  will_return( mock_readlink, link_length );
+
+  // Test if correctly basename.
+  expect_string( mock_basename, path, valid_exe_path );
+  will_return( mock_basename, strdup( "chess" ) );
+
   // Go
   pid_t pid = read_pid( "/home/yasuhito/trema/tmp", "chess" );
   assert_true( pid == valid_pid );
@@ -577,6 +612,105 @@ test_read_pid_fail_if_kill_fail_with_EPERM() {
 }
 
 
+static void
+test_read_pid_fail_if_readlink_fail() {
+  // Test if correctly access.
+  char path[] = "/home/yasuhito/trema/tmp/chess.pid";
+  expect_string( mock_access, pathname, path );
+  expect_value( mock_access, mode, R_OK );
+  will_return( mock_access, 0 );
+
+  // Test if correctly opened.
+  int pid_file_fd = 111;
+  expect_string( mock_open, pathname, path );
+  expect_value( mock_open, flags, O_RDONLY );
+  expect_value( mock_open, mode, 0 );
+  will_return( mock_open, pid_file_fd );
+
+  // Test if correctly read.
+  expect_value( mock_read, fd, pid_file_fd );
+  expect_not_value( mock_read, buf, NULL );
+  expect_value( mock_read, count, 10 - 1 );
+  char valid_pid_string[] = "123\n";
+  pid_t valid_pid = 123;
+  read_buffer = valid_pid_string;
+  read_length = strlen( valid_pid_string );
+  will_return( mock_read, read_length );
+
+  // Test if correctly kill.
+  expect_value( mock_kill, pid, valid_pid );
+  expect_value( mock_kill, sig, 0 );
+  will_return( mock_kill, 0 );
+
+  // Test if correctly close.
+  expect_value( mock_close, fd, pid_file_fd );
+
+  // Test if correctly readlink.
+  char proc_path[] = "/proc/123/exe";
+  expect_string( mock_readlink, path, proc_path );
+  expect_not_value( mock_readlink, buf, NULL );
+  expect_value( mock_readlink, bufsiz, PATH_MAX - 1 );
+  will_return( mock_readlink, -1 );
+
+  // Go
+  pid_t pid = read_pid( "/home/yasuhito/trema/tmp", "chess" );
+  assert_true( pid == -1 );
+}
+
+
+static void
+test_read_pid_fail_if_strcmp_fail() {
+  // Test if correctly access.
+  char path[] = "/home/yasuhito/trema/tmp/chess.pid";
+  expect_string( mock_access, pathname, path );
+  expect_value( mock_access, mode, R_OK );
+  will_return( mock_access, 0 );
+
+  // Test if correctly opened.
+  int pid_file_fd = 111;
+  expect_string( mock_open, pathname, path );
+  expect_value( mock_open, flags, O_RDONLY );
+  expect_value( mock_open, mode, 0 );
+  will_return( mock_open, pid_file_fd );
+
+  // Test if correctly read.
+  expect_value( mock_read, fd, pid_file_fd );
+  expect_not_value( mock_read, buf, NULL );
+  expect_value( mock_read, count, 10 - 1 );
+  char valid_pid_string[] = "123\n";
+  pid_t valid_pid = 123;
+  read_buffer = valid_pid_string;
+  read_length = strlen( valid_pid_string );
+  will_return( mock_read, read_length );
+
+  // Test if correctly kill.
+  expect_value( mock_kill, pid, valid_pid );
+  expect_value( mock_kill, sig, 0 );
+  will_return( mock_kill, 0 );
+
+  // Test if correctly close.
+  expect_value( mock_close, fd, pid_file_fd );
+
+  // Test if correctly readlink.
+  char proc_path[] = "/proc/123/exe";
+  expect_string( mock_readlink, path, proc_path );
+  expect_not_value( mock_readlink, buf, NULL );
+  expect_value( mock_readlink, bufsiz, PATH_MAX - 1 );
+  char INVALID_exe_path[] = "/home/yasuhito/trema/bin/chess2";
+  link_buffer = INVALID_exe_path;
+  link_length = strlen( INVALID_exe_path );
+  will_return( mock_readlink, link_length );
+
+  // Test if correctly basename.
+  expect_string( mock_basename, path, INVALID_exe_path );
+  will_return( mock_basename, strdup( "chess2" ) );
+
+  // Go
+  pid_t pid = read_pid( "/home/yasuhito/trema/tmp", "chess" );
+  assert_true( pid == -1 );
+}
+
+
 static void
 test_rename_pid_successed() {
   // Test if correctly unlink.
@@ -646,6 +780,8 @@ main() {
     unit_test( test_read_pid_fail_if_pid_is_zero ),
     unit_test( test_read_pid_fail_if_kill_fail_with_ESRCH ),
     unit_test( test_read_pid_fail_if_kill_fail_with_EPERM ),
+    unit_test( test_read_pid_fail_if_readlink_fail ),
+    unit_test( test_read_pid_fail_if_strcmp_fail ),
 
     // rename_pid() tests.
     unit_test( test_rename_pid_successed ),

data/unittests/lib/doubly_linked_list_test.c

@@ -1,6 +1,6 @@
 /*
  * Unit tests for doubly linked list library.
- * 
+ *
  * Author: Yasuhito Takamiya <yasuhito@gmail.com>
  *
  * Copyright (C) 2008-2012 NEC Corporation
@@ -274,6 +274,10 @@ test_find_element() {
   assert_true( new_element->next->next == e );
   e = find_element( new_element, element_data1 );
   assert_true( new_element->next->next->next == e );
+
+  e = find_element( new_element->next->next->next, element_data2 );
+  assert_true( new_element->next->next == e );
+
   e = find_element( new_element, no_such_element );
   assert_true( e == NULL );
 

data/unittests/lib/ether_test.c

@@ -44,8 +44,8 @@ mock_die( const char *format, ... ) {
   va_end( args );
   check_expected( output );
 
-  mock_assert( false, "mock_die", __FILE__, __LINE__ ); 
-} 
+  mock_assert( false, "mock_die", __FILE__, __LINE__ );
+}
 
 
 /******************************************************************************
@@ -60,9 +60,9 @@ setup() {
 
 
 static void
-teardown() { 
+teardown() {
   die = original_die;
-} 
+}
 
 
 /******************************************************************************

data/unittests/lib/hash_table_test.c

@@ -1,6 +1,6 @@
 /*
  * Unit tests for hash table.
- * 
+ *
  * Author: Yasuhito Takamiya <yasuhito@gmail.com>
  *
  * Copyright (C) 2008-2012 NEC Corporation
@@ -134,7 +134,7 @@ append_back_foreach( void *key, void *value, void *user_data ) {
   assert_true( user_data == NULL );
 
   int i;
-  for ( i = 0 ; i < 3 ; i++ ) {
+  for ( i = 0; i < 3; i++ ) {
     if ( abc[ i ] == NULL ) {
       abc[ i ] = value;
       return;
@@ -241,7 +241,9 @@ test_iterate_empty_hash() {
   table = create_hash( compare_atom, hash_atom );
   init_hash_iterator( table, &iter );
 
-  while ( iterate_hash_next( &iter ) != NULL ) { UNREACHABLE(); }
+  while ( iterate_hash_next( &iter ) != NULL ) {
+    UNREACHABLE();
+  }
 
   delete_hash( table );
 }

data/unittests/lib/linked_list_test.c

@@ -1,7 +1,5 @@
 /*
  * Unit tests for linked list library.
- * 
- * Author: Yasuhito Takamiya <yasuhito@gmail.com>
  *
  * Copyright (C) 2008-2012 NEC Corporation
  *
@@ -22,6 +20,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include "checks.h"
 #include "cmockery_trema.h"
 #include "linked_list.h"
 #include "utility.h"
@@ -72,7 +71,7 @@ static char delete_me[] = "delete me!";
 /********************************************************************************
  * Tests.
  ********************************************************************************/
-                 
+
 static void
 test_create_list() {
   assert_true( create_list( &new_list ) );
@@ -192,7 +191,7 @@ test_delete_first_element() {
   append_to_tail( &new_list, delete_me );
   append_to_tail( &new_list, bravo );
   append_to_tail( &new_list, charlie );
-  
+
   assert_true( delete_element( &new_list, delete_me ) );
   assert_string_equal( new_list->data, "bravo" );
   assert_string_equal( new_list->next->data, "charlie" );
@@ -281,6 +280,81 @@ test_list_length_of_empty_list() {
 }
 
 
+static void
+get_sum_length( void *data, void *user_data ) {
+  size_t *sum_length = user_data;
+  *sum_length += strlen( data );
+}
+
+
+static void
+test_iterate_list() {
+  create_list( &new_list );
+
+  append_to_tail( &new_list, &alpha );
+  append_to_tail( &new_list, &bravo );
+  append_to_tail( &new_list, &charlie );
+
+  size_t sum_length = 0;
+  iterate_list( new_list, get_sum_length, &sum_length );
+  assert_int_equal( 17, sum_length );
+
+  delete_list( new_list );
+}
+
+
+static bool
+find_bravo( void *data, void *user_data ) {
+  UNUSED( user_data );
+
+  if ( strcmp( data, "bravo" ) == 0 ) {
+    return true;
+  }
+  else {
+    return false;
+  }
+}
+
+
+static bool
+find_nothing( void *data, void *user_data ) {
+  UNUSED( data );
+  UNUSED( user_data );
+
+  return false;
+}
+
+
+static void
+test_find_list_custom() {
+  create_list( &new_list );
+
+  append_to_tail( &new_list, &alpha );
+  append_to_tail( &new_list, &bravo );
+  append_to_tail( &new_list, &charlie );
+
+  void *found = find_list_custom( new_list, find_bravo, NULL );
+  assert_string_equal( found, "bravo" );
+
+  delete_list( new_list );
+}
+
+
+static void
+test_find_list_custom_fail() {
+  create_list( &new_list );
+
+  append_to_tail( &new_list, &alpha );
+  append_to_tail( &new_list, &bravo );
+  append_to_tail( &new_list, &charlie );
+
+  void *found = find_list_custom( new_list, find_nothing, NULL );
+  assert_true( found == NULL );
+
+  delete_list( new_list );
+}
+
+
 static void
 test_delete_list() {
   create_list( &new_list );
@@ -328,6 +402,10 @@ main() {
     unit_test( test_list_length ),
     unit_test( test_list_length_of_empty_list ),
 
+    unit_test( test_iterate_list ),
+    unit_test( test_find_list_custom ),
+    unit_test( test_find_list_custom_fail ),
+
     unit_test( test_delete_list ),
   };
   setup_leak_detector();

data/unittests/lib/log_test.c

@@ -1,6 +1,6 @@
 /*
  * Unit tests for logging functions and macros.
- * 
+ *
  * Author: Yasuhito Takamiya <yasuhito@gmail.com>
  *
  * Copyright (C) 2008-2012 NEC Corporation
@@ -122,10 +122,17 @@ reset_LOGGING_LEVEL() {
 }
 
 
+static void
+reset_LOGGING_FACILITY() {
+  unsetenv( "LOGGING_FACILITY" );
+}
+
+
 static void
 setup() {
   finalize_log();
   reset_LOGGING_LEVEL();
+  reset_LOGGING_FACILITY();
 
   setup_leak_detector();
 
@@ -177,6 +184,7 @@ static void
 teardown() {
   finalize_log();
   reset_LOGGING_LEVEL();
+  reset_LOGGING_FACILITY();
 
   teardown_leak_detector();
 
@@ -213,6 +221,19 @@ test_init_log_opens_syslog() {
 }
 
 
+void
+test_init_log_reads_LOGGING_FACILITY_environment_variable() {
+  const char *ident = "tetris";
+  setenv( "LOGGING_FACILITY", "LOCAL7", 1 );
+
+  expect_string( mock_openlog, ident, ident );
+  expect_value( mock_openlog, option, LOG_NDELAY );
+  expect_value( mock_openlog, facility, LOG_LOCAL7 );
+  init_log( ident, get_trema_tmp(), LOGGING_TYPE_SYSLOG );
+  assert_true( syslog_initialized );
+}
+
+
 /********************************************************************************
  * Finalization test.
  ********************************************************************************/
@@ -235,14 +256,14 @@ test_default_logging_level_is_INFO() {
 
 
 void
-test_set_logging_level_succeed() {
+test_set_logging_level_succeeds() {
   set_logging_level( "critical" );
   assert_int_equal( LOG_CRIT, get_logging_level() );
 }
 
 
 void
-test_set_logging_level_fail_with_invalid_value() {
+test_set_logging_level_fails_with_invalid_value() {
   expect_assert_failure( set_logging_level( "INVALID_LEVEL" ) );
 }
 
@@ -264,6 +285,63 @@ test_LOGGING_LEVEL_overrides_logging_level() {
 }
 
 
+void
+test_valid_logging_level_returns_true_with_valid_logging_level() {
+  assert_true( valid_logging_level( "information" ) );
+}
+
+
+void
+test_valid_logging_level_returns_false_with_invalid_logging_level() {
+  assert_false( valid_logging_level( "INVALID_LOGGING_LEVEL" ) );
+}
+
+
+/********************************************************************************
+ * Syslog facility tests.
+ ********************************************************************************/
+
+void
+test_default_faciliity_is_USER() {
+  const char *ident = "tetris";
+  expect_string( mock_openlog, ident, ident );
+  expect_value( mock_openlog, option, LOG_NDELAY );
+  expect_value( mock_openlog, facility, LOG_USER );
+  init_log( ident, get_trema_tmp(), LOGGING_TYPE_SYSLOG );
+}
+
+
+void
+test_set_syslog_facility_succeeds() {
+  const char *ident = "tetris";
+  set_syslog_facility( "LOCAL0" );
+
+  expect_string( mock_openlog, ident, ident );
+  expect_value( mock_openlog, option, LOG_NDELAY );
+  expect_value( mock_openlog, facility, LOG_LOCAL0 );
+  init_log( ident, get_trema_tmp(), LOGGING_TYPE_SYSLOG );
+}
+
+
+void
+test_set_syslog_facility_fails_with_invalid_value() {
+  expect_assert_failure( set_syslog_facility( "INVALID_FACILITY" ) );
+}
+
+
+void
+test_LOGGING_FACILITY_overrides_logging_facility() {
+  const char *ident = "tetris";
+  setenv( "LOGGING_FACILITY", "LOCAL0", 1 );
+  set_syslog_facility( "LOCAL7" );
+
+  expect_string( mock_openlog, ident, ident );
+  expect_value( mock_openlog, option, LOG_NDELAY );
+  expect_value( mock_openlog, facility, LOG_LOCAL0 );
+  init_log( ident, get_trema_tmp(), LOGGING_TYPE_SYSLOG );
+}
+
+
 /********************************************************************************
  * critical() tests.
  ********************************************************************************/
@@ -499,20 +577,33 @@ main() {
                               reset_LOGGING_LEVEL, reset_LOGGING_LEVEL ),
     unit_test_setup_teardown( test_init_log_opens_syslog,
                               setup, teardown ),
+    unit_test_setup_teardown( test_init_log_reads_LOGGING_FACILITY_environment_variable,
+                              setup, teardown ),
 
     unit_test_setup_teardown( test_finalize_log_closes_syslog,
                               setup_logger_syslog, teardown ),
 
     unit_test_setup_teardown( test_default_logging_level_is_INFO,
                               setup_logger_file, teardown ),
-    unit_test_setup_teardown( test_set_logging_level_succeed,
+    unit_test_setup_teardown( test_set_logging_level_succeeds,
                               setup_logger_file, teardown ),
-    unit_test_setup_teardown( test_set_logging_level_fail_with_invalid_value,
+    unit_test_setup_teardown( test_set_logging_level_fails_with_invalid_value,
                               setup_logger_file, teardown ),
     unit_test_setup_teardown( test_set_logging_level_is_called_before_init_log,
                               setup, teardown ),
     unit_test_setup_teardown( test_LOGGING_LEVEL_overrides_logging_level,
                               setup, teardown ),
+    unit_test( test_valid_logging_level_returns_true_with_valid_logging_level ),
+    unit_test( test_valid_logging_level_returns_false_with_invalid_logging_level ),
+
+    unit_test_setup_teardown( test_default_faciliity_is_USER,
+                              setup, teardown ),
+    unit_test_setup_teardown( test_set_syslog_facility_succeeds,
+                              setup, teardown ),
+    unit_test_setup_teardown( test_set_syslog_facility_fails_with_invalid_value,
+                              setup, teardown ),
+    unit_test_setup_teardown( test_LOGGING_FACILITY_overrides_logging_facility,
+                              setup, teardown ),
 
     unit_test_setup_teardown( test_critical_logs_if_logging_level_is_CRITICAL,
                               setup_logger_file, teardown ),