Changeset 4938

Timestamp:

09/15/09 16:17:56 (3 years ago)

Author:

AndrewJones

Message:

Item1363: still fighting the tests. just checking in so I can work on another machine

Location:

trunk/SearchEngineKinoSearchAddOn/test/unit/SearchEngineKinoSearchAddOn

Files:

• IndexTests.pm (modified) (1 diff)
• SearchTests.pm (modified) (10 diffs)

trunk/SearchEngineKinoSearchAddOn/test/unit/SearchEngineKinoSearchAddOn/IndexTests.pm

@@ -30 +30 @@
 
     #$this->registerUser("TestUser", "User", "TestUser", 'testuser@an-address.net');
+    
+    $Foswiki::cfg{SearchEngineKinoSearchAddOn}{Debug} = 1;
+    
+    # don't bother indexing everything, we only want the temporary webs. Makes the tests a lot quicker
+    $Foswiki::cfg{SearchEngineKinoSearchAddOn}{SkipWebs} = 'Trash, Sandbox, System, TWiki, Main, TestCases';
 }
 

trunk/SearchEngineKinoSearchAddOn/test/unit/SearchEngineKinoSearchAddOn/SearchTests.pm

@@ -4 +4 @@
 
 use strict;
-use CGI;
 
 use Foswiki::Func;
@@ -18 +17 @@
         $self->{attachmentDir} = 'SearchEngineKinoSearchAddOn/attachement_examples/';
     }
+    
     return $self;
 }
@@ -27 +27 @@
     # Use RcsLite so we can manually gen topic revs
     $Foswiki::cfg{StoreImpl} = 'RcsLite';
+    
+    $Foswiki::cfg{SearchEngineKinoSearchAddOn}{Debug} = 1;
+    
+    # don't bother indexing everything, we only want the temporary webs. Makes the tests a lot quicker
+    $Foswiki::cfg{SearchEngineKinoSearchAddOn}{SkipWebs} = 'Trash, Sandbox, System, TWiki, Main, TestCases';
 
     $this->registerUser("TestUser", "User", "TestUser", 'testuser@an-address.net');
-    $this->assert( defined $this->{users_web}, "no {users_web}" );
-    Foswiki::Func::saveTopicText( $this->{users_web}, 'TopicWithoutAttachment', <<'HERE');
+    $this->assert( defined $this->{test_web}, "no {test_web}" );
+    Foswiki::Func::saveTopicText( $this->{test_web}, 'TopicWithoutAttachment', <<'HERE');
 Just an example topic
 Keyword: startpoint
 HERE
-        Foswiki::Func::saveTopicText( $this->{users_web}, 'TopicWithWordAttachment', <<'HERE');
+        Foswiki::Func::saveTopicText( $this->{test_web}, 'TopicWithWordAttachment', <<'HERE');
 Just an example topic wird MS Word
 Keyword: redmond
 HERE
-        Foswiki::Func::saveAttachment( $this->{users_web}, "TopicWithWordAttachment", "Simple_example.doc",
+        Foswiki::Func::saveAttachment( $this->{test_web}, "TopicWithWordAttachment", "Simple_example.doc",
                                        {file => $this->{attachmentDir}."Simple_example.doc"});
 }
@@ -51 +56 @@
     my $search = Foswiki::Contrib::SearchEngineKinoSearchAddOn::Search->newSearch();
 
-    $this->assert(defined($search), "Search exemplar not created.")
+    $this->assert(defined($search), "Search example not created.")
 }
 
@@ -68 +73 @@
 
     # Let's create something
-    Foswiki::Func::saveTopicText( $this->{users_web}, "TopicTitleToSearch", <<'HERE');
+    Foswiki::Func::saveTopicText( $this->{test_web}, "TopicTitleToSearch", <<'HERE');
 Just an example topic
 Keyword: BodyToSearchFor
@@ -97 +102 @@
 
     # Let's create something
-    Foswiki::Func::saveTopicText( $this->{users_web}, "TopicTitleToSearch", <<'HERE');
+    Foswiki::Func::saveTopicText( $this->{test_web}, "TopicTitleToSearch", <<'HERE');
 Just an example topic
 Keyword: BodyToSearchFor
@@ -153 +158 @@
 
     # Let's create something
-    Foswiki::Func::saveTopicText( $this->{users_web}, "TopicToSearch", <<'HERE');
+    Foswiki::Func::saveTopicText( $this->{test_web}, "TopicToSearch", <<'HERE');
 Just an example topic
 Keyword: BodyToSearchFor
 HERE
 
-        Foswiki::Func::saveAttachment( $this->{users_web}, "TopicToSearch", "Simple_example.doc",
+        Foswiki::Func::saveAttachment( $this->{test_web}, "TopicToSearch", "Simple_example.doc",
                                        {file => $this->{attachmentDir}."Simple_example.doc"});
 
@@ -188 +193 @@
 
     # Now I create a topic that only "TestUser2" can read
-    Foswiki::Func::saveTopicText( $this->{users_web}, "TopicWithAccesControl", << 'HERE');
+    Foswiki::Func::saveTopicText( $this->{test_web}, "TopicWithAccesControl", << 'HERE');
 Just an example topic
 Keyword: KeepOutHere
-      * Set ALLOWTOPICVIEW = UserTestUser2
+   * Set ALLOWTOPICVIEW = TestUser2
 HERE
 
@@ -218 +223 @@
     my ( $this, $web, $topic, $user, $searchString ) = @_;
     
-    my $query = new CGI({
+    my $query = new Unit::Request({
         webName   => [ $web ],
         topicName => [ $topic ],
         search    => [ $searchString ],
     });
-
     $query->path_info( "$web/$topic" );
+    
+    my $response = new Unit::Response();
+    $response->charset("utf8");
 
     #my $foswiki  = new Foswiki( $this->{test_user_login}, $query );
@@ -233 +240 @@
     # Note: With $foswiki I hand over the just defined session. Thus I have full 
     # control over query etc.
-    my ($text, $result) = $this->capture( \&Foswiki::Contrib::SearchEngineKinoSearchAddOn::Search::search, $search, undef, $foswiki);
+    my ($text, $result) = $this->capture( \&Foswiki::Contrib::SearchEngineKinoSearchAddOn::Search::search, $search, 1, $foswiki);
 
     $foswiki->finish();
-    $text =~ s/\r//g;
-    $text =~ s/^.*?\n\n+//s; # remove CGI header
+    #$text =~ s/\r//g;
+    #$text =~ s/^.*?\n\n+//s; # remove CGI header
     return $text;
 }