[popfile-commit] engine/tests TestIMAP.tst,1.7,1.8

[Manni H. <man...@us...>]

Update of /cvsroot/popfile/engine/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29438/tests

Modified Files:
	TestIMAP.tst 
Log Message:
IMAP tests now finish and no failed tests are reported. Next step: Look at the coverage report.

Index: TestIMAP.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestIMAP.tst,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TestIMAP.tst	2 Dec 2007 09:41:10 -0000	1.7
--- TestIMAP.tst	2 Dec 2007 13:08:37 -0000	1.8
***************
*** 62,66 ****
      configure_imap_module( $im, $c, $mq, $l, $b, $h );
      test_imap_ui( $im );
!     onfigure_imap_module( $im, $c, $mq, $l, $b, $h );
      test_imap_module( $im, $c, $mq, $l, $b, $h );
      test_imap_client( $im );
--- 62,66 ----
      configure_imap_module( $im, $c, $mq, $l, $b, $h );
      test_imap_ui( $im );
!     configure_imap_module( $im, $c, $mq, $l, $b, $h );
      test_imap_module( $im, $c, $mq, $l, $b, $h );
      test_imap_client( $im );
***************
*** 621,633 ****
      $form->{imap_use_ssl} = 1;
      $im->validate_item( 'imap_0_connection_details', $tmpl, $language, $form );
!     test_assert_equal( $im->user_config_( 1,  'use_ssl' ), 1 );
!     test_assert_equal( $im->user_config_( 1,  'password' ), 'secret' );
!     test_assert_equal( $im->user_config_( 1,  'login' ), 'username' );
!     test_assert_equal( $im->user_config_( 1,  'port' ), 123 );
!     test_assert_equal( $im->user_config_( 1,  'hostname' ), 'hostname' );
  
      $form->{imap_use_ssl} = undef;
      $im->validate_item( 'imap_0_connection_details', $tmpl, $language, $form );
!     test_assert_equal( $im->user_config_( 1,  'use_ssl' ), 0 );
  
      # After updating the connection details, the module must disconnect
--- 621,633 ----
      $form->{imap_use_ssl} = 1;
      $im->validate_item( 'imap_0_connection_details', $tmpl, $language, $form );
!     test_assert_equal( $im->user_config_( 1, 'use_ssl' ), 1 );
!     test_assert_equal( $im->user_config_( 1, 'password' ), 'secret' );
!     test_assert_equal( $im->user_config_( 1, 'login' ), 'username' );
!     test_assert_equal( $im->user_config_( 1, 'port' ), 123 );
!     test_assert_equal( $im->user_config_( 1, 'hostname' ), 'hostname' );
  
      $form->{imap_use_ssl} = undef;
      $im->validate_item( 'imap_0_connection_details', $tmpl, $language, $form );
!     test_assert_equal( $im->user_config_( 1, 'use_ssl' ), 0 );
  
      # After updating the connection details, the module must disconnect
***************
*** 642,650 ****
          delete $invalid_form{$_};
          $tmpl = HTML::Template->new( filename => '../skins/default/imap-connection-details.thtml' );
!         $im->validate_item( 'imap_0_connection_details', $tmpl, $language, \%invalid_form );
!         my $template_param = $_;
!         $template_param =~ s/imap_//;
!         $template_param = 'IMAP_connection_if_' . $template_param . '_error';
!         test_assert_equal( $tmpl->param( $template_param ), 1, $_ );
      }
  
--- 642,647 ----
          delete $invalid_form{$_};
          $tmpl = HTML::Template->new( filename => '../skins/default/imap-connection-details.thtml' );
!         my ($status, $error ) = $im->validate_item( 'imap_0_connection_details', $tmpl, $language, \%invalid_form );
!         test_assert( $error );
      }
  
***************
*** 695,719 ****
      $im->user_config_( 1,  'update_interval', 10 );
      $im->user_config_( 1,  'use_ssl', 0 );
!     $im->validate_item( 'imap_4_update_mailbox_list', $tmpl, $language, $form );
      test_assert_equal( scalar @{$im->{mailboxes__}}, 5 );
!     test_assert( ! $tmpl->param( 'IMAP_update_list_failed' ) );
  
      $im->user_config_( 1,  'login', 'someone' );
      $im->user_config_( 1,  'hostname', '' );
      $tmpl = HTML::Template->new( filename => '../skins/default/imap-update-mailbox-list.thtml' );
!     $im->validate_item( 'imap_4_update_mailbox_list', $tmpl, $language, $form );
!     test_assert( $tmpl->param( 'IMAP_update_list_failed' ) );
  
      $im->user_config_( 1,  'hostname', '127.0.0.1' );
      $im->user_config_( 1,  'port', '12345' );
      $tmpl = HTML::Template->new( filename => '../skins/default/imap-update-mailbox-list.thtml' );
!     $im->validate_item( 'imap_4_update_mailbox_list', $tmpl, $language, $form );
!     test_assert( $tmpl->param( 'IMAP_update_list_failed' ) );
  
      $im->user_config_( 1,  'port', 1143 );
      $im->user_config_( 1,  'login', 'fail' );
      $tmpl = HTML::Template->new( filename => '../skins/default/imap-update-mailbox-list.thtml' );
!     $im->validate_item( 'imap_4_update_mailbox_list', $tmpl, $language, $form );
!     test_assert( $tmpl->param( 'IMAP_update_list_failed' ) );
  
  
--- 692,716 ----
      $im->user_config_( 1,  'update_interval', 10 );
      $im->user_config_( 1,  'use_ssl', 0 );
!     my ( $status, $error ) = $im->validate_item( 'imap_4_update_mailbox_list', $tmpl, $language, $form );
      test_assert_equal( scalar @{$im->{mailboxes__}}, 5 );
!     test_assert( ! $error );
  
      $im->user_config_( 1,  'login', 'someone' );
      $im->user_config_( 1,  'hostname', '' );
      $tmpl = HTML::Template->new( filename => '../skins/default/imap-update-mailbox-list.thtml' );
!     ( $status, $error ) = $im->validate_item( 'imap_4_update_mailbox_list', $tmpl, $language, $form );
!     test_assert_equal( $error, $language->{Imap_UpdateError3} );
  
      $im->user_config_( 1,  'hostname', '127.0.0.1' );
      $im->user_config_( 1,  'port', '12345' );
      $tmpl = HTML::Template->new( filename => '../skins/default/imap-update-mailbox-list.thtml' );
!     ( $status, $error ) = $im->validate_item( 'imap_4_update_mailbox_list', $tmpl, $language, $form );
!     test_assert_equal( $error, $language->{Imap_UpdateError2} );
  
      $im->user_config_( 1,  'port', 1143 );
      $im->user_config_( 1,  'login', 'fail' );
      $tmpl = HTML::Template->new( filename => '../skins/default/imap-update-mailbox-list.thtml' );
!     ( $status, $error ) = $im->validate_item( 'imap_4_update_mailbox_list', $tmpl, $language, $form );
!     test_assert( $error, $language->{Imap_UpdateError1} );
  
  
***************
*** 733,738 ****
  
      $form->{imap_options_update_interval} = 0;
!     $im->validate_item( 'imap_5_options', $tmpl, $language, $form );
!     test_assert_equal( $tmpl->param('IMAP_if_interval_error'), 1 );
  }
  
--- 730,735 ----
  
      $form->{imap_options_update_interval} = 0;
!     ( $status, $error ) = $im->validate_item( 'imap_5_options', $tmpl, $language, $form );
!     test_assert_equal( $error, $language->{Imap_IntervalError} );
  }