[svn-components] 7418 - in /trunk/Search: design/class_diagram.png src/handlers/solr.php src/search_autoload.php tests/handlers/solr_test.php

[Derick Rethans]

Author: dr
Date: Wed Feb 20 10:44:10 2008
New Revision: 7418

Log:
- Fixed exception message.
- Added test for solr running in setup() method.

Modified:
    trunk/Search/design/class_diagram.png
    trunk/Search/src/handlers/solr.php
    trunk/Search/src/search_autoload.php
    trunk/Search/tests/handlers/solr_test.php

Modified: trunk/Search/design/class_diagram.png
==============================================================================
Binary files - no diff available.

Modified: trunk/Search/src/handlers/solr.php
==============================================================================
--- trunk/Search/src/handlers/solr.php [iso-8859-1] (original)
+++ trunk/Search/src/handlers/solr.php [iso-8859-1] Wed Feb 20 10:44:10 2008
@@ -40,7 +40,7 @@
         $this->connection = @stream_socket_client( 
"tcp://{$this->host}:{$this->port}" );
         if ( !$this->connection )
         {
-            throw new ezcSearchCanNotConnectException( 'solr', 
"http://{$this->host}:{$this->port}/{$this->location}" );
+            throw new ezcSearchCanNotConnectException( 'solr', 
"http://{$this->host}:{$this->port}{$this->location}" );
         }
 
     }

Modified: trunk/Search/src/search_autoload.php
==============================================================================
--- trunk/Search/src/search_autoload.php [iso-8859-1] (original)
+++ trunk/Search/src/search_autoload.php [iso-8859-1] Wed Feb 20 10:44:10 2008
@@ -10,23 +10,24 @@
  */
 
 return array(
-    'ezcSearchException'                   => 
'Search/exceptions/exception.php',
-    'ezcSearchCanNotConnectException'      => 
'Search/exceptions/can_not_connect.php',
-    'ezcSearchDefinitionInvalidException'  => 
'Search/exceptions/definition_invalid.php',
-    'ezcSearchDefinitionNotFoundException' => 
'Search/exceptions/definition_not_found.php',
-    'ezcSearchDefinitionManager'           => 
'Search/interfaces/definition_manager.php',
-    'ezcSearchHandler'                     => 'Search/interfaces/handler.php',
-    'ezcSearchIndexHandler'                => 
'Search/interfaces/index_handler.php',
-    'ezcSearchQuery'                       => 'Search/abstraction/query.php',
-    'ezcSearchCodeManager'                 => 
'Search/managers/code_manager.php',
-    'ezcSearchDefinitionDocumentField'     => 
'Search/structs/document_field_definition.php',
-    'ezcSearchDocumentDefinition'          => 
'Search/structs/document_definition.php',
-    'ezcSearchFindQuery'                   => 
'Search/abstraction/query_find.php',
-    'ezcSearchQueryInsert'                 => 
'Search/abstraction/query_index.php',
-    'ezcSearchResult'                      => 'Search/search_result.php',
-    'ezcSearchSession'                     => 'Search/search_session.php',
-    'ezcSearchSessionInstance'             => 
'Search/search_session_instance.php',
-    'ezcSearchSolrHandler'                 => 'Search/handlers/solr.php',
-    'ezcSearchXmlManager'                  => 
'Search/managers/xml_manager.php',
+    'ezcSearchException'                            => 
'Search/exceptions/exception.php',
+    'ezcSearchCanNotConnectException'               => 
'Search/exceptions/can_not_connect.php',
+    'ezcSearchDefinitionInvalidException'           => 
'Search/exceptions/definition_invalid.php',
+    'ezcSearchDefinitionMissingIdPropertyException' => 
'Search/exceptions/missing_id.php',
+    'ezcSearchDefinitionNotFoundException'          => 
'Search/exceptions/definition_not_found.php',
+    'ezcSearchDefinitionManager'                    => 
'Search/interfaces/definition_manager.php',
+    'ezcSearchHandler'                              => 
'Search/interfaces/handler.php',
+    'ezcSearchIndexHandler'                         => 
'Search/interfaces/index_handler.php',
+    'ezcSearchQuery'                                => 
'Search/abstraction/query.php',
+    'ezcSearchCodeManager'                          => 
'Search/managers/code_manager.php',
+    'ezcSearchDefinitionDocumentField'              => 
'Search/structs/document_field_definition.php',
+    'ezcSearchDocumentDefinition'                   => 
'Search/structs/document_definition.php',
+    'ezcSearchFindQuery'                            => 
'Search/abstraction/query_find.php',
+    'ezcSearchQueryInsert'                          => 
'Search/abstraction/query_index.php',
+    'ezcSearchResult'                               => 
'Search/search_result.php',
+    'ezcSearchSession'                              => 
'Search/search_session.php',
+    'ezcSearchSessionInstance'                      => 
'Search/search_session_instance.php',
+    'ezcSearchSolrHandler'                          => 
'Search/handlers/solr.php',
+    'ezcSearchXmlManager'                           => 
'Search/managers/xml_manager.php',
 );
 ?>

Modified: trunk/Search/tests/handlers/solr_test.php
==============================================================================
--- trunk/Search/tests/handlers/solr_test.php [iso-8859-1] (original)
+++ trunk/Search/tests/handlers/solr_test.php [iso-8859-1] Wed Feb 20 10:44:10 
2008
@@ -23,7 +23,14 @@
 
     function setUp()
     {
-        $this->solr = new ezcSearchSolrHandler;
+        try
+        {
+            $this->solr = new ezcSearchSolrHandler;
+        }
+        catch ( ezcSearchCanNotConnectException $e )
+        {
+            self::markTestSkipped( 'Solr is not running.' );
+        }
     }
 
     function testUnableToConnect()
@@ -36,7 +43,7 @@
         }
         catch ( ezcSearchCanNotConnectException $e )
         {
-            self::assertEquals( "Could not connect to 'solr' at 
'http://localhost:58983//solr'.", $e->getMessage() );
+            self::assertEquals( "Could not connect to 'solr' at 
'http://localhost:58983/solr'.", $e->getMessage() );
         }
     }
 


-- 
svn-components mailing list
svn-components@lists.ez.no
http://lists.ez.no/mailman/listinfo/svn-components