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

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

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

Modified Files:
	TestIMAP.tst 
Log Message:
Make the tests of the UI a bit more nitpicky.
Fix minor bugs in the IMAP modules.


Index: TestIMAP.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestIMAP.tst,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TestIMAP.tst	2 Dec 2007 13:08:37 -0000	1.8
--- TestIMAP.tst	3 Dec 2007 08:16:49 -0000	1.9
***************
*** 620,624 ****
      $form->{imap_password} = 'secret';
      $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' );
--- 620,626 ----
      $form->{imap_password} = 'secret';
      $form->{imap_use_ssl} = 1;
!     my ( $status, $error ) = $im->validate_item( 'imap_0_connection_details', $tmpl, $language, $form );
!     test_assert_equal( $status, $language->{Imap_ConnectionDetailsUpdated} );
!     test_assert( ! $error );
      test_assert_equal( $im->user_config_( 1, 'use_ssl' ), 1 );
      test_assert_equal( $im->user_config_( 1, 'password' ), 'secret' );
***************
*** 628,633 ****
  
      $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
--- 630,637 ----
  
      $form->{imap_use_ssl} = undef;
!     ( $status, $error ) = $im->validate_item( 'imap_0_connection_details', $tmpl, $language, $form );
      test_assert_equal( $im->user_config_( 1, 'use_ssl' ), 0 );
+     test_assert_equal( $status, $language->{Imap_ConnectionDetailsUpdated} );
+     test_assert( ! $error );
  
      # After updating the connection details, the module must disconnect
***************
*** 638,647 ****
  
      # all the parameters need to be set to something (except for use_ssl)
      foreach ( qw/ imap_hostname imap_port imap_login imap_password / ) {
          my %invalid_form = %$form;
          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 );
      }
  
--- 642,658 ----
  
      # all the parameters need to be set to something (except for use_ssl)
+     my %errors = (
+         imap_hostname => $language->{Imap_ServerNameError},
+         imap_port     => $language->{Imap_PortError},
+         imap_login    => $language->{Imap_LoginError},
+         imap_password  => $language->{Imap_PasswordError}
+     );
      foreach ( qw/ imap_hostname imap_port imap_login imap_password / ) {
          my %invalid_form = %$form;
          delete $invalid_form{$_};
          $tmpl = HTML::Template->new( filename => '../skins/default/imap-connection-details.thtml' );
!         ( $status, $error ) = $im->validate_item( 'imap_0_connection_details', $tmpl, $language, \%invalid_form );
!         test_assert_equal( $error, $errors{ $_ } );
!         test_assert( ! $status );
      }
  
***************
*** 654,658 ****
      $form->{update_imap_1_watch_folders} = 1;
      $im->watched_folders__( '1', '2' );
!     $im->validate_item( 'imap_1_watch_folders', $tmpl, $language, $form );
      test_assert_equal( $im->{folder_change_flag__}, 1 );
      my @folders = $im->watched_folders__();
--- 665,671 ----
      $form->{update_imap_1_watch_folders} = 1;
      $im->watched_folders__( '1', '2' );
!     ( $status, $error ) = $im->validate_item( 'imap_1_watch_folders', $tmpl, $language, $form );
!     test_assert_equal( $status, $language->{Imap_WatchedFoldersUpdated} );
!     test_assert( ! $error );
      test_assert_equal( $im->{folder_change_flag__}, 1 );
      my @folders = $im->watched_folders__();
***************
*** 665,669 ****
      $form->{imap_2_watch_more_folders} = 1;
      $tmpl = HTML::Template->new( filename => '../skins/default/imap-watch-more-folders.thtml' );
!     $im->validate_item( 'imap_2_watch_more_folders', $tmpl, $language, $form );
      @folders = $im->watched_folders__();
      test_assert_equal( scalar @folders, 3 );
--- 678,684 ----
      $form->{imap_2_watch_more_folders} = 1;
      $tmpl = HTML::Template->new( filename => '../skins/default/imap-watch-more-folders.thtml' );
!     ( $status, $error ) = $im->validate_item( 'imap_2_watch_more_folders', $tmpl, $language, $form );
!     test_assert_equal( $status, $language->{Imap_WatchedFolderAdded} );
!     test_assert( ! $error );
      @folders = $im->watched_folders__();
      test_assert_equal( scalar @folders, 3 );
***************
*** 677,681 ****
  
      $tmpl = HTML::Template->new( filename => '../skins/default/imap-bucket-folders.thtml' );
