[Openinteract-commits] CVS: OpenInteract2/t utils.pl,1.100,1.101 repository.t,1.11,1.12 manage_list_packages.t,1.15,1.16 manage_list_objects.t,1.9,1.10 manage_list_actions.t,1.10,1.11 context.t,1.46,1.47 00_manage_create_website.t,1.5,1.6

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/t
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7816

Modified Files:
	utils.pl repository.t manage_list_packages.t 
	manage_list_objects.t manage_list_actions.t context.t 
	00_manage_create_website.t 
Log Message:
fix tests for new package


Index: utils.pl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/t/utils.pl,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** utils.pl	4 Mar 2005 03:11:21 -0000	1.100
--- utils.pl	21 Sep 2005 12:33:54 -0000	1.101
***************
*** 44,51 ****
  
  sub main::get_packages {
!     return qw( base  base_box  base_error  base_group  base_page
!                base_security  base_template  base_theme  base_user
!                comments  full_text  lookup  news  object_activity
!                system_doc  whats_new );
  }
  
--- 44,52 ----
  
  sub main::get_packages {
!     return @{ OpenInteract2::Manage->SYSTEM_PACKAGES() };
! }
! 
! sub main::get_num_packages {
!     return scalar @{ OpenInteract2::Manage->SYSTEM_PACKAGES() };
  }
  

Index: repository.t
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/t/repository.t,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** repository.t	28 Feb 2005 01:02:38 -0000	1.11
--- repository.t	21 Sep 2005 12:33:54 -0000	1.12
***************
*** 92,96 ****
            'Correctly threw exception with no name to fetch package' );
  
!     is( scalar( @{ $repos->fetch_all_packages } ), 16,
          'Fetched the correct number of packages' );
  
--- 92,96 ----
            'Correctly threw exception with no name to fetch package' );
  
!     is( scalar( @{ $repos->fetch_all_packages } ), get_num_packages(),
          'Fetched the correct number of packages' );
  
***************
*** 115,119 ****
      is( $pkg_check_add->version, $package_add->version,
          '...refetched version matches' );
!     is( scalar @{ $repos->fetch_all_packages }, 17,
          '...number of packages matches' );
  
--- 115,119 ----
      is( $pkg_check_add->version, $package_add->version,
          '...refetched version matches' );
!     is( scalar @{ $repos->fetch_all_packages }, get_num_packages() + 1,
          '...number of packages matches' );
  
***************
*** 130,134 ****
      is( $pkg_check_post->version, $package_add->version,
          '...new refetched name matches' );
!     is( scalar @{ $repos_check->fetch_all_packages }, 17,
          '...new refetched number of packages matches' );
  }
--- 130,134 ----
      is( $pkg_check_post->version, $package_add->version,
          '...new refetched name matches' );
!     is( scalar @{ $repos_check->fetch_all_packages }, get_num_packages() + 1,
          '...new refetched number of packages matches' );
  }
***************
*** 140,144 ****
      is( $repos->fetch_package( $package_add_name ), undef,
          'Removed package no longer exists in repository' );
!     is( scalar @{ $repos->fetch_all_packages }, 16,
          'Number of packages matches' );
  
--- 140,144 ----
      is( $repos->fetch_package( $package_add_name ), undef,
          'Removed package no longer exists in repository' );
!     is( scalar @{ $repos->fetch_all_packages }, get_num_packages(),
          'Number of packages matches' );
  
***************
*** 147,151 ****
      my $repos_check =
          OpenInteract2::Repository->new({ website_dir => $website_dir });
!     is( scalar @{ $repos_check->fetch_all_packages }, 16,
          '...refetched Number of packages matches' );
  }
--- 147,151 ----
      my $repos_check =
          OpenInteract2::Repository->new({ website_dir => $website_dir });
!     is( scalar @{ $repos_check->fetch_all_packages }, get_num_packages(),
          '...refetched Number of packages matches' );
  }

Index: manage_list_packages.t
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/t/manage_list_packages.t,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** manage_list_packages.t	4 Mar 2005 03:46:21 -0000	1.15
--- manage_list_packages.t	21 Sep 2005 12:33:54 -0000	1.16
***************
*** 6,10 ****
  use lib 't/';
  require 'utils.pl';
! use Test::More  tests => 21;
  
  require_ok( 'OpenInteract2::Manage' );
--- 6,10 ----
  use lib 't/';
  require 'utils.pl';
! use Test::More  tests => 22;
  
  require_ok( 'OpenInteract2::Manage' );
***************
*** 23,27 ****
  my @status = eval { $task->execute };
  ok( ! $@, 'Task executed ok' ) || diag "Error: $@";
! is( scalar @status, 16,
      'Correct number of packages listed' );
  
--- 23,27 ----
  my @status = eval { $task->execute };
  ok( ! $@, 'Task executed ok' ) || diag "Error: $@";
! is( scalar @status, get_num_packages(),
      'Correct number of packages listed' );
  

Index: manage_list_objects.t
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/t/manage_list_objects.t,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** manage_list_objects.t	4 Mar 2005 20:48:41 -0000	1.9
--- manage_list_objects.t	21 Sep 2005 12:33:54 -0000	1.10
***************
*** 6,10 ****
  use lib 't/';
  require 'utils.pl';
! use Test::More  tests => 43;
  
  
--- 6,10 ----
  use lib 't/';
  require 'utils.pl';
! use Test::More  tests => 45;
  
  
***************
*** 20,23 ****
--- 20,24 ----
                 news_section       => 'NewsSection',
                 object_action      => 'ObjectAction',
+                object_tag         => 'ObjectTag',
                 page               => 'Page',
                 page_content       => 'PageContent',

Index: manage_list_actions.t
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/t/manage_list_actions.t,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** manage_list_actions.t	4 Mar 2005 20:34:06 -0000	1.10
--- manage_list_actions.t	21 Sep 2005 12:33:54 -0000	1.11
***************
*** 6,10 ****
  use lib 't/';
  require 'utils.pl';
! use Test::More  tests => 50;
  
  require_ok( 'OpenInteract2::Manage' );
--- 6,10 ----
  use lib 't/';
  require 'utils.pl';
! use Test::More  tests => 55;
  
  require_ok( 'OpenInteract2::Manage' );
***************
*** 25,37 ****
  
  my @names = qw(
!     admin_tools_box boxes comment comment_admin comment_recent content_type
!     edit_document_box error_browser file_index forgotpassword
!     group latest_news login_box logout lookups new new_comment_form
      news news_archive_monthly news_section news_tools_box newuser
      object_modify_box objectactivity package page pagedirectory
!     pagescan powered_by_box search search_box security show_comment_by_object
!     show_comment_summary simple_index sitesearch systemdoc template
!     template_only template_tools_box templates_used_box theme
!     user user_info_box user_language
  );
  
--- 25,37 ----
  
  my @names = qw(
!     admin_tools_box all_tags_box boxes comment comment_admin comment_recent
!     content_type edit_document_box error_browser file_index forgotpassword
!     group latest_news login_box logout lookups my_tags new new_comment_form
      news news_archive_monthly news_section news_tools_box newuser
      object_modify_box objectactivity package page pagedirectory
!     pagescan powered_by_box related_tags_box search search_box security 
!     show_comment_by_object show_comment_summary simple_index sitesearch 
!     systemdoc tagged_objects tags template template_only template_tools_box 
!     templates_used_box theme user user_info_box user_language
  );
  

Index: context.t
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/t/context.t,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** context.t	4 Mar 2005 20:34:06 -0000	1.46
--- context.t	21 Sep 2005 12:33:54 -0000	1.47
***************
*** 17,21 ****
  }
  
! plan tests => 152;
  
  require_ok( 'OpenInteract2::Context' );
--- 17,21 ----
  }
  
! plan tests => 153;
  
  require_ok( 'OpenInteract2::Context' );
***************
*** 66,70 ****
      'Website directory set in repository' );
  my $packages = $repository->fetch_all_packages;
! is( scalar @{ $packages }, 16,
      'Number of packages fetched by repository' );
  
--- 66,70 ----
      'Website directory set in repository' );
  my $packages = $repository->fetch_all_packages;
! is( scalar @{ $packages }, get_num_packages(),
      'Number of packages fetched by repository' );
  
***************
*** 80,84 ****
  is( ref $action_table, 'HASH',
      'Action table is correct data structure' );
! is( scalar keys %{ $action_table }, 45,
      'Correct number of actions in table' );
  
--- 80,84 ----
  is( ref $action_table, 'HASH',
      'Action table is correct data structure' );
! is( scalar keys %{ $action_table }, 50,
      'Correct number of actions in table' );
  
***************
*** 156,160 ****
  is( ref $spops_config, 'HASH',
      'SPOPS config is correct data structure' );
! is( scalar keys %{ $spops_config }, 19,
      'Correct number of SPOPS configs in structure' );
  
--- 156,160 ----
  is( ref $spops_config, 'HASH',
      'SPOPS config is correct data structure' );
! is( scalar keys %{ $spops_config }, 20,
      'Correct number of SPOPS configs in structure' );
  

Index: 00_manage_create_website.t
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/t/00_manage_create_website.t,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** 00_manage_create_website.t	28 Feb 2005 01:03:59 -0000	1.5
--- 00_manage_create_website.t	21 Sep 2005 12:33:54 -0000	1.6
***************
*** 41,45 ****
  my @status = eval { $task->execute };
  ok( ! $@, 'Task executed' ) || diag "Execution error: $@";
! is( scalar @status, 110,
      'Number of status messages' );
  
--- 41,45 ----
  my @status = eval { $task->execute };
  ok( ! $@, 'Task executed' ) || diag "Execution error: $@";
! is( scalar @status, 111,
      'Number of status messages' );
  
***************
*** 102,106 ****
  
  my $site_pkg_dir = catdir( $website_dir, 'pkg' );
! is( count_dirs( $site_pkg_dir ), 16,
      'Number of directories in pkg/' );
  
--- 102,106 ----
  
  my $site_pkg_dir = catdir( $website_dir, 'pkg' );
! is( count_dirs( $site_pkg_dir ), get_num_packages(),
      'Number of directories in pkg/' );
  
***************
*** 123,127 ****
      'Repository reports proper config dir' );
  my $packages = $repository->fetch_all_packages;
! is( scalar @{ $packages }, 16,
      'Repository contains correct number of packages' );
  
--- 123,127 ----
      'Repository reports proper config dir' );
  my $packages = $repository->fetch_all_packages;
! is( scalar @{ $packages }, get_num_packages(),
      'Repository contains correct number of packages' );