Changeset 1853
- Timestamp:
- 09/26/08 23:38:27 (3 months ago)
- Files:
-
- framework/trunk/src/main/php/net/stubbles/lang/types (moved) (moved from labs/incubator/src/main/php/net/stubbles/util/date)
- framework/trunk/src/main/php/net/stubbles/lang/types/stubDate.php (copied) (copied from labs/incubator/src/main/php/net/stubbles/util/date/stubDate.php) (2 diffs)
- framework/trunk/src/main/php/net/stubbles/lang/types/stubTimezone.php (copied) (copied from labs/incubator/src/main/php/net/stubbles/util/date/stubTimezone.php) (4 diffs)
- framework/trunk/src/test/php/net/stubbles/lang/types (moved) (moved from labs/incubator/src/test/php/net/stubbles/util/date)
- framework/trunk/src/test/php/net/stubbles/lang/types/stubDateTestCase.php (copied) (copied from labs/incubator/src/test/php/net/stubbles/util/date/stubDateTestCase.php) (1 diff)
- framework/trunk/src/test/php/net/stubbles/lang/types/stubTimeZoneTestCase.php (copied) (copied from labs/incubator/src/test/php/net/stubbles/util/date/stubTimeZoneTestCase.php) (2 diffs)
- framework/trunk/src/test/php/net/stubbles/stubTestSuite.php (modified) (1 diff)
- labs/incubator/src/test/AllTests.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
framework/trunk/src/main/php/net/stubbles/lang/types/stubDate.php
r1727 r1853 6 6 * @author Frank Kleine <mikey@stubbles.net> 7 7 * @package stubbles 8 * @subpackage util_date8 * @subpackage lang_types 9 9 * @version $Id$ 10 10 */ 11 11 stubClassLoader::load('net::stubbles::lang::exceptions::stubIllegalArgumentException', 12 'net::stubbles:: util::date::stubTimeZone'12 'net::stubbles::lang::types::stubTimeZone' 13 13 ); 14 14 /** … … 19 19 * 20 20 * @package stubbles 21 * @subpackage util_date21 * @subpackage lang_types 22 22 */ 23 23 class stubDate extends stubSerializableObject framework/trunk/src/main/php/net/stubbles/lang/types/stubTimezone.php
r1727 r1853 6 6 * @author Frank Kleine <mikey@stubbles.net> 7 7 * @package stubbles 8 * @subpackage util_date8 * @subpackage lang_types 9 9 * @version $Id$ 10 10 */ 11 11 stubClassLoader::load('net::stubbles::lang::exceptions::stubIllegalArgumentException', 12 'net::stubbles:: util::date::stubDate'12 'net::stubbles::lang::types::stubDate' 13 13 ); 14 14 /** … … 19 19 * 20 20 * @package stubbles 21 * @subpackage util_date21 * @subpackage lang_types 22 22 */ 23 23 class stubTimeZone extends stubBaseObject … … 44 44 $this->timeZone = timezone_open($timeZone); 45 45 } elseif (null === $timeZone) { 46 $this->timeZone = timezone_open(date_default_timezone_get()); 46 $this->timeZone = timezone_open(date_default_timezone_get()); 47 47 } else { 48 48 $this->timeZone = $timeZone; … … 102 102 if (null === $date) { 103 103 $this->timeZone->getOffset(new DateTime('now')); 104 } 104 } 105 105 106 106 return $this->timeZone->getOffset($date->getHandle()); framework/trunk/src/test/php/net/stubbles/lang/types/stubDateTestCase.php
r1729 r1853 1 1 <?php 2 2 /** 3 * Tests for net::stubbles:: util::date::stubDate.3 * Tests for net::stubbles::lang::types::stubDate. 4 4 * 5 5 * @author Alex Kiesel 6 6 * @author Frank Kleine <mikey@stubbles.net> 7 7 * @package stubbles 8 * @subpackage util_date_test8 * @subpackage lang_types_test 9 9 * @version $Id$ 10 10 */ 11 stubClassLoader::load('net::stubbles:: util::date::stubDate');11 stubClassLoader::load('net::stubbles::lang::types::stubDate'); 12 12 /** 13 * Tests for net::stubbles:: util::date::stubTimeZone.13 * Tests for net::stubbles::lang::types::stubTimeZone. 14 14 * 15 15 * @package stubbles 16 * @subpackage util_date_test 17 * @group util_date 16 * @subpackage lang_types_test 17 * @group lang 18 * @group lang_types 18 19 */ 19 20 class stubDateTestCase extends PHPUnit_Framework_TestCase framework/trunk/src/test/php/net/stubbles/lang/types/stubTimeZoneTestCase.php
r1727 r1853 1 1 <?php 2 2 /** 3 * Tests for net::stubbles:: util::date::stubTimeZone.3 * Tests for net::stubbles::lang::types::stubTimeZone. 4 4 * 5 5 * @author Alex Kiesel 6 6 * @author Frank Kleine <mikey@stubbles.net> 7 7 * @package stubbles 8 * @subpackage util_date_test8 * @subpackage lang_types_test 9 9 * @version $Id$ 10 10 */ 11 stubClassLoader::load('net::stubbles:: util::date::stubTimeZone');11 stubClassLoader::load('net::stubbles::lang::types::stubTimeZone'); 12 12 /** 13 * Tests for net::stubbles:: util::date::stubTimeZone.13 * Tests for net::stubbles::lang::types::stubTimeZone. 14 14 * 15 15 * @package stubbles 16 * @subpackage util_date_test 17 * @group util_date 16 * @subpackage lang_types_test 17 * @group lang 18 * @group lang_types 18 19 */ 19 20 class stubTimeZoneTestCase extends PHPUnit_Framework_TestCase … … 98 99 $this->assertEquals(new stubDate('2006-12-31 14:00:00 Europe/Berlin'), $this->timeZone->translate($date)); 99 100 } 100 101 101 } 102 102 ?> framework/trunk/src/test/php/net/stubbles/stubTestSuite.php
r1763 r1853 53 53 $suite->addTestFile($dir . '/lang/serialize/stubSerializableObjectTestCase.php'); 54 54 $suite->addTestFile($dir . '/lang/serialize/stubSerializedObjectTestCase.php'); 55 56 // types 57 $suite->addTestFile($dir . '/lang/types/stubDateTestCase.php'); 58 $suite->addTestFile($dir . '/lang/types/stubTimeZoneTestCase.php'); 59 55 60 return $suite; 56 61 } labs/incubator/src/test/AllTests.php
r1727 r1853 26 26 require_once TEST_SRC_PATH . '/php/net/stubbles/lang/LangTestSuite.php'; 27 27 require_once TEST_SRC_PATH . '/php/net/stubbles/remote/RemoteTestSuite.php'; 28 require_once TEST_SRC_PATH . '/php/net/stubbles/util/UtilTestSuite.php';29 28 /** 30 29 * Class to organize all tests. … … 55 54 $suite->addTestSuite('LangTestSuite'); 56 55 $suite->addTestSuite('RemoteTestSuite'); 57 $suite->addTestSuite('UtilTestSuite');58 56 return $suite; 59 57 }