!     $im->validate_item('imap_3_bucket_folders', $tmpl, $language, $form );
      test_assert_equal( $im->{folder_change_flag__}, 1 );
      test_assert_equal( $im->folder_for_bucket__( 'other' ), 'personal' );
--- 692,702 ----
  
      $tmpl = HTML::Template->new( filename => '../skins/default/imap-bucket-folders.thtml' );
!     ( $status, $error ) = $im->validate_item('imap_3_bucket_folders', $tmpl, $language, $form );
!     test_assert( ! $error );
!     my $expected = sprintf $language->{Imap_MapUpdated}, 'other', 'personal';
!     $expected .= '<br />';
!     $expected .= sprintf $language->{Imap_MapUpdated}, 'personal', 'other';
!     $expected .= '<br />';
!     test_assert_equal( $status, $expected );
      test_assert_equal( $im->{folder_change_flag__}, 1 );
      test_assert_equal( $im->folder_for_bucket__( 'other' ), 'personal' );
***************
*** 692,698 ****
      $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' );
--- 713,720 ----
      $im->user_config_( 1,  'update_interval', 10 );
      $im->user_config_( 1,  'use_ssl', 0 );
!     ( $status, $error ) = $im->validate_item( 'imap_4_update_mailbox_list', $tmpl, $language, $form );
      test_assert_equal( scalar @{$im->{mailboxes__}}, 5 );
      test_assert( ! $error );
+     test_assert_equal( $status, $language->{Imap_UpdateOK} );
  
      $im->user_config_( 1,  'login', 'someone' );
***************
*** 701,704 ****
--- 723,727 ----
      ( $status, $error ) = $im->validate_item( 'imap_4_update_mailbox_list', $tmpl, $language, $form );
      test_assert_equal( $error, $language->{Imap_UpdateError3} );
+     test_assert( ! $status );
  
      $im->user_config_( 1,  'hostname', '127.0.0.1' );
***************
*** 707,710 ****
--- 730,734 ----
      ( $status, $error ) = $im->validate_item( 'imap_4_update_mailbox_list', $tmpl, $language, $form );
      test_assert_equal( $error, $language->{Imap_UpdateError2} );
+     test_assert( ! $status );
  
      $im->user_config_( 1,  'port', 1143 );
***************
*** 712,716 ****
      $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} );
  
  
--- 736,741 ----
      $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_UpdateError1} );
!     test_assert( ! $status );
  
  
***************
*** 721,735 ****
      $form->{imap_options_expunge} = 1;
      $form->{imap_options_update_interval} = 1234;
!     $im->validate_item( 'imap_5_options', $tmpl, $language, $form );
      test_assert_equal( $im->user_config_( 1,  'expunge' ), 1 );
      test_assert_equal( $im->user_config_( 1,  'update_interval' ), 1234 );
  
      $form->{imap_options_expunge} = undef;
      $im->validate_item( 'imap_5_options', $tmpl, $language, $form );
      test_assert_equal( $im->user_config_( 1,  'expunge' ), 0 );
  
      $form->{imap_options_update_interval} = 0;
      ( $status, $error ) = $im->validate_item( 'imap_5_options', $tmpl, $language, $form );
      test_assert_equal( $error, $language->{Imap_IntervalError} );
  }
  
--- 746,765 ----
      $form->{imap_options_expunge} = 1;
      $form->{imap_options_update_interval} = 1234;
!     ( $status, $error ) = $im->validate_item( 'imap_5_options', $tmpl, $language, $form );
      test_assert_equal( $im->user_config_( 1,  'expunge' ), 1 );
      test_assert_equal( $im->user_config_( 1,  'update_interval' ), 1234 );
+     test_assert_equal( $status, $language->{Imap_OptionsUpdated} );
+     test_assert( ! $error );
  
      $form->{imap_options_expunge} = undef;
      $im->validate_item( 'imap_5_options', $tmpl, $language, $form );
      test_assert_equal( $im->user_config_( 1,  'expunge' ), 0 );
+     test_assert_equal( $status, $language->{Imap_OptionsUpdated} );
+     test_assert( ! $error );
  
      $form->{imap_options_update_interval} = 0;
      ( $status, $error ) = $im->validate_item( 'imap_5_options', $tmpl, $language, $form );
      test_assert_equal( $error, $language->{Imap_IntervalError} );
+     test_assert( ! $status );
  }
  
***************
*** 837,840 ****
--- 867,872 ----
      $l->config_( logdir => '/tmp/' );
  
+     $im->module_config_( 'html', 'port', 8082 );
+ 
      $POPFile->CORE_start();