Browse Source

[ZF-7497]Line endings in Zend/Amf

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@17446 44c647ce-9c0f-0410-b52a-842ac1e357ba
yoshida@zend.co.jp 16 years ago
parent
commit
86483a4114
3 changed files with 135 additions and 137 deletions
  1. 51 51
      tests/Zend/Amf/AllTests.php
  2. 19 20
      tests/Zend/Amf/Contact.php
  3. 65 66
      tests/Zend/Amf/TypeLoaderTest.php

+ 51 - 51
tests/Zend/Amf/AllTests.php

@@ -1,51 +1,51 @@
-<?php
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../TestHelper.php';
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Amf_AllTests::main');
-}
-
-require_once 'Zend/Amf/Adobe/IntrospectorTest.php';
-require_once 'Zend/Amf/RequestTest.php';
-require_once 'Zend/Amf/ResponseTest.php';
-require_once 'Zend/Amf/ServerTest.php';
-require_once 'Zend/Amf/TypeLoaderTest.php';
-require_once 'Zend/Amf/Util/BinaryStreamTest.php';
-require_once 'Zend/Amf/Value/MessageBodyTest.php';
-require_once 'Zend/Amf/Value/MessageHeaderTest.php';
-require_once 'Zend/Amf/AuthTest.php';
-require_once 'Zend/Amf/ResourceTest.php';
-
-
-class Zend_Amf_AllTests
-{
-    public static function main()
-    {
-        PHPUnit_TextUI_TestRunner::run(self::suite());
-    }
-
-    public static function suite()
-    {
-        $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Amf');
-
-        $suite->addTestSuite('Zend_Amf_Adobe_IntrospectorTest');
-        $suite->addTestSuite('Zend_Amf_RequestTest');
-        $suite->addTestSuite('Zend_Amf_ResponseTest');
-        $suite->addTestSuite('Zend_Amf_ServerTest');
-        $suite->addTestSuite('Zend_Amf_TypeLoaderTest');
-        $suite->addTestSuite('Zend_Amf_Util_BinaryStreamTest');
-        $suite->addTestSuite('Zend_Amf_Value_MessageBodyTest');
-        $suite->addTestSuite('Zend_Amf_Value_MessageHeaderTest');
-        $suite->addTestSuite('Zend_Amf_AuthTest');
-        $suite->addTestSuite('Zend_Amf_ResourceTest');
-
-
-        return $suite;
-    }
-}
-
-if (PHPUnit_MAIN_METHOD == 'Zend_Amf_AllTests::main') {
-    Zend_Amf_AllTests::main();
-}
+<?php
+/**
+ * Test helper
+ */
+require_once dirname(__FILE__) . '/../../TestHelper.php';
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Amf_AllTests::main');
+}
+
+require_once 'Zend/Amf/Adobe/IntrospectorTest.php';
+require_once 'Zend/Amf/RequestTest.php';
+require_once 'Zend/Amf/ResponseTest.php';
+require_once 'Zend/Amf/ServerTest.php';
+require_once 'Zend/Amf/TypeLoaderTest.php';
+require_once 'Zend/Amf/Util/BinaryStreamTest.php';
+require_once 'Zend/Amf/Value/MessageBodyTest.php';
+require_once 'Zend/Amf/Value/MessageHeaderTest.php';
+require_once 'Zend/Amf/AuthTest.php';
+require_once 'Zend/Amf/ResourceTest.php';
+
+
+class Zend_Amf_AllTests
+{
+    public static function main()
+    {
+        PHPUnit_TextUI_TestRunner::run(self::suite());
+    }
+
+    public static function suite()
+    {
+        $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Amf');
+
+        $suite->addTestSuite('Zend_Amf_Adobe_IntrospectorTest');
+        $suite->addTestSuite('Zend_Amf_RequestTest');
+        $suite->addTestSuite('Zend_Amf_ResponseTest');
+        $suite->addTestSuite('Zend_Amf_ServerTest');
+        $suite->addTestSuite('Zend_Amf_TypeLoaderTest');
+        $suite->addTestSuite('Zend_Amf_Util_BinaryStreamTest');
+        $suite->addTestSuite('Zend_Amf_Value_MessageBodyTest');
+        $suite->addTestSuite('Zend_Amf_Value_MessageHeaderTest');
+        $suite->addTestSuite('Zend_Amf_AuthTest');
+        $suite->addTestSuite('Zend_Amf_ResourceTest');
+
+
+        return $suite;
+    }
+}
+
+if (PHPUnit_MAIN_METHOD == 'Zend_Amf_AllTests::main') {
+    Zend_Amf_AllTests::main();
+}

+ 19 - 20
tests/Zend/Amf/Contact.php

@@ -1,20 +1,19 @@
-<?php
-/**
- * Test Class for class mapping tests.
- *
- */
-class Contact
-{
-  public $_explicitType = 'ContactVO';
-  public $id = 0;
-  public $firstname = "";
-  public $lastname = "";
-  public $email = "";
-  public $mobile = "";
-
-  public function getASClassName()
-  {
-      return 'ContactVO';
-  }
-}
-?>
+<?php
+/**
+ * Test Class for class mapping tests.
+ *
+ */
+class Contact
+{
+    public $_explicitType = 'ContactVO';
+    public $id = 0;
+    public $firstname = "";
+    public $lastname = "";
+    public $email = "";
+    public $mobile = "";
+
+    public function getASClassName()
+    {
+        return 'ContactVO';
+    }
+}

+ 65 - 66
tests/Zend/Amf/TypeLoaderTest.php

@@ -1,66 +1,65 @@
-<?php
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Amf_TypeloaderTest::main');
-}
-
-require_once dirname(__FILE__) . '/../../TestHelper.php';
-require_once 'Zend/Amf/Parse/TypeLoader.php';
-
-class Zend_Amf_TypeloaderTest extends PHPUnit_Framework_TestCase
-{
-    public static function main()
-    {
-        $suite  = new PHPUnit_Framework_TestSuite("Zend_Amf_ResponseTest");
-        $result = PHPUnit_TextUI_TestRunner::run($suite);
-    }
-
-    /**
-     * test that we can get the server name from the client name for deserialization.
-     *
-     */
-    public function testGetMappedClassNameForClient()
-    {
-        $class = Zend_Amf_Parse_TypeLoader::getMappedClassName('flex.messaging.messages.RemotingMessage');
-        $this->assertEquals('Zend_Amf_Value_Messaging_RemotingMessage', $class);
-    }
-
-    /**
-     * Test that we can get the return name from the server name for serialization
-     *
-     */
-    public function testGetMappedClassNameForServer()
-    {
-        $class = Zend_Amf_Parse_TypeLoader::getMappedClassName('Zend_Amf_Value_Messaging_RemotingMessage');
-        $this->assertEquals('flex.messaging.messages.RemotingMessage', $class);
-    }
-
-    /**
-     * Test that we can find and load the remote matching class name
-     *
-     */
-    public function testLoadTypeSuccess(){
-        $class = Zend_Amf_Parse_TypeLoader::loadType('flex.messaging.messages.RemotingMessage');
-        $this->assertEquals('Zend_Amf_Value_Messaging_RemotingMessage', $class);
-    }
-
-    /**
-     * Test that adding our own mappping will result in it being added to the classMap
-     *
-     */
-    public function testSetMappingClass()
-    {
-        Zend_Amf_Parse_TypeLoader::setMapping('com.example.vo.Contact','Contact');
-        $class = Zend_Amf_Parse_TypeLoader::getMappedClassName('com.example.vo.Contact');
-        $this->assertEquals('Contact', $class);
-    }
-
-    public function testUnknownClassMap() {
-        $class = Zend_Amf_Parse_TypeLoader::loadType('com.example.vo.Bogus');
-        $this->assertEquals('stdClass', $class);
-    }
-}
-
-if (PHPUnit_MAIN_METHOD == 'Zend_Amf_TypeloaderTest::main') {
-    Zend_Amf_ResponseTest::main();
-}
-?>
+<?php
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Amf_TypeloaderTest::main');
+}
+
+require_once dirname(__FILE__) . '/../../TestHelper.php';
+require_once 'Zend/Amf/Parse/TypeLoader.php';
+
+class Zend_Amf_TypeloaderTest extends PHPUnit_Framework_TestCase
+{
+    public static function main()
+    {
+        $suite  = new PHPUnit_Framework_TestSuite("Zend_Amf_ResponseTest");
+        $result = PHPUnit_TextUI_TestRunner::run($suite);
+    }
+
+    /**
+     * test that we can get the server name from the client name for deserialization.
+     *
+     */
+    public function testGetMappedClassNameForClient()
+    {
+        $class = Zend_Amf_Parse_TypeLoader::getMappedClassName('flex.messaging.messages.RemotingMessage');
+        $this->assertEquals('Zend_Amf_Value_Messaging_RemotingMessage', $class);
+    }
+
+    /**
+     * Test that we can get the return name from the server name for serialization
+     *
+     */
+    public function testGetMappedClassNameForServer()
+    {
+        $class = Zend_Amf_Parse_TypeLoader::getMappedClassName('Zend_Amf_Value_Messaging_RemotingMessage');
+        $this->assertEquals('flex.messaging.messages.RemotingMessage', $class);
+    }
+
+    /**
+     * Test that we can find and load the remote matching class name
+     *
+     */
+    public function testLoadTypeSuccess(){
+        $class = Zend_Amf_Parse_TypeLoader::loadType('flex.messaging.messages.RemotingMessage');
+        $this->assertEquals('Zend_Amf_Value_Messaging_RemotingMessage', $class);
+    }
+
+    /**
+     * Test that adding our own mappping will result in it being added to the classMap
+     *
+     */
+    public function testSetMappingClass()
+    {
+        Zend_Amf_Parse_TypeLoader::setMapping('com.example.vo.Contact','Contact');
+        $class = Zend_Amf_Parse_TypeLoader::getMappedClassName('com.example.vo.Contact');
+        $this->assertEquals('Contact', $class);
+    }
+
+    public function testUnknownClassMap() {
+        $class = Zend_Amf_Parse_TypeLoader::loadType('com.example.vo.Bogus');
+        $this->assertEquals('stdClass', $class);
+    }
+}
+
+if (PHPUnit_MAIN_METHOD == 'Zend_Amf_TypeloaderTest::main') {
+    Zend_Amf_ResponseTest::main();
+}