[popfile-commit] engine/tests TestHTML.script,1.18,1.19 TestHTML.tst,1.20,1.21

[<jgr...@us...>]

Update of /cvsroot/popfile/engine/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv20003/tests

Modified Files:
	TestHTML.script TestHTML.tst 
Log Message:
Bring HTML test suite up to date with recent changes to the UI

Index: TestHTML.script
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestHTML.script,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** TestHTML.script	15 Sep 2003 14:55:37 -0000	1.18
--- TestHTML.script	30 Sep 2003 00:02:03 -0000	1.19
***************
*** 71,76 ****
  MATCH <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
  MATCH <link rel="stylesheet" type="text/css" href="skins/SimplyBlue.css" title="SimplyBlue">
! MATCH <link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
! MATCH <link rel="icon" href="popfile.ico" type="image/ico">
  
  # Common MIDDLE parts (i.e. the tabs)
--- 71,75 ----
  MATCH <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
  MATCH <link rel="stylesheet" type="text/css" href="skins/SimplyBlue.css" title="SimplyBlue">
! MATCH <link rel="icon" href="favicon.ico">
  
  # Common MIDDLE parts (i.e. the tabs)
***************
*** 326,335 ****
  MATCH <font color=\"green\">personal</font>
  MATCH Scores
! MATCH 0. [28 zeroes] 265393
! MATCH 0. [29 zeroes] 796179
! MATCH 0. [33 zeroes] 976128
  MATCH <font color="red">here</font>
! MATCH 0.0017
! MATCH 0.0034
  MATCH <font color="black">John</font>
  MATCH <font color="red">here</font>
--- 325,334 ----
  MATCH <font color=\"green\">personal</font>
  MATCH Scores
! MATCH 0.769209
! MATCH 0.230763
! MATCH 2.829186e-005
  MATCH <font color="red">here</font>
! MATCH 0.3289
! MATCH 0.6697
  MATCH <font color="black">John</font>
  MATCH <font color="red">here</font>
***************
*** 344,353 ****
  MATCH <font color=\"green\">personal</font>
  MATCH Scores
! MATCH 0. [28 zeroes] 265393
! MATCH 0. [29 zeroes] 796179
! MATCH 0. [33 zeroes] 976128
  MATCH <font color="red">here</font>
! MATCH 0.0017
! MATCH 0.0034
  MATCH <font color="black">John</font>
  MATCH <font color="red">here</font>
--- 343,352 ----
  MATCH <font color=\"green\">personal</font>
  MATCH Scores
! MATCH 0.769209
! MATCH 0.230763
! MATCH 2.829186e-005
  MATCH <font color="red">here</font>
! MATCH 0.3289
! MATCH 0.6697
  MATCH <font color="black">John</font>
  MATCH <font color="red">here</font>
***************
*** 922,926 ****
  MATCH 0.0005602241
  MATCH 0.6873803233
! MATCH 0.6587808605
  MATCH Frequency
  
--- 921,925 ----
  MATCH 0.0005602241
  MATCH 0.6873803233
! MATCH 1.8945518529
  MATCH Frequency
  

Index: TestHTML.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestHTML.tst,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** TestHTML.tst	15 Sep 2003 14:55:37 -0000	1.20
--- TestHTML.tst	30 Sep 2003 00:02:04 -0000	1.21
***************
*** 169,192 ****
  $p->initialize();
  
  $b->initialize();
- open STDOUT, ">temp.tmp";
  test_assert( $b->start() );
- close STDOUT;
- unlink 'temp.tmp';
  
  our $h = new UI::HTML;
  
  $h->classifier( $b );
  $h->configuration( $c );
  $h->mq( $mq );
  $h->logger( $l );
  $h->initialize();
  $h->version( 'vtest.suite.ver' );
  test_assert_equal( $h->language(), 'English' );
  our $version = $h->version();
  
  our $sk = $h->session_key();
  
  $mq->service();
  
  test_assert_equal( $h->url_encode_( ']' ), '%5d' );
--- 169,199 ----
  $p->initialize();
  
+ test_assert(1);
+ 
  $b->initialize();
  test_assert( $b->start() );
  
  our $h = new UI::HTML;
  
+ test_assert(1);
+ 
  $h->classifier( $b );
  $h->configuration( $c );
  $h->mq( $mq );
  $h->logger( $l );
+ test_assert(1);
  $h->initialize();
+ test_assert(1);
  $h->version( 'vtest.suite.ver' );
  test_assert_equal( $h->language(), 'English' );
  our $version = $h->version();
  
+ test_assert(1);
+ 
  our $sk = $h->session_key();
  
  $mq->service();
+ 
+ $h->global_config_( 'ecount', 1 );
  
  test_assert_equal( $h->url_encode_( ']' ), '%5d' );