Author: ts
Date: Tue Oct  9 20:34:53 2007
New Revision: 6408

Log:
- Added missing mock for generating client test cases.
- Added test case for ezcWebavServer->handle().

Added:
    trunk/Webdav/tests/scripts/client_test_generate.php
      - copied unchanged from r6407, 
trunk/Webdav/tests/scripts/extract_general.php
Removed:
    trunk/Webdav/tests/scripts/extract_general.php
Modified:
    trunk/Webdav/tests/server_test.php

Modified: trunk/Webdav/tests/server_test.php
==============================================================================
--- trunk/Webdav/tests/server_test.php [iso-8859-1] (original)
+++ trunk/Webdav/tests/server_test.php [iso-8859-1] Tue Oct  9 20:34:53 2007
@@ -13,6 +13,11 @@
  * Reqiuire base test
  */
 require_once 'test_case.php';
+
+/**
+ * Additional transport for testing. 
+ */
+require_once 'classes/transport_test_mock.php';
 
 /**
  * Tests for ezcWebdavServer class.
@@ -204,106 +209,41 @@
         );
     }
 
-    /*
-     * Old tests.
-     * Need updated environment now.
-
     public function testDefaultHandlerWithUnknowClient()
     {
         $_SERVER['HTTP_USER_AGENT'] = 'ezcUnknownClient';
 
-        $webdav = new ezcWebdavServer();
-        $webdav->handle();
-
-        $this->assertEquals(
-            $this->readAttribute( $webdav, 'transport' ),
-            new ezcWebdavTransport(),
-            'Fallback to ezcWebdavTransport expected.'
-        );
-    }
-
-    public function testAddMockedTransport()
-    {
-        $_SERVER['HTTP_USER_AGENT'] = 'ezcMockedClient';
-
-        $mockedTransport = $this->getMock( 'ezcWebdavTransport' );
-
-        $webdav = new ezcWebdavServer();
-
-        $count = count( $this->readAttribute( $webdav, 'transportHandlers' ) );
-        $webdav->registerTransportHandler( 
-            '(^ezcMockedClient$)', 
-            get_class( $mockedTransport )
-        );
-
-        $this->assertEquals(
-            $count + 1,
-            count( $this->readAttribute( $webdav, 'transportHandlers' ) ),
-            'Expected increased count of transport handlers.'
-        );
-
-        $transportHandlers = $this->readAttribute( $webdav, 
'transportHandlers' );
-        $this->assertEquals(
-            reset( $transportHandlers ),
-            get_class( $mockedTransport ),
-            'Expected mocked transport handler to be first in list.'
-        );
-
-        $webdav->handle();
-
-        $this->assertEquals(
-            $this->readAttribute( $webdav, 'transport' ),
-            $mockedTransport,
-            'Mocked transport handler expected.'
-        );
-    }
-
-    public function testRemoveTransport()
+        $webdav  = ezcWebdavServer::getInstance();
+        $backend = new ezcWebdavMemoryBackend();
+
+        ob_start();
+
+        $webdav->handle( $backend );
+
+        $body = ob_get_clean();
+    }
+
+    public function testDefaultHandlerWithUnknowClientAdditionalHandler()
     {
         $_SERVER['HTTP_USER_AGENT'] = 'ezcUnknownClient';
-
-        $webdav = new ezcWebdavServer();
-
-        $count = count( $this->readAttribute( $webdav, 'transportHandlers' ) );
-        $webdav->unregisterTransportHandler( 
-            '(.*)'
-        );
-
-        $this->assertEquals(
-            $count - 1,
-            count( $this->readAttribute( $webdav, 'transportHandlers' ) ),
-            'Expected decreased count of transport handlers.'
-        );
-    }
-
-    public function testExceptionForUnhandledClient()
-    {
-        $_SERVER['HTTP_USER_AGENT'] = 'ezcUnknownClient';
-
-        $webdav = new ezcWebdavServer();
-
-        $webdav->unregisterTransportHandler( 
-            '(.*)'
-        );
-
-        try
-        {
-            $webdav->handle();
-        }
-        catch ( ezcWebdavNotTransportHandlerException $e )
-        {
-            $this->assertEquals(
-                $e->getMessage(),
-                "Could not find any ezcWebdavTransport for the client 
'ezcUnknownClient'."
-            );
-
-            return true;
-        }
-
-        $this->fail( 'Expected ezcWebdavNotTransportHandlerException.' );
-    }
-
-    */
+        $_SERVER['REQUEST_METHOD']  = 'OPTIONS';
+
+        $webdav  = ezcWebdavServer::getInstance();
+        $webdav->transports->insertBefore(
+            new ezcWebdavTransportConfiguration(
+                '(.*SomeAgent.*)',
+                'ezcWebdavTransportTestMock'
+            )
+        );
+
+        $backend = new ezcWebdavMemoryBackend();
+
+        ob_start();
+
+        $webdav->handle( $backend );
+
+        $body = ob_get_clean();
+    }
 
     protected function assertSetPropertyFailure( $propertyName, array 
$propertyValues, $exceptionClass )
     {


-- 
svn-components mailing list
[email protected]
http://lists.ez.no/mailman/listinfo/svn-components

Reply via email to