summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/ActiveBricksTest.page2
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/ActiveButtonTest.page2
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/ActiveCheckBoxTest.page1
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/ActiveControlExpressionTag.page1
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/ActiveControlWithTinyMce.page1
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/ActiveDropDownList.page2
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/ActiveHiddenFieldTest.page5
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/ActiveHyperLinkTest.page4
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/ActiveImageButtonTest.page2
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/ActiveLinkButtonTest.page2
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/ActiveListBoxMasterTest.page2
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/ActiveListBoxTest.page2
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/ActivePanelTest.page1
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/ActivePanelVisibleTest.page1
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonListTest.page2
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonTest.page1
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/ActiveRedirectionTest.page1
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/ActiveTextBoxCallback.page1
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/AutoCompleteTest.page5
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/Callback.page10
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/CallbackCustomValidatorTest.page2
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/ClientSideDispatch.page11
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/ControlAdapterTest.page5
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/CustomTemplateControlTest.page3
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/CustomValidatorByPass.page13
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/DelayedCallback.page1
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/DisplayStyleTest.page1
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/DynamicRepeaterDataTest.page1
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/EventTriggeredCallback.page1
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/GerTurno2.page3
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/InPlaceWithValidator.page13
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/LargePageStateTest.page1
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/LargePageStateTest2.page1
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/MessagesPanelTest.page1
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/MyTabPanelTest.page1
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/NestedActiveControls.page7
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/NullStateTest.page1
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/PopulateActiveList.page1
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/PostLoadingTest.page2
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/RadioButtonListTest.page9
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/RatingList.page1
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/RepeaterWithActiveControls.page1
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/ReplaceContentTest.page1
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/Sessioned/PageStateTest.page1
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/TActiveCheckBoxListTest.page2
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/TActiveFileUploadAutoPostBackTest.page8
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/TInPlaceTextBoxTest.page4
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/TextBoxValidationCallback.page1
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/TimeTriggeredCallbackTest.page1
-rwxr-xr-xtests/FunctionalTests/active-controls/protected/pages/ValueTriggerCallbackTest.page1
-rwxr-xr-xtests/FunctionalTests/active-controls/tests/ActiveButtonTestCase.php4
-rwxr-xr-xtests/FunctionalTests/features/protected/controls/Layout.tpl1
-rwxr-xr-xtests/FunctionalTests/features/protected/pages/RatingList.page30
-rw-r--r--tests/FunctionalTests/features/protected/pages/RatingList.php9
-rwxr-xr-xtests/FunctionalTests/tickets/protected/controls/ToggleImageButton.php1
-rwxr-xr-xtests/FunctionalTests/tickets/protected/pages/ExtendedToggleImageButton.php7
-rwxr-xr-xtests/FunctionalTests/tickets/protected/pages/Layout.tpl9
-rwxr-xr-xtests/FunctionalTests/tickets/protected/pages/Ticket653/Layout.tpl9
-rwxr-xr-xtests/FunctionalTests/tickets/protected/pages/Ticket659.php5
-rw-r--r--tests/FunctionalTests/tickets/protected/pages/ToggleTest.php8
-rwxr-xr-xtests/FunctionalTests/tickets/tests/Ticket656TestCase.php9
-rwxr-xr-xtests/FunctionalTests/validators/protected/pages/Layout.tpl1
-rwxr-xr-xtests/FunctionalTests/validators/tests/DatePickerTestCase.php2
-rwxr-xr-xtests/FunctionalTests/validators/tests/RequiredFieldTestCase.php2
-rw-r--r--tests/simple_unit/ActiveRecord/ActiveRecordDynamicCallTestCase.php2
-rw-r--r--tests/simple_unit/ActiveRecord/ActiveRecordFinderTestCase.php2
-rw-r--r--tests/simple_unit/ActiveRecord/ActiveRecordMySql5TestCase.php3
-rw-r--r--tests/simple_unit/ActiveRecord/ActiveRecordRegistryTestCase.php2
-rw-r--r--tests/simple_unit/ActiveRecord/BaseActiveRecordTestCase.php2
-rw-r--r--tests/simple_unit/ActiveRecord/CountRecordsTestCase.php2
-rw-r--r--tests/simple_unit/ActiveRecord/CriteriaTestCase.php2
-rw-r--r--tests/simple_unit/ActiveRecord/DeleteByPkTestCase.php3
-rw-r--r--tests/simple_unit/ActiveRecord/FindByPksTestCase.php2
-rw-r--r--tests/simple_unit/ActiveRecord/FindBySqlTestCase.php2
-rw-r--r--tests/simple_unit/ActiveRecord/ForeignKeyTestCase.php2
-rw-r--r--tests/simple_unit/ActiveRecord/ForeignObjectUpdateTest.php2
-rw-r--r--tests/simple_unit/ActiveRecord/MultipleForeignKeyTestCase.php2
-rw-r--r--tests/simple_unit/ActiveRecord/RecordEventTestCase.php2
-rw-r--r--tests/simple_unit/ActiveRecord/SqliteTestCase.php2
-rw-r--r--tests/simple_unit/ActiveRecord/UserRecordTestCase.php2
-rw-r--r--tests/simple_unit/ActiveRecord/ViewRecordTestCase.php3
-rw-r--r--tests/simple_unit/ActiveRecord/records/Blogs.php2
-rw-r--r--tests/simple_unit/ActiveRecord/records/DepSections.php2
-rw-r--r--tests/simple_unit/ActiveRecord/records/DepartmentRecord.php2
-rw-r--r--tests/simple_unit/ActiveRecord/records/ItemRecord.php2
-rw-r--r--tests/simple_unit/ActiveRecord/records/SimpleUser.php2
-rw-r--r--tests/simple_unit/ActiveRecord/records/SqliteUsers.php2
-rw-r--r--tests/simple_unit/ActiveRecord/records/UserRecord.php2
-rw-r--r--tests/simple_unit/DbCommon/CommandBuilderMssqlTest.php2
-rw-r--r--tests/simple_unit/DbCommon/CommandBuilderMysqlTest.php2
-rw-r--r--tests/simple_unit/DbCommon/CommandBuilderPgsqlTest.php2
-rw-r--r--tests/simple_unit/DbCommon/MssqlColumnTest.php2
-rw-r--r--tests/simple_unit/DbCommon/Mysql4ColumnTest.php2
-rw-r--r--tests/simple_unit/DbCommon/MysqlColumnTest.php2
-rw-r--r--tests/simple_unit/DbCommon/PgsqlColumnTest.php2
-rw-r--r--tests/simple_unit/DbCommon/SqliteColumnTest.php3
-rw-r--r--tests/simple_unit/I18N/MysqlMessageSourceTestCase.php2
-rw-r--r--tests/simple_unit/Soap/ContactManager.php34
-rw-r--r--tests/simple_unit/Soap/SoapTestCase.php3
-rw-r--r--tests/simple_unit/SqlMap/ActiveRecordSqlMapTest.php2
-rw-r--r--tests/simple_unit/SqlMap/BaseCase.php2
-rw-r--r--tests/simple_unit/SqlMap/CacheTest.php2
-rw-r--r--tests/simple_unit/SqlMap/DelegateTest.php2
-rw-r--r--tests/simple_unit/SqlMap/Dynamic/DynamicTest.php2
-rw-r--r--tests/simple_unit/SqlMap/GroupByTest.php2
-rw-r--r--tests/simple_unit/SqlMap/InheritanceTest.php3
-rw-r--r--tests/simple_unit/SqlMap/ParameterMapTest.php2
-rw-r--r--tests/simple_unit/SqlMap/PropertyAccessTest.php2
-rw-r--r--tests/simple_unit/SqlMap/ResultClassTest.php2
-rw-r--r--tests/simple_unit/SqlMap/ResultMapTest.php2
-rw-r--r--tests/simple_unit/SqlMap/SelectKeyTest.php2
-rw-r--r--tests/simple_unit/SqlMap/SqlMapCacheTest.php2
-rw-r--r--tests/simple_unit/SqlMap/StatementExtendsTest.php2
-rw-r--r--tests/simple_unit/SqlMap/StatementTest.php2
-rw-r--r--tests/simple_unit/SqlMap/TestQueryForMap.php2
-rw-r--r--tests/simple_unit/SqlMap/common.php2
-rw-r--r--tests/simple_unit/SqlMap/domain/A.php2
-rw-r--r--tests/simple_unit/SqlMap/domain/Account.php2
-rw-r--r--tests/simple_unit/SqlMap/domain/AccountBis.php2
-rw-r--r--tests/simple_unit/SqlMap/domain/AccountCollection.php2
-rw-r--r--tests/simple_unit/SqlMap/domain/B.php2
-rw-r--r--tests/simple_unit/SqlMap/domain/Book.php4
-rw-r--r--tests/simple_unit/SqlMap/domain/C.php2
-rw-r--r--tests/simple_unit/SqlMap/domain/Category.php2
-rw-r--r--tests/simple_unit/SqlMap/domain/Complex.php2
-rw-r--r--tests/simple_unit/SqlMap/domain/D.php2
-rw-r--r--tests/simple_unit/SqlMap/domain/Document.php2
-rw-r--r--tests/simple_unit/SqlMap/domain/DocumentCollection.php2
-rw-r--r--tests/simple_unit/SqlMap/domain/E.php2
-rw-r--r--tests/simple_unit/SqlMap/domain/F.php2
-rw-r--r--tests/simple_unit/SqlMap/domain/LineItem.php2
-rw-r--r--tests/simple_unit/SqlMap/domain/LineItemCollection.php2
-rw-r--r--tests/simple_unit/SqlMap/domain/Newspaper.php2
-rw-r--r--tests/simple_unit/SqlMap/domain/Order.php2
-rw-r--r--tests/simple_unit/SqlMap/domain/Other.php2
-rw-r--r--tests/simple_unit/SqlMap/domain/Sample.php2
-rw-r--r--tests/simple_unit/SqlMap/domain/Search.php2
-rw-r--r--tests/simple_unit/SqlMap/domain/User.php2
-rw-r--r--tests/simple_unit/SqlMap/gen.php2
-rw-r--r--tests/simple_unit/SqlMap/queryForListLimitTest.php2
-rw-r--r--tests/simple_unit/TableGateway/BaseGatewayTest.php3
-rw-r--r--tests/simple_unit/TableGateway/CountTest.php3
-rw-r--r--tests/simple_unit/TableGateway/DeleteByPkTest.php3
-rw-r--r--tests/simple_unit/TableGateway/MagicCallTest.php3
-rw-r--r--tests/simple_unit/TableGateway/TableGatewayPgsqlTest.php3
-rw-r--r--tests/simple_unit/TableGateway/TableInfoGatewayTest.php3
-rw-r--r--tests/simple_unit/TableGateway/TestFindByPk.php3
-rw-r--r--tests/simple_unit/Tickets/Ticket589Test.php2
-rw-r--r--tests/simple_unit/unit.php2
-rw-r--r--tests/simple_unit/ws.php2
-rw-r--r--tests/test_tools/PradoGenericSelenium2Test.php49
-rw-r--r--tests/test_tools/PradoGenericSeleniumTest.php25
-rw-r--r--tests/test_tools/README.txt90
-rw-r--r--tests/test_tools/phpunit_bootstrap.php3
-rw-r--r--tests/test_tools/simpletest/HtmlReporterWithCoverage.php65
-rw-r--r--tests/test_tools/simpletest/authentication.php3
-rw-r--r--tests/test_tools/simpletest/browser.php9
-rw-r--r--tests/test_tools/simpletest/collector.php28
-rw-r--r--tests/test_tools/simpletest/compatibility.php1
-rw-r--r--tests/test_tools/simpletest/cookies.php51
-rw-r--r--tests/test_tools/simpletest/detached.php3
-rw-r--r--tests/test_tools/simpletest/dumper.php3
-rw-r--r--tests/test_tools/simpletest/encoding.php91
-rw-r--r--tests/test_tools/simpletest/errors.php3
-rw-r--r--tests/test_tools/simpletest/exceptions.php3
-rw-r--r--tests/test_tools/simpletest/expectation.php1
-rw-r--r--tests/test_tools/simpletest/form.php49
-rw-r--r--tests/test_tools/simpletest/frames.php3
-rw-r--r--tests/test_tools/simpletest/http.php89
-rw-r--r--tests/test_tools/simpletest/invoker.php1
-rw-r--r--tests/test_tools/simpletest/mock_objects.php3
-rw-r--r--tests/test_tools/simpletest/options.php1
-rw-r--r--tests/test_tools/simpletest/page.php5
-rw-r--r--tests/test_tools/simpletest/parser.php3
-rw-r--r--tests/test_tools/simpletest/reflection_php4.php3
-rw-r--r--tests/test_tools/simpletest/reflection_php5.php7
-rw-r--r--tests/test_tools/simpletest/remote.php13
-rw-r--r--tests/test_tools/simpletest/reporter.php3
-rw-r--r--tests/test_tools/simpletest/runner.php49
-rw-r--r--tests/test_tools/simpletest/scorer.php3
-rw-r--r--tests/test_tools/simpletest/selector.php3
-rw-r--r--tests/test_tools/simpletest/shell_tester.php7
-rw-r--r--tests/test_tools/simpletest/simple_test.php1
-rw-r--r--tests/test_tools/simpletest/simpletest.php3
-rw-r--r--tests/test_tools/simpletest/socket.php3
-rw-r--r--tests/test_tools/simpletest/tag.php235
-rw-r--r--tests/test_tools/simpletest/test_case.php1
-rw-r--r--tests/test_tools/simpletest/unit_tester.php1
-rw-r--r--tests/test_tools/simpletest/url.php3
-rw-r--r--tests/test_tools/simpletest/user_agent.php49
-rw-r--r--tests/test_tools/simpletest/web_tester.php213
-rw-r--r--tests/test_tools/simpletest/xml.php1
-rw-r--r--tests/unit/AllTests.php2
-rw-r--r--tests/unit/Caching/AllTests.php7
-rw-r--r--tests/unit/Caching/TAPCCacheTest.php15
-rw-r--r--tests/unit/Caching/TDirectoryCacheDependencyTest.php2
-rw-r--r--tests/unit/Caching/TFileCacheDependencyTest.php2
-rw-r--r--tests/unit/Caching/TMemCacheTest.php13
-rw-r--r--tests/unit/Caching/TSqliteCacheTest.php17
-rw-r--r--tests/unit/Collections/AllTests.php7
-rw-r--r--tests/unit/Collections/TAttributeCollectionTest.php19
-rw-r--r--tests/unit/Collections/TListTest.php68
-rw-r--r--tests/unit/Collections/TMapTest.php3
-rw-r--r--tests/unit/Collections/TPagedDataSourceTest.php25
-rw-r--r--tests/unit/Collections/TPagedListTest.php53
-rw-r--r--tests/unit/Collections/TPriorityMapTest.php161
-rw-r--r--tests/unit/Collections/TQueueTest.php13
-rw-r--r--tests/unit/Collections/TStackTest.php13
-rw-r--r--tests/unit/Data/DataGateway/AllTests.php7
-rw-r--r--tests/unit/Data/DataGateway/TSqlCriteriaTest.php25
-rw-r--r--tests/unit/Data/SqlMap/AllTests.php1
-rw-r--r--tests/unit/Data/SqlMap/DataMapper/AllTests.php3
-rw-r--r--tests/unit/Data/SqlMap/DataMapper/TPropertyAccessTest.php2
-rw-r--r--tests/unit/Data/SqlMap/DynamicParameterTest.php2
-rw-r--r--tests/unit/Data/TDbCommandTest.php2
-rw-r--r--tests/unit/Data/TDbConnectionTest.php2
-rw-r--r--tests/unit/Data/TDbDataReaderTest.php2
-rw-r--r--tests/unit/Data/TDbTransactionTest.php2
-rw-r--r--tests/unit/I18N/core/AllTests.php7
-rw-r--r--tests/unit/I18N/core/ChoiceFormatTest.php2
-rw-r--r--tests/unit/I18N/core/CultureInfoTest.php22
-rw-r--r--tests/unit/I18N/core/DateFormatTest.php56
-rw-r--r--tests/unit/I18N/core/DateTimeFormatInfoTest.php67
-rw-r--r--tests/unit/I18N/core/NumberFormatInfoTest.php36
-rw-r--r--tests/unit/I18N/core/NumberFormatTest.php52
-rw-r--r--tests/unit/IO/AllTests.php7
-rw-r--r--tests/unit/IO/TTarFileExtractorTest.php5
-rw-r--r--tests/unit/IO/TTextWriterTest.php3
-rw-r--r--tests/unit/Security/AllTests.php7
-rw-r--r--tests/unit/Security/TAuthManagerTest.php35
-rw-r--r--tests/unit/Security/TAuthorizationRuleTest.php15
-rw-r--r--tests/unit/Security/TSecurityManagerTest.php31
-rw-r--r--tests/unit/Security/TUserManagerTest.php31
-rw-r--r--tests/unit/Security/TUserTest.php21
-rw-r--r--tests/unit/TComponentTest.php970
-rw-r--r--tests/unit/Util/AllTests.php7
-rw-r--r--tests/unit/Util/TDateTimeStampTest.php3
-rw-r--r--tests/unit/Util/TLoggerTest.php3
-rw-r--r--tests/unit/Util/TSimpleDateFormatterTest.php21
-rw-r--r--tests/unit/Web/AllTests.php9
-rw-r--r--tests/unit/Web/TAssetManagerTest.php57
-rw-r--r--tests/unit/Web/TCacheHttpSessionTest.php31
-rw-r--r--tests/unit/Web/THttpCookieCollectionTest.php5
-rw-r--r--tests/unit/Web/THttpCookieTest.php3
-rw-r--r--tests/unit/Web/THttpRequestTest.php3
-rw-r--r--tests/unit/Web/THttpResponseTest.php21
-rw-r--r--tests/unit/Web/THttpSessionTest.php3
-rw-r--r--tests/unit/Web/THttpUtilityTest.php3
-rw-r--r--tests/unit/Web/TUriTest.php13
-rw-r--r--tests/unit/Web/UI/ActiveControls/AllTests.php7
-rw-r--r--tests/unit/Web/UI/ActiveControls/TActiveHiddenFieldTest.php2
-rw-r--r--tests/unit/Web/UI/AllTests.php7
-rw-r--r--tests/unit/Web/UI/TClientScriptManagerTest.php3
-rw-r--r--tests/unit/Web/UI/TControlAdapterTest.php23
-rw-r--r--tests/unit/Web/UI/TControlTest.php133
-rw-r--r--tests/unit/Web/UI/TFormTest.php11
-rw-r--r--tests/unit/Web/UI/THtmlWriterTest.php13
-rw-r--r--tests/unit/Web/UI/TPageStatePersisterTest.php9
-rw-r--r--tests/unit/Web/UI/TPageTest.php87
-rw-r--r--tests/unit/Web/UI/TSessionPageStatePersisterTest.php11
-rw-r--r--tests/unit/Web/UI/TTemplateControlTest.php17
-rw-r--r--tests/unit/Web/UI/TTemplateManagerTest.php11
-rw-r--r--tests/unit/Web/UI/TTemplateTest.php23
-rw-r--r--tests/unit/Web/UI/TThemeManagerTest.php13
-rw-r--r--tests/unit/Web/UI/TThemeTest.php17
-rw-r--r--tests/unit/Web/UI/WebControls/AllTests.php7
-rw-r--r--tests/unit/Web/UI/WebControls/TDropDownListTest.php1
-rw-r--r--tests/unit/Web/UI/WebControls/TLabelTest.php2
-rw-r--r--tests/unit/Web/UI/WebControls/TRequiredFieldValidatorTest.php2
-rw-r--r--tests/unit/Web/UI/WebControls/TXmlTransformTest.php5
-rw-r--r--tests/unit/Xml/AllTests.php7
-rw-r--r--tests/unit/Xml/TXmlDocumentTest.php7
-rw-r--r--tests/unit/Xml/TXmlElementListTest.php3
-rw-r--r--tests/unit/Xml/TXmlElementTest.php3
274 files changed, 1874 insertions, 2210 deletions
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveBricksTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveBricksTest.page
index 7cb8c6b3..4ea65f04 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveBricksTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveBricksTest.page
@@ -37,6 +37,4 @@
AIP
</com:TActivePanel>
- <com:TJavascriptLogger />
-
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveButtonTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveButtonTest.page
index 2e192c19..a5788625 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveButtonTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveButtonTest.page
@@ -6,6 +6,4 @@
<com:TActiveLabel ID="label1" Text="Label 1" />
- <com:TJavascriptLogger />
-
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveCheckBoxTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveCheckBoxTest.page
index 431d42f2..cea4d3d8 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveCheckBoxTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveCheckBoxTest.page
@@ -25,5 +25,4 @@
position: absolute; right: 0; top: 0">
Loading...
</div>
- <com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveControlExpressionTag.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveControlExpressionTag.page
index 7b983cd7..b4ce61d4 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveControlExpressionTag.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveControlExpressionTag.page
@@ -22,6 +22,5 @@
<com:TActiveButton ID="button2" Text="Show More!" Enabled="false"
OnCallback="button2_callback" />
-<com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveControlWithTinyMce.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveControlWithTinyMce.page
index aa3be754..c6748403 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveControlWithTinyMce.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveControlWithTinyMce.page
@@ -7,5 +7,4 @@
<com:TActiveLabel ID="label1" />
-<com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveDropDownList.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveDropDownList.page
index dc71a228..4fcd789a 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveDropDownList.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveDropDownList.page
@@ -26,6 +26,4 @@
<com:TButton ID="button5" Text="Post Back" OnClick="do_postback"/>
</div>
- <com:TJavascriptLogger />
-
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveHiddenFieldTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveHiddenFieldTest.page
index f0fc4b92..837cc580 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveHiddenFieldTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveHiddenFieldTest.page
@@ -1,9 +1,9 @@
<com:TForm ID="form1">
<h1>Active HiddenField Test Case</h1>
-
+
<com:TActiveHiddenField ID="HiddenFieldEmpty" />
<com:TActiveHiddenField ID="HiddenFieldUsed" Value="My value" />
-
+
<div>
<com:TActiveButton ID="Button1" Text="Set value to HiddenFieldEmpty" OnClick="onSetValue" />
<com:TActiveButton ID="Button2" Text="Get value from HiddenFieldUsed" OnClick="onGetValue" />
@@ -12,5 +12,4 @@
<div>
<com:TActiveLabel ID="ResponseLabel" Text="Value of current hidden field" />
</div>
- <com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveHyperLinkTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveHyperLinkTest.page
index 59098052..740c3b21 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveHyperLinkTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveHyperLinkTest.page
@@ -1,6 +1,6 @@
<com:TForm ID="form1">
<h1>Active HyperLink Test Case</h1>
-
+
<div style="margin:1em; padding:1em; border:1px solid #ccc; text-align:center;">
<com:TActiveHyperLink ID="link1" Text="Link 1" NavigateUrl="http://www.pradosoft.com" />
</div>
@@ -8,6 +8,4 @@
<com:TActiveButton ID="button2" Text="Change Image" OnClick="change_image" />
<com:TActiveButton ID="button3" Text="Change Target" OnClick="change_target" />
<com:TActiveButton ID="button4" Text="Change URL" OnClick="change_url" />
-
- <com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveImageButtonTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveImageButtonTest.page
index 7696261a..ff0f588f 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveImageButtonTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveImageButtonTest.page
@@ -19,6 +19,4 @@
<com:TActiveButton ID="button3" Text="Change Align" OnClick="change_align" />
<com:TActiveButton ID="button4" Text="Change Description" OnClick="change_description" />
- <com:TJavascriptLogger />
-
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveLinkButtonTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveLinkButtonTest.page
index cb9f0322..39c53fe8 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveLinkButtonTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveLinkButtonTest.page
@@ -6,6 +6,4 @@
<com:TActiveLabel ID="label1" Text="Label 1" />
- <com:TJavascriptLogger />
-
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveListBoxMasterTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveListBoxMasterTest.page
index f7c6baaf..115b833a 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveListBoxMasterTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveListBoxMasterTest.page
@@ -23,6 +23,4 @@
<com:TActiveButton ID="button6" Text="Change to Multi-Select" OnClick="change_to_multiple" />
<com:TActiveButton ID="button7" Text="Change to Single-Select" OnClick="change_to_single" />
</div>
-
- <com:TJavascriptLogger />
</com:TContent> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveListBoxTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveListBoxTest.page
index 318d53c3..bf13a61b 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveListBoxTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveListBoxTest.page
@@ -22,6 +22,4 @@
<com:TActiveButton ID="button6" Text="Change to Multi-Select" OnClick="change_to_multiple" />
<com:TActiveButton ID="button7" Text="Change to Single-Select" OnClick="change_to_single" />
</div>
-
- <com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActivePanelTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActivePanelTest.page
index 13133a32..645a2a92 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActivePanelTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActivePanelTest.page
@@ -16,5 +16,4 @@
});
});
</script>
- <com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActivePanelVisibleTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActivePanelVisibleTest.page
index 0795e46b..cb2802e5 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActivePanelVisibleTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActivePanelVisibleTest.page
@@ -12,6 +12,5 @@
<com:TActivePanel ID="pnlB">bar</com:TActivePanel>
-<com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonListTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonListTest.page
index 26feb594..1c59cfed 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonListTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonListTest.page
@@ -17,6 +17,4 @@
<com:TActiveButton ID="button4" Text="Select Index 4" OnClick="select_index_4" />
</div>
- <com:TJavascriptLogger />
-
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonTest.page
index 2bb4c9de..18e4fc37 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonTest.page
@@ -34,5 +34,4 @@
position: absolute; right: 0; top: 0">
Loading...
</div>
- <com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveRedirectionTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveRedirectionTest.page
index 5f7959c5..fa0d8caa 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveRedirectionTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveRedirectionTest.page
@@ -3,6 +3,5 @@
<com:TActiveButton Text="Redirect to Default Page" OnClick="button_clicked" />
-<com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveTextBoxCallback.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveTextBoxCallback.page
index b05ce62e..d0a750ac 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveTextBoxCallback.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveTextBoxCallback.page
@@ -2,5 +2,4 @@
<h1>ActiveTextBox Callback Test</h1>
<com:TActiveTextBox ID="textbox1" AutoPostBack="true" OnCallback="textbox1_callback" />
<com:TActiveLabel ID="label1" Text="Label 1" />
- <com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/AutoCompleteTest.page b/tests/FunctionalTests/active-controls/protected/pages/AutoCompleteTest.page
index 477764c3..f4fffc63 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/AutoCompleteTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/AutoCompleteTest.page
@@ -58,7 +58,7 @@
<li>
&lt;&lt;
<span class="select"><%# $this->Data %></span>
- &gt;&gt;
+ &gt;&gt;
</li>
</prop:Suggestions.ItemTemplate>
</com:TAutoComplete>
@@ -79,7 +79,7 @@
OnSuggest="suggestCountries"
OnCallback="callback_requested"
OnSuggestionSelected="suggestion_selected"
- ResultPanel.CssClass="autocomplete"
+ ResultPanel.CssClass="autocomplete"
MinChars="4" Frequency="2" />
<p><br /></p>
@@ -91,5 +91,4 @@
<p><br /></p>
<p><br /></p>
<p><br /></p>
- <com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/Callback.page b/tests/FunctionalTests/active-controls/protected/pages/Callback.page
index d8744760..3404cf6e 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/Callback.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/Callback.page
@@ -1,15 +1,13 @@
<com:TForm>
<com:TCallback ID="callback1" OnCallback="callback1_Requested" />
- <script type="text/javascript">
+ <script type="text/javascript">
function do_callback1()
- {
+ {
var callback = <%= $this->callback1->ActiveControl->Javascript %>;
callback.dispatch();
- }
- </script>
+ }
+ </script>
<div onclick="do_callback1()">Click Me!</div>
- <com:TJavascriptLogger />
-
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/CallbackCustomValidatorTest.page b/tests/FunctionalTests/active-controls/protected/pages/CallbackCustomValidatorTest.page
index a99fbf55..4c82da40 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/CallbackCustomValidatorTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/CallbackCustomValidatorTest.page
@@ -37,6 +37,4 @@
<span id="loader" style="display:none;" onfocus="alert('ok')" class="loader">Loading...</span>
- <com:TJavascriptLogger />
-
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ClientSideDispatch.page b/tests/FunctionalTests/active-controls/protected/pages/ClientSideDispatch.page
index acf56bfe..de4ea482 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ClientSideDispatch.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ClientSideDispatch.page
@@ -7,21 +7,20 @@
var link1 = Prado.CallbackRequest.getRequestById('<%= $this->link1->ClientID %>');
Prado.Callback('<%= $this->callback1->UniqueID %>', link1.getCallbackParameter());
</prop:ClientSide.OnSuccess>
-
+
</com:TCallbackOptions>
- <com:TActiveLinkButton
+ <com:TActiveLinkButton
ID="link1"
- Text="Tab 1"
- OnCallback="method2"
- ActiveControl.CallbackParameter="test"
+ Text="Tab 1"
+ OnCallback="method2"
+ ActiveControl.CallbackParameter="test"
ActiveControl.CallbackOptions="options1"/>
<com:TActiveLabel ID="status1" />
<com:TActiveLabel ID="status2" />
-<com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ControlAdapterTest.page b/tests/FunctionalTests/active-controls/protected/pages/ControlAdapterTest.page
index f0f3044d..c5642712 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ControlAdapterTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ControlAdapterTest.page
@@ -1,10 +1,10 @@
<com:TForm ID="form1">
<h1>Control Adapter - State Tracking Tests</h1>
<com:TActiveButton ID="button1" Text="Test Button 1" />
- <com:TActiveButton ID="button2" Text="Test Button 2"
+ <com:TActiveButton ID="button2" Text="Test Button 2"
Attributes.onclick="alert('ok')"
Style.Font.Size="12" Style.BackColor="blue" Style.Height="2em" />
-
+
<div style="margin:1em; padding: 0.5em; border:1px solid #ccc; text-align:center">
<com:TActiveButton ID="test1" Text="Enable/Disable Button 1" OnClick="change_enabled"/>
<com:TActiveButton ID="test2" Text="Hide/Show Button 1" OnClick="change_visible"/>
@@ -19,5 +19,4 @@
<com:TActiveButton ID="test8" Text="Change Button 1 Attributes" OnClick="change_attributes1"/>
<com:TActiveButton ID="test9" Text="Change Button 2 Attributes" OnClick="change_attributes2"/>
</div>
- <com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/CustomTemplateControlTest.page b/tests/FunctionalTests/active-controls/protected/pages/CustomTemplateControlTest.page
index 3bed7d5b..4c0eaf03 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/CustomTemplateControlTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/CustomTemplateControlTest.page
@@ -10,7 +10,4 @@
<com:TActivePanel ID="placeholder" />
<com:TActiveLabel ID="label1" Text="Label 1" />
-
-
- <com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/CustomValidatorByPass.page b/tests/FunctionalTests/active-controls/protected/pages/CustomValidatorByPass.page
index 08b7bb3e..28f27b8f 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/CustomValidatorByPass.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/CustomValidatorByPass.page
@@ -10,19 +10,19 @@
</div>
<span>Username:</span><br />
<com:TActiveTextBox ID="Username" />
- <com:TRequiredFieldValidator
+ <com:TRequiredFieldValidator
ID="validator1"
- ControlToValidate="Username"
- ValidationGroup="login"
+ ControlToValidate="Username"
+ ValidationGroup="login"
Text="...is required" Display="Dynamic"/>
<br />
<span>Password:</span><br />
<com:TActiveTextBox TextMode="Password" ID="Password" />
- <com:TActiveCustomValidator
- ID="validator2"
- ControlToValidate="Password"
+ <com:TActiveCustomValidator
+ ID="validator2"
+ ControlToValidate="Password"
Text="*"
OnServerValidate="validateUser" ValidationGroup="login" />
@@ -33,6 +33,5 @@
</div>
-<com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/DelayedCallback.page b/tests/FunctionalTests/active-controls/protected/pages/DelayedCallback.page
index b8fba648..d3447635 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/DelayedCallback.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/DelayedCallback.page
@@ -3,5 +3,4 @@
<com:TActiveButton ID="button1" Text="Delayed 4000" OnCallback="callback1" />
<com:TActiveButton ID="button2" Text="Delayed 2000" OnCallback="callback2" />
<com:TActiveLabel ID="status" />
-<com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/DisplayStyleTest.page b/tests/FunctionalTests/active-controls/protected/pages/DisplayStyleTest.page
index df1db27a..09ec16ed 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/DisplayStyleTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/DisplayStyleTest.page
@@ -17,6 +17,5 @@ here.
<com:TActiveLabel ID="status" />
-<com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/DynamicRepeaterDataTest.page b/tests/FunctionalTests/active-controls/protected/pages/DynamicRepeaterDataTest.page
index 913f6a17..7863fafe 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/DynamicRepeaterDataTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/DynamicRepeaterDataTest.page
@@ -11,6 +11,5 @@
</com:TRepeater>
</com:TActivePanel>
-<com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/EventTriggeredCallback.page b/tests/FunctionalTests/active-controls/protected/pages/EventTriggeredCallback.page
index 889636f3..80d94cbb 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/EventTriggeredCallback.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/EventTriggeredCallback.page
@@ -27,5 +27,4 @@
<div style="padding: 2em; border:1px solid #ccc; margin-top:2em">
<com:TActiveLabel ID="label1" Text="Label 1" />
</div>
- <com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/GerTurno2.page b/tests/FunctionalTests/active-controls/protected/pages/GerTurno2.page
index f4bf644c..2952c36c 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/GerTurno2.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/GerTurno2.page
@@ -1,7 +1,7 @@
<com:TForm>
<com:TLabel ForControl="DDropTurno" Text="Turno:"/>
-<com:TActiveDropDownList ID="DDropTurno"
+<com:TActiveDropDownList ID="DDropTurno"
onSelectedIndexChanged="trocaTurno" AutoPostBack="true"/>
<com:TLabel Text="Código:" ForControl="Codigo"/>
@@ -11,6 +11,5 @@
<com:TActiveTextBox ID="Descricao" MaxLength="25" Columns="25"/>
-<com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/InPlaceWithValidator.page b/tests/FunctionalTests/active-controls/protected/pages/InPlaceWithValidator.page
index ba3a35db..2a80a57a 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/InPlaceWithValidator.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/InPlaceWithValidator.page
@@ -60,19 +60,18 @@
ValidationGroup="Group"
/>
<br />
- <com:TActiveButton ID="active_button"
- Text="Active Submit"
+ <com:TActiveButton ID="active_button"
+ Text="Active Submit"
ValidationGroup="Group"
CausesValidation="true"
OnCallback="button_valid"
- />
- <com:TButton ID="passive_button"
- Text="Passive Submit"
+ />
+ <com:TButton ID="passive_button"
+ Text="Passive Submit"
ValidationGroup="Group"
CausesValidation="true"
OnClick="button_valid"
- />
+ />
<br />
<com:TActiveLabel ID="status" Text="Status:" />
- <com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/LargePageStateTest.page b/tests/FunctionalTests/active-controls/protected/pages/LargePageStateTest.page
index 701bd74c..c265f9d2 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/LargePageStateTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/LargePageStateTest.page
@@ -4,7 +4,6 @@
<com:TActiveButton Text="Show Changes" OnClick="button_clicked"/>
<com:TActiveLabel ID="status" />
-<com:TJavascriptLogger />
<com:TPanel ID="Panel1">
</com:TPanel>
diff --git a/tests/FunctionalTests/active-controls/protected/pages/LargePageStateTest2.page b/tests/FunctionalTests/active-controls/protected/pages/LargePageStateTest2.page
index 0b662617..168b7b8c 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/LargePageStateTest2.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/LargePageStateTest2.page
@@ -5,7 +5,6 @@
<com:TActiveButton Text="Show Changes" OnClick="button_clicked"/>
<com:TActiveLabel ID="status" />
-<com:TJavascriptLogger />
<com:TPanel ID="Panel1">
</com:TPanel>
diff --git a/tests/FunctionalTests/active-controls/protected/pages/MessagesPanelTest.page b/tests/FunctionalTests/active-controls/protected/pages/MessagesPanelTest.page
index ab4798a8..248d1760 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/MessagesPanelTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/MessagesPanelTest.page
@@ -3,5 +3,4 @@
<com:Application.pages.DMessagesPanel ID="panel1" PanelCssClass="one1" />
<com:TActiveButton Text="Show" OnClick="show_clicked" />
<com:TActiveButton Text="Hide" OnClick="hide_clicked" />
-<com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/MyTabPanelTest.page b/tests/FunctionalTests/active-controls/protected/pages/MyTabPanelTest.page
index 7371086a..5e04cd28 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/MyTabPanelTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/MyTabPanelTest.page
@@ -36,6 +36,5 @@
This is the contents of panel C
</com:TActivePanel>
-<com:TJavascriptLogger />
</com:TForm>
diff --git a/tests/FunctionalTests/active-controls/protected/pages/NestedActiveControls.page b/tests/FunctionalTests/active-controls/protected/pages/NestedActiveControls.page
index 9d3a3d61..a7875c0d 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/NestedActiveControls.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/NestedActiveControls.page
@@ -3,10 +3,10 @@
<com:TCallback ID="callback1" OnCallback="callback1_requested" />
<com:TActivePanel ID="panel1">
<com:TPlaceHolder ID="content1" Visible="false">
- Something lalala
+ Something lalala
<com:TActiveButton ID="button1" Text="Button 1" OnClick="button1_clicked" />
<com:TActiveLabel ID="label3" Text="Label 3" />
-
+
</com:TPlaceHolder>
<com:TActiveLabel ID="label1" Text="Label 1" />
</com:TActivePanel>
@@ -23,6 +23,5 @@
})
})
</script>
- <com:TJavascriptLogger />
-
+
</com:TForm>
diff --git a/tests/FunctionalTests/active-controls/protected/pages/NullStateTest.page b/tests/FunctionalTests/active-controls/protected/pages/NullStateTest.page
index 2ce98f5b..64643177 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/NullStateTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/NullStateTest.page
@@ -5,6 +5,5 @@
<com:TActiveLabel ID="lblTest"/>
<com:TActiveButton OnCallback="btnTest_OnCallback" Text="Clickme"/>
-<com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/PopulateActiveList.page b/tests/FunctionalTests/active-controls/protected/pages/PopulateActiveList.page
index c7bf0952..24cdb366 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/PopulateActiveList.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/PopulateActiveList.page
@@ -12,6 +12,5 @@
<com:TActiveButton ID="button2" Text="populate list 2" OnClick="populate_list2" />
-<com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/PostLoadingTest.page b/tests/FunctionalTests/active-controls/protected/pages/PostLoadingTest.page
index 09ab2fbc..885b368f 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/PostLoadingTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/PostLoadingTest.page
@@ -19,6 +19,4 @@
})
</script>
- <com:TJavascriptLogger />
-
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/RadioButtonListTest.page b/tests/FunctionalTests/active-controls/protected/pages/RadioButtonListTest.page
index 7de9c6ab..9d900e15 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/RadioButtonListTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/RadioButtonListTest.page
@@ -6,8 +6,8 @@
Display="Dynamic"
ValidationGroup="Group"
/>
- <br />
- <com:TActiveRadioButtonList
+ <br />
+ <com:TActiveRadioButtonList
ID="rad_button_list"
OnCallback="radChange">
<com:TListItem Value="yes" Text="Yes" />
@@ -16,15 +16,14 @@
</com:TActiveRadioButtonList>
<br />
<com:TActiveLabel
- ID="label"
+ ID="label"
Text="Choice : " />
<br /><br /><br />
<com:TActiveButton
ID="action_button"
Text="action"
OnCallback="action"
- ValidationGroup="Group" />
+ ValidationGroup="Group" />
-<com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/RatingList.page b/tests/FunctionalTests/active-controls/protected/pages/RatingList.page
index ba9c2e5d..d50e5929 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/RatingList.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/RatingList.page
@@ -93,6 +93,5 @@
Loading...
</div>
-<com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/RepeaterWithActiveControls.page b/tests/FunctionalTests/active-controls/protected/pages/RepeaterWithActiveControls.page
index b94fdbfb..59410b0b 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/RepeaterWithActiveControls.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/RepeaterWithActiveControls.page
@@ -56,6 +56,5 @@
<com:TActiveLabel ID="label1" />
-<com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ReplaceContentTest.page b/tests/FunctionalTests/active-controls/protected/pages/ReplaceContentTest.page
index 7842cde9..6127c313 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ReplaceContentTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ReplaceContentTest.page
@@ -26,6 +26,5 @@ Main Panel
<com:TActiveButton id="btn_replace" Text="Replace" OnCallback="replaceContent"/>
-<com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/Sessioned/PageStateTest.page b/tests/FunctionalTests/active-controls/protected/pages/Sessioned/PageStateTest.page
index fdd4a604..194f35d6 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/Sessioned/PageStateTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/Sessioned/PageStateTest.page
@@ -42,6 +42,5 @@
</div>
-<com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/TActiveCheckBoxListTest.page b/tests/FunctionalTests/active-controls/protected/pages/TActiveCheckBoxListTest.page
index f3332bad..460d2f71 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/TActiveCheckBoxListTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/TActiveCheckBoxListTest.page
@@ -19,6 +19,4 @@
<com:TActiveButton ID="button5" Text="Select Values 'value 2', 'value 5'" OnClick="select_values_25" />
</div>
- <com:TJavascriptLogger />
-
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/TActiveFileUploadAutoPostBackTest.page b/tests/FunctionalTests/active-controls/protected/pages/TActiveFileUploadAutoPostBackTest.page
index 41390e52..66c2a0c4 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/TActiveFileUploadAutoPostBackTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/TActiveFileUploadAutoPostBackTest.page
@@ -2,13 +2,11 @@
<h1 id="heading">TActiveFileUpload AutoPostBack Functional Test</h1>
<com:TActiveFileUpload ID='uploader' OnFileUpload="uploadComplete" AutoPostBack="false"/>
-
+
<com:TActiveButton ID="button1" Text="Submit File"/>
-
+
<com:TActiveButton ID="button2" Text="This won't submit the file"/>
-
- <com:TActiveLabel ID="label1" Text="Label 1" />
- <com:TJavascriptLogger />
+ <com:TActiveLabel ID="label1" Text="Label 1" />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/TInPlaceTextBoxTest.page b/tests/FunctionalTests/active-controls/protected/pages/TInPlaceTextBoxTest.page
index 8c0a0d71..33ba6dda 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/TInPlaceTextBoxTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/TInPlaceTextBoxTest.page
@@ -61,7 +61,7 @@
<com:TActiveLabel ID="status" Text="Status:" />
- <com:TInPlaceTextBox
+ <com:TInPlaceTextBox
id="lblNewPackageTitle"
OnTextChanged="NewPackageSubject"
CssClass="textbox"
@@ -72,6 +72,4 @@
<com:TActiveButton Text="ad" OnCallback="button_clicked" />
- <com:TJavascriptLogger />
-
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/TextBoxValidationCallback.page b/tests/FunctionalTests/active-controls/protected/pages/TextBoxValidationCallback.page
index 79fc17e0..1746c628 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/TextBoxValidationCallback.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/TextBoxValidationCallback.page
@@ -14,7 +14,6 @@
Maxlength="12"
ValidationGroup="post"
OnCallback="lookupZipCode"/>
-<com:TJavascriptLogger />
<com:TActiveTextBox ID="City" Columns="60" Maxlength="128" />
diff --git a/tests/FunctionalTests/active-controls/protected/pages/TimeTriggeredCallbackTest.page b/tests/FunctionalTests/active-controls/protected/pages/TimeTriggeredCallbackTest.page
index a285f03d..680922a3 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/TimeTriggeredCallbackTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/TimeTriggeredCallbackTest.page
@@ -17,5 +17,4 @@
position: absolute; right: 0; top: 0">
Loading...
</div>
- <com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ValueTriggerCallbackTest.page b/tests/FunctionalTests/active-controls/protected/pages/ValueTriggerCallbackTest.page
index 1281cc5c..4097f69c 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ValueTriggerCallbackTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ValueTriggerCallbackTest.page
@@ -9,6 +9,5 @@
<com:TActiveLabel ID="label1" Text="Label 1" />
-<com:TJavascriptLogger />
</com:TForm> \ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/tests/ActiveButtonTestCase.php b/tests/FunctionalTests/active-controls/tests/ActiveButtonTestCase.php
index c8fcfa57..880c46fe 100755
--- a/tests/FunctionalTests/active-controls/tests/ActiveButtonTestCase.php
+++ b/tests/FunctionalTests/active-controls/tests/ActiveButtonTestCase.php
@@ -1,13 +1,13 @@
<?php
-class ActiveButtonTestCase extends PradoGenericSeleniumTest
+class ActiveButtonTestCase extends PradoGenericSelenium2Test
{
function test()
{
$this->open("active-controls/index.php?page=ActiveButtonTest");
$this->verifyTextPresent("TActiveButton Functional Test");
$this->assertText("label1", "Label 1");
- $this->click("button2");
+ $this->clickOnElement("button2");
$this->pause(800);
$this->assertText("label1", "Button 1 was clicked using callback!");
}
diff --git a/tests/FunctionalTests/features/protected/controls/Layout.tpl b/tests/FunctionalTests/features/protected/controls/Layout.tpl
index dbd433b8..66b42f6c 100755
--- a/tests/FunctionalTests/features/protected/controls/Layout.tpl
+++ b/tests/FunctionalTests/features/protected/controls/Layout.tpl
@@ -27,7 +27,6 @@
<body>
<com:TForm>
<com:TContentPlaceHolder ID="Content" />
-<com:TJavascriptLogger />
</com:TForm>
</body>
</html> \ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/pages/RatingList.page b/tests/FunctionalTests/features/protected/pages/RatingList.page
index 909180c7..eaf9a282 100755
--- a/tests/FunctionalTests/features/protected/pages/RatingList.page
+++ b/tests/FunctionalTests/features/protected/pages/RatingList.page
@@ -2,40 +2,46 @@
<h1>TRatingList Examples</h1>
<h2>Default TRatingList</h2>
- <com:TRatingList RepeatDirection="Vertical" Style="caption-side: right;">
+ <com:TLabel ID="label1" Text="Rate it:" />
+ <com:TRatingList CaptionID="label1">
<com:TListItem Text="Fair" />
<com:TListItem Text="Average" />
<com:TListItem Text="Good" />
- <com:TListItem Text="Execellent" />
+ <com:TListItem Text="Excellent" />
</com:TRatingList>
-<h2>TRatingList </h2>
- <com:TRatingList SelectedIndex="2">
+<h2>TRatingList in vertical mode, SelectedIndex=2</h2>
+ <com:TLabel ID="label2" Text="Rate it:" />
+ <com:TRatingList CaptionID="label2" SelectedIndex="2" RepeatDirection="Vertical" Style="caption-side: right;">
<com:TListItem Text="Poor" />
<com:TListItem Text="Fair" />
<com:TListItem Text="Average" />
<com:TListItem Text="Good" />
- <com:TListItem Text="Execellent" />
+ <com:TListItem Text="Excellent" />
<com:TListItem Text="Super" />
</com:TRatingList>
-<h2>TRatingList </h2>
- <com:TRatingList RatingStyle="blocks" SelectedValue="Good">
+<h2>TRatingList with RatingStyle=blocks, AutoPostback=true, SelectedValue=Good</h2>
+ <com:TLabel ID="label3" Text="Rate it:" />
+ <com:TRatingList ID="Rating3" CaptionID="label3" RatingStyle="blocks" SelectedValue="Good" AutoPostBack="true" OnSelectedIndexChanged="rating3_selectionChanged">
<com:TListItem Text="Poor" />
<com:TListItem Text="Fair" />
<com:TListItem Text="Average" />
<com:TListItem Text="Good" />
- <com:TListItem Text="Execellent" />
+ <com:TListItem Text="Excellent" />
<com:TListItem Text="Super" />
</com:TRatingList>
+ Postback result: <com:TLabel ID="labelResult3" />
-<h2>TRatingList </h2>
- <com:TRatingList ID="Rating1" AllowInput="false" Caption="Rating:" Rating="4.6">
+<h2>TRatingList with AllowInput=false, Rating=4.6</h2>
+ <com:TLabel ID="label4" Text="Rate it:" />
+ <com:TRatingList CaptionID="label4" AllowInput="false" Rating="4.6">
<com:TListItem Text="Poor" />
<com:TListItem Text="Fair" />
<com:TListItem Text="Average" />
<com:TListItem Text="Good" />
- <com:TListItem Text="Execellent" />
+ <com:TListItem Text="Excellent" />
<com:TListItem Text="Super" />
- </com:TRatingList>
+ </com:TRatingList>
+
</com:TContent> \ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/pages/RatingList.php b/tests/FunctionalTests/features/protected/pages/RatingList.php
new file mode 100644
index 00000000..9592680a
--- /dev/null
+++ b/tests/FunctionalTests/features/protected/pages/RatingList.php
@@ -0,0 +1,9 @@
+<?php
+
+class RatingList extends TPage
+{
+ protected function rating3_selectionChanged($sender, $param)
+ {
+ $this->labelResult3->Text=$this->Rating3->SelectedValue;
+ }
+} \ No newline at end of file
diff --git a/tests/FunctionalTests/tickets/protected/controls/ToggleImageButton.php b/tests/FunctionalTests/tickets/protected/controls/ToggleImageButton.php
index 9aecda84..0165edac 100755
--- a/tests/FunctionalTests/tickets/protected/controls/ToggleImageButton.php
+++ b/tests/FunctionalTests/tickets/protected/controls/ToggleImageButton.php
@@ -6,7 +6,6 @@
* @author Christophe BOULAIN (Christophe.Boulain@ceram.fr)
* @copyright Copyright &copy; 2007, CERAM Sophia Antipolis
* @license url nameoflicense
- * @version $Id: ToggleImageButton.php 2043 2007-06-30 15:07:50Z xue $
*
*/
diff --git a/tests/FunctionalTests/tickets/protected/pages/ExtendedToggleImageButton.php b/tests/FunctionalTests/tickets/protected/pages/ExtendedToggleImageButton.php
index 934efcef..7bc53ba3 100755
--- a/tests/FunctionalTests/tickets/protected/pages/ExtendedToggleImageButton.php
+++ b/tests/FunctionalTests/tickets/protected/pages/ExtendedToggleImageButton.php
@@ -1,16 +1,15 @@
<?php
/**
*
- *
+ *
* @author Christophe BOULAIN (Christophe.Boulain@ceram.fr)
* @copyright Copyright &copy; 2007, CERAM Sophia Antipolis
* @license url nameoflicense
- * @version $Id: ExtendedToggleImageButton.php 2039 2007-06-28 08:41:57Z tof $
- *
+ *
*/
prado::using ('Application.controls.ToggleImageButton');
class ExtendedToggleImageButton extends ToggleImageButton {
-
+
} \ No newline at end of file
diff --git a/tests/FunctionalTests/tickets/protected/pages/Layout.tpl b/tests/FunctionalTests/tickets/protected/pages/Layout.tpl
index bf2f8fab..b245a50d 100755
--- a/tests/FunctionalTests/tickets/protected/pages/Layout.tpl
+++ b/tests/FunctionalTests/tickets/protected/pages/Layout.tpl
@@ -1,7 +1,7 @@
-<!DOCTYPE html PUBLIC
- "-//W3C//DTD XHTML 1.0 Strict//EN"
+<!DOCTYPE html PUBLIC
+ "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
+
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<com:THead Title="PRADO Functional Tests">
<meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
@@ -30,7 +30,6 @@
<com:TContentPlaceHolder ID="Content" />
<hr style="margin-top: 2em" />
-<com:TJavascriptLogger />
</com:TForm>
<div class="w3c">
<a href="http://validator.w3.org/check?uri=referer">
@@ -38,7 +37,7 @@
</a>
<a href="?page=ViewSource&amp;path=<%= str_replace('.','/', $this->Request->ServiceParameter) %>.page"
style="margin: 0 1em;"
- onclick="window.open(this.href); return false;"
+ onclick="window.open(this.href); return false;"
onkeypress="window.open(this.href); return false;">View Source</a>
</div>
</body>
diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket653/Layout.tpl b/tests/FunctionalTests/tickets/protected/pages/Ticket653/Layout.tpl
index bf2f8fab..b245a50d 100755
--- a/tests/FunctionalTests/tickets/protected/pages/Ticket653/Layout.tpl
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket653/Layout.tpl
@@ -1,7 +1,7 @@
-<!DOCTYPE html PUBLIC
- "-//W3C//DTD XHTML 1.0 Strict//EN"
+<!DOCTYPE html PUBLIC
+ "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
+
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<com:THead Title="PRADO Functional Tests">
<meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
@@ -30,7 +30,6 @@
<com:TContentPlaceHolder ID="Content" />
<hr style="margin-top: 2em" />
-<com:TJavascriptLogger />
</com:TForm>
<div class="w3c">
<a href="http://validator.w3.org/check?uri=referer">
@@ -38,7 +37,7 @@
</a>
<a href="?page=ViewSource&amp;path=<%= str_replace('.','/', $this->Request->ServiceParameter) %>.page"
style="margin: 0 1em;"
- onclick="window.open(this.href); return false;"
+ onclick="window.open(this.href); return false;"
onkeypress="window.open(this.href); return false;">View Source</a>
</div>
</body>
diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket659.php b/tests/FunctionalTests/tickets/protected/pages/Ticket659.php
index cb266fd7..85b87d55 100755
--- a/tests/FunctionalTests/tickets/protected/pages/Ticket659.php
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket659.php
@@ -1,12 +1,11 @@
<?php
/**
*
- *
+ *
* @author Christophe BOULAIN (Christophe.Boulain@ceram.fr)
* @copyright Copyright &copy; 2007, CERAM Sophia Antipolis
* @license url nameoflicense
- * @version $Id: Ticket659.php 2039 2007-06-28 08:41:57Z tof $
- *
+ *
*/
prado::using ('Application.pages.ExtendedToggleImageButton');
diff --git a/tests/FunctionalTests/tickets/protected/pages/ToggleTest.php b/tests/FunctionalTests/tickets/protected/pages/ToggleTest.php
index 73a2cc57..98492ffb 100644
--- a/tests/FunctionalTests/tickets/protected/pages/ToggleTest.php
+++ b/tests/FunctionalTests/tickets/protected/pages/ToggleTest.php
@@ -1,12 +1,11 @@
<?php
/**
*
- *
+ *
* @author Christophe BOULAIN (Christophe.Boulain@ceram.fr)
* @copyright Copyright &copy; 2007, CERAM Sophia Antipolis
* @license url nameoflicense
- * @version $Id: ToggleTest.php 2039 2007-06-28 08:41:57Z tof $
- *
+ *
*/
prado::using ('Application.controls.ToggleImageButton');
@@ -15,5 +14,4 @@ class ToggleTest extends TPage {
public function clickToggleButton ($sender, $param) {
$this->lbl->Text=$sender->State;
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/FunctionalTests/tickets/tests/Ticket656TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket656TestCase.php
index ff167b0e..9fe238b9 100755
--- a/tests/FunctionalTests/tickets/tests/Ticket656TestCase.php
+++ b/tests/FunctionalTests/tickets/tests/Ticket656TestCase.php
@@ -6,19 +6,20 @@ class Ticket656TestCase extends PradoGenericSeleniumTest
$base = 'ctl0_Content_';
$this->open('tickets/index.php?page=Ticket656');
$this->assertTitle("Verifying Ticket 656");
-
+
// First test, current date
$this->click($base."btnUpdate");
$this->pause(800);
$this->assertText($base."lblStatus",date("d-m-Y"));
-
+
// Then, set another date
+ $year=date('Y')-2;
$this->select($base."datePicker_day",20);
$this->select($base."datePicker_month", 10);
- $this->select($base."datePicker_year", 2008);
+ $this->select($base."datePicker_year", $year);
$this->click($base."btnUpdate");
$this->pause(800);
- $this->assertText($base."lblStatus",date("d-m-Y", mktime(0,0,0,10,20,2008)));
+ $this->assertText($base."lblStatus",date("d-m-Y", mktime(0,0,0,10,20,$year)));
}
} \ No newline at end of file
diff --git a/tests/FunctionalTests/validators/protected/pages/Layout.tpl b/tests/FunctionalTests/validators/protected/pages/Layout.tpl
index 25dbea09..47591ef3 100755
--- a/tests/FunctionalTests/validators/protected/pages/Layout.tpl
+++ b/tests/FunctionalTests/validators/protected/pages/Layout.tpl
@@ -33,7 +33,6 @@
<com:TForm>
<com:TContentPlaceHolder ID="Content" />
<hr style="margin-top: 2em" />
-<com:TJavascriptLogger />
</com:TForm>
</body>
</html> \ No newline at end of file
diff --git a/tests/FunctionalTests/validators/tests/DatePickerTestCase.php b/tests/FunctionalTests/validators/tests/DatePickerTestCase.php
index ab37ec06..bbefd2a7 100755
--- a/tests/FunctionalTests/validators/tests/DatePickerTestCase.php
+++ b/tests/FunctionalTests/validators/tests/DatePickerTestCase.php
@@ -28,8 +28,6 @@ class DatePickerTestCase extends PradoGenericSeleniumTest
$this->assertNotVisible("{$base}validator6", "");
$this->assertVisible("{$base}validator8", "");
- $this->clickAndWait("{$base}submit1");
-
$this->type("{$base}picker1", "13/4/$year");
$this->select("{$base}picker2_month", "label=9");
$this->select("{$base}picker2_day", "label=10");
diff --git a/tests/FunctionalTests/validators/tests/RequiredFieldTestCase.php b/tests/FunctionalTests/validators/tests/RequiredFieldTestCase.php
index f8b54eb0..8ee278f8 100755
--- a/tests/FunctionalTests/validators/tests/RequiredFieldTestCase.php
+++ b/tests/FunctionalTests/validators/tests/RequiredFieldTestCase.php
@@ -48,7 +48,7 @@ class RequiredFieldTestCase extends PradoGenericSeleniumTest
$this->type("{$base}text1", "Hello");
$this->click("{$base}check1");
- $this->click("{$base}submit2");
+ $this->clickAndWait("{$base}submit2");
$this->assertNotVisible("{$base}validator5");
$this->assertNotVisible("{$base}validator6");
diff --git a/tests/simple_unit/ActiveRecord/ActiveRecordDynamicCallTestCase.php b/tests/simple_unit/ActiveRecord/ActiveRecordDynamicCallTestCase.php
index 8d7fa46a..58c9977a 100644
--- a/tests/simple_unit/ActiveRecord/ActiveRecordDynamicCallTestCase.php
+++ b/tests/simple_unit/ActiveRecord/ActiveRecordDynamicCallTestCase.php
@@ -65,5 +65,3 @@ class ActiveRecordDynamicCallTestCase extends UnitTestCase
var_dump($param);
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/ActiveRecordFinderTestCase.php b/tests/simple_unit/ActiveRecord/ActiveRecordFinderTestCase.php
index e962046b..d9bd7420 100644
--- a/tests/simple_unit/ActiveRecord/ActiveRecordFinderTestCase.php
+++ b/tests/simple_unit/ActiveRecord/ActiveRecordFinderTestCase.php
@@ -41,5 +41,3 @@ class ActiveRecordFinderTestCase extends UnitTestCase
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/ActiveRecordMySql5TestCase.php b/tests/simple_unit/ActiveRecord/ActiveRecordMySql5TestCase.php
index d173f005..09981f43 100644
--- a/tests/simple_unit/ActiveRecord/ActiveRecordMySql5TestCase.php
+++ b/tests/simple_unit/ActiveRecord/ActiveRecordMySql5TestCase.php
@@ -42,5 +42,4 @@ class ActiveRecordMySql5TestCase extends UnitTestCase
$this->assertEqual($check->{$prop}, $blog->{$prop});
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/ActiveRecordRegistryTestCase.php b/tests/simple_unit/ActiveRecord/ActiveRecordRegistryTestCase.php
index fe1507cd..12b0796c 100644
--- a/tests/simple_unit/ActiveRecord/ActiveRecordRegistryTestCase.php
+++ b/tests/simple_unit/ActiveRecord/ActiveRecordRegistryTestCase.php
@@ -163,5 +163,3 @@ class ActiveRecordRegistryTestCase extends UnitTestCase
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/BaseActiveRecordTestCase.php b/tests/simple_unit/ActiveRecord/BaseActiveRecordTestCase.php
index c356216b..676a0dd0 100644
--- a/tests/simple_unit/ActiveRecord/BaseActiveRecordTestCase.php
+++ b/tests/simple_unit/ActiveRecord/BaseActiveRecordTestCase.php
@@ -29,5 +29,3 @@ class BaseActiveRecordTestCase extends UnitTestCase
}
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/CountRecordsTestCase.php b/tests/simple_unit/ActiveRecord/CountRecordsTestCase.php
index 4c489d49..36a96ab6 100644
--- a/tests/simple_unit/ActiveRecord/CountRecordsTestCase.php
+++ b/tests/simple_unit/ActiveRecord/CountRecordsTestCase.php
@@ -31,5 +31,3 @@ class CountRecordsTestCase extends UnitTestCase
$this->assertEqual($finder->count(), 8);
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/CriteriaTestCase.php b/tests/simple_unit/ActiveRecord/CriteriaTestCase.php
index de5b3b71..a320f38c 100644
--- a/tests/simple_unit/ActiveRecord/CriteriaTestCase.php
+++ b/tests/simple_unit/ActiveRecord/CriteriaTestCase.php
@@ -46,5 +46,3 @@ class CriteriaTestCase extends UnitTestCase
$this->assertEqual($criteria->getParameters()->toArray(), $expect);
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/DeleteByPkTestCase.php b/tests/simple_unit/ActiveRecord/DeleteByPkTestCase.php
index f848033c..0c09a9b0 100644
--- a/tests/simple_unit/ActiveRecord/DeleteByPkTestCase.php
+++ b/tests/simple_unit/ActiveRecord/DeleteByPkTestCase.php
@@ -27,5 +27,4 @@ class DeleteByPkTestCase extends UnitTestCase
$this->assertEqual($finder->deleteByPk(array(100, 101), array(102, 103)),0);
$this->assertEqual($finder->deleteByPk(array(array(100, 101), array(102, 103))),0);
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/FindByPksTestCase.php b/tests/simple_unit/ActiveRecord/FindByPksTestCase.php
index 4ccbddd5..32a79cea 100644
--- a/tests/simple_unit/ActiveRecord/FindByPksTestCase.php
+++ b/tests/simple_unit/ActiveRecord/FindByPksTestCase.php
@@ -60,5 +60,3 @@ class FindByPksTestCase extends UnitTestCase
$this->assertEqual($dep->section_id, $sec_id);
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/FindBySqlTestCase.php b/tests/simple_unit/ActiveRecord/FindBySqlTestCase.php
index e613cc30..14da0833 100644
--- a/tests/simple_unit/ActiveRecord/FindBySqlTestCase.php
+++ b/tests/simple_unit/ActiveRecord/FindBySqlTestCase.php
@@ -42,5 +42,3 @@ class FindBySqlTestCase extends UnitTestCase
var_dump($users);
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/ForeignKeyTestCase.php b/tests/simple_unit/ActiveRecord/ForeignKeyTestCase.php
index b960760e..86462ca6 100644
--- a/tests/simple_unit/ActiveRecord/ForeignKeyTestCase.php
+++ b/tests/simple_unit/ActiveRecord/ForeignKeyTestCase.php
@@ -171,5 +171,3 @@ class ForeignKeyTestCase extends UnitTestCase
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/ForeignObjectUpdateTest.php b/tests/simple_unit/ActiveRecord/ForeignObjectUpdateTest.php
index 672c2d0f..29fbff42 100644
--- a/tests/simple_unit/ActiveRecord/ForeignObjectUpdateTest.php
+++ b/tests/simple_unit/ActiveRecord/ForeignObjectUpdateTest.php
@@ -238,5 +238,3 @@ class ForeignObjectUpdateTest extends UnitTestCase
}
//*/
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/MultipleForeignKeyTestCase.php b/tests/simple_unit/ActiveRecord/MultipleForeignKeyTestCase.php
index c43db032..4b149503 100644
--- a/tests/simple_unit/ActiveRecord/MultipleForeignKeyTestCase.php
+++ b/tests/simple_unit/ActiveRecord/MultipleForeignKeyTestCase.php
@@ -188,5 +188,3 @@ class MultipleForeignKeyTestCase extends UnitTestCase
$this->assertNotIdentical($arr, $arr->state2[0]->object2);
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/RecordEventTestCase.php b/tests/simple_unit/ActiveRecord/RecordEventTestCase.php
index 3e98d46b..12c57421 100644
--- a/tests/simple_unit/ActiveRecord/RecordEventTestCase.php
+++ b/tests/simple_unit/ActiveRecord/RecordEventTestCase.php
@@ -33,5 +33,3 @@ class RecordEventTestCase extends UnitTestCase
//var_dump($param);
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/SqliteTestCase.php b/tests/simple_unit/ActiveRecord/SqliteTestCase.php
index 7d860b9a..ed0ea496 100644
--- a/tests/simple_unit/ActiveRecord/SqliteTestCase.php
+++ b/tests/simple_unit/ActiveRecord/SqliteTestCase.php
@@ -17,5 +17,3 @@ class SqliteTestCase extends UnitTestCase
$this->assertNotNull($user);
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/UserRecordTestCase.php b/tests/simple_unit/ActiveRecord/UserRecordTestCase.php
index 34e45ca8..85b12594 100644
--- a/tests/simple_unit/ActiveRecord/UserRecordTestCase.php
+++ b/tests/simple_unit/ActiveRecord/UserRecordTestCase.php
@@ -62,5 +62,3 @@ class UserRecordTestCase extends UnitTestCase
$this->assertEqual($user->$prop,$check->$prop);
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/ViewRecordTestCase.php b/tests/simple_unit/ActiveRecord/ViewRecordTestCase.php
index adf0beed..bb13a96f 100644
--- a/tests/simple_unit/ActiveRecord/ViewRecordTestCase.php
+++ b/tests/simple_unit/ActiveRecord/ViewRecordTestCase.php
@@ -72,5 +72,4 @@ class ViewRecordTestCase extends UnitTestCase
$this->pass();
}
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/records/Blogs.php b/tests/simple_unit/ActiveRecord/records/Blogs.php
index 680b3141..6523f029 100644
--- a/tests/simple_unit/ActiveRecord/records/Blogs.php
+++ b/tests/simple_unit/ActiveRecord/records/Blogs.php
@@ -10,5 +10,3 @@ class Blogs extends TActiveRecord
return parent::finder($className);
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/records/DepSections.php b/tests/simple_unit/ActiveRecord/records/DepSections.php
index 6f37ae3e..bf01ed12 100644
--- a/tests/simple_unit/ActiveRecord/records/DepSections.php
+++ b/tests/simple_unit/ActiveRecord/records/DepSections.php
@@ -12,5 +12,3 @@ class DepSections extends TActiveRecord
return parent::finder($className);
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/records/DepartmentRecord.php b/tests/simple_unit/ActiveRecord/records/DepartmentRecord.php
index 732610ae..b60c7930 100644
--- a/tests/simple_unit/ActiveRecord/records/DepartmentRecord.php
+++ b/tests/simple_unit/ActiveRecord/records/DepartmentRecord.php
@@ -14,5 +14,3 @@ class DepartmentRecord extends TActiveRecord
return parent::finder($className);
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/records/ItemRecord.php b/tests/simple_unit/ActiveRecord/records/ItemRecord.php
index 8585ebaf..e6707cde 100644
--- a/tests/simple_unit/ActiveRecord/records/ItemRecord.php
+++ b/tests/simple_unit/ActiveRecord/records/ItemRecord.php
@@ -45,5 +45,3 @@ class ItemRecord extends TActiveRecord
return parent::finder($className);
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/records/SimpleUser.php b/tests/simple_unit/ActiveRecord/records/SimpleUser.php
index cfba272e..b6748857 100644
--- a/tests/simple_unit/ActiveRecord/records/SimpleUser.php
+++ b/tests/simple_unit/ActiveRecord/records/SimpleUser.php
@@ -10,5 +10,3 @@ class SimpleUser extends TActiveRecord
return parent::finder($className);
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/records/SqliteUsers.php b/tests/simple_unit/ActiveRecord/records/SqliteUsers.php
index 8e5b9fde..f8fa12c5 100644
--- a/tests/simple_unit/ActiveRecord/records/SqliteUsers.php
+++ b/tests/simple_unit/ActiveRecord/records/SqliteUsers.php
@@ -12,5 +12,3 @@ class SqliteUsers extends TActiveRecord
return parent::finder($className);
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/ActiveRecord/records/UserRecord.php b/tests/simple_unit/ActiveRecord/records/UserRecord.php
index c4e8ce60..4ef98baf 100644
--- a/tests/simple_unit/ActiveRecord/records/UserRecord.php
+++ b/tests/simple_unit/ActiveRecord/records/UserRecord.php
@@ -34,5 +34,3 @@ class UserRecord extends TActiveRecord
return parent::finder($className);
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/DbCommon/CommandBuilderMssqlTest.php b/tests/simple_unit/DbCommon/CommandBuilderMssqlTest.php
index f8a4257c..d309c1cc 100644
--- a/tests/simple_unit/DbCommon/CommandBuilderMssqlTest.php
+++ b/tests/simple_unit/DbCommon/CommandBuilderMssqlTest.php
@@ -42,5 +42,3 @@ class CommandBuilderMssqlTest extends UnitTestCase
// var_dump($sql);
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/DbCommon/CommandBuilderMysqlTest.php b/tests/simple_unit/DbCommon/CommandBuilderMysqlTest.php
index e248defd..e47914aa 100644
--- a/tests/simple_unit/DbCommon/CommandBuilderMysqlTest.php
+++ b/tests/simple_unit/DbCommon/CommandBuilderMysqlTest.php
@@ -15,5 +15,3 @@ class CommandBuilderMysqlTest extends UnitTestCase
$this->mysql_meta_data()->getTableInfo("tests.table1");
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/DbCommon/CommandBuilderPgsqlTest.php b/tests/simple_unit/DbCommon/CommandBuilderPgsqlTest.php
index 63660aee..8e339073 100644
--- a/tests/simple_unit/DbCommon/CommandBuilderPgsqlTest.php
+++ b/tests/simple_unit/DbCommon/CommandBuilderPgsqlTest.php
@@ -72,5 +72,3 @@ class CommandBuilderPgsqlTest extends UnitTestCase
$this->assertEqual($expect, $limit);
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/DbCommon/MssqlColumnTest.php b/tests/simple_unit/DbCommon/MssqlColumnTest.php
index 16d73bc4..f64615e8 100644
--- a/tests/simple_unit/DbCommon/MssqlColumnTest.php
+++ b/tests/simple_unit/DbCommon/MssqlColumnTest.php
@@ -44,5 +44,3 @@ class MssqlColumnTest extends UnitTestCase
var_dump($result);
}*/
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/DbCommon/Mysql4ColumnTest.php b/tests/simple_unit/DbCommon/Mysql4ColumnTest.php
index 234a212f..6216cdd7 100644
--- a/tests/simple_unit/DbCommon/Mysql4ColumnTest.php
+++ b/tests/simple_unit/DbCommon/Mysql4ColumnTest.php
@@ -250,5 +250,3 @@ class Mysql4ColumnTest extends UnitTestCase
}
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/DbCommon/MysqlColumnTest.php b/tests/simple_unit/DbCommon/MysqlColumnTest.php
index 08fdb545..57565ca1 100644
--- a/tests/simple_unit/DbCommon/MysqlColumnTest.php
+++ b/tests/simple_unit/DbCommon/MysqlColumnTest.php
@@ -250,5 +250,3 @@ class MysqlColumnTest extends UnitTestCase
}
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/DbCommon/PgsqlColumnTest.php b/tests/simple_unit/DbCommon/PgsqlColumnTest.php
index a16de964..5859c115 100644
--- a/tests/simple_unit/DbCommon/PgsqlColumnTest.php
+++ b/tests/simple_unit/DbCommon/PgsqlColumnTest.php
@@ -135,5 +135,3 @@ class PgsqlColumnTest extends UnitTestCase
}
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/DbCommon/SqliteColumnTest.php b/tests/simple_unit/DbCommon/SqliteColumnTest.php
index 246c4a27..712d2977 100644
--- a/tests/simple_unit/DbCommon/SqliteColumnTest.php
+++ b/tests/simple_unit/DbCommon/SqliteColumnTest.php
@@ -25,5 +25,4 @@ class SqliteColumnTest extends UnitTestCase
//$table = new TTableGateway('Accounts', $conn);
// var_dump($table->findAll()->readAll());
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/simple_unit/I18N/MysqlMessageSourceTestCase.php b/tests/simple_unit/I18N/MysqlMessageSourceTestCase.php
index 80e9c1fd..0728baf7 100644
--- a/tests/simple_unit/I18N/MysqlMessageSourceTestCase.php
+++ b/tests/simple_unit/I18N/MysqlMessageSourceTestCase.php
@@ -41,5 +41,3 @@ class MysqlMessageSourceTestCase extends UnitTestCase
}
*/
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/Soap/ContactManager.php b/tests/simple_unit/Soap/ContactManager.php
index 290063b3..2fbeec48 100644
--- a/tests/simple_unit/Soap/ContactManager.php
+++ b/tests/simple_unit/Soap/ContactManager.php
@@ -23,12 +23,12 @@ class ContactManager{
$Contact->email = "me@you.com";
$Contact->id = 1;
$Contact->name ="me";
-
+
$ret[] = $Contact;
//debugObject("Contacten: ",$ret);
return $ret;
}
-
+
/**
* Gets the Contact with the given id.
* @param int $id The id
@@ -48,7 +48,7 @@ class ContactManager{
public function newContact() {
return new Contact();
}
-
+
/**
* Saves a given Contact
* @param Contact $Contact
@@ -60,7 +60,7 @@ class ContactManager{
//$Contact->save();
return true;
}
-
+
/**
* @return mixed
* @soapmethod
@@ -69,7 +69,7 @@ class ContactManager{
{
return array(array(1,2), array("12", 1.2));
}
-
+
/**
* @return array
* @soapmethod
@@ -92,13 +92,13 @@ class ContactManager{
*/
class Contact{
- /**
+ /**
* @var int $id
* @soapproperty
*/
public $id;
-
- /**
+
+ /**
* @var string $name
* @soapproperty
*/
@@ -110,10 +110,10 @@ class Contact{
public $address;
/** @var string $email
- * @soapproperty
+ * @soapproperty
*/
public $email;
-
+
/**
* saves a Contact
*
@@ -134,24 +134,22 @@ class Contact{
*/
class Address{
/** @var string $street
- * @soapproperty
+ * @soapproperty
*/
public $street;
-
+
/** @var string $nr
* @soapproperty
*/
public $nr;
-
+
/** @var string $zipcode
* @soapproperty
*/
- public $zipcode;
-
+ public $zipcode;
+
/** @var string $city
* @soapproperty
*/
- public $city;
+ public $city;
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/Soap/SoapTestCase.php b/tests/simple_unit/Soap/SoapTestCase.php
index fe151b04..3aaa60d3 100644
--- a/tests/simple_unit/Soap/SoapTestCase.php
+++ b/tests/simple_unit/Soap/SoapTestCase.php
@@ -35,7 +35,7 @@ class SoapTestCase extends UnitTestCase
{
try
{
- $result = $this->getClient()->getContact(1);
+ $result = $this->getClient()->getContact(1);
$this->fail();
}
catch (SoapFault $f)
@@ -88,4 +88,3 @@ class SoapTestCase extends UnitTestCase
}
}
-?>
diff --git a/tests/simple_unit/SqlMap/ActiveRecordSqlMapTest.php b/tests/simple_unit/SqlMap/ActiveRecordSqlMapTest.php
index b3cde511..2ae051e8 100644
--- a/tests/simple_unit/SqlMap/ActiveRecordSqlMapTest.php
+++ b/tests/simple_unit/SqlMap/ActiveRecordSqlMapTest.php
@@ -83,5 +83,3 @@ class ActiveRecordSqlMapTest extends BaseCase
$this->assertEqual($account1->{$prop}, $account2->{$prop});
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/BaseCase.php b/tests/simple_unit/SqlMap/BaseCase.php
index b0961b5b..4f44a5b7 100644
--- a/tests/simple_unit/SqlMap/BaseCase.php
+++ b/tests/simple_unit/SqlMap/BaseCase.php
@@ -258,5 +258,3 @@ class TDateTime
$this->_datetime = $value;
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/CacheTest.php b/tests/simple_unit/SqlMap/CacheTest.php
index 131ddfbb..ff87cd3a 100644
--- a/tests/simple_unit/SqlMap/CacheTest.php
+++ b/tests/simple_unit/SqlMap/CacheTest.php
@@ -160,5 +160,3 @@ class CacheTest extends BaseCase
$this->assertIdentical(0.5, $cache->getHitRatio());
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/DelegateTest.php b/tests/simple_unit/SqlMap/DelegateTest.php
index 800e4240..80b23332 100644
--- a/tests/simple_unit/SqlMap/DelegateTest.php
+++ b/tests/simple_unit/SqlMap/DelegateTest.php
@@ -60,5 +60,3 @@ class DelegateTest extends BaseCase
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/Dynamic/DynamicTest.php b/tests/simple_unit/SqlMap/Dynamic/DynamicTest.php
index 436cd49e..be7a1820 100644
--- a/tests/simple_unit/SqlMap/Dynamic/DynamicTest.php
+++ b/tests/simple_unit/SqlMap/Dynamic/DynamicTest.php
@@ -7,5 +7,3 @@ class DynamicTest extends UnitTestCase
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/GroupByTest.php b/tests/simple_unit/SqlMap/GroupByTest.php
index 11bd86bb..a16211c3 100644
--- a/tests/simple_unit/SqlMap/GroupByTest.php
+++ b/tests/simple_unit/SqlMap/GroupByTest.php
@@ -39,5 +39,3 @@ class GroupByTest extends BaseCase
/**/
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/InheritanceTest.php b/tests/simple_unit/SqlMap/InheritanceTest.php
index 82f86af3..81cad4a5 100644
--- a/tests/simple_unit/SqlMap/InheritanceTest.php
+++ b/tests/simple_unit/SqlMap/InheritanceTest.php
@@ -141,5 +141,4 @@ class CustomInheritance extends TSqlMapTypeHandler
{
throw new TDataMapperException('can not create');
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/ParameterMapTest.php b/tests/simple_unit/SqlMap/ParameterMapTest.php
index fb29c162..557b9f4d 100644
--- a/tests/simple_unit/SqlMap/ParameterMapTest.php
+++ b/tests/simple_unit/SqlMap/ParameterMapTest.php
@@ -245,5 +245,3 @@ class ParameterMapTest extends BaseCase
}
/**/
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/PropertyAccessTest.php b/tests/simple_unit/SqlMap/PropertyAccessTest.php
index d580f965..80199628 100644
--- a/tests/simple_unit/SqlMap/PropertyAccessTest.php
+++ b/tests/simple_unit/SqlMap/PropertyAccessTest.php
@@ -73,5 +73,3 @@ class PropertyAccessTest extends BaseCase
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/ResultClassTest.php b/tests/simple_unit/SqlMap/ResultClassTest.php
index 041c124e..773268b9 100644
--- a/tests/simple_unit/SqlMap/ResultClassTest.php
+++ b/tests/simple_unit/SqlMap/ResultClassTest.php
@@ -245,5 +245,3 @@ class ResultClassTest extends BaseCase
/**/
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/ResultMapTest.php b/tests/simple_unit/SqlMap/ResultMapTest.php
index d545b65e..b14cee31 100644
--- a/tests/simple_unit/SqlMap/ResultMapTest.php
+++ b/tests/simple_unit/SqlMap/ResultMapTest.php
@@ -269,5 +269,3 @@ class ResultMapTest extends BaseCase
*/
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/SelectKeyTest.php b/tests/simple_unit/SqlMap/SelectKeyTest.php
index a1efa640..464b94f1 100644
--- a/tests/simple_unit/SqlMap/SelectKeyTest.php
+++ b/tests/simple_unit/SqlMap/SelectKeyTest.php
@@ -116,5 +116,3 @@ class SelectKeyTest extends BaseCase
$this->initScript('line-item-init.sql');
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/SqlMapCacheTest.php b/tests/simple_unit/SqlMap/SqlMapCacheTest.php
index 1bb9b8d4..7c3495b5 100644
--- a/tests/simple_unit/SqlMap/SqlMapCacheTest.php
+++ b/tests/simple_unit/SqlMap/SqlMapCacheTest.php
@@ -73,5 +73,3 @@ class SqlMapCacheTest extends UnitTestCase
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/StatementExtendsTest.php b/tests/simple_unit/SqlMap/StatementExtendsTest.php
index f496f154..69beaa58 100644
--- a/tests/simple_unit/SqlMap/StatementExtendsTest.php
+++ b/tests/simple_unit/SqlMap/StatementExtendsTest.php
@@ -25,5 +25,3 @@ class StatementExtendsTest extends UnitTestCase
$this->assertPattern('/img_progress/', $sql2);
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/StatementTest.php b/tests/simple_unit/SqlMap/StatementTest.php
index f9c3fb13..3f9f4506 100644
--- a/tests/simple_unit/SqlMap/StatementTest.php
+++ b/tests/simple_unit/SqlMap/StatementTest.php
@@ -1131,5 +1131,3 @@ class StatementTest extends BaseCase
#endregion
/**/
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/TestQueryForMap.php b/tests/simple_unit/SqlMap/TestQueryForMap.php
index 89676469..2de020a8 100644
--- a/tests/simple_unit/SqlMap/TestQueryForMap.php
+++ b/tests/simple_unit/SqlMap/TestQueryForMap.php
@@ -39,5 +39,3 @@ class TestQueryForMap extends BaseCase
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/common.php b/tests/simple_unit/SqlMap/common.php
index 5146d123..020a296b 100644
--- a/tests/simple_unit/SqlMap/common.php
+++ b/tests/simple_unit/SqlMap/common.php
@@ -151,5 +151,3 @@ class BaseTestConfig
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/A.php b/tests/simple_unit/SqlMap/domain/A.php
index af1f925d..a4f204e4 100644
--- a/tests/simple_unit/SqlMap/domain/A.php
+++ b/tests/simple_unit/SqlMap/domain/A.php
@@ -23,5 +23,3 @@ class A
public function getF(){ return $this->_F; }
public function setF($value){ $this->_F = $value; }
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/Account.php b/tests/simple_unit/SqlMap/domain/Account.php
index 9502eb85..b4bcbcc8 100644
--- a/tests/simple_unit/SqlMap/domain/Account.php
+++ b/tests/simple_unit/SqlMap/domain/Account.php
@@ -32,5 +32,3 @@ class Account
public function setCartOptions($value){ $this->_CartOptions = $value; }
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/AccountBis.php b/tests/simple_unit/SqlMap/domain/AccountBis.php
index d454f2a8..e48184b6 100644
--- a/tests/simple_unit/SqlMap/domain/AccountBis.php
+++ b/tests/simple_unit/SqlMap/domain/AccountBis.php
@@ -9,5 +9,3 @@ class AccountBis
public $More;
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/AccountCollection.php b/tests/simple_unit/SqlMap/domain/AccountCollection.php
index b14ece5e..06e30dc8 100644
--- a/tests/simple_unit/SqlMap/domain/AccountCollection.php
+++ b/tests/simple_unit/SqlMap/domain/AccountCollection.php
@@ -13,5 +13,3 @@ class AccountCollection extends TList
$array->copyFrom($this);
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/B.php b/tests/simple_unit/SqlMap/domain/B.php
index 788b804e..ab42e6b6 100644
--- a/tests/simple_unit/SqlMap/domain/B.php
+++ b/tests/simple_unit/SqlMap/domain/B.php
@@ -19,5 +19,3 @@ class B
public function getLibelle(){ return $this->_Libelle; }
public function setLibelle($value){ $this->_Libelle = $value; }
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/Book.php b/tests/simple_unit/SqlMap/domain/Book.php
index 80877112..4c0670e8 100644
--- a/tests/simple_unit/SqlMap/domain/Book.php
+++ b/tests/simple_unit/SqlMap/domain/Book.php
@@ -5,7 +5,5 @@ class Book extends Document
private $_PageNumber='';
public function getPageNumber(){ return $this->_PageNumber; }
- public function setPageNumber($value){ $this->_PageNumber = $value; }
+ public function setPageNumber($value){ $this->_PageNumber = $value; }
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/C.php b/tests/simple_unit/SqlMap/domain/C.php
index 47118d44..642f97e9 100644
--- a/tests/simple_unit/SqlMap/domain/C.php
+++ b/tests/simple_unit/SqlMap/domain/C.php
@@ -11,5 +11,3 @@ class C
public function getLibelle(){ return $this->_Libelle; }
public function setLibelle($value){ $this->_Libelle = $value; }
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/Category.php b/tests/simple_unit/SqlMap/domain/Category.php
index db76edb4..895819e9 100644
--- a/tests/simple_unit/SqlMap/domain/Category.php
+++ b/tests/simple_unit/SqlMap/domain/Category.php
@@ -15,5 +15,3 @@ class Category
public function getGuidString(){ return $this->_Guid; }
public function setGuidString($value){ $this->_Guid = $value; }
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/Complex.php b/tests/simple_unit/SqlMap/domain/Complex.php
index 99cb04b8..01082343 100644
--- a/tests/simple_unit/SqlMap/domain/Complex.php
+++ b/tests/simple_unit/SqlMap/domain/Complex.php
@@ -7,5 +7,3 @@ class Complex
public function getMap(){ return $this->_map; }
public function setMap(TMap $map){ $this->_map = $map; }
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/D.php b/tests/simple_unit/SqlMap/domain/D.php
index 2cbd2883..f120e2d1 100644
--- a/tests/simple_unit/SqlMap/domain/D.php
+++ b/tests/simple_unit/SqlMap/domain/D.php
@@ -12,5 +12,3 @@ class D
public function setLibelle($value){ $this->_Libelle = $value; }
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/Document.php b/tests/simple_unit/SqlMap/domain/Document.php
index 682f8eb3..518851e6 100644
--- a/tests/simple_unit/SqlMap/domain/Document.php
+++ b/tests/simple_unit/SqlMap/domain/Document.php
@@ -12,5 +12,3 @@ class Document
public function setTitle($value){ $this->_Title = $value; }
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/DocumentCollection.php b/tests/simple_unit/SqlMap/domain/DocumentCollection.php
index c130db56..a2d5d89d 100644
--- a/tests/simple_unit/SqlMap/domain/DocumentCollection.php
+++ b/tests/simple_unit/SqlMap/domain/DocumentCollection.php
@@ -4,5 +4,3 @@ class DocumentCollection extends TList
{
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/E.php b/tests/simple_unit/SqlMap/domain/E.php
index 8473c156..c69c8027 100644
--- a/tests/simple_unit/SqlMap/domain/E.php
+++ b/tests/simple_unit/SqlMap/domain/E.php
@@ -12,5 +12,3 @@ class E
public function setLibelle($value){ $this->_Libelle = $value; }
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/F.php b/tests/simple_unit/SqlMap/domain/F.php
index 2bbbb2fb..159d8d63 100644
--- a/tests/simple_unit/SqlMap/domain/F.php
+++ b/tests/simple_unit/SqlMap/domain/F.php
@@ -12,5 +12,3 @@ class F
public function setLibelle($value){ $this->_Libelle = $value; }
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/LineItem.php b/tests/simple_unit/SqlMap/domain/LineItem.php
index f6908bbd..a989ab8b 100644
--- a/tests/simple_unit/SqlMap/domain/LineItem.php
+++ b/tests/simple_unit/SqlMap/domain/LineItem.php
@@ -28,5 +28,3 @@ class LineItem
public function setPictureData($value){ $this->_PictureData = $value; }
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/LineItemCollection.php b/tests/simple_unit/SqlMap/domain/LineItemCollection.php
index 8bc95622..1c31dca3 100644
--- a/tests/simple_unit/SqlMap/domain/LineItemCollection.php
+++ b/tests/simple_unit/SqlMap/domain/LineItemCollection.php
@@ -4,5 +4,3 @@ class LineItemCollection extends TList
{
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/Newspaper.php b/tests/simple_unit/SqlMap/domain/Newspaper.php
index 08716c6d..12ebce5b 100644
--- a/tests/simple_unit/SqlMap/domain/Newspaper.php
+++ b/tests/simple_unit/SqlMap/domain/Newspaper.php
@@ -8,5 +8,3 @@ class Newspaper extends Document
public function setCity($value){ $this->_City = $value; }
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/Order.php b/tests/simple_unit/SqlMap/domain/Order.php
index 312626fe..2b907ac6 100644
--- a/tests/simple_unit/SqlMap/domain/Order.php
+++ b/tests/simple_unit/SqlMap/domain/Order.php
@@ -67,5 +67,3 @@ class Order
public function setFavouriteLineItem($value){ $this->_FavouriteLineItem = $value; }
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/Other.php b/tests/simple_unit/SqlMap/domain/Other.php
index 9e78ab97..89f9d490 100644
--- a/tests/simple_unit/SqlMap/domain/Other.php
+++ b/tests/simple_unit/SqlMap/domain/Other.php
@@ -19,5 +19,3 @@ class Other
public function getLong(){ return $this->_Long; }
public function setLong($value){ $this->_Long = $value; }
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/Sample.php b/tests/simple_unit/SqlMap/domain/Sample.php
index e03be2df..f2a8951f 100644
--- a/tests/simple_unit/SqlMap/domain/Sample.php
+++ b/tests/simple_unit/SqlMap/domain/Sample.php
@@ -51,5 +51,3 @@ class Sample
public function getSequenceDate(){ return $this->_SequenceDate; }
public function setSequenceDate($value){ $this->_SequenceDate = $value; }
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/Search.php b/tests/simple_unit/SqlMap/domain/Search.php
index c01891a9..d2170044 100644
--- a/tests/simple_unit/SqlMap/domain/Search.php
+++ b/tests/simple_unit/SqlMap/domain/Search.php
@@ -19,5 +19,3 @@ class Search
public function getStartDateAnd(){ return $this->_StartDateAnd; }
public function setStartDateAnd($value){ $this->_StartDateAnd = $value; }
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/domain/User.php b/tests/simple_unit/SqlMap/domain/User.php
index b21712a3..1106d1e9 100644
--- a/tests/simple_unit/SqlMap/domain/User.php
+++ b/tests/simple_unit/SqlMap/domain/User.php
@@ -23,5 +23,3 @@ class User
public function getLastLogon(){ return $this->_LastLogon; }
public function setLastLogon($value){ $this->_LastLogon = $value; }
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/gen.php b/tests/simple_unit/SqlMap/gen.php
index 855172ba..40ddc297 100644
--- a/tests/simple_unit/SqlMap/gen.php
+++ b/tests/simple_unit/SqlMap/gen.php
@@ -29,5 +29,3 @@ function print_funcs($props)
echo $getter.$setter."\n";
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/SqlMap/queryForListLimitTest.php b/tests/simple_unit/SqlMap/queryForListLimitTest.php
index 349314a5..af550dcb 100644
--- a/tests/simple_unit/SqlMap/queryForListLimitTest.php
+++ b/tests/simple_unit/SqlMap/queryForListLimitTest.php
@@ -36,5 +36,3 @@ class queryForListLimitTest extends BaseCase
$this->assertEqual($list1[1][2],'Dalton');
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/TableGateway/BaseGatewayTest.php b/tests/simple_unit/TableGateway/BaseGatewayTest.php
index 98b236ee..f3117ed2 100644
--- a/tests/simple_unit/TableGateway/BaseGatewayTest.php
+++ b/tests/simple_unit/TableGateway/BaseGatewayTest.php
@@ -90,5 +90,4 @@ class BaseGatewayTest extends UnitTestCase
{
$this->getGateway()->deleteAll('1=1');
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/simple_unit/TableGateway/CountTest.php b/tests/simple_unit/TableGateway/CountTest.php
index 0e159ab0..97211e3c 100644
--- a/tests/simple_unit/TableGateway/CountTest.php
+++ b/tests/simple_unit/TableGateway/CountTest.php
@@ -12,5 +12,4 @@ class CountTest extends BaseGatewayTest
$result = $this->getGateway2()->count('department_id = ?', 1);
$this->assertEqual(4, $result);
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/simple_unit/TableGateway/DeleteByPkTest.php b/tests/simple_unit/TableGateway/DeleteByPkTest.php
index 57d9dd31..49b2d86c 100644
--- a/tests/simple_unit/TableGateway/DeleteByPkTest.php
+++ b/tests/simple_unit/TableGateway/DeleteByPkTest.php
@@ -48,5 +48,4 @@ class DeleteByPkTest extends BaseGatewayTest
$this->assertEqual(2, $deleted);
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/simple_unit/TableGateway/MagicCallTest.php b/tests/simple_unit/TableGateway/MagicCallTest.php
index 8d42fba8..87f9e785 100644
--- a/tests/simple_unit/TableGateway/MagicCallTest.php
+++ b/tests/simple_unit/TableGateway/MagicCallTest.php
@@ -27,5 +27,4 @@ class MagicCallTest extends BaseGatewayTest
$this->assertEqual(0, count($result));
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/simple_unit/TableGateway/TableGatewayPgsqlTest.php b/tests/simple_unit/TableGateway/TableGatewayPgsqlTest.php
index f34dcefc..96c9351d 100644
--- a/tests/simple_unit/TableGateway/TableGatewayPgsqlTest.php
+++ b/tests/simple_unit/TableGateway/TableGatewayPgsqlTest.php
@@ -52,5 +52,4 @@ class TableGatewayPgsqlTest extends BaseGatewayTest
$this->assertEqual($result['username'], 'record2');
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/simple_unit/TableGateway/TableInfoGatewayTest.php b/tests/simple_unit/TableGateway/TableInfoGatewayTest.php
index 51af7634..6c85248c 100644
--- a/tests/simple_unit/TableGateway/TableInfoGatewayTest.php
+++ b/tests/simple_unit/TableGateway/TableInfoGatewayTest.php
@@ -13,5 +13,4 @@ class TableInfoGatewayTest extends BaseGatewayTest
$table = new TTableGateway($info, $conn);
$this->assertEqual(count($table->findAll()->readAll()), 2);
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/simple_unit/TableGateway/TestFindByPk.php b/tests/simple_unit/TableGateway/TestFindByPk.php
index 5a7a081c..3756d35a 100644
--- a/tests/simple_unit/TableGateway/TestFindByPk.php
+++ b/tests/simple_unit/TableGateway/TestFindByPk.php
@@ -44,5 +44,4 @@ class TestFindByPk extends BaseGatewayTest
$this->assertEqual($expect, $result);
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/simple_unit/Tickets/Ticket589Test.php b/tests/simple_unit/Tickets/Ticket589Test.php
index 2fedda6f..487181ff 100644
--- a/tests/simple_unit/Tickets/Ticket589Test.php
+++ b/tests/simple_unit/Tickets/Ticket589Test.php
@@ -18,5 +18,3 @@ class Ticket589Test extends UnitTestCase
}
}
}
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/unit.php b/tests/simple_unit/unit.php
index 63910f68..b0e7874d 100644
--- a/tests/simple_unit/unit.php
+++ b/tests/simple_unit/unit.php
@@ -5,5 +5,3 @@ $test_cases = dirname(__FILE__)."/";
$tester = new PradoUnitTester($test_cases);
$tester->run(new HtmlReporter());
-
-?> \ No newline at end of file
diff --git a/tests/simple_unit/ws.php b/tests/simple_unit/ws.php
index 703235d1..9096183e 100644
--- a/tests/simple_unit/ws.php
+++ b/tests/simple_unit/ws.php
@@ -5,5 +5,3 @@ include_once './Soap/ContactManager.php';
$app = new TApplication('.');
$app->run();
-
-?> \ No newline at end of file
diff --git a/tests/test_tools/PradoGenericSelenium2Test.php b/tests/test_tools/PradoGenericSelenium2Test.php
new file mode 100644
index 00000000..66350e11
--- /dev/null
+++ b/tests/test_tools/PradoGenericSelenium2Test.php
@@ -0,0 +1,49 @@
+<?php
+require_once 'PHPUnit/Extensions/Selenium2TestCase.php';
+
+// TODO: stub
+class PradoGenericSelenium2Test extends PHPUnit_Extensions_Selenium2TestCase
+{
+ static $browser='chrome';
+ static $baseurl='http://127.0.0.1/prado-3.2/tests/FunctionalTests/';
+ static $timeout=5; //seconds
+ static $wait=1000; //msecs
+
+ protected function setUp()
+ {
+ $this->setBrowser(static::$browser);
+ $this->setBrowserUrl(static::$baseurl);
+ $this->setSeleniumServerRequestsTimeout(static::$timeout);
+ }
+
+ public function setUpPage()
+ {
+ $this->timeouts()->implicitWait(static::$wait);
+ }
+
+ protected function open($url)
+ {
+ $this->url($url);
+ }
+
+ protected function tearDown()
+ {
+ }
+
+ protected function verifyTextPresent($txt)
+ {
+ $this->assertContains($txt, $this->source());
+ }
+
+ protected function assertText($id, $txt)
+ {
+ $element = $this->byId($id);
+ $this->assertEquals($txt, $element->text());
+ }
+
+ protected function pause($msec)
+ {
+ usleep($msec*1000);
+ }
+
+} \ No newline at end of file
diff --git a/tests/test_tools/PradoGenericSeleniumTest.php b/tests/test_tools/PradoGenericSeleniumTest.php
index 2c9ceb21..9a60f95a 100644
--- a/tests/test_tools/PradoGenericSeleniumTest.php
+++ b/tests/test_tools/PradoGenericSeleniumTest.php
@@ -1,7 +1,6 @@
<?php
require_once 'PHPUnit/Extensions/SeleniumTestCase.php';
-require_once 'PHPUnit/Extensions/Selenium2TestCase.php';
-
+
class PradoGenericSeleniumTest extends PHPUnit_Extensions_SeleniumTestCase
{
static $browser='*googlechrome';
@@ -17,26 +16,4 @@ class PradoGenericSeleniumTest extends PHPUnit_Extensions_SeleniumTestCase
protected function tearDown()
{
}
-}
-
-// TODO: stub
-class PradoGenericSelenium2Test extends PHPUnit_Extensions_Selenium2TestCase
-{
- static $browser='chrome';
- static $baseurl='http://127.0.0.1/prado-3.2/tests/FunctionalTests/';
-
- protected function setUp()
- {
- $this->setBrowser(static::$browser);
- $this->setBrowserUrl(static::$baseurl);
- }
-
- protected function open($url)
- {
- $this->setBrowserUrl(static::$baseurl.$url);
- }
-
- protected function tearDown()
- {
- }
} \ No newline at end of file
diff --git a/tests/test_tools/README.txt b/tests/test_tools/README.txt
index cfa02abe..6bc3aa79 100644
--- a/tests/test_tools/README.txt
+++ b/tests/test_tools/README.txt
@@ -4,7 +4,7 @@ Functional tests are browser based that tests the overall functional of a Prado
=== Writing Tests ===
-Lets test some part of a Prado application. Create a new php file, e.g.
+Lets test some part of a Prado application. Create a new php file, e.g.
testExample1.php
@@ -21,11 +21,10 @@ class testExample1 extends SeleniumTestCase
{
//using xpath to find the button with value "Click Me!"
$this->click('//input[@value="Click Me!"]');
-
+
//..more commands and assertions
}
}
-?>
</php>
=== Tests as part of Example code ===
@@ -50,9 +49,9 @@ class testMyButtonExample extends SeleniumTestCase
{
//get the test page url
$page = Prado::getApplication()->getTestPage(__FILE__);
-
+
//open MyButtonExample page
- $this->open($page);
+ $this->open($page);
}
function testButtonClick()
@@ -62,7 +61,6 @@ class testMyButtonExample extends SeleniumTestCase
$this->click('//input[@value="Hello World!"]');
}
}
-?>
</php>
File: MyButtonExample.tpl
@@ -108,7 +106,7 @@ Select the element with the specified @id attribute. If no match is found, sele
Find an element using JavaScript traversal of the HTML Document Object Model. DOM locators ''must'' begin with "document.".
* dom=document.forms['myForm'].myDropdown
* dom=document.images[56]
-
+
==== '''xpath='''''xpathExpression''====
Locate an element using an XPath expression. XPath locators ''must'' begin with "//".
* xpath=//img[@alt='The image alt text']
@@ -133,15 +131,15 @@ Select Option Specifiers provide different ways of specifying options of an HTML
matches options based on their labels, i.e. the visible text.
* label=regexp:^[Oo]ther
-==== value=valuePattern ====
+==== value=valuePattern ====
matches options based on their values.
* value=other
-==== id=id ====
+==== id=id ====
matches options based on their ids.
* id=option1
-==== index=index ====
+==== index=index ====
matches an option based on its index (offset from zero).
* index=2
@@ -174,8 +172,8 @@ Selenium Actions
examples:
- open /mypage
- open http://localhost/
+ open /mypage
+ open http://localhost/
click( elementLocator )
@@ -183,9 +181,9 @@ Selenium Actions
examples:
- click aCheckbox
- clickAndWait submitButton
- clickAndWait anyLink
+ click aCheckbox
+ clickAndWait submitButton
+ clickAndWait anyLink
note:
Selenium will always automatically click on a popup dialog raised by the alert() or confirm() methods. (The exception is those raised during 'onload', which are not yet handled by Selenium). You must use [verify|assert]Alert or [verify|assert]Confirmation to tell Selenium that you expect the popup dialog. You may use chooseCancelOnNextConfirmation to click 'cancel' on the next confirmation dialog instead of clicking 'OK'.
@@ -222,8 +220,8 @@ Selenium Actions
examples:
- selectWindow myPopupWindow
- selectWindow null
+ selectWindow myPopupWindow
+ selectWindow null
goBack()
@@ -231,7 +229,7 @@ Selenium Actions
examples:
- goBack
+ goBack
close()
@@ -239,7 +237,7 @@ Selenium Actions
examples:
- close
+ close
pause( milliseconds )
@@ -247,8 +245,8 @@ Selenium Actions
examples:
- pause 5000
- pause 2000
+ pause 5000
+ pause 2000
fireEvent( elementLocator, eventName )
@@ -310,7 +308,7 @@ Selenium Actions
examples:
- chooseCancelOnNextConfirmation
+ chooseCancelOnNextConfirmation
answerOnNextPrompt( answerString )
@@ -318,7 +316,7 @@ Selenium Actions
examples:
- answerOnNextPrompt Kangaroo
+ answerOnNextPrompt Kangaroo
Selenium Checks
@@ -330,8 +328,8 @@ Selenium Checks
examples:
- verifyLocation /mypage
- assertLocation /mypage
+ verifyLocation /mypage
+ assertLocation /mypage
assertTitle( titlePattern )
@@ -339,8 +337,8 @@ Selenium Checks
examples:
- verifyTitle My Page
- assertTitle My Page
+ verifyTitle My Page
+ assertTitle My Page
assertValue( inputLocator, valuePattern )
@@ -396,8 +394,8 @@ Selenium Checks
examples:
- verifyTextPresent You are now logged in.
- assertTextPresent You are now logged in.
+ verifyTextPresent You are now logged in.
+ assertTextPresent You are now logged in.
assertTextNotPresent( text )
@@ -409,8 +407,8 @@ Selenium Checks
examples:
- verifyElementPresent submitButton
- assertElementPresent //img[@alt='foo']
+ verifyElementPresent submitButton
+ assertElementPresent //img[@alt='foo']
assertElementNotPresent( elementLocator )
@@ -418,8 +416,8 @@ Selenium Checks
examples:
- verifyElementNotPresent cancelButton
- assertElementNotPresent cancelButton
+ verifyElementNotPresent cancelButton
+ assertElementNotPresent cancelButton
assertTable( cellAddress, valuePattern )
@@ -436,8 +434,8 @@ Selenium Checks
examples:
- verifyVisible postcode
- assertVisible postcode
+ verifyVisible postcode
+ assertVisible postcode
assertNotVisible( elementLocator )
@@ -445,8 +443,8 @@ Selenium Checks
examples:
- verifyNotVisible postcode
- assertNotVisible postcode
+ verifyNotVisible postcode
+ assertNotVisible postcode
verifyEditable / assertEditable( inputLocator )
@@ -454,8 +452,8 @@ Selenium Checks
examples:
- verifyEditable shape
- assertEditable colour
+ verifyEditable shape
+ assertEditable colour
assertNotEditable( inputLocator )
@@ -473,8 +471,8 @@ Selenium Checks
examples:
- verifyAlert Invalid Phone Number
- assertAlert Invalid Phone Number
+ verifyAlert Invalid Phone Number
+ assertAlert Invalid Phone Number
assertConfirmation( messagePattern )
@@ -488,8 +486,8 @@ Selenium Checks
examples:
- assertConfirmation Remove this user?
- verifyConfirmation Are you sure?
+ assertConfirmation Remove this user?
+ verifyConfirmation Are you sure?
assertPrompt( messagePattern )
@@ -499,9 +497,9 @@ Selenium Checks
examples:
- answerOnNextPrompt Joe
- click id=delegate
- verifyPrompt Delegate to who?
+ answerOnNextPrompt Joe
+ click id=delegate
+ verifyPrompt Delegate to who?
Parameter construction and Variables
diff --git a/tests/test_tools/phpunit_bootstrap.php b/tests/test_tools/phpunit_bootstrap.php
index 1154e5fc..23e25a1c 100644
--- a/tests/test_tools/phpunit_bootstrap.php
+++ b/tests/test_tools/phpunit_bootstrap.php
@@ -22,4 +22,5 @@ if (!@include_once VENDOR_DIR.'/autoload.php') {
require_once(PRADO_FRAMEWORK_DIR.'/prado.php');
// for FunctionalTests
-require_once(__DIR__.'/PradoGenericSeleniumTest.php'); \ No newline at end of file
+require_once(__DIR__.'/PradoGenericSeleniumTest.php');
+require_once(__DIR__.'/PradoGenericSelenium2Test.php'); \ No newline at end of file
diff --git a/tests/test_tools/simpletest/HtmlReporterWithCoverage.php b/tests/test_tools/simpletest/HtmlReporterWithCoverage.php
index abd10076..f3ae2391 100644
--- a/tests/test_tools/simpletest/HtmlReporterWithCoverage.php
+++ b/tests/test_tools/simpletest/HtmlReporterWithCoverage.php
@@ -1,11 +1,11 @@
<?php
-if (!defined('T_ML_COMMENT'))
+if (!defined('T_ML_COMMENT'))
define('T_ML_COMMENT', T_COMMENT);
-else
+else
define('T_DOC_COMMENT', T_ML_COMMENT);
-class HtmlReporterWithCoverage extends HtmlReporter
+class HtmlReporterWithCoverage extends HtmlReporter
{
protected $coverage = array();
@@ -19,7 +19,7 @@ class HtmlReporterWithCoverage extends HtmlReporter
$this->base_dir = $base_dir;
}
- function paintHeader($test_name, $charset="UTF-8")
+ function paintHeader($test_name, $charset="UTF-8")
{
$this->sendNoCacheHeaders();
header('Content-Type: text/html; Charset='.$charset);
@@ -31,30 +31,30 @@ class HtmlReporterWithCoverage extends HtmlReporter
print "</head>\n<body>\n";
print "<h1>$test_name</h1>\n";
flush();
-
- if (extension_loaded('xdebug'))
+
+ if (extension_loaded('xdebug'))
xdebug_start_code_coverage(XDEBUG_CC_UNUSED);
- }
+ }
/**
*
*/
- function _getCss()
+ function _getCss()
{
$contents = parent::_getCss()."\n ";
$contents .= '
- .bar { float: left; display: inline; border: 1px solid #eee; width: 300px; white-space: nowrap;}
- .percentage { float: left; background-color: #eef; font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 0.65em; padding: 5px; margin-right: }
- .coverage {margin: 0.4em; }
+ .bar { float: left; display: inline; border: 1px solid #eee; width: 300px; white-space: nowrap;}
+ .percentage { float: left; background-color: #eef; font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 0.65em; padding: 5px; margin-right: }
+ .coverage {margin: 0.4em; }
.coverage a {
padding-left: 0.5em;
}
- .coverage:after {
- content: ".";
- display: block;
- height: 0;
- clear: both;
+ .coverage:after {
+ content: ".";
+ display: block;
+ height: 0;
+ clear: both;
visibility: hidden;
}
.coverage {display: inline-block;}
@@ -66,9 +66,9 @@ class HtmlReporterWithCoverage extends HtmlReporter
Return $contents;
}
- function paintFooter($test_name)
+ function paintFooter($test_name)
{
- if (extension_loaded('xdebug'))
+ if (extension_loaded('xdebug'))
{
$this->coverage = xdebug_get_code_coverage();
xdebug_stop_code_coverage();
@@ -93,10 +93,10 @@ class HtmlReporterWithCoverage extends HtmlReporter
$dir = dirname(__FILE__);
if(count($this->coverage) > 0)
print '<h2>Code Coverage</h2>';
-
-
- ksort($this->coverage);
-
+
+
+ ksort($this->coverage);
+
$details = array();
foreach($this->coverage as $file => $coverage)
{
@@ -110,7 +110,7 @@ class HtmlReporterWithCoverage extends HtmlReporter
$width = $percentage * 3;
$filename = str_replace($this->base_dir, '',$file);
$link = $this->constructURL($filename, $coverage);
-
+
$detail['total'] = $total;
$detail['executed'] = $executed;
$detail['width'] = $width;
@@ -150,7 +150,7 @@ class HtmlReporterWithCoverage extends HtmlReporter
}
-class HTMLCoverageReport extends HtmlReporter
+class HTMLCoverageReport extends HtmlReporter
{
protected $file;
protected $lines;
@@ -184,7 +184,7 @@ class HTMLCoverageReport extends HtmlReporter
$this->paintFooter();
}
- function paintHeader($file, $charset="UTF-8")
+ function paintHeader($file, $charset="UTF-8")
{
$total = $this->codelines($this->file);
$executed = count($this->lines);
@@ -218,21 +218,21 @@ class HTMLCoverageReport extends HtmlReporter
$lines = '';
- foreach ($tokens as $token)
+ foreach ($tokens as $token)
{
- if (is_string($token))
+ if (is_string($token))
{
// simple 1-character token
$lines .= $token;
- }
- else
+ }
+ else
{
// token array
list($id, $text) = $token;
- switch ($id)
- {
- case T_COMMENT:
+ switch ($id)
+ {
+ case T_COMMENT:
case T_ML_COMMENT: // we've defined this
case T_DOC_COMMENT: // and this
// no action on comments
@@ -265,4 +265,3 @@ class HTMLCoverageReport extends HtmlReporter
}
}
-?>
diff --git a/tests/test_tools/simpletest/authentication.php b/tests/test_tools/simpletest/authentication.php
index cae366b3..86b68402 100644
--- a/tests/test_tools/simpletest/authentication.php
+++ b/tests/test_tools/simpletest/authentication.php
@@ -234,5 +234,4 @@
'Authorization: Basic ' . base64_encode("$username:$password"));
}
}
- }
-?> \ No newline at end of file
+ } \ No newline at end of file
diff --git a/tests/test_tools/simpletest/browser.php b/tests/test_tools/simpletest/browser.php
index 44c8ddd4..410b18b9 100644
--- a/tests/test_tools/simpletest/browser.php
+++ b/tests/test_tools/simpletest/browser.php
@@ -220,7 +220,7 @@
function useFrames() {
$this->_ignore_frames = false;
}
-
+
/**
* Switches off cookie sending and recieving.
* @access public
@@ -228,7 +228,7 @@
function ignoreCookies() {
$this->_user_agent->ignoreCookies();
}
-
+
/**
* Switches back on the cookie sending and recieving.
* @access public
@@ -257,7 +257,7 @@
}
return $frameset;
}
-
+
/**
* Assembles the parsing machinery and actually parses
* a single page. Frees all of the builder memory and so
@@ -1053,5 +1053,4 @@
}
return $raw;
}
- }
-?> \ No newline at end of file
+ } \ No newline at end of file
diff --git a/tests/test_tools/simpletest/collector.php b/tests/test_tools/simpletest/collector.php
index 5bcde179..ded847c9 100644
--- a/tests/test_tools/simpletest/collector.php
+++ b/tests/test_tools/simpletest/collector.php
@@ -1,12 +1,11 @@
<?php
/**
- * This file contains the following classes: {@link SimpleCollector},
+ * This file contains the following classes: {@link SimpleCollector},
* {@link SimplePatternCollector}.
- *
+ *
* @author Travis Swicegood <development@domain51.com>
* @package SimpleTest
* @subpackage UnitTester
- * @version $Id: collector.php 1398 2006-09-08 19:31:03Z xue $
*/
/**
@@ -17,7 +16,7 @@
* @subpackage UnitTester
*/
class SimpleCollector {
-
+
/**
* Strips off any kind of slash at the end so as to normalise the path
*
@@ -25,12 +24,12 @@ class SimpleCollector {
*/
function _removeTrailingSlash($path) {
return preg_replace('|[\\/]$|', '', $path);
-
+
/**
* @internal
* Try benchmarking the following. It's more code, but by not using the
- * regex, it may be faster? Also, shouldn't be looking for
- * DIRECTORY_SEPERATOR instead of a manual "/"?
+ * regex, it may be faster? Also, shouldn't be looking for
+ * DIRECTORY_SEPERATOR instead of a manual "/"?
*/
if (substr($path, -1) == DIRECTORY_SEPERATOR) {
return substr($path, 0, -1);
@@ -54,12 +53,12 @@ class SimpleCollector {
closedir($handle);
}
}
-
+
/**
* This method determines what should be done with a given file and adds
* it via {@link GroupTest::addTestFile()} if necessary.
*
- * This method should be overriden to provide custom matching criteria,
+ * This method should be overriden to provide custom matching criteria,
* such as pattern matching, recursive matching, etc. For an example, see
* {@link SimplePatternCollector::_handle()}.
*
@@ -85,8 +84,8 @@ class SimpleCollector {
*/
class SimplePatternCollector extends SimpleCollector {
protected $_pattern;
-
-
+
+
/**
*
* @param string $pattern Perl compatible regex to test name against
@@ -96,8 +95,8 @@ class SimplePatternCollector extends SimpleCollector {
function SimplePatternCollector($pattern = '/php$/i') {
$this->_pattern = $pattern;
}
-
-
+
+
/**
* Attempts to add files that match a given pattern.
*
@@ -111,5 +110,4 @@ class SimplePatternCollector extends SimpleCollector {
parent::_handle($test, $filename);
}
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/test_tools/simpletest/compatibility.php b/tests/test_tools/simpletest/compatibility.php
index 92cf70d3..a181793e 100644
--- a/tests/test_tools/simpletest/compatibility.php
+++ b/tests/test_tools/simpletest/compatibility.php
@@ -181,4 +181,3 @@
return array();
}
}
-?>
diff --git a/tests/test_tools/simpletest/cookies.php b/tests/test_tools/simpletest/cookies.php
index 4a2b0d4e..eba8776e 100644
--- a/tests/test_tools/simpletest/cookies.php
+++ b/tests/test_tools/simpletest/cookies.php
@@ -11,7 +11,7 @@
*/
require_once(dirname(__FILE__) . '/url.php');
/**#@-*/
-
+
/**
* Cookie data holder. Cookie rules are full of pretty
* arbitary stuff. I have used...
@@ -27,7 +27,7 @@
protected $_path;
protected $_expiry;
protected $_is_secure;
-
+
/**
* Constructor. Sets the stored values.
* @param string $name Cookie key.
@@ -49,7 +49,7 @@
}
$this->_is_secure = $is_secure;
}
-
+
/**
* Sets the host. The cookie rules determine
* that the first two parts are taken for
@@ -67,7 +67,7 @@
}
return false;
}
-
+
/**
* Accessor for the truncated host to which this
* cookie applies.
@@ -77,7 +77,7 @@
function getHost() {
return $this->_host;
}
-
+
/**
* Test for a cookie being valid for a host name.
* @param string $host Host to test against.
@@ -87,7 +87,7 @@
function isValidHost($host) {
return ($this->_truncateHost($host) === $this->getHost());
}
-
+
/**
* Extracts just the domain part that determines a
* cookie's host validity.
@@ -104,7 +104,7 @@
}
return false;
}
-
+
/**
* Accessor for name.
* @return string Cookie key.
@@ -113,7 +113,7 @@
function getName() {
return $this->_name;
}
-
+
/**
* Accessor for value. A deleted cookie will
* have an empty string for this.
@@ -123,7 +123,7 @@
function getValue() {
return $this->_value;
}
-
+
/**
* Accessor for path.
* @return string Valid cookie path.
@@ -132,7 +132,7 @@
function getPath() {
return $this->_path;
}
-
+
/**
* Tests a path to see if the cookie applies
* there. The test path must be longer or
@@ -147,7 +147,7 @@
$this->getPath(),
strlen($this->getPath())) == 0);
}
-
+
/**
* Accessor for expiry.
* @return string Expiry string.
@@ -159,7 +159,7 @@
}
return gmdate("D, d M Y H:i:s", $this->_expiry) . " GMT";
}
-
+
/**
* Test to see if cookie is expired against
* the cookie format time or timestamp.
@@ -180,7 +180,7 @@
}
return ($this->_expiry < $now);
}
-
+
/**
* Ages the cookie by the specified number of
* seconds.
@@ -192,7 +192,7 @@
$this->_expiry -= $interval;
}
}
-
+
/**
* Accessor for the secure flag.
* @return boolean True if cookie needs SSL.
@@ -201,7 +201,7 @@
function isSecure() {
return $this->_is_secure;
}
-
+
/**
* Adds a trailing and leading slash to the path
* if missing.
@@ -218,7 +218,7 @@
return $path;
}
}
-
+
/**
* Repository for cookies. This stuff is a
* tiny bit browser dependent.
@@ -227,7 +227,7 @@
*/
class SimpleCookieJar {
protected $_cookies;
-
+
/**
* Constructor. Jar starts empty.
* @access public
@@ -235,7 +235,7 @@
function SimpleCookieJar() {
$this->_cookies = array();
}
-
+
/**
* Removes expired and temporary cookies as if
* the browser was closed and re-opened.
@@ -258,7 +258,7 @@
}
$this->_cookies = $surviving_cookies;
}
-
+
/**
* Ages all cookies in the cookie jar.
* @param integer $interval The old session is moved
@@ -272,7 +272,7 @@
$this->_cookies[$i]->agePrematurely($interval);
}
}
-
+
/**
* Sets an additional cookie. If a cookie has
* the same name and path it is replaced.
@@ -290,7 +290,7 @@
}
$this->_cookies[$this->_findFirstMatch($cookie)] = $cookie;
}
-
+
/**
* Finds a matching cookie to write over or the
* first empty slot if none.
@@ -311,7 +311,7 @@
}
return count($this->_cookies);
}
-
+
/**
* Reads the most specific cookie value from the
* browser cookies. Looks for the longest path that
@@ -335,7 +335,7 @@
}
return (isset($value) ? $value : false);
}
-
+
/**
* Tests cookie for matching against search
* criteria.
@@ -359,7 +359,7 @@
}
return true;
}
-
+
/**
* Uses a URL to sift relevant cookies by host and
* path. Results are list of strings of form "name=value".
@@ -376,5 +376,4 @@
}
return $pairs;
}
- }
-?> \ No newline at end of file
+ } \ No newline at end of file
diff --git a/tests/test_tools/simpletest/detached.php b/tests/test_tools/simpletest/detached.php
index 1f3638bb..06665781 100644
--- a/tests/test_tools/simpletest/detached.php
+++ b/tests/test_tools/simpletest/detached.php
@@ -92,5 +92,4 @@
function &_createParser($reporter) {
return new SimpleTestXmlParser($reporter);
}
- }
-?> \ No newline at end of file
+ } \ No newline at end of file
diff --git a/tests/test_tools/simpletest/dumper.php b/tests/test_tools/simpletest/dumper.php
index a2ea30b0..9c3f745a 100644
--- a/tests/test_tools/simpletest/dumper.php
+++ b/tests/test_tools/simpletest/dumper.php
@@ -398,5 +398,4 @@
}
return false;
}
- }
-?> \ No newline at end of file
+ } \ No newline at end of file
diff --git a/tests/test_tools/simpletest/encoding.php b/tests/test_tools/simpletest/encoding.php
index 0dc9fbfa..ca2083a3 100644
--- a/tests/test_tools/simpletest/encoding.php
+++ b/tests/test_tools/simpletest/encoding.php
@@ -5,7 +5,7 @@
* @subpackage WebTester
* @version $Id: encoding.php 1398 2006-09-08 19:31:03Z xue $
*/
-
+
/**#@+
* include other SimpleTest class files
*/
@@ -20,7 +20,7 @@
class SimpleEncodedPair {
protected $_key;
protected $_value;
-
+
/**
* Stashes the data for rendering later.
* @param string $key Form element name.
@@ -30,7 +30,7 @@
$this->_key = $key;
$this->_value = $value;
}
-
+
/**
* The pair as a single string.
* @return string Encoded pair.
@@ -39,7 +39,7 @@
function asRequest() {
return $this->_key . '=' . urlencode($this->_value);
}
-
+
/**
* The MIME part as a string.
* @return string MIME part encoding.
@@ -51,7 +51,7 @@
$part .= "\r\n" . $this->_value;
return $part;
}
-
+
/**
* Is this the value we are looking for?
* @param string $key Identifier.
@@ -61,7 +61,7 @@
function isKey($key) {
return $key == $this->_key;
}
-
+
/**
* Is this the value we are looking for?
* @return string Identifier.
@@ -70,7 +70,7 @@
function getKey() {
return $this->_key;
}
-
+
/**
* Is this the value we are looking for?
* @return string Content.
@@ -90,7 +90,7 @@
protected $_key;
protected $_content;
protected $_filename;
-
+
/**
* Stashes the data for rendering later.
* @param string $key Key to add value to.
@@ -102,7 +102,7 @@
$this->_content = $content;
$this->_filename = $filename;
}
-
+
/**
* The pair as a single string.
* @return string Encoded pair.
@@ -111,7 +111,7 @@
function asRequest() {
return '';
}
-
+
/**
* The MIME part as a string.
* @return string MIME part encoding.
@@ -125,7 +125,7 @@
$part .= "\r\n\r\n" . $this->_content;
return $part;
}
-
+
/**
* Attempts to figure out the MIME type from the
* file extension and the content.
@@ -138,7 +138,7 @@
}
return 'application/octet-stream';
}
-
+
/**
* Tests each character is in the range 0-127.
* @param string $ascii String to test.
@@ -152,7 +152,7 @@
}
return true;
}
-
+
/**
* Is this the value we are looking for?
* @param string $key Identifier.
@@ -162,7 +162,7 @@
function isKey($key) {
return $key == $this->_key;
}
-
+
/**
* Is this the value we are looking for?
* @return string Identifier.
@@ -171,7 +171,7 @@
function getKey() {
return $this->_key;
}
-
+
/**
* Is this the value we are looking for?
* @return string Content.
@@ -190,7 +190,7 @@
*/
class SimpleEncoding {
protected $_request;
-
+
/**
* Starts empty.
* @param array $query Hash of parameters.
@@ -205,7 +205,7 @@
$this->clear();
$this->merge($query);
}
-
+
/**
* Empties the request of parameters.
* @access public
@@ -213,7 +213,7 @@
function clear() {
$this->_request = array();
}
-
+
/**
* Adds a parameter to the query.
* @param string $key Key to add value to.
@@ -232,7 +232,7 @@
$this->_addPair($key, $value);
}
}
-
+
/**
* Adds a new value into the request.
* @param string $key Key to add value to.
@@ -242,7 +242,7 @@
function _addPair($key, $value) {
$this->_request[] = new SimpleEncodedPair($key, $value);
}
-
+
/**
* Adds a MIME part to the query. Does nothing for a
* form encoded packet.
@@ -254,7 +254,7 @@
function attach($key, $content, $filename) {
$this->_request[] = new SimpleAttachment($key, $content, $filename);
}
-
+
/**
* Adds a set of parameters to this query.
* @param array/SimpleQueryString $query Multiple values are
@@ -270,7 +270,7 @@
}
}
}
-
+
/**
* Accessor for single value.
* @return string/array False if missing, string
@@ -293,7 +293,7 @@
return $values;
}
}
-
+
/**
* Accessor for listing of pairs.
* @return array All pair objects.
@@ -302,7 +302,7 @@
function getAll() {
return $this->_request;
}
-
+
/**
* Renders the query string as a URL encoded
* request part.
@@ -319,7 +319,7 @@
return implode('&', $statements);
}
}
-
+
/**
* Bundle of GET parameters. Can include
* repeated parameters.
@@ -327,7 +327,7 @@
* @subpackage WebTester
*/
class SimpleGetEncoding extends SimpleEncoding {
-
+
/**
* Starts empty.
* @param array $query Hash of parameters.
@@ -338,7 +338,7 @@
function SimpleGetEncoding($query = false) {
$this->SimpleEncoding($query);
}
-
+
/**
* HTTP request method.
* @return string Always GET.
@@ -347,7 +347,7 @@
function getMethod() {
return 'GET';
}
-
+
/**
* Writes no extra headers.
* @param SimpleSocket $socket Socket to write to.
@@ -355,7 +355,7 @@
*/
function writeHeadersTo($socket) {
}
-
+
/**
* No data is sent to the socket as the data is encoded into
* the URL.
@@ -364,7 +364,7 @@
*/
function writeTo($socket) {
}
-
+
/**
* Renders the query string as a URL encoded
* request part for attaching to a URL.
@@ -375,14 +375,14 @@
return $this->_encode();
}
}
-
+
/**
* Bundle of URL parameters for a HEAD request.
* @package SimpleTest
* @subpackage WebTester
*/
class SimpleHeadEncoding extends SimpleGetEncoding {
-
+
/**
* Starts empty.
* @param array $query Hash of parameters.
@@ -393,7 +393,7 @@
function SimpleHeadEncoding($query = false) {
$this->SimpleGetEncoding($query);
}
-
+
/**
* HTTP request method.
* @return string Always HEAD.
@@ -403,7 +403,7 @@
return 'HEAD';
}
}
-
+
/**
* Bundle of POST parameters. Can include
* repeated parameters.
@@ -411,7 +411,7 @@
* @subpackage WebTester
*/
class SimplePostEncoding extends SimpleEncoding {
-
+
/**
* Starts empty.
* @param array $query Hash of parameters.
@@ -422,7 +422,7 @@
function SimplePostEncoding($query = false) {
$this->SimpleEncoding($query);
}
-
+
/**
* HTTP request method.
* @return string Always POST.
@@ -431,7 +431,7 @@
function getMethod() {
return 'POST';
}
-
+
/**
* Dispatches the form headers down the socket.
* @param SimpleSocket $socket Socket to write to.
@@ -441,7 +441,7 @@
$socket->write("Content-Length: " . (integer)strlen($this->_encode()) . "\r\n");
$socket->write("Content-Type: application/x-www-form-urlencoded\r\n");
}
-
+
/**
* Dispatches the form data down the socket.
* @param SimpleSocket $socket Socket to write to.
@@ -450,7 +450,7 @@
function writeTo($socket) {
$socket->write($this->_encode());
}
-
+
/**
* Renders the query string as a URL encoded
* request part for attaching to a URL.
@@ -461,7 +461,7 @@
return '';
}
}
-
+
/**
* Bundle of POST parameters in the multipart
* format. Can include file uploads.
@@ -470,7 +470,7 @@
*/
class SimpleMultipartEncoding extends SimplePostEncoding {
protected $_boundary;
-
+
/**
* Starts empty.
* @param array $query Hash of parameters.
@@ -482,7 +482,7 @@
$this->SimplePostEncoding($query);
$this->_boundary = ($boundary === false ? uniqid('st') : $boundary);
}
-
+
/**
* Dispatches the form headers down the socket.
* @param SimpleSocket $socket Socket to write to.
@@ -492,7 +492,7 @@
$socket->write("Content-Length: " . (integer)strlen($this->_encode()) . "\r\n");
$socket->write("Content-Type: multipart/form-data, boundary=" . $this->_boundary . "\r\n");
}
-
+
/**
* Dispatches the form data down the socket.
* @param SimpleSocket $socket Socket to write to.
@@ -501,7 +501,7 @@
function writeTo($socket) {
$socket->write($this->_encode());
}
-
+
/**
* Renders the query string as a URL encoded
* request part.
@@ -517,5 +517,4 @@
$stream .= "--" . $this->_boundary . "--\r\n";
return $stream;
}
- }
-?> \ No newline at end of file
+ } \ No newline at end of file
diff --git a/tests/test_tools/simpletest/errors.php b/tests/test_tools/simpletest/errors.php
index a756bd7c..c10d68a5 100644
--- a/tests/test_tools/simpletest/errors.php
+++ b/tests/test_tools/simpletest/errors.php
@@ -178,5 +178,4 @@
$queue->add($severity, $message, $filename, $line, $super_globals);
set_error_handler('simpleTestErrorHandler');
}
- }
-?> \ No newline at end of file
+ } \ No newline at end of file
diff --git a/tests/test_tools/simpletest/exceptions.php b/tests/test_tools/simpletest/exceptions.php
index 63558ad1..30d35386 100644
--- a/tests/test_tools/simpletest/exceptions.php
+++ b/tests/test_tools/simpletest/exceptions.php
@@ -42,5 +42,4 @@
$test_case->exception($exception);
}
}
- }
-?> \ No newline at end of file
+ } \ No newline at end of file
diff --git a/tests/test_tools/simpletest/expectation.php b/tests/test_tools/simpletest/expectation.php
index 8513aff4..a660fa9c 100644
--- a/tests/test_tools/simpletest/expectation.php
+++ b/tests/test_tools/simpletest/expectation.php
@@ -717,4 +717,3 @@
"] should contain method [$method]";
}
}
-?>
diff --git a/tests/test_tools/simpletest/form.php b/tests/test_tools/simpletest/form.php
index 0e6aea14..fba26bf6 100644
--- a/tests/test_tools/simpletest/form.php
+++ b/tests/test_tools/simpletest/form.php
@@ -5,7 +5,7 @@
* @subpackage WebTester
* @version $Id: form.php 1398 2006-09-08 19:31:03Z xue $
*/
-
+
/**#@+
* include SimpleTest files
*/
@@ -13,7 +13,7 @@
require_once(dirname(__FILE__) . '/encoding.php');
require_once(dirname(__FILE__) . '/selector.php');
/**#@-*/
-
+
/**
* Form tag class to hold widget values.
* @package SimpleTest
@@ -30,7 +30,7 @@
protected $_widgets;
protected $_radios;
protected $_checkboxes;
-
+
/**
* Starts with no held controls/widgets.
* @param SimpleTag $tag Form tag to read.
@@ -48,7 +48,7 @@
$this->_radios = array();
$this->_checkboxes = array();
}
-
+
/**
* Creates the request packet to be sent by the form.
* @param SimpleTag $tag Form tag to read.
@@ -64,7 +64,7 @@
}
return 'SimpleGetEncoding';
}
-
+
/**
* Sets the frame target within a frameset.
* @param string $frame Name of frame.
@@ -73,7 +73,7 @@
function setDefaultTarget($frame) {
$this->_default_target = $frame;
}
-
+
/**
* Accessor for method of form submission.
* @return string Either get or post.
@@ -82,7 +82,7 @@
function getMethod() {
return ($this->_method ? strtolower($this->_method) : 'get');
}
-
+
/**
* Combined action attribute with current location
* to get an absolute form target.
@@ -97,7 +97,7 @@
$url = new SimpleUrl($action);
return $url->makeAbsolute($base);
}
-
+
/**
* Absolute URL of the target.
* @return SimpleUrl URL target.
@@ -110,7 +110,7 @@
}
return $url;
}
-
+
/**
* Creates the encoding for the current values in the
* form.
@@ -125,7 +125,7 @@
}
return $encoding;
}
-
+
/**
* ID field of form for unique identification.
* @return string Unique tag ID.
@@ -134,7 +134,7 @@
function getId() {
return $this->_id;
}
-
+
/**
* Adds a tag contents to the form.
* @param SimpleWidget $tag Input tag to add.
@@ -149,7 +149,7 @@
$this->_setWidget($tag);
}
}
-
+
/**
* Sets the widget into the form, grouping radio
* buttons if any.
@@ -165,7 +165,7 @@
$this->_widgets[] = $tag;
}
}
-
+
/**
* Adds a radio button, building a group if necessary.
* @param SimpleRadioButtonTag $tag Incoming form control.
@@ -178,7 +178,7 @@
}
$this->_widgets[$this->_radios[$tag->getName()]]->addWidget($tag);
}
-
+
/**
* Adds a checkbox, making it a group on a repeated name.
* @param SimpleCheckboxTag $tag Incoming form control.
@@ -198,7 +198,7 @@
$this->_widgets[$index]->addWidget($tag);
}
}
-
+
/**
* Extracts current value from form.
* @param SimpleSelector $selector Criteria to apply.
@@ -219,7 +219,7 @@
}
return null;
}
-
+
/**
* Sets a widget value within the form.
* @param SimpleSelector $selector Criteria to apply.
@@ -240,7 +240,7 @@
}
return $success;
}
-
+
/**
* Used by the page object to set widgets labels to
* external label tags.
@@ -257,7 +257,7 @@
}
}
}
-
+
/**
* Test to see if a form has a submit button.
* @param SimpleSelector $selector Criteria to apply.
@@ -272,7 +272,7 @@
}
return false;
}
-
+
/**
* Test to see if a form has an image control.
* @param SimpleSelector $selector Criteria to apply.
@@ -287,7 +287,7 @@
}
return false;
}
-
+
/**
* Gets the submit values for a selected button.
* @param SimpleSelector $selector Criteria to apply.
@@ -306,12 +306,12 @@
if ($additional) {
$encoding->merge($additional);
}
- return $encoding;
+ return $encoding;
}
}
return false;
}
-
+
/**
* Gets the submit values for an image.
* @param SimpleSelector $selector Criteria to apply.
@@ -332,12 +332,12 @@
if ($additional) {
$encoding->merge($additional);
}
- return $encoding;
+ return $encoding;
}
}
return false;
}
-
+
/**
* Simply submits the form without the submit button
* value. Used when there is only one button or it
@@ -349,4 +349,3 @@
return $this->_encode();
}
}
-?>
diff --git a/tests/test_tools/simpletest/frames.php b/tests/test_tools/simpletest/frames.php
index 60ced141..86e03157 100644
--- a/tests/test_tools/simpletest/frames.php
+++ b/tests/test_tools/simpletest/frames.php
@@ -584,5 +584,4 @@
}
return null;
}
- }
-?> \ No newline at end of file
+ } \ No newline at end of file
diff --git a/tests/test_tools/simpletest/http.php b/tests/test_tools/simpletest/http.php
index 9344a5b9..78c91b7e 100644
--- a/tests/test_tools/simpletest/http.php
+++ b/tests/test_tools/simpletest/http.php
@@ -13,7 +13,7 @@
require_once(dirname(__FILE__) . '/cookies.php');
require_once(dirname(__FILE__) . '/url.php');
/**#@-*/
-
+
/**
* Creates HTTP headers for the end point of
* a HTTP request.
@@ -22,7 +22,7 @@
*/
class SimpleRoute {
protected $_url;
-
+
/**
* Sets the target URL.
* @param SimpleUrl $url URL as object.
@@ -31,7 +31,7 @@
function SimpleRoute($url) {
$this->_url = $url;
}
-
+
/**
* Resource name.
* @return SimpleUrl Current url.
@@ -40,7 +40,7 @@
function getUrl() {
return $this->_url;
}
-
+
/**
* Creates the first line which is the actual request.
* @param string $method HTTP request method, usually GET.
@@ -51,7 +51,7 @@
return $method . ' ' . $this->_url->getPath() .
$this->_url->getEncodedRequest() . ' HTTP/1.0';
}
-
+
/**
* Creates the host part of the request.
* @return string Host line content.
@@ -64,7 +64,7 @@
}
return $line;
}
-
+
/**
* Opens a socket to the route.
* @param string $method HTTP request method, usually GET.
@@ -86,7 +86,7 @@
}
return $socket;
}
-
+
/**
* Factory for socket.
* @param string $scheme Protocol to use.
@@ -105,7 +105,7 @@
return $socket;
}
}
-
+
/**
* Creates HTTP headers for the end point of
* a HTTP request via a proxy server.
@@ -116,7 +116,7 @@
protected $_proxy;
protected $_username;
protected $_password;
-
+
/**
* Stashes the proxy address.
* @param SimpleUrl $url URL as object.
@@ -131,7 +131,7 @@
$this->_username = $username;
$this->_password = $password;
}
-
+
/**
* Creates the first line which is the actual request.
* @param string $method HTTP request method, usually GET.
@@ -146,7 +146,7 @@
return $method . ' ' . $scheme . '://' . $url->getHost() . $port .
$url->getPath() . $url->getEncodedRequest() . ' HTTP/1.0';
}
-
+
/**
* Creates the host part of the request.
* @param SimpleUrl $url URL as object.
@@ -158,7 +158,7 @@
$port = $this->_proxy->getPort() ? $this->_proxy->getPort() : 8080;
return "$host:$port";
}
-
+
/**
* Opens a socket to the route.
* @param string $method HTTP request method, usually GET.
@@ -198,7 +198,7 @@
protected $_encoding;
protected $_headers;
protected $_cookies;
-
+
/**
* Builds the socket request from the different pieces.
* These include proxy information, URL, cookies, headers,
@@ -214,7 +214,7 @@
$this->_headers = array();
$this->_cookies = array();
}
-
+
/**
* Dispatches the content to the route's socket.
* @param integer $timeout Connection timeout.
@@ -231,7 +231,7 @@
$response = $this->_createResponse($socket);
return $response;
}
-
+
/**
* Sends the headers.
* @param SimpleSocket $socket Open socket.
@@ -251,7 +251,7 @@
$socket->write("\r\n");
$encoding->writeTo($socket);
}
-
+
/**
* Adds a header line to the request.
* @param string $header_line Text of full header line.
@@ -260,7 +260,7 @@
function addHeaderLine($header_line) {
$this->_headers[] = $header_line;
}
-
+
/**
* Reads all the relevant cookies from the
* cookie jar.
@@ -271,7 +271,7 @@
function readCookiesFromJar($jar, $url) {
$this->_cookies = $jar->selectAsPairs($url);
}
-
+
/**
* Wraps the socket in a response parser.
* @param SimpleSocket $socket Responding socket.
@@ -286,7 +286,7 @@
return $response;
}
}
-
+
/**
* Collection of header lines in the response.
* @package SimpleTest
@@ -301,7 +301,7 @@
protected $_cookies;
protected $_authentication;
protected $_realm;
-
+
/**
* Parses the incoming header block.
* @param string $headers Header block.
@@ -320,7 +320,7 @@
$this->_parseHeaderLine($header_line);
}
}
-
+
/**
* Accessor for parsed HTTP protocol version.
* @return integer HTTP error code.
@@ -329,7 +329,7 @@
function getHttpVersion() {
return $this->_http_version;
}
-
+
/**
* Accessor for raw header block.
* @return string All headers as raw string.
@@ -338,7 +338,7 @@
function getRaw() {
return $this->_raw_headers;
}
-
+
/**
* Accessor for parsed HTTP error code.
* @return integer HTTP error code.
@@ -347,7 +347,7 @@
function getResponseCode() {
return (integer)$this->_response_code;
}
-
+
/**
* Returns the redirected URL or false if
* no redirection.
@@ -357,7 +357,7 @@
function getLocation() {
return $this->_location;
}
-
+
/**
* Test to see if the response is a valid redirect.
* @return boolean True if valid redirect.
@@ -367,7 +367,7 @@
return in_array($this->_response_code, array(301, 302, 303, 307)) &&
(boolean)$this->getLocation();
}
-
+
/**
* Test to see if the response is an authentication
* challenge.
@@ -379,7 +379,7 @@
(boolean)$this->_authentication &&
(boolean)$this->_realm;
}
-
+
/**
* Accessor for MIME type header information.
* @return string MIME type.
@@ -388,7 +388,7 @@
function getMimeType() {
return $this->_mime_type;
}
-
+
/**
* Accessor for authentication type.
* @return string Type.
@@ -397,7 +397,7 @@
function getAuthentication() {
return $this->_authentication;
}
-
+
/**
* Accessor for security realm.
* @return string Realm.
@@ -406,7 +406,7 @@
function getRealm() {
return $this->_realm;
}
-
+
/**
* Writes new cookies to the cookie jar.
* @param SimpleCookieJar $jar Jar to write to.
@@ -449,7 +449,7 @@
$this->_realm = trim($matches[2]);
}
}
-
+
/**
* Parse the Set-cookie content.
* @param string $cookie_line Text after "Set-cookie:"
@@ -472,7 +472,7 @@
isset($cookie["expires"]) ? $cookie["expires"] : false);
}
}
-
+
/**
* Basic HTTP response.
* @package SimpleTest
@@ -484,7 +484,7 @@
protected $_sent;
protected $_content;
protected $_headers;
-
+
/**
* Constructor. Reads and parses the incoming
* content and headers.
@@ -507,7 +507,7 @@
}
$this->_parse($raw);
}
-
+
/**
* Splits up the headers and the rest of the content.
* @param string $raw Content to parse.
@@ -525,7 +525,7 @@
$this->_headers = new SimpleHttpHeaders($headers);
}
}
-
+
/**
* Original request method.
* @return string GET, POST or HEAD.
@@ -534,7 +534,7 @@
function getMethod() {
return $this->_encoding->getMethod();
}
-
+
/**
* Resource name.
* @return SimpleUrl Current url.
@@ -543,7 +543,7 @@
function getUrl() {
return $this->_url;
}
-
+
/**
* Original request data.
* @return mixed Sent content.
@@ -552,7 +552,7 @@
function getRequestData() {
return $this->_encoding;
}
-
+
/**
* Raw request that was sent down the wire.
* @return string Bytes actually sent.
@@ -561,7 +561,7 @@
function getSent() {
return $this->_sent;
}
-
+
/**
* Accessor for the content after the last
* header line.
@@ -571,7 +571,7 @@
function getContent() {
return $this->_content;
}
-
+
/**
* Accessor for header block. The response is the
* combination of this and the content.
@@ -581,7 +581,7 @@
function getHeaders() {
return $this->_headers;
}
-
+
/**
* Accessor for any new cookies.
* @return array List of new cookies.
@@ -590,7 +590,7 @@
function getNewCookies() {
return $this->_headers->getNewCookies();
}
-
+
/**
* Reads the whole of the socket output into a
* single string.
@@ -606,7 +606,7 @@
}
return $all;
}
-
+
/**
* Test to see if the packet from the socket is the
* last one.
@@ -620,5 +620,4 @@
}
return ! $packet;
}
- }
-?> \ No newline at end of file
+ } \ No newline at end of file
diff --git a/tests/test_tools/simpletest/invoker.php b/tests/test_tools/simpletest/invoker.php
index d5bf4996..dfe9263c 100644
--- a/tests/test_tools/simpletest/invoker.php
+++ b/tests/test_tools/simpletest/invoker.php
@@ -136,4 +136,3 @@
$this->_invoker->after($method);
}
}
-?>
diff --git a/tests/test_tools/simpletest/mock_objects.php b/tests/test_tools/simpletest/mock_objects.php
index 1636600e..b63d1760 100644
--- a/tests/test_tools/simpletest/mock_objects.php
+++ b/tests/test_tools/simpletest/mock_objects.php
@@ -1269,5 +1269,4 @@
}
return $code;
}
- }
-?> \ No newline at end of file
+ } \ No newline at end of file
diff --git a/tests/test_tools/simpletest/options.php b/tests/test_tools/simpletest/options.php
index da4d8b2f..23008ff9 100644
--- a/tests/test_tools/simpletest/options.php
+++ b/tests/test_tools/simpletest/options.php
@@ -363,4 +363,3 @@
return array();
}
}
-?>
diff --git a/tests/test_tools/simpletest/page.php b/tests/test_tools/simpletest/page.php
index eeae0cc9..7d0ac7b8 100644
--- a/tests/test_tools/simpletest/page.php
+++ b/tests/test_tools/simpletest/page.php
@@ -128,7 +128,7 @@
function SimplePageBuilder() {
$this->SimpleSaxListener();
}
-
+
/**
* Frees up any references so as to allow the PHP garbage
* collection from unset() to work.
@@ -177,7 +177,7 @@
$parser = new SimpleHtmlSaxParser($listener);
return $parser;
}
-
+
/**
* Start of element event. Opens a new tag.
* @param string $name Element name.
@@ -972,4 +972,3 @@
return null;
}
}
-?>
diff --git a/tests/test_tools/simpletest/parser.php b/tests/test_tools/simpletest/parser.php
index d6c10579..94fd40d0 100644
--- a/tests/test_tools/simpletest/parser.php
+++ b/tests/test_tools/simpletest/parser.php
@@ -769,5 +769,4 @@
*/
function addContent($text) {
}
- }
-?> \ No newline at end of file
+ } \ No newline at end of file
diff --git a/tests/test_tools/simpletest/reflection_php4.php b/tests/test_tools/simpletest/reflection_php4.php
index 4af685ec..df9c76cc 100644
--- a/tests/test_tools/simpletest/reflection_php4.php
+++ b/tests/test_tools/simpletest/reflection_php4.php
@@ -111,5 +111,4 @@
function getSignature($method) {
return "function $method()";
}
- }
-?> \ No newline at end of file
+ } \ No newline at end of file
diff --git a/tests/test_tools/simpletest/reflection_php5.php b/tests/test_tools/simpletest/reflection_php5.php
index 58a30856..6d2ad360 100644
--- a/tests/test_tools/simpletest/reflection_php5.php
+++ b/tests/test_tools/simpletest/reflection_php5.php
@@ -124,7 +124,7 @@
}
return array_unique($methods);
}
-
+
/**
* Checks to see if the method signature has to be tightly
* specified.
@@ -207,7 +207,7 @@
}
return "function $name()";
}
-
+
/**
* For a signature specified in an interface, full
* details must be replicated to be a valid implementation.
@@ -271,5 +271,4 @@
}
return false;
}
- }
-?> \ No newline at end of file
+ } \ No newline at end of file
diff --git a/tests/test_tools/simpletest/remote.php b/tests/test_tools/simpletest/remote.php
index 7e6898cb..1868733d 100644
--- a/tests/test_tools/simpletest/remote.php
+++ b/tests/test_tools/simpletest/remote.php
@@ -23,7 +23,7 @@
protected $_url;
protected $_dry_url;
protected $_size;
-
+
/**
* Sets the location of the remote test.
* @param string $url Test location.
@@ -35,7 +35,7 @@
$this->_dry_url = $dry_url ? $dry_url : $url;
$this->_size = false;
}
-
+
/**
* Accessor for the test name for subclasses.
* @return string Name of the test.
@@ -67,7 +67,7 @@
}
return true;
}
-
+
/**
* Creates a new web browser object for fetching
* the XML report.
@@ -77,7 +77,7 @@
function &_createBrowser() {
return new SimpleBrowser();
}
-
+
/**
* Creates the XML parser.
* @param SimpleReporter $reporter Target of test results.
@@ -87,7 +87,7 @@
function &_createParser($reporter) {
return new SimpleTestXmlParser($reporter);
}
-
+
/**
* Accessor for the number of subtests.
* @return integer Number of test cases.
@@ -111,5 +111,4 @@
}
return $this->_size;
}
- }
-?> \ No newline at end of file
+ } \ No newline at end of file
diff --git a/tests/test_tools/simpletest/reporter.php b/tests/test_tools/simpletest/reporter.php
index c8c1639d..a6b5a85a 100644
--- a/tests/test_tools/simpletest/reporter.php
+++ b/tests/test_tools/simpletest/reporter.php
@@ -363,5 +363,4 @@
$this->_within_test_case = false;
}
}
- }
-?> \ No newline at end of file
+ } \ No newline at end of file
diff --git a/tests/test_tools/simpletest/runner.php b/tests/test_tools/simpletest/runner.php
index 57939f7a..d7303895 100644
--- a/tests/test_tools/simpletest/runner.php
+++ b/tests/test_tools/simpletest/runner.php
@@ -5,7 +5,7 @@
* @subpackage UnitTester
* @version $Id: runner.php 1398 2006-09-08 19:31:03Z xue $
*/
-
+
/**#@+
* Includes SimpleTest files and defined the root constant
* for dependent libraries.
@@ -19,7 +19,7 @@
define('SIMPLE_TEST', dirname(__FILE__) . '/');
}
/**#@-*/
-
+
/**
* This is called by the class runner to run a
* single test method. Will also run the setUp()
@@ -29,7 +29,7 @@
*/
class SimpleInvoker {
protected $_test_case;
-
+
/**
* Stashes the test case for later.
* @param SimpleTestCase $test_case Test case to run.
@@ -37,7 +37,7 @@
function SimpleInvoker($test_case) {
$this->_test_case = $test_case;
}
-
+
/**
* Accessor for test case being run.
* @return SimpleTestCase Test case.
@@ -46,7 +46,7 @@
function getTestCase() {
return $this->_test_case;
}
-
+
/**
* Invokes a test method and buffered with setUp()
* and tearDown() calls.
@@ -59,7 +59,7 @@
$this->_test_case->tearDown();
}
}
-
+
/**
* Do nothing decorator. Just passes the invocation
* straight through.
@@ -68,7 +68,7 @@
*/
class SimpleInvokerDecorator {
protected $_invoker;
-
+
/**
* Stores the invoker to wrap.
* @param SimpleInvoker $invoker Test method runner.
@@ -76,7 +76,7 @@
function SimpleInvokerDecorator($invoker) {
$this->_invoker = $invoker;
}
-
+
/**
* Accessor for test case being run.
* @return SimpleTestCase Test case.
@@ -85,7 +85,7 @@
function getTestCase() {
return $this->_invoker->getTestCase();
}
-
+
/**
* Invokes a test method and buffered with setUp()
* and tearDown() calls.
@@ -103,7 +103,7 @@
* @subpackage UnitTester
*/
class SimpleErrorTrappingInvoker extends SimpleInvokerDecorator {
-
+
/**
/**
* Stores the invoker to wrap.
@@ -112,7 +112,7 @@
function SimpleErrorTrappingInvoker($invoker) {
$this->SimpleInvokerDecorator($invoker);
}
-
+
/**
* Invokes a test method and dispatches any
* untrapped errors. Called back from
@@ -142,7 +142,7 @@
class SimpleRunner {
protected $_test_case;
protected $_scorer;
-
+
/**
* Takes in the test case and reporter to mediate between.
* @param SimpleTestCase $test_case Test case to run.
@@ -152,7 +152,7 @@
$this->_test_case = $test_case;
$this->_scorer = $scorer;
}
-
+
/**
* Accessor for test case being run.
* @return SimpleTestCase Test case.
@@ -161,7 +161,7 @@
function getTestCase() {
return $this->_test_case;
}
-
+
/**
* Runs the test methods in the test case.
* @param SimpleTest $test_case Test case to run test on.
@@ -185,7 +185,7 @@
$this->_scorer->paintMethodEnd($method);
}
}
-
+
/**
* Tests to see if the method is the constructor and
* so should be ignored.
@@ -198,7 +198,7 @@
$this->_test_case,
strtolower($method));
}
-
+
/**
* Tests to see if the method is a test that should
* be run. Currently any method that starts with 'test'
@@ -219,7 +219,7 @@
function paintMethodStart($test_name) {
$this->_scorer->paintMethodStart($test_name);
}
-
+
/**
* Paints the end of a test method.
* @param string $test_name Name of test or other label.
@@ -228,7 +228,7 @@
function paintMethodEnd($test_name) {
$this->_scorer->paintMethodEnd($test_name);
}
-
+
/**
* Chains to the wrapped reporter.
* @param string $message Message is ignored.
@@ -237,7 +237,7 @@
function paintPass($message) {
$this->_scorer->paintPass($message);
}
-
+
/**
* Chains to the wrapped reporter.
* @param string $message Message is ignored.
@@ -246,7 +246,7 @@
function paintFail($message) {
$this->_scorer->paintFail($message);
}
-
+
/**
* Chains to the wrapped reporter.
* @param string $message Text of error formatted by
@@ -256,7 +256,7 @@
function paintError($message) {
$this->_scorer->paintError($message);
}
-
+
/**
* Chains to the wrapped reporter.
* @param Exception $exception Object thrown.
@@ -265,7 +265,7 @@
function paintException($exception) {
$this->_scorer->paintException($exception);
}
-
+
/**
* Chains to the wrapped reporter.
* @param string $message Text to display.
@@ -274,7 +274,7 @@
function paintMessage($message) {
$this->_scorer->paintMessage($message);
}
-
+
/**
* Chains to the wrapped reporter.
* @param string $message Text to display.
@@ -283,7 +283,7 @@
function paintFormattedMessage($message) {
$this->_scorer->paintFormattedMessage($message);
}
-
+
/**
* Chains to the wrapped reporter.
* @param string $type Event type as text.
@@ -297,4 +297,3 @@
$this->_scorer->paintSignal($type, $payload);
}
}
-?>
diff --git a/tests/test_tools/simpletest/scorer.php b/tests/test_tools/simpletest/scorer.php
index 2c81c954..48b7162b 100644
--- a/tests/test_tools/simpletest/scorer.php
+++ b/tests/test_tools/simpletest/scorer.php
@@ -773,5 +773,4 @@
$this->_reporters[$i]->paintSignal($type, $payload);
}
}
- }
-?> \ No newline at end of file
+ } \ No newline at end of file
diff --git a/tests/test_tools/simpletest/selector.php b/tests/test_tools/simpletest/selector.php
index 901815ad..6af21ff6 100644
--- a/tests/test_tools/simpletest/selector.php
+++ b/tests/test_tools/simpletest/selector.php
@@ -129,5 +129,4 @@
}
return ($widget->getName() == $this->_label);
}
- }
-?> \ No newline at end of file
+ } \ No newline at end of file
diff --git a/tests/test_tools/simpletest/shell_tester.php b/tests/test_tools/simpletest/shell_tester.php
index 5719e9d3..5ac6013d 100644
--- a/tests/test_tools/simpletest/shell_tester.php
+++ b/tests/test_tools/simpletest/shell_tester.php
@@ -127,7 +127,7 @@
$shell = $this->_getShell();
return $shell->getOutputAsList();
}
-
+
/**
* Will trigger a pass if the two parameters have
* the same value only. Otherwise a fail. This
@@ -144,7 +144,7 @@
$second,
$message);
}
-
+
/**
* Will trigger a pass if the two parameters have
* a different value. Otherwise a fail. This
@@ -302,5 +302,4 @@
$shell = new SimpleShell();
return $shell;
}
- }
-?> \ No newline at end of file
+ } \ No newline at end of file
diff --git a/tests/test_tools/simpletest/simple_test.php b/tests/test_tools/simpletest/simple_test.php
index 3bb1d40e..cc39a08b 100644
--- a/tests/test_tools/simpletest/simple_test.php
+++ b/tests/test_tools/simpletest/simple_test.php
@@ -550,4 +550,3 @@
return 0;
}
}
-?>
diff --git a/tests/test_tools/simpletest/simpletest.php b/tests/test_tools/simpletest/simpletest.php
index f859ac0f..df1536ac 100644
--- a/tests/test_tools/simpletest/simpletest.php
+++ b/tests/test_tools/simpletest/simpletest.php
@@ -278,5 +278,4 @@
function getDefaultProxyPassword() {
return Simpletest::getDefaultProxyPassword();
}
- }
-?> \ No newline at end of file
+ } \ No newline at end of file
diff --git a/tests/test_tools/simpletest/socket.php b/tests/test_tools/simpletest/socket.php
index 7b47aa9c..cfeed48a 100644
--- a/tests/test_tools/simpletest/socket.php
+++ b/tests/test_tools/simpletest/socket.php
@@ -212,5 +212,4 @@
function _openSocket($host, $port, $error_number, $error, $timeout) {
return parent::_openSocket("tls://$host", $port, $error_number, $error, $timeout);
}
- }
-?> \ No newline at end of file
+ } \ No newline at end of file
diff --git a/tests/test_tools/simpletest/tag.php b/tests/test_tools/simpletest/tag.php
index 5d8de890..46fb740a 100644
--- a/tests/test_tools/simpletest/tag.php
+++ b/tests/test_tools/simpletest/tag.php
@@ -5,14 +5,14 @@
* @subpackage WebTester
* @version $Id: tag.php 1398 2006-09-08 19:31:03Z xue $
*/
-
+
/**#@+
* include SimpleTest files
*/
require_once(dirname(__FILE__) . '/parser.php');
require_once(dirname(__FILE__) . '/encoding.php');
/**#@-*/
-
+
/**
* HTML or XML tag.
* @package SimpleTest
@@ -22,7 +22,7 @@
protected $_name;
protected $_attributes;
protected $_content;
-
+
/**
* Starts with a named tag with attributes only.
* @param string $name Tag name.
@@ -36,7 +36,7 @@
$this->_attributes = $attributes;
$this->_content = '';
}
-
+
/**
* Check to see if the tag can have both start and
* end tags with content in between.
@@ -46,7 +46,7 @@
function expectEndTag() {
return true;
}
-
+
/**
* The current tag should not swallow all content for
* itself as it's searchable page content. Private
@@ -68,7 +68,7 @@
function addContent($content) {
$this->_content .= (string)$content;
}
-
+
/**
* Adds an enclosed tag to the content.
* @param SimpleTag $tag New tag.
@@ -76,7 +76,7 @@
*/
function addTag($tag) {
}
-
+
/**
* Accessor for tag name.
* @return string Name of tag.
@@ -85,7 +85,7 @@
function getTagName() {
return $this->_name;
}
-
+
/**
* List of legal child elements.
* @return array List of element names.
@@ -94,7 +94,7 @@
function getChildElements() {
return array();
}
-
+
/**
* Accessor for an attribute.
* @param string $label Attribute name.
@@ -108,7 +108,7 @@
}
return (string)$this->_attributes[$label];
}
-
+
/**
* Sets an attribute.
* @param string $label Attribute name.
@@ -118,7 +118,7 @@
function _setAttribute($label, $value) {
$this->_attributes[strtolower($label)] = $value;
}
-
+
/**
* Accessor for the whole content so far.
* @return string Content as big raw string.
@@ -127,7 +127,7 @@
function getContent() {
return $this->_content;
}
-
+
/**
* Accessor for content reduced to visible text. Acts
* like a text mode browser, normalising space and
@@ -138,7 +138,7 @@
function getText() {
return SimpleHtmlSaxParser::normalise($this->_content);
}
-
+
/**
* Test to see if id attribute matches.
* @param string $id ID to test against.
@@ -149,14 +149,14 @@
return ($this->getAttribute('id') == $id);
}
}
-
+
/**
* Page title.
* @package SimpleTest
* @subpackage WebTester
*/
class SimpleTitleTag extends SimpleTag {
-
+
/**
* Starts with a named tag with attributes only.
* @param hash $attributes Attribute names and
@@ -166,14 +166,14 @@
$this->SimpleTag('title', $attributes);
}
}
-
+
/**
* Link.
* @package SimpleTest
* @subpackage WebTester
*/
class SimpleAnchorTag extends SimpleTag {
-
+
/**
* Starts with a named tag with attributes only.
* @param hash $attributes Attribute names and
@@ -182,7 +182,7 @@
function SimpleAnchorTag($attributes) {
$this->SimpleTag('a', $attributes);
}
-
+
/**
* Accessor for URL as string.
* @return string Coerced as string.
@@ -196,7 +196,7 @@
return $url;
}
}
-
+
/**
* Form element.
* @package SimpleTest
@@ -206,7 +206,7 @@
protected $_value;
protected $_label;
protected $_is_set;
-
+
/**
* Starts with a named tag with attributes only.
* @param string $name Tag name.
@@ -219,7 +219,7 @@
$this->_label = false;
$this->_is_set = false;
}
-
+
/**
* Accessor for name submitted as the key in
* GET/POST variables hash.
@@ -229,7 +229,7 @@
function getName() {
return $this->getAttribute('name');
}
-
+
/**
* Accessor for default value parsed with the tag.
* @return string Parsed value.
@@ -238,7 +238,7 @@
function getDefault() {
return $this->getAttribute('value');
}
-
+
/**
* Accessor for currently set value or default if
* none.
@@ -252,7 +252,7 @@
}
return $this->_value;
}
-
+
/**
* Sets the current form element value.
* @param string $value New value.
@@ -264,7 +264,7 @@
$this->_is_set = true;
return true;
}
-
+
/**
* Resets the form element value back to the
* default.
@@ -273,7 +273,7 @@
function resetValue() {
$this->_is_set = false;
}
-
+
/**
* Allows setting of a label externally, say by a
* label tag.
@@ -283,7 +283,7 @@
function setLabel($label) {
$this->_label = trim($label);
}
-
+
/**
* Reads external or internal label.
* @param string $label Label to test.
@@ -293,7 +293,7 @@
function isLabel($label) {
return $this->_label == trim($label);
}
-
+
/**
* Dispatches the value into the form encoded packet.
* @param SimpleEncoding $encoding Form packet.
@@ -305,14 +305,14 @@
}
}
}
-
+
/**
* Text, password and hidden field.
* @package SimpleTest
* @subpackage WebTester
*/
class SimpleTextTag extends SimpleWidget {
-
+
/**
* Starts with a named tag with attributes only.
* @param hash $attributes Attribute names and
@@ -324,7 +324,7 @@
$this->_setAttribute('value', '');
}
}
-
+
/**
* Tag contains no content.
* @return boolean False.
@@ -333,7 +333,7 @@
function expectEndTag() {
return false;
}
-
+
/**
* Sets the current form element value. Cannot
* change the value of a hidden field.
@@ -348,14 +348,14 @@
return parent::setValue($value);
}
}
-
+
/**
* Submit button as input tag.
* @package SimpleTest
* @subpackage WebTester
*/
class SimpleSubmitTag extends SimpleWidget {
-
+
/**
* Starts with a named tag with attributes only.
* @param hash $attributes Attribute names and
@@ -367,7 +367,7 @@
$this->_setAttribute('value', 'Submit');
}
}
-
+
/**
* Tag contains no end element.
* @return boolean False.
@@ -376,7 +376,7 @@
function expectEndTag() {
return false;
}
-
+
/**
* Disables the setting of the button value.
* @param string $value Ignored.
@@ -386,7 +386,7 @@
function setValue($value) {
return false;
}
-
+
/**
* Value of browser visible text.
* @return string Visible label.
@@ -395,7 +395,7 @@
function getLabel() {
return $this->getValue();
}
-
+
/**
* Test for a label match when searching.
* @param string $label Label to test.
@@ -406,14 +406,14 @@
return trim($label) == trim($this->getLabel());
}
}
-
+
/**
* Image button as input tag.
* @package SimpleTest
* @subpackage WebTester
*/
class SimpleImageSubmitTag extends SimpleWidget {
-
+
/**
* Starts with a named tag with attributes only.
* @param hash $attributes Attribute names and
@@ -422,7 +422,7 @@
function SimpleImageSubmitTag($attributes) {
$this->SimpleWidget('input', $attributes);
}
-
+
/**
* Tag contains no end element.
* @return boolean False.
@@ -431,7 +431,7 @@
function expectEndTag() {
return false;
}
-
+
/**
* Disables the setting of the button value.
* @param string $value Ignored.
@@ -441,7 +441,7 @@
function setValue($value) {
return false;
}
-
+
/**
* Value of browser visible text.
* @return string Visible label.
@@ -453,7 +453,7 @@
}
return $this->getAttribute('alt');
}
-
+
/**
* Test for a label match when searching.
* @param string $label Label to test.
@@ -463,7 +463,7 @@
function isLabel($label) {
return trim($label) == trim($this->getLabel());
}
-
+
/**
* Dispatches the value into the form encoded packet.
* @param SimpleEncoding $encoding Form packet.
@@ -481,14 +481,14 @@
}
}
}
-
+
/**
* Submit button as button tag.
* @package SimpleTest
* @subpackage WebTester
*/
class SimpleButtonTag extends SimpleWidget {
-
+
/**
* Starts with a named tag with attributes only.
* Defaults are very browser dependent.
@@ -498,7 +498,7 @@
function SimpleButtonTag($attributes) {
$this->SimpleWidget('button', $attributes);
}
-
+
/**
* Check to see if the tag can have both start and
* end tags with content in between.
@@ -508,7 +508,7 @@
function expectEndTag() {
return true;
}
-
+
/**
* Disables the setting of the button value.
* @param string $value Ignored.
@@ -518,7 +518,7 @@
function setValue($value) {
return false;
}
-
+
/**
* Value of browser visible text.
* @return string Visible label.
@@ -527,7 +527,7 @@
function getLabel() {
return $this->getContent();
}
-
+
/**
* Test for a label match when searching.
* @param string $label Label to test.
@@ -538,14 +538,14 @@
return trim($label) == trim($this->getLabel());
}
}
-
+
/**
* Content tag for text area.
* @package SimpleTest
* @subpackage WebTester
*/
class SimpleTextAreaTag extends SimpleWidget {
-
+
/**
* Starts with a named tag with attributes only.
* @param hash $attributes Attribute names and
@@ -554,7 +554,7 @@
function SimpleTextAreaTag($attributes) {
$this->SimpleWidget('textarea', $attributes);
}
-
+
/**
* Accessor for starting value.
* @return string Parsed value.
@@ -563,7 +563,7 @@
function getDefault() {
return $this->_wrap(SimpleHtmlSaxParser::decodeHtml($this->getContent()));
}
-
+
/**
* Applies word wrapping if needed.
* @param string $value New value.
@@ -573,7 +573,7 @@
function setValue($value) {
return parent::setValue($this->_wrap($value));
}
-
+
/**
* Test to see if text should be wrapped.
* @return boolean True if wrapping on.
@@ -588,7 +588,7 @@
}
return false;
}
-
+
/**
* Performs the formatting that is peculiar to
* this tag. There is strange behaviour in this
@@ -613,7 +613,7 @@
}
return $text;
}
-
+
/**
* The content of textarea is not part of the page.
* @return boolean True.
@@ -623,14 +623,14 @@
return true;
}
}
-
+
/**
* File upload widget.
* @package SimpleTest
* @subpackage WebTester
*/
class SimpleUploadTag extends SimpleWidget {
-
+
/**
* Starts with attributes only.
* @param hash $attributes Attribute names and
@@ -639,7 +639,7 @@
function SimpleUploadTag($attributes) {
$this->SimpleWidget('input', $attributes);
}
-
+
/**
* Tag contains no content.
* @return boolean False.
@@ -648,7 +648,7 @@
function expectEndTag() {
return false;
}
-
+
/**
* Dispatches the value into the form encoded packet.
* @param SimpleEncoding $encoding Form packet.
@@ -664,7 +664,7 @@
basename($this->getValue()));
}
}
-
+
/**
* Drop down widget.
* @package SimpleTest
@@ -673,7 +673,7 @@
class SimpleSelectionTag extends SimpleWidget {
protected $_options;
protected $_choice;
-
+
/**
* Starts with attributes only.
* @param hash $attributes Attribute names and
@@ -684,7 +684,7 @@
$this->_options = array();
$this->_choice = false;
}
-
+
/**
* Adds an option tag to a selection field.
* @param SimpleOptionTag $tag New option.
@@ -695,7 +695,7 @@
$this->_options[] = $tag;
}
}
-
+
/**
* Text within the selection element is ignored.
* @param string $content Ignored.
@@ -703,7 +703,7 @@
*/
function addContent($content) {
}
-
+
/**
* Scans options for defaults. If none, then
* the first option is selected.
@@ -721,7 +721,7 @@
}
return '';
}
-
+
/**
* Can only set allowed values.
* @param string $value New choice.
@@ -737,7 +737,7 @@
}
return false;
}
-
+
/**
* Accessor for current selection value.
* @return string Value attribute or
@@ -751,7 +751,7 @@
return $this->_options[$this->_choice]->getValue();
}
}
-
+
/**
* Drop down widget.
* @package SimpleTest
@@ -760,7 +760,7 @@
class MultipleSelectionTag extends SimpleWidget {
protected $_options;
protected $_values;
-
+
/**
* Starts with attributes only.
* @param hash $attributes Attribute names and
@@ -771,7 +771,7 @@
$this->_options = array();
$this->_values = false;
}
-
+
/**
* Adds an option tag to a selection field.
* @param SimpleOptionTag $tag New option.
@@ -782,7 +782,7 @@
$this->_options[] = $tag;
}
}
-
+
/**
* Text within the selection element is ignored.
* @param string $content Ignored.
@@ -790,7 +790,7 @@
*/
function addContent($content) {
}
-
+
/**
* Scans options for defaults to populate the
* value array().
@@ -806,7 +806,7 @@
}
return $default;
}
-
+
/**
* Can only set allowed values. Any illegal value
* will result in a failure, but all correct values
@@ -833,7 +833,7 @@
$this->_values = $achieved;
return true;
}
-
+
/**
* Accessor for current selection value.
* @return array List of currently set options.
@@ -846,21 +846,21 @@
return $this->_values;
}
}
-
+
/**
* Option for selection field.
* @package SimpleTest
* @subpackage WebTester
*/
class SimpleOptionTag extends SimpleWidget {
-
+
/**
* Stashes the attributes.
*/
function SimpleOptionTag($attributes) {
$this->SimpleWidget('option', $attributes);
}
-
+
/**
* Does nothing.
* @param string $value Ignored.
@@ -870,7 +870,7 @@
function setValue($value) {
return false;
}
-
+
/**
* Test to see if a value matches the option.
* @param string $compare Value to compare with.
@@ -884,7 +884,7 @@
}
return trim($this->getContent()) == $compare;
}
-
+
/**
* Accessor for starting value. Will be set to
* the option label if no value exists.
@@ -897,7 +897,7 @@
}
return $this->getAttribute('value');
}
-
+
/**
* The content of options is not part of the page.
* @return boolean True.
@@ -907,14 +907,14 @@
return true;
}
}
-
+
/**
* Radio button.
* @package SimpleTest
* @subpackage WebTester
*/
class SimpleRadioButtonTag extends SimpleWidget {
-
+
/**
* Stashes the attributes.
* @param array $attributes Hash of attributes.
@@ -925,7 +925,7 @@
$this->_setAttribute('value', 'on');
}
}
-
+
/**
* Tag contains no content.
* @return boolean False.
@@ -934,7 +934,7 @@
function expectEndTag() {
return false;
}
-
+
/**
* The only allowed value sn the one in the
* "value" attribute.
@@ -951,7 +951,7 @@
}
return parent::setValue($value);
}
-
+
/**
* Accessor for starting value.
* @return string Parsed value.
@@ -964,14 +964,14 @@
return false;
}
}
-
+
/**
* Checkbox widget.
* @package SimpleTest
* @subpackage WebTester
*/
class SimpleCheckboxTag extends SimpleWidget {
-
+
/**
* Starts with attributes only.
* @param hash $attributes Attribute names and
@@ -983,7 +983,7 @@
$this->_setAttribute('value', 'on');
}
}
-
+
/**
* Tag contains no content.
* @return boolean False.
@@ -992,7 +992,7 @@
function expectEndTag() {
return false;
}
-
+
/**
* The only allowed value in the one in the
* "value" attribute. The default for this
@@ -1014,7 +1014,7 @@
}
return parent::setValue($value);
}
-
+
/**
* Accessor for starting value. The default
* value is "on".
@@ -1028,7 +1028,7 @@
return false;
}
}
-
+
/**
* A group of multiple widgets with some shared behaviour.
* @package SimpleTest
@@ -1045,7 +1045,7 @@
function addWidget($widget) {
$this->_widgets[] = $widget;
}
-
+
/**
* Accessor to widget set.
* @return array All widgets.
@@ -1064,7 +1064,7 @@
function getAttribute($label) {
return false;
}
-
+
/**
* Fetches the name for the widget from the first
* member.
@@ -1076,7 +1076,7 @@
return $this->_widgets[0]->getName();
}
}
-
+
/**
* Scans the widgets for one with the appropriate
* ID field.
@@ -1092,7 +1092,7 @@
}
return false;
}
-
+
/**
* Scans the widgets for one with the appropriate
* attached label.
@@ -1108,7 +1108,7 @@
}
return false;
}
-
+
/**
* Dispatches the value into the form encoded packet.
* @param SimpleEncoding $encoding Form packet.
@@ -1125,7 +1125,7 @@
* @subpackage WebTester
*/
class SimpleCheckboxGroup extends SimpleTagGroup {
-
+
/**
* Accessor for current selected widget or false
* if none.
@@ -1142,7 +1142,7 @@
}
return $this->_coerceValues($values);
}
-
+
/**
* Accessor for starting value that is active.
* @return string/array Widget values or false if none.
@@ -1158,7 +1158,7 @@
}
return $this->_coerceValues($values);
}
-
+
/**
* Accessor for current set values.
* @param string/array/boolean $values Either a single string, a
@@ -1182,7 +1182,7 @@
}
return true;
}
-
+
/**
* Tests to see if a possible value set is legal.
* @param string/array/boolean $values Either a single string, a
@@ -1202,7 +1202,7 @@
}
return ($values == $matches);
}
-
+
/**
* Converts the output to an appropriate format. This means
* that no values is false, a single value is just that
@@ -1220,7 +1220,7 @@
return $values;
}
}
-
+
/**
* Converts false or string into array. The opposite of
* the coercian method.
@@ -1248,7 +1248,7 @@
* @subpackage WebTester
*/
class SimpleRadioGroup extends SimpleTagGroup {
-
+
/**
* Each tag is tried in turn until one is
* successfully set. The others will be
@@ -1270,7 +1270,7 @@
}
return true;
}
-
+
/**
* Tests to see if a value is allowed.
* @param string Attempted value.
@@ -1286,7 +1286,7 @@
}
return false;
}
-
+
/**
* Accessor for current selected widget or false
* if none.
@@ -1303,7 +1303,7 @@
}
return false;
}
-
+
/**
* Accessor for starting value that is active.
* @return string/boolean Value of first checked
@@ -1320,14 +1320,14 @@
return false;
}
}
-
+
/**
* Tag to keep track of labels.
* @package SimpleTest
* @subpackage WebTester
*/
class SimpleLabelTag extends SimpleTag {
-
+
/**
* Starts with a named tag with attributes only.
* @param hash $attributes Attribute names and
@@ -1336,7 +1336,7 @@
function SimpleLabelTag($attributes) {
$this->SimpleTag('label', $attributes);
}
-
+
/**
* Access for the ID to attach the label to.
* @return string For attribute.
@@ -1346,14 +1346,14 @@
return $this->getAttribute('for');
}
}
-
+
/**
* Tag to aid parsing the form.
* @package SimpleTest
* @subpackage WebTester
*/
class SimpleFormTag extends SimpleTag {
-
+
/**
* Starts with a named tag with attributes only.
* @param hash $attributes Attribute names and
@@ -1363,14 +1363,14 @@
$this->SimpleTag('form', $attributes);
}
}
-
+
/**
* Tag to aid parsing the frames in a page.
* @package SimpleTest
* @subpackage WebTester
*/
class SimpleFrameTag extends SimpleTag {
-
+
/**
* Starts with a named tag with attributes only.
* @param hash $attributes Attribute names and
@@ -1379,7 +1379,7 @@
function SimpleFrameTag($attributes) {
$this->SimpleTag('frame', $attributes);
}
-
+
/**
* Tag contains no content.
* @return boolean False.
@@ -1388,5 +1388,4 @@
function expectEndTag() {
return false;
}
- }
-?> \ No newline at end of file
+ } \ No newline at end of file
diff --git a/tests/test_tools/simpletest/test_case.php b/tests/test_tools/simpletest/test_case.php
index 91a356d8..74253d80 100644
--- a/tests/test_tools/simpletest/test_case.php
+++ b/tests/test_tools/simpletest/test_case.php
@@ -687,4 +687,3 @@
return 0;
}
}
-?>
diff --git a/tests/test_tools/simpletest/unit_tester.php b/tests/test_tools/simpletest/unit_tester.php
index 7a382b5f..672a3050 100644
--- a/tests/test_tools/simpletest/unit_tester.php
+++ b/tests/test_tools/simpletest/unit_tester.php
@@ -370,4 +370,3 @@
return $this->assertError(new PatternExpectation($pattern), $message);
}
}
-?>
diff --git a/tests/test_tools/simpletest/url.php b/tests/test_tools/simpletest/url.php
index b208d1b3..dedc6a9b 100644
--- a/tests/test_tools/simpletest/url.php
+++ b/tests/test_tools/simpletest/url.php
@@ -521,5 +521,4 @@
static function getAllTopLevelDomains() {
return 'com|edu|net|org|gov|mil|int|biz|info|name|pro|aero|coop|museum';
}
- }
-?> \ No newline at end of file
+ } \ No newline at end of file
diff --git a/tests/test_tools/simpletest/user_agent.php b/tests/test_tools/simpletest/user_agent.php
index a901e6d4..161a1b68 100644
--- a/tests/test_tools/simpletest/user_agent.php
+++ b/tests/test_tools/simpletest/user_agent.php
@@ -14,11 +14,11 @@
require_once(dirname(__FILE__) . '/encoding.php');
require_once(dirname(__FILE__) . '/authentication.php');
/**#@-*/
-
+
if (! defined('DEFAULT_MAX_REDIRECTS')) {
define('DEFAULT_MAX_REDIRECTS', 3);
}
-
+
if (! defined('DEFAULT_CONNECTION_TIMEOUT')) {
define('DEFAULT_CONNECTION_TIMEOUT', 15);
}
@@ -39,7 +39,7 @@
protected $_proxy_password = false;
protected $_connection_timeout = DEFAULT_CONNECTION_TIMEOUT;
protected $_additional_headers = array();
-
+
/**
* Starts with no cookies, realms or proxies.
* @access public
@@ -48,7 +48,7 @@
$this->_cookie_jar = new SimpleCookieJar();
$this->_authenticator = new SimpleAuthenticator();
}
-
+
/**
* Removes expired and temporary cookies as if
* the browser was closed and re-opened. Authorisation
@@ -62,7 +62,7 @@
$this->_cookie_jar->restartSession($date);
$this->_authenticator->restartSession();
}
-
+
/**
* Adds a header to every fetch.
* @param string $header Header line to add to every
@@ -72,7 +72,7 @@
function addHeader($header) {
$this->_additional_headers[] = $header;
}
-
+
/**
* Ages the cookies by the specified time.
* @param integer $interval Amount in seconds.
@@ -81,7 +81,7 @@
function ageCookies($interval) {
$this->_cookie_jar->agePrematurely($interval);
}
-
+
/**
* Sets an additional cookie. If a cookie has
* the same name and path it is replaced.
@@ -95,7 +95,7 @@
function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
$this->_cookie_jar->setCookie($name, $value, $host, $path, $expiry);
}
-
+
/**
* Reads the most specific cookie value from the
* browser cookies.
@@ -109,7 +109,7 @@
function getCookieValue($host, $path, $name) {
return $this->_cookie_jar->getCookieValue($host, $path, $name);
}
-
+
/**
* Reads the current cookies within the base URL.
* @param string $name Key of cookie to find.
@@ -124,7 +124,7 @@
}
return $this->getCookieValue($base->getHost(), $base->getPath(), $name);
}
-
+
/**
* Switches off cookie sending and recieving.
* @access public
@@ -132,7 +132,7 @@
function ignoreCookies() {
$this->_cookies_enabled = false;
}
-
+
/**
* Switches back on the cookie sending and recieving.
* @access public
@@ -140,7 +140,7 @@
function useCookies() {
$this->_cookies_enabled = true;
}
-
+
/**
* Sets the socket timeout for opening a connection.
* @param integer $timeout Maximum time in seconds.
@@ -149,7 +149,7 @@
function setConnectionTimeout($timeout) {
$this->_connection_timeout = $timeout;
}
-
+
/**
* Sets the maximum number of redirects before
* a page will be loaded anyway.
@@ -159,7 +159,7 @@
function setMaximumRedirects($max) {
$this->_max_redirects = $max;
}
-
+
/**
* Sets proxy to use on all requests for when
* testing from behind a firewall. Set URL
@@ -181,7 +181,7 @@
$this->_proxy_username = $username;
$this->_proxy_password = $password;
}
-
+
/**
* Test to see if the redirect limit is passed.
* @param integer $redirects Count so far.
@@ -191,7 +191,7 @@
function _isTooManyRedirects($redirects) {
return ($redirects > $this->_max_redirects);
}
-
+
/**
* Sets the identity for the current realm.
* @param string $host Host to which realm applies.
@@ -203,7 +203,7 @@
function setIdentity($host, $realm, $username, $password) {
$this->_authenticator->setIdentityForRealm($host, $realm, $username, $password);
}
-
+
/**
* Fetches a URL as a response object. Will keep trying if redirected.
* It will also collect authentication realm information.
@@ -228,7 +228,7 @@
}
return $response;
}
-
+
/**
* Fetches the page until no longer redirected or
* until the redirect limit runs out.
@@ -257,7 +257,7 @@
} while (! $this->_isTooManyRedirects(++$redirects));
return $response;
}
-
+
/**
* Actually make the web request.
* @param SimpleUrl $url Target to fetch.
@@ -270,7 +270,7 @@
$response = $request->fetch($this->_connection_timeout);
return $response;
}
-
+
/**
* Creates a full page request.
* @param SimpleUrl $url Target to fetch as url object.
@@ -287,7 +287,7 @@
$this->_authenticator->addHeaders($request, $url);
return $request;
}
-
+
/**
* Builds the appropriate HTTP request object.
* @param SimpleUrl $url Target to fetch as url object.
@@ -299,7 +299,7 @@
$request = new SimpleHttpRequest($this->_createRoute($url), $encoding);
return $request;
}
-
+
/**
* Sets up either a direct route or via a proxy.
* @param SimpleUrl $url Target to fetch as url object.
@@ -318,7 +318,7 @@
}
return $route;
}
-
+
/**
* Adds additional manual headers.
* @param SimpleHttpRequest $request Outgoing request.
@@ -329,5 +329,4 @@
$request->addHeaderLine($header);
}
}
- }
-?> \ No newline at end of file
+ } \ No newline at end of file
diff --git a/tests/test_tools/simpletest/web_tester.php b/tests/test_tools/simpletest/web_tester.php
index c582a6ff..c6a48110 100644
--- a/tests/test_tools/simpletest/web_tester.php
+++ b/tests/test_tools/simpletest/web_tester.php
@@ -14,7 +14,7 @@
require_once(dirname(__FILE__) . '/page.php');
require_once(dirname(__FILE__) . '/expectation.php');
/**#@-*/
-
+
/**
* Test for an HTML widget value match.
* @package SimpleTest
@@ -22,7 +22,7 @@
*/
class FieldExpectation extends SimpleExpectation {
protected $_value;
-
+
/**
* Sets the field value to compare against.
* @param mixed $value Test value to match. Can be an
@@ -38,7 +38,7 @@
}
$this->_value = $value;
}
-
+
/**
* Tests the expectation. True if it matches
* a string value or an array value in any order.
@@ -59,7 +59,7 @@
}
return false;
}
-
+
/**
* Tests for valid field comparisons with a single option.
* @param mixed $value Value to type check.
@@ -69,7 +69,7 @@
function _isSingle($value) {
return is_string($value) || is_integer($value) || is_float($value);
}
-
+
/**
* String comparison for simple field with a single option.
* @param mixed $compare String to test against.
@@ -85,7 +85,7 @@
}
return ($this->_value == $compare);
}
-
+
/**
* List comparison for multivalue field.
* @param mixed $compare List in any order to test against.
@@ -102,7 +102,7 @@
sort($compare);
return ($this->_value === $compare);
}
-
+
/**
* Returns a human readable test message.
* @param mixed $compare Comparison value.
@@ -125,7 +125,7 @@
}
}
}
-
+
/**
* Test for a specific HTTP header within a header block.
* @package SimpleTest
@@ -134,7 +134,7 @@
class HttpHeaderExpectation extends SimpleExpectation {
protected $_expected_header;
protected $_expected_value;
-
+
/**
* Sets the field and value to compare against.
* @param string $header Case insenstive trimmed header name.
@@ -150,7 +150,7 @@
$this->_expected_header = $this->_normaliseHeader($header);
$this->_expected_value = $value;
}
-
+
/**
* Accessor for aggregated object.
* @return mixed Expectation set in constructor.
@@ -159,7 +159,7 @@
function _getExpectation() {
return $this->_expected_value;
}
-
+
/**
* Removes whitespace at ends and case variations.
* @param string $header Name of header.
@@ -170,7 +170,7 @@
function _normaliseHeader($header) {
return strtolower(trim($header));
}
-
+
/**
* Tests the expectation. True if it matches
* a string value or an array value in any order.
@@ -181,7 +181,7 @@
function test($compare) {
return is_string($this->_findHeader($compare));
}
-
+
/**
* Searches the incoming result. Will extract the matching
* line as text.
@@ -198,7 +198,7 @@
}
return false;
}
-
+
/**
* Compares a single header line against the expectation.
* @param string $line A single line to compare.
@@ -215,7 +215,7 @@
}
return $this->_testHeaderValue($value, $this->_expected_value);
}
-
+
/**
* Tests the value part of the header.
* @param string $value Value to test.
@@ -232,7 +232,7 @@
}
return (trim($value) == trim($expected));
}
-
+
/**
* Returns a human readable test message.
* @param mixed $compare Raw header block to search.
@@ -254,7 +254,7 @@
}
}
}
-
+
/**
* Test for a specific HTTP header within a header block that
* should not be found.
@@ -264,7 +264,7 @@
class NoHttpHeaderExpectation extends HttpHeaderExpectation {
protected $_expected_header;
protected $_expected_value;
-
+
/**
* Sets the field and value to compare against.
* @param string $unwanted Case insenstive trimmed header name.
@@ -274,7 +274,7 @@
function NoHttpHeaderExpectation($unwanted, $message = '%s') {
$this->HttpHeaderExpectation($unwanted, false, $message);
}
-
+
/**
* Tests that the unwanted header is not found.
* @param mixed $compare Raw header block to search.
@@ -284,7 +284,7 @@
function test($compare) {
return ($this->_findHeader($compare) === false);
}
-
+
/**
* Returns a human readable test message.
* @param mixed $compare Raw header block to search.
@@ -301,7 +301,7 @@
}
}
}
-
+
/**
* Test for a text substring.
* @package SimpleTest
@@ -309,7 +309,7 @@
*/
class TextExpectation extends SimpleExpectation {
protected $_substring;
-
+
/**
* Sets the value to compare against.
* @param string $substring Text to search for.
@@ -320,7 +320,7 @@
$this->SimpleExpectation($message);
$this->_substring = $substring;
}
-
+
/**
* Accessor for the substring.
* @return string Text to match.
@@ -329,7 +329,7 @@
function _getSubstring() {
return $this->_substring;
}
-
+
/**
* Tests the expectation. True if the text contains the
* substring.
@@ -340,7 +340,7 @@
function test($compare) {
return (strpos($compare, $this->_substring) !== false);
}
-
+
/**
* Returns a human readable test message.
* @param mixed $compare Comparison value.
@@ -358,7 +358,7 @@
$dumper->describeValue($compare) . "]";
}
}
-
+
/**
* Describes a pattern match including the string
* found and it's position.
@@ -374,7 +374,7 @@
$dumper->clipString($subject, 100, $position) . "]";
}
}
-
+
/**
* Fail if a substring is detected within the
* comparison text.
@@ -382,7 +382,7 @@
* @subpackage UnitTester
*/
class NoTextExpectation extends TextExpectation {
-
+
/**
* Sets the reject pattern
* @param string $substring Text to search for.
@@ -392,7 +392,7 @@
function NoTextExpectation($substring, $message = '%s') {
$this->TextExpectation($substring, $message);
}
-
+
/**
* Tests the expectation. False if the substring appears
* in the text.
@@ -403,7 +403,7 @@
function test($compare) {
return ! parent::test($compare);
}
-
+
/**
* Returns a human readable test message.
* @param string $compare Comparison value.
@@ -422,7 +422,7 @@
}
}
}
-
+
/**
* Test case for testing of web pages. Allows
* fetching of pages, parsing of HTML and
@@ -433,7 +433,7 @@
class WebTestCase extends SimpleTestCase {
protected $_browser;
protected $_ignore_errors = false;
-
+
/**
* Creates an empty test case. Should be subclassed
* with test methods for a functional test case.
@@ -444,7 +444,7 @@
function WebTestCase($label = false) {
$this->SimpleTestCase($label);
}
-
+
/**
* Announces the start of the test.
* @param string $method Test method just started.
@@ -464,7 +464,7 @@
$this->unsetBrowser();
parent::after($method);
}
-
+
/**
* Gets a current browser reference for setting
* special expectations or for detailed
@@ -475,7 +475,7 @@
function &getBrowser() {
return $this->_browser;
}
-
+
/**
* Gets a current browser reference for setting
* special expectations or for detailed
@@ -486,7 +486,7 @@
function setBrowser($browser) {
return $this->_browser = $browser;
}
-
+
/**
* Clears the current browser reference to help the
* PHP garbage collector.
@@ -495,7 +495,7 @@
function unsetBrowser() {
unset($this->_browser);
}
-
+
/**
* Creates a new default web browser object.
* Will be cleared at the end of the test method.
@@ -506,7 +506,7 @@
$browser = new SimpleBrowser();
return $browser;
}
-
+
/**
* Gets the last response error.
* @return string Last low level HTTP error.
@@ -515,7 +515,7 @@
function getTransportError() {
return $this->_browser->getTransportError();
}
-
+
/**
* Accessor for the currently selected URL.
* @return string Current location or false if
@@ -525,7 +525,7 @@
function getUrl() {
return $this->_browser->getUrl();
}
-
+
/**
* Dumps the current request for debugging.
* @access public
@@ -533,7 +533,7 @@
function showRequest() {
$this->dump($this->_browser->getRequest());
}
-
+
/**
* Dumps the current HTTP headers for debugging.
* @access public
@@ -541,7 +541,7 @@
function showHeaders() {
$this->dump($this->_browser->getHeaders());
}
-
+
/**
* Dumps the current HTML source for debugging.
* @access public
@@ -549,7 +549,7 @@
function showSource() {
$this->dump($this->_browser->getContent());
}
-
+
/**
* Dumps the visible text only for debugging.
* @access public
@@ -557,7 +557,7 @@
function showText() {
$this->dump(wordwrap($this->_browser->getContentAsText(), 80));
}
-
+
/**
* Simulates the closing and reopening of the browser.
* Temporary cookies will be discarded and timed
@@ -575,7 +575,7 @@
}
$this->_browser->restart($date);
}
-
+
/**
* Moves cookie expiry times back into the past.
* Useful for testing timeouts and expiries.
@@ -585,7 +585,7 @@
function ageCookies($interval) {
$this->_browser->ageCookies($interval);
}
-
+
/**
* Disables frames support. Frames will not be fetched
* and the frameset page will be used instead.
@@ -594,7 +594,7 @@
function ignoreFrames() {
$this->_browser->ignoreFrames();
}
-
+
/**
* Switches off cookie sending and recieving.
* @access public
@@ -602,7 +602,7 @@
function ignoreCookies() {
$this->_browser->ignoreCookies();
}
-
+
/**
* Skips errors for the next request only. You might
* want to confirm that a page is unreachable for
@@ -612,7 +612,7 @@
function ignoreErrors() {
$this->_ignore_errors = true;
}
-
+
/**
* Issues a fail if there is a transport error anywhere
* in the current frameset. Only one such error is
@@ -640,7 +640,7 @@
function addHeader($header) {
$this->_browser->addHeader($header);
}
-
+
/**
* Sets the maximum number of redirects before
* the web page is loaded regardless.
@@ -654,7 +654,7 @@
}
$this->_browser->setMaximumRedirects($max);
}
-
+
/**
* Sets the socket timeout for opening a connection and
* receiving at least one byte of information.
@@ -664,7 +664,7 @@
function setConnectionTimeout($timeout) {
$this->_browser->setConnectionTimeout($timeout);
}
-
+
/**
* Sets proxy to use on all requests for when
* testing from behind a firewall. Set URL
@@ -677,7 +677,7 @@
function useProxy($proxy, $username = false, $password = false) {
$this->_browser->useProxy($proxy, $username, $password);
}
-
+
/**
* Fetches a page into the page buffer. If
* there is no base for the URL then the
@@ -691,7 +691,7 @@
function get($url, $parameters = false) {
return $this->_failOnError($this->_browser->get($url, $parameters));
}
-
+
/**
* Fetches a page by POST into the page buffer.
* If there is no base for the URL then the
@@ -705,7 +705,7 @@
function post($url, $parameters = false) {
return $this->_failOnError($this->_browser->post($url, $parameters));
}
-
+
/**
* Does a HTTP HEAD fetch, fetching only the page
* headers. The current base URL is unchanged by this.
@@ -717,7 +717,7 @@
function head($url, $parameters = false) {
return $this->_failOnError($this->_browser->head($url, $parameters));
}
-
+
/**
* Equivalent to hitting the retry button on the
* browser. Will attempt to repeat the page fetch.
@@ -727,7 +727,7 @@
function retry() {
return $this->_failOnError($this->_browser->retry());
}
-
+
/**
* Equivalent to hitting the back button on the
* browser.
@@ -738,7 +738,7 @@
function back() {
return $this->_failOnError($this->_browser->back());
}
-
+
/**
* Equivalent to hitting the forward button on the
* browser.
@@ -749,7 +749,7 @@
function forward() {
return $this->_failOnError($this->_browser->forward());
}
-
+
/**
* Retries a request after setting the authentication
* for the current realm.
@@ -764,7 +764,7 @@
return $this->_failOnError(
$this->_browser->authenticate($username, $password));
}
-
+
/**
* Gets the cookie value for the current browser context.
* @param string $name Name of cookie.
@@ -774,7 +774,7 @@
function getCookie($name) {
return $this->_browser->getCurrentCookieValue($name);
}
-
+
/**
* Sets a cookie in the current browser.
* @param string $name Name of cookie.
@@ -787,7 +787,7 @@
function setCookie($name, $value, $host = false, $path = "/", $expiry = false) {
$this->_browser->setCookie($name, $value, $host, $path, $expiry);
}
-
+
/**
* Accessor for current frame focus. Will be
* false if no frame has focus.
@@ -799,7 +799,7 @@
function getFrameFocus() {
return $this->_browser->getFrameFocus();
}
-
+
/**
* Sets the focus by index. The integer index starts from 1.
* @param integer $choice Chosen frame.
@@ -809,7 +809,7 @@
function setFrameFocusByIndex($choice) {
return $this->_browser->setFrameFocusByIndex($choice);
}
-
+
/**
* Sets the focus by name.
* @param string $name Chosen frame.
@@ -819,7 +819,7 @@
function setFrameFocus($name) {
return $this->_browser->setFrameFocus($name);
}
-
+
/**
* Clears the frame focus. All frames will be searched
* for content.
@@ -828,7 +828,7 @@
function clearFrameFocus() {
return $this->_browser->clearFrameFocus();
}
-
+
/**
* Clicks a visible text item. Will first try buttons,
* then links and then images.
@@ -839,7 +839,7 @@
function click($label) {
return $this->_failOnError($this->_browser->click($label));
}
-
+
/**
* Clicks the submit button by label. The owning
* form will be submitted by this.
@@ -853,7 +853,7 @@
return $this->_failOnError(
$this->_browser->clickSubmit($label, $additional));
}
-
+
/**
* Clicks the submit button by name attribute. The owning
* form will be submitted by this.
@@ -866,7 +866,7 @@
return $this->_failOnError(
$this->_browser->clickSubmitByName($name, $additional));
}
-
+
/**
* Clicks the submit button by ID attribute. The owning
* form will be submitted by this.
@@ -879,7 +879,7 @@
return $this->_failOnError(
$this->_browser->clickSubmitById($id, $additional));
}
-
+
/**
* Clicks the submit image by some kind of label. Usually
* the alt tag or the nearest equivalent. The owning
@@ -897,7 +897,7 @@
return $this->_failOnError(
$this->_browser->clickImage($label, $x, $y, $additional));
}
-
+
/**
* Clicks the submit image by the name. Usually
* the alt tag or the nearest equivalent. The owning
@@ -915,7 +915,7 @@
return $this->_failOnError(
$this->_browser->clickImageByName($name, $x, $y, $additional));
}
-
+
/**
* Clicks the submit image by ID attribute. The owning
* form will be submitted by this. Clicking outside of
@@ -932,7 +932,7 @@
return $this->_failOnError(
$this->_browser->clickImageById($id, $x, $y, $additional));
}
-
+
/**
* Submits a form by the ID.
* @param string $id Form ID. No button information
@@ -943,7 +943,7 @@
function submitFormById($id) {
return $this->_failOnError($this->_browser->submitFormById($id));
}
-
+
/**
* Follows a link by name. Will click the first link
* found with this link text by default, or a later
@@ -957,7 +957,7 @@
function clickLink($label, $index = 0) {
return $this->_failOnError($this->_browser->clickLink($label, $index));
}
-
+
/**
* Follows a link by id attribute.
* @param string $id ID attribute value.
@@ -967,7 +967,7 @@
function clickLinkById($id) {
return $this->_failOnError($this->_browser->clickLinkById($id));
}
-
+
/**
* Will trigger a pass if the two parameters have
* the same value only. Otherwise a fail. This
@@ -984,7 +984,7 @@
$second,
$message);
}
-
+
/**
* Will trigger a pass if the two parameters have
* a different value. Otherwise a fail. This
@@ -1001,7 +1001,7 @@
$second,
$message);
}
-
+
/**
* Tests for the presence of a link label. Match is
* case insensitive with normalised space.
@@ -1032,7 +1032,7 @@
$this->_browser->isLink($label),
sprintf($message, "Link [$label] should not exist"));
}
-
+
/**
* Tests for the presence of a link id attribute.
* @param string $id Id attribute value.
@@ -1061,7 +1061,7 @@
$this->_browser->isLinkById($id),
sprintf($message, "Link ID [$id] should not exist"));
}
-
+
/**
* Sets all form fields with that label, or name if there
* is no label attached.
@@ -1073,7 +1073,7 @@
function setField($label, $value) {
return $this->_browser->setField($label, $value);
}
-
+
/**
* Sets all form fields with that name.
* @param string $name Name of field in forms.
@@ -1084,7 +1084,7 @@
function setFieldByName($name, $value) {
return $this->_browser->setFieldByName($name, $value);
}
-
+
/**
* Sets all form fields with that name.
* @param string/integer $id Id of field in forms.
@@ -1095,7 +1095,7 @@
function setFieldById($id, $value) {
return $this->_browser->setFieldById($id, $value);
}
-
+
/**
* Confirms that the form element is currently set
* to the expected value. A missing form will always
@@ -1113,7 +1113,7 @@
$value = $this->_browser->getField($label);
return $this->_assertFieldValue($label, $value, $expected, $message);
}
-
+
/**
* Confirms that the form element is currently set
* to the expected value. A missing form element will always
@@ -1131,7 +1131,7 @@
$value = $this->_browser->getFieldByName($name);
return $this->_assertFieldValue($name, $value, $expected, $message);
}
-
+
/**
* Confirms that the form element is currently set
* to the expected value. A missing form will always
@@ -1149,7 +1149,7 @@
$value = $this->_browser->getFieldById($id);
return $this->_assertFieldValue($id, $value, $expected, $message);
}
-
+
/**
* Tests the field value against the expectation.
* @param string $identifier Name, ID or label.
@@ -1173,7 +1173,7 @@
}
return $this->assert($expected, $value, $message);
}
-
+
/**
* Checks the response code against a list
* of possible values.
@@ -1190,7 +1190,7 @@
implode(", ", $responses) . "] got [$code]");
return $this->assertTrue(in_array($code, $responses), $message);
}
-
+
/**
* Checks the mime type against a list
* of possible values.
@@ -1206,7 +1206,7 @@
implode(", ", $types) . "] got [$type]");
return $this->assertTrue(in_array($type, $types), $message);
}
-
+
/**
* Attempt to match the authentication type within
* the security realm we are currently matching.
@@ -1230,7 +1230,7 @@
$message);
}
}
-
+
/**
* Checks that no authentication is necessary to view
* the desired page.
@@ -1243,7 +1243,7 @@
$this->_browser->getAuthentication() . "]");
return $this->assertFalse($this->_browser->getAuthentication(), $message);
}
-
+
/**
* Attempts to match the current security realm.
* @param string $realm Name of security realm.
@@ -1260,7 +1260,7 @@
$this->_browser->getRealm(),
"Expected realm -> $message");
}
-
+
/**
* Checks each header line for the required value. If no
* value is given then only an existence check is made.
@@ -1277,7 +1277,7 @@
$this->_browser->getHeaders(),
$message);
}
-
+
/**
* @deprecated
*/
@@ -1303,14 +1303,14 @@
$this->_browser->getHeaders(),
$message);
}
-
+
/**
* @deprecated
*/
function assertNoUnwantedHeader($header, $message = '%s') {
return $this->assertNoHeader($header, $message);
}
-
+
/**
* Tests the text between the title tags.
* @param string $title Expected title.
@@ -1324,7 +1324,7 @@
}
return $this->assert($title, $this->_browser->getTitle(), $message);
}
-
+
/**
* Will trigger a pass if the text is found in the plain
* text form of the page.
@@ -1339,14 +1339,14 @@
$this->_browser->getContentAsText(),
$message);
}
-
+
/**
* @deprecated
*/
function assertWantedText($text, $message = '%s') {
return $this->assertText($text, $message);
}
-
+
/**
* Will trigger a pass if the text is not found in the plain
* text form of the page.
@@ -1361,14 +1361,14 @@
$this->_browser->getContentAsText(),
$message);
}
-
+
/**
* @deprecated
*/
function assertNoUnwantedText($text, $message = '%s') {
return $this->assertNoText($text, $message);
}
-
+
/**
* Will trigger a pass if the Perl regex pattern
* is found in the raw content.
@@ -1384,14 +1384,14 @@
$this->_browser->getContent(),
$message);
}
-
+
/**
* @deprecated
*/
function assertWantedPattern($pattern, $message = '%s') {
return $this->assertPattern($pattern, $message);
}
-
+
/**
* Will trigger a pass if the perl regex pattern
* is not present in raw content.
@@ -1407,14 +1407,14 @@
$this->_browser->getContent(),
$message);
}
-
+
/**
* @deprecated
*/
function assertNoUnwantedPattern($pattern, $message = '%s') {
return $this->assertNoPattern($pattern, $message);
}
-
+
/**
* Checks that a cookie is set for the current page
* and optionally checks the value.
@@ -1437,7 +1437,7 @@
}
return $this->assert($expected, $value, "Expecting cookie [$name] -> $message");
}
-
+
/**
* Checks that no cookie is present or that it has
* been successfully cleared.
@@ -1451,5 +1451,4 @@
$this->getCookie($name) === false,
sprintf($message, "Not expecting cookie [$name]"));
}
- }
-?> \ No newline at end of file
+ } \ No newline at end of file
diff --git a/tests/test_tools/simpletest/xml.php b/tests/test_tools/simpletest/xml.php
index 9d1ab3b2..54b53011 100644
--- a/tests/test_tools/simpletest/xml.php
+++ b/tests/test_tools/simpletest/xml.php
@@ -611,4 +611,3 @@
function _default($expat, $default) {
}
}
-?>
diff --git a/tests/unit/AllTests.php b/tests/unit/AllTests.php
index 7b8027b3..eb08a5f7 100644
--- a/tests/unit/AllTests.php
+++ b/tests/unit/AllTests.php
@@ -50,5 +50,3 @@ class AllTests {
if(PHPUnit_MAIN_METHOD == 'AllTests::main') {
AllTests::main();
}
-
-?> \ No newline at end of file
diff --git a/tests/unit/Caching/AllTests.php b/tests/unit/Caching/AllTests.php
index bffe3b2f..179840fc 100644
--- a/tests/unit/Caching/AllTests.php
+++ b/tests/unit/Caching/AllTests.php
@@ -12,14 +12,14 @@ class Caching_AllTests {
public static function main() {
PHPUnit_TextUI_TestRunner::run(self::suite());
}
-
+
public static function suite() {
$suite = new PHPUnit_Framework_TestSuite('System.Caching');
-
+
$suite->addTestSuite('TSqliteCacheTest');
$suite->addTestSuite('TAPCCacheTest');
$suite->addTestSuite('TMemCacheTest');
-
+
return $suite;
}
}
@@ -27,4 +27,3 @@ class Caching_AllTests {
if(PHPUnit_MAIN_METHOD == 'Caching_AllTests::main') {
Caching_AllTests::main();
}
-?>
diff --git a/tests/unit/Caching/TAPCCacheTest.php b/tests/unit/Caching/TAPCCacheTest.php
index 3cb04361..ccb6ee85 100644
--- a/tests/unit/Caching/TAPCCacheTest.php
+++ b/tests/unit/Caching/TAPCCacheTest.php
@@ -26,7 +26,7 @@ class TAPCCacheTest extends PHPUnit_Framework_TestCase {
} catch(TConfigurationException $e) {
self::markTestSkipped($e->getMessage());
}
-
+
}
}
@@ -38,24 +38,24 @@ class TAPCCacheTest extends PHPUnit_Framework_TestCase {
public function testInit() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testPrimaryCache() {
self::$cache->PrimaryCache = true;
self::assertEquals(true, self::$cache->PrimaryCache);
self::$cache->PrimaryCache = false;
self::assertEquals(false, self::$cache->PrimaryCache);
}
-
+
public function testKeyPrefix() {
self::$cache->KeyPrefix = 'prefix';
self::assertEquals('prefix', self::$cache->KeyPrefix);
}
-
+
public function testSetAndGet() {
self::$cache->set('key', 'value');
self::assertEquals('value', self::$cache->get('key'));
}
-
+
public function testAdd() {
try {
self::$cache->add('anotherkey', 'value');
@@ -65,12 +65,12 @@ class TAPCCacheTest extends PHPUnit_Framework_TestCase {
}
self::assertEquals('value', self::$cache->get('anotherkey'));
}
-
+
public function testDelete() {
self::$cache->delete('key');
self::assertEquals(false, self::$cache->get('key'));
}
-
+
public function testFlush() {
$this->testSetAndGet();
self::assertEquals(true, self::$cache->flush());
@@ -78,4 +78,3 @@ class TAPCCacheTest extends PHPUnit_Framework_TestCase {
}
-?>
diff --git a/tests/unit/Caching/TDirectoryCacheDependencyTest.php b/tests/unit/Caching/TDirectoryCacheDependencyTest.php
index c5c75dec..10da9b58 100644
--- a/tests/unit/Caching/TDirectoryCacheDependencyTest.php
+++ b/tests/unit/Caching/TDirectoryCacheDependencyTest.php
@@ -78,5 +78,3 @@ class TDirectoryCacheDependencyTest extends PHPUnit_Framework_TestCase
@unlink($tempFile);
}
}
-
-?> \ No newline at end of file
diff --git a/tests/unit/Caching/TFileCacheDependencyTest.php b/tests/unit/Caching/TFileCacheDependencyTest.php
index b4bc89d3..24f2721b 100644
--- a/tests/unit/Caching/TFileCacheDependencyTest.php
+++ b/tests/unit/Caching/TFileCacheDependencyTest.php
@@ -54,5 +54,3 @@ class TFileCacheDependencyTest extends PHPUnit_Framework_TestCase
@unlink($tempFile);
}
}
-
-?> \ No newline at end of file
diff --git a/tests/unit/Caching/TMemCacheTest.php b/tests/unit/Caching/TMemCacheTest.php
index 8c1fa934..3d0d651f 100644
--- a/tests/unit/Caching/TMemCacheTest.php
+++ b/tests/unit/Caching/TMemCacheTest.php
@@ -33,34 +33,34 @@ class TMemCacheTest extends PHPUnit_Framework_TestCase {
public function testInit() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testPrimaryCache() {
self::$cache->PrimaryCache = true;
self::assertEquals(true, self::$cache->PrimaryCache);
self::$cache->PrimaryCache = false;
self::assertEquals(false, self::$cache->PrimaryCache);
}
-
+
public function testKeyPrefix() {
self::$cache->KeyPrefix = 'prefix';
self::assertEquals('prefix', self::$cache->KeyPrefix);
}
-
+
public function testSetAndGet() {
self::$cache->set('key', 'value');
self::assertEquals('value', self::$cache->get('key'));
}
-
+
public function testAdd() {
self::$cache->add('anotherkey', 'value');
self::assertEquals('value', self::$cache->get('anotherkey'));
}
-
+
public function testDelete() {
self::$cache->delete('key');
self::assertEquals(false, self::$cache->get('key'));
}
-
+
public function testFlush() {
$this->testSetAndGet();
self::assertEquals(true, self::$cache->flush());
@@ -68,4 +68,3 @@ class TMemCacheTest extends PHPUnit_Framework_TestCase {
}
-?>
diff --git a/tests/unit/Caching/TSqliteCacheTest.php b/tests/unit/Caching/TSqliteCacheTest.php
index fd4ab1bf..b979b0ec 100644
--- a/tests/unit/Caching/TSqliteCacheTest.php
+++ b/tests/unit/Caching/TSqliteCacheTest.php
@@ -15,7 +15,7 @@ class TSqliteCacheTest extends PHPUnit_Framework_TestCase {
self::markTestSkipped('The SQLite extension is not available');
} else {
if(self::$app === null) {
-
+
$basePath = dirname(__FILE__).'/mockapp';
$runtimePath = $basePath.'/runtime';
if(!is_writable($runtimePath)) {
@@ -37,38 +37,38 @@ class TSqliteCacheTest extends PHPUnit_Framework_TestCase {
public function testInit() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testPrimaryCache() {
self::$cache->PrimaryCache = true;
self::assertEquals(true, self::$cache->PrimaryCache);
self::$cache->PrimaryCache = false;
self::assertEquals(false, self::$cache->PrimaryCache);
}
-
+
public function testKeyPrefix() {
self::$cache->KeyPrefix = 'prefix';
self::assertEquals('prefix', self::$cache->KeyPrefix);
}
-
+
public function testDbFile() {
self::assertEquals('sqlite.cache', basename(self::$cache->DbFile));
}
-
+
public function testSetAndGet() {
self::$cache->set('key', 'value');
self::assertEquals('value', self::$cache->get('key'));
}
-
+
public function testAdd() {
self::$cache->add('key', 'value');
self::assertEquals('value', self::$cache->get('key'));
}
-
+
public function testDelete() {
self::$cache->delete('key');
self::assertEquals(false, self::$cache->get('key'));
}
-
+
public function testFlush() {
$this->testAdd();
self::assertEquals(true, self::$cache->flush());
@@ -76,4 +76,3 @@ class TSqliteCacheTest extends PHPUnit_Framework_TestCase {
}
-?>
diff --git a/tests/unit/Collections/AllTests.php b/tests/unit/Collections/AllTests.php
index f290be31..3c286132 100644
--- a/tests/unit/Collections/AllTests.php
+++ b/tests/unit/Collections/AllTests.php
@@ -16,10 +16,10 @@ class Collections_AllTests {
public static function main() {
PHPUnit_TextUI_TestRunner::run(self::suite());
}
-
+
public static function suite() {
$suite = new PHPUnit_Framework_TestSuite('System.Collections');
-
+
$suite->addTestSuite('TListTest');
$suite->addTestSuite('TMapTest');
$suite->addTestSuite('TQueueTest');
@@ -27,7 +27,7 @@ class Collections_AllTests {
$suite->addTestSuite('TAttributeCollectionTest');
$suite->addTestSuite('TPagedListTest');
$suite->addTestSuite('TPagedDataSourceTest');
-
+
return $suite;
}
}
@@ -35,4 +35,3 @@ class Collections_AllTests {
if(PHPUnit_MAIN_METHOD == 'Collections_AllTests::main') {
Collections_AllTests::main();
}
-?>
diff --git a/tests/unit/Collections/TAttributeCollectionTest.php b/tests/unit/Collections/TAttributeCollectionTest.php
index 5805f2d0..f61f58b3 100644
--- a/tests/unit/Collections/TAttributeCollectionTest.php
+++ b/tests/unit/Collections/TAttributeCollectionTest.php
@@ -19,7 +19,7 @@ class TAttributeCollectionTest extends PHPUnit_Framework_TestCase {
self::assertEquals('value', $collection->Property);
self::assertEquals(true, $collection->canGetProperty('Property'));
}
-
+
public function testCanNotGetUndefinedProperty() {
$collection = new TAttributeCollection(array(), true);
self::assertEquals(false, $collection->canGetProperty('Property'));
@@ -37,7 +37,7 @@ class TAttributeCollectionTest extends PHPUnit_Framework_TestCase {
self::assertEquals('value', $collection->itemAt('Property'));
self::assertEquals(true, $collection->canSetProperty('Property'));
}
-
+
public function testCanNotSetPropertyIfReadOnly() {
$collection = new TAttributeCollection(array(), true);
try {
@@ -47,7 +47,7 @@ class TAttributeCollectionTest extends PHPUnit_Framework_TestCase {
}
self::fail('An expected TInvalidOperationException was not raised');
}
-
+
public function testGetCaseSensitive() {
$collection = new TAttributeCollection();
$collection->setCaseSensitive(false);
@@ -55,40 +55,40 @@ class TAttributeCollectionTest extends PHPUnit_Framework_TestCase {
$collection->setCaseSensitive(true);
self::assertEquals(true, $collection->getCaseSensitive());
}
-
+
public function testSetCaseSensitive() {
$collection = new TAttributeCollection();
$collection->Property = 'value';
$collection->setCaseSensitive(false);
self::assertEquals('value', $collection->itemAt('property'));
}
-
+
public function testItemAt() {
$collection = new TAttributeCollection();
$collection->Property = 'value';
self::assertEquals('value', $collection->itemAt('Property'));
}
-
+
public function testAdd() {
$collection = new TAttributeCollection();
$collection->add('Property', 'value');
self::assertEquals('value', $collection->itemAt('Property'));
}
-
+
public function testRemove() {
$collection = new TAttributeCollection();
$collection->add('Property', 'value');
$collection->remove('Property');
self::assertEquals(0, count($collection));
}
-
+
public function testContains() {
$collection = new TAttributeCollection();
self::assertEquals(false, $collection->contains('Property'));
$collection->Property = 'value';
self::assertEquals(true, $collection->contains('Property'));
}
-
+
public function testHasProperty() {
$collection = new TAttributeCollection();
self::assertEquals(false, $collection->hasProperty('Property'));
@@ -98,4 +98,3 @@ class TAttributeCollectionTest extends PHPUnit_Framework_TestCase {
}
-?>
diff --git a/tests/unit/Collections/TListTest.php b/tests/unit/Collections/TListTest.php
index 349d87ed..9d6950b9 100644
--- a/tests/unit/Collections/TListTest.php
+++ b/tests/unit/Collections/TListTest.php
@@ -8,7 +8,7 @@ class ListItem {
* @package System.Collections
*/
class TListTest extends PHPUnit_Framework_TestCase {
-
+
protected $list;
protected $item1, $item2, $item3, $item4;
@@ -21,7 +21,7 @@ class TListTest extends PHPUnit_Framework_TestCase {
$this->list->add($this->item1);
$this->list->add($this->item2);
}
-
+
public function tearDown() {
$this->list=null;
$this->item1=null;
@@ -29,7 +29,7 @@ class TListTest extends PHPUnit_Framework_TestCase {
$this->item3=null;
$this->item4=null;
}
-
+
public function testConstruct() {
$a=array(1,2,3);
$list=new TList($a);
@@ -37,19 +37,19 @@ class TListTest extends PHPUnit_Framework_TestCase {
$list2=new TList($this->list);
$this->assertEquals(2,$list2->getCount());
}
-
+
public function testGetReadOnly() {
$list = new TList(null, true);
self::assertEquals(true, $list->getReadOnly(), 'List is not read-only');
$list = new TList(null, false);
self::assertEquals(false, $list->getReadOnly(), 'List is read-only');
}
-
+
public function testGetCount() {
$this->assertEquals(2,$this->list->getCount());
$this->assertEquals(2,$this->list->Count);
}
-
+
public function testItemAt() {
$this->assertTrue($this->list->itemAt(0) === $this->item1);
$this->assertTrue($this->list->itemAt(1) === $this->item2);
@@ -59,14 +59,14 @@ class TListTest extends PHPUnit_Framework_TestCase {
} catch(TInvalidDataValueException $e) {
}
}
-
+
public function testAdd() {
$this->assertEquals(2,$this->list->add(null));
$this->assertEquals(3,$this->list->add($this->item3));
$this->assertEquals(4,$this->list->getCount());
$this->assertEquals(3,$this->list->indexOf($this->item3));
}
-
+
public function testCanNotAddWhenReadOnly() {
$list = new TList(array(), true);
try {
@@ -75,7 +75,7 @@ class TListTest extends PHPUnit_Framework_TestCase {
} catch(TInvalidOperationException $e) {
}
}
-
+
public function testInsertAt() {
$this->assertNull($this->list->insertAt(0,$this->item3));
$this->assertEquals(3,$this->list->getCount());
@@ -88,7 +88,7 @@ class TListTest extends PHPUnit_Framework_TestCase {
} catch(TInvalidDataValueException $e) {
}
}
-
+
public function testCanNotInsertAtWhenReadOnly() {
$list = new TList(array(), true);
try {
@@ -102,7 +102,7 @@ class TListTest extends PHPUnit_Framework_TestCase {
} catch(TInvalidOperationException $e) {
}
}
-
+
public function testInsertBefore() {
try {
$this->list->insertBefore($this->item4,$this->item3);
@@ -116,7 +116,7 @@ class TListTest extends PHPUnit_Framework_TestCase {
$this->assertEquals(1,$this->list->indexOf($this->item1));
$this->assertEquals(2,$this->list->indexOf($this->item2));
}
-
+
public function testCanNotInsertBeforeWhenReadOnly() {
$list = new TList(array(5), true);
try {
@@ -130,7 +130,7 @@ class TListTest extends PHPUnit_Framework_TestCase {
} catch(TInvalidOperationException $e) {
}
}
-
+
public function testInsertAfter() {
try {
$this->list->insertAfter($this->item4,$this->item3);
@@ -144,7 +144,7 @@ class TListTest extends PHPUnit_Framework_TestCase {
$this->assertEquals(1,$this->list->indexOf($this->item2));
$this->assertEquals(2,$this->list->indexOf($this->item3));
}
-
+
public function testCanNotInsertAfterWhenReadOnly() {
$list = new TList(array(5), true);
try {
@@ -158,7 +158,7 @@ class TListTest extends PHPUnit_Framework_TestCase {
} catch(TInvalidOperationException $e) {
}
}
-
+
public function testRemove() {
$this->assertEquals(0,$this->list->remove($this->item1));
$this->assertEquals(1,$this->list->getCount());
@@ -170,7 +170,7 @@ class TListTest extends PHPUnit_Framework_TestCase {
} catch(Exception $e) {
}
}
-
+
public function testCanNotRemoveWhenReadOnly() {
$list = new TList(array(1, 2, 3), true);
try {
@@ -178,7 +178,7 @@ class TListTest extends PHPUnit_Framework_TestCase {
self::fail('An expected TInvalidOperationException was not raised');
} catch(TInvalidOperationException $e) {
}
-
+
$list = new TList(array(1, 2, 3), true);
try {
$list->remove(10);
@@ -186,7 +186,7 @@ class TListTest extends PHPUnit_Framework_TestCase {
} catch(TInvalidOperationException $e) {
}
}
-
+
public function testRemoveAt() {
$this->list->add($this->item3);
$this->assertEquals($this->item2, $this->list->removeAt(1));
@@ -199,7 +199,7 @@ class TListTest extends PHPUnit_Framework_TestCase {
} catch(TInvalidDataValueException $e) {
}
}
-
+
public function testCanNotRemoveAtWhenReadOnly() {
$list = new TList(array(1, 2, 3), true);
try {
@@ -207,7 +207,7 @@ class TListTest extends PHPUnit_Framework_TestCase {
self::fail('An expected TInvalidOperationException was not raised');
} catch(TInvalidOperationException $e) {
}
-
+
$list = new TList(array(1, 2, 3), true);
try {
$list->removeAt(10);
@@ -215,14 +215,14 @@ class TListTest extends PHPUnit_Framework_TestCase {
} catch(TInvalidOperationException $e) {
}
}
-
+
public function testClear() {
$this->list->clear();
$this->assertEquals(0,$this->list->getCount());
$this->assertEquals(-1,$this->list->indexOf($this->item1));
$this->assertEquals(-1,$this->list->indexOf($this->item2));
}
-
+
public function testCanNotClearWhenReadOnly() {
$list = new TList(array(1, 2, 3), true);
try {
@@ -232,19 +232,19 @@ class TListTest extends PHPUnit_Framework_TestCase {
}
self::fail('An expected TInvalidOperationException was not raised');
}
-
+
public function testContains() {
$this->assertTrue($this->list->contains($this->item1));
$this->assertTrue($this->list->contains($this->item2));
$this->assertFalse($this->list->contains($this->item3));
}
-
+
public function testIndexOf() {
$this->assertEquals(0,$this->list->indexOf($this->item1));
$this->assertEquals(1,$this->list->indexOf($this->item2));
$this->assertEquals(-1,$this->list->indexOf($this->item3));
}
-
+
public function testCopyFrom() {
$array=array($this->item3,$this->item1);
$this->list->copyFrom($array);
@@ -255,7 +255,7 @@ class TListTest extends PHPUnit_Framework_TestCase {
} catch(TInvalidDataTypeException $e) {
}
}
-
+
public function testMergeWith() {
$array=array($this->item3,$this->item1);
$this->list->mergeWith($array);
@@ -266,12 +266,12 @@ class TListTest extends PHPUnit_Framework_TestCase {
} catch(TInvalidDataTypeException $e) {
}
}
-
+
public function testToArray() {
$array=$this->list->toArray();
$this->assertTrue(count($array)==2 && $array[0]===$this->item1 && $array[1]===$this->item2);
}
-
+
public function testArrayRead() {
$this->assertTrue($this->list[0]===$this->item1);
$this->assertTrue($this->list[1]===$this->item2);
@@ -281,7 +281,7 @@ class TListTest extends PHPUnit_Framework_TestCase {
} catch(TInvalidDataValueException $e) {
}
}
-
+
public function testGetIterator() {
$n=0;
$found=0;
@@ -295,25 +295,25 @@ class TListTest extends PHPUnit_Framework_TestCase {
}
$this->assertTrue($n==2 && $found==2);
}
-
+
public function testArrayMisc() {
$this->assertEquals($this->list->Count,count($this->list));
$this->assertTrue(isset($this->list[1]));
$this->assertFalse(isset($this->list[2]));
}
-
+
public function testOffsetSetAdd() {
$list = new TList(array(1, 2, 3));
$list->offsetSet(null, 4);
self::assertEquals(array(1, 2, 3, 4), $list->toArray());
}
-
+
public function testOffsetSetReplace() {
$list = new TList(array(1, 2, 3));
$list->offsetSet(1, 4);
self::assertEquals(array(1, 4, 3), $list->toArray());
}
-
+
public function testOffsetUnset() {
$list = new TList(array(1, 2, 3));
$list->offsetUnset(1);
@@ -321,5 +321,3 @@ class TListTest extends PHPUnit_Framework_TestCase {
}
}
-
-?> \ No newline at end of file
diff --git a/tests/unit/Collections/TMapTest.php b/tests/unit/Collections/TMapTest.php
index 0634a2a3..da198eb4 100644
--- a/tests/unit/Collections/TMapTest.php
+++ b/tests/unit/Collections/TMapTest.php
@@ -176,11 +176,10 @@ class TMapTest extends PHPUnit_Framework_TestCase {
$this->assertTrue(isset($this->map['key1']));
$this->assertFalse(isset($this->map['unknown key']));
}
-
+
public function testToArray() {
$map = new TMap(array('key' => 'value'));
self::assertEquals(array('key' => 'value'), $map->toArray());
}
}
-?>
diff --git a/tests/unit/Collections/TPagedDataSourceTest.php b/tests/unit/Collections/TPagedDataSourceTest.php
index 92f4061b..ebb8e60d 100644
--- a/tests/unit/Collections/TPagedDataSourceTest.php
+++ b/tests/unit/Collections/TPagedDataSourceTest.php
@@ -16,55 +16,54 @@ class TPagedDataSourceTest extends PHPUnit_Framework_TestCase {
public function testDataSource() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testPageSize() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testCurrentPageIndex() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testAllowPaging() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testAllowCustomPaging() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testVirtualItemCount() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testCount() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testPageCount() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testIsFirstPage() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testIsLastPage() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testFirstIndexInPage() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testDataSourceCount() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testIterator() {
throw new PHPUnit_Framework_IncompleteTestError();
}
}
-?>
diff --git a/tests/unit/Collections/TPagedListTest.php b/tests/unit/Collections/TPagedListTest.php
index 2d884736..a225db61 100644
--- a/tests/unit/Collections/TPagedListTest.php
+++ b/tests/unit/Collections/TPagedListTest.php
@@ -3,26 +3,26 @@
Prado::using('System.Collections.TPagedList');
class MyPagedList extends TPagedList {
-
+
private $_isPageIndexChanged = false;
private $_hasFetchedData = false;
-
+
public function pageIndexChanged($sender, $param) {
$this->_isPageIndexChanged = true;
}
-
+
public function fetchData($sender, $param) {
$this->_hasFetchedData = true;
}
-
+
public function isPageIndexChanged() {
return $this->_isPageIndexChanged;
}
-
+
public function hasFetchedData() {
return $this->_hasFetchedData;
}
-
+
}
/**
@@ -58,7 +58,7 @@ class TPagedListTest extends PHPUnit_Framework_TestCase {
$list->PageSize = 5;
self::assertEquals(5, $list->PageSize);
}
-
+
public function testCanNotSetInvalidPageSize() {
$list = new TPagedList();
try {
@@ -68,14 +68,14 @@ class TPagedListTest extends PHPUnit_Framework_TestCase {
}
self::fail('An expected TInvalidDataValueException was not raised');
}
-
+
public function testCurrentPageIndex() {
$list = new TPagedList(array(1, 2, 3));
$list->PageSize = 1;
$list->CurrentPageIndex = 2;
self::assertEquals(2, $list->CurrentPageIndex);
}
-
+
public function testOnPageIndexChanged() {
$list = new TPagedList(array(1, 2, 3, 4, 5));
$list->PageSize = 1;
@@ -87,7 +87,7 @@ class TPagedListTest extends PHPUnit_Framework_TestCase {
$list->onPageIndexChanged(new TPagedListPageChangedEventParameter($oldPage));
self::assertEquals(true, $myList->isPageIndexChanged());
}
-
+
public function testOnFetchData() {
$list = new TPagedList(array(1, 2, 3, 4));
$list->CustomPaging = true;
@@ -95,18 +95,18 @@ class TPagedListTest extends PHPUnit_Framework_TestCase {
$list->gotoPage(0);
$myList = new MyPagedList();
$list->attachEventHandler('OnFetchData', array($myList, 'fetchData'));
- self::assertEquals(false, $myList->hasFetchedData());
+ self::assertEquals(false, $myList->hasFetchedData());
$list->onFetchData(new TPagedListFetchDataEventParameter($list->CurrentPageIndex, $list->PageSize*$list->CurrentPageIndex, $list->PageSize));
self::assertEquals(true, $myList->hasFetchedData());
}
-
+
public function testGotoPage() {
$list = new TPagedList(array(1, 2, 3));
$list->PageSize = 1;
self::assertEquals(2, $list->gotoPage(2));
self::assertEquals(false, $list->gotoPage(4));
}
-
+
public function testNextPage() {
$list = new TPagedList(array(1, 2));
$list->PageSize = 1;
@@ -114,7 +114,7 @@ class TPagedListTest extends PHPUnit_Framework_TestCase {
self::assertEquals(1, $list->nextPage());
self::assertEquals(false, $list->nextPage());
}
-
+
public function testPreviousPage() {
$list = new TPagedList(array(1, 2));
$list->PageSize = 1;
@@ -122,7 +122,7 @@ class TPagedListTest extends PHPUnit_Framework_TestCase {
self::assertEquals(0, $list->previousPage());
self::assertEquals(false, $list->previousPage());
}
-
+
public function testVirtualCount() {
$list = new TPagedList(array(1, 2));
$list->VirtualCount = -10;
@@ -130,7 +130,7 @@ class TPagedListTest extends PHPUnit_Framework_TestCase {
$list->VirtualCount = 5;
self::assertEquals(5, $list->VirtualCount);
}
-
+
public function testPageCount() {
$list = new TPagedList(array(1, 2, 3));
$list->PageSize = 1;
@@ -141,7 +141,7 @@ class TPagedListTest extends PHPUnit_Framework_TestCase {
$list->CustomPaging = false;
self::assertEquals(3, $list->PageCount);
}
-
+
public function testIsFirstPage() {
$list = new TPagedList(array(1, 2, 3));
$list->PageSize = 1;
@@ -150,7 +150,7 @@ class TPagedListTest extends PHPUnit_Framework_TestCase {
$list->gotoPage(1);
self::assertEquals(false, $list->IsFirstPage);
}
-
+
public function testIsLastPage() {
$list = new TPagedList(array(1, 2, 3));
$list->PageSize = 1;
@@ -159,7 +159,7 @@ class TPagedListTest extends PHPUnit_Framework_TestCase {
$list->gotoPage(2);
self::assertEquals(true, $list->IsLastPage);
}
-
+
public function testGetCount() {
$list = new TPagedList(array(1, 2, 3));
$list->PageSize = 1;
@@ -167,7 +167,7 @@ class TPagedListTest extends PHPUnit_Framework_TestCase {
$list->CustomPaging = true;
self::assertEquals(3, $list->Count);
}
-
+
public function testGetIterator() {
$list = new TPagedList(array(1, 2));
$list->CustomPaging = true;
@@ -181,12 +181,12 @@ class TPagedListTest extends PHPUnit_Framework_TestCase {
$found++;
}
if($index === 1 && $item === 2) {
- $found++;
+ $found++;
}
}
self::assertTrue($n == 2 && $found == 2);
}
-
+
public function testItemAt() {
$list = new TPagedList(array(1, 2, 3));
$list->CustomPaging = true;
@@ -196,27 +196,27 @@ class TPagedListTest extends PHPUnit_Framework_TestCase {
$list->CurrentPageIndex = 0;
self::assertEquals(1, $list[0]);
}
-
+
public function testIndexOf() {
$list = new TPagedList(array(1, 2, 3));
$list->CustomPaging = true;
self::assertEquals(0, $list->indexOf(1));
self::assertEquals(-1, $list->indexOf(0));
}
-
+
public function testOffsetExists() {
$list = new TPagedList(array(1, 2, 3));
$list->CustomPaging = true;
self::assertEquals(true, isset($list[0]));
self::assertEquals(false, isset($list[4]));
}
-
+
public function testOffsetGet() {
$list = new TPagedList(array(1, 2, 3));
$list->CustomPaging = true;
self::assertEquals(2, $list[1]);
}
-
+
public function testToArray() {
$list = new TPagedList(array(1, 2, 3));
$list->CustomPaging = true;
@@ -225,4 +225,3 @@ class TPagedListTest extends PHPUnit_Framework_TestCase {
}
-?>
diff --git a/tests/unit/Collections/TPriorityMapTest.php b/tests/unit/Collections/TPriorityMapTest.php
index 7c6ed498..847e09fe 100644
--- a/tests/unit/Collections/TPriorityMapTest.php
+++ b/tests/unit/Collections/TPriorityMapTest.php
@@ -22,10 +22,10 @@ class TPriorityMapTest extends PHPUnit_Framework_TestCase {
$this->item5=new TPriorityMapTest_MapItem;
$this->map->add('key1',$this->item1);
$this->map->add('key2',$this->item2);
-
+
//Test the priority capabilities
}
-
+
public function setUpPriorities() {
$this->map->add('key3', $this->item3, 0);
$this->map->add('key4', $this->item4, 100);
@@ -45,16 +45,16 @@ class TPriorityMapTest extends PHPUnit_Framework_TestCase {
$this->assertEquals(3,$map->getCount());
$map2=new TPriorityMap($this->map);
$this->assertEquals(2,$map2->getCount());
-
+
/* Test the priority functionality of TPriorityMap */
-
+
$map3=new TPriorityMap($this->map, false, 100, -1);
$this->assertEquals(100,$map3->getDefaultPriority());
$this->assertEquals(-1,$map3->getPrecision());
}
-
+
/* Test that TPriorityMap complies with TMap */
-
+
public function testGetReadOnly() {
$map = new TPriorityMap(null, true);
@@ -202,46 +202,46 @@ class TPriorityMapTest extends PHPUnit_Framework_TestCase {
$this->assertTrue(isset($this->map['key1']));
$this->assertFalse(isset($this->map['unknown key']));
}
-
+
public function testToArray() {
$map = new TPriorityMap(array('key' => 'value'));
self::assertEquals(array('key' => 'value'), $map->toArray());
}
-
-
-
-
+
+
+
+
/* Test the priority functionality of TPriorityMap */
-
-
+
+
public function testDefaultPriorityAndPrecision() {
-
+
$this->assertEquals(10, $this->map->DefaultPriority);
-
+
$this->map->DefaultPriority = 5;
$this->assertEquals(5, $this->map->getDefaultPriority());
-
+
$this->assertEquals(8, $this->map->Precision);
-
+
$this->map->Precision = 0;
$this->assertEquals(0, $this->map->getPrecision());
-
+
;
-
+
$this->assertEquals(5, $this->map->add('key3', $this->item3));
$this->assertEquals(10, $this->map->add('key4', $this->item1, 10));
$this->assertTrue(10 == $this->map->add('key4', $this->item1, 10.01));
$this->assertTrue(100 == $this->map->add('key4', $this->item1, 100));
$this->map->Precision = 1;
$this->assertTrue(10.1 == $this->map->add('key5', $this->item1, 10.1));
-
+
$this->assertEquals(5, $this->map->getCount());
}
-
+
public function testAddWithPriorityAndPriorityOfAt() {
-
+
$this->setUpPriorities();
-
+
$this->assertEquals(5, $this->map->getCount());
$this->assertEquals(10, $this->map->priorityOf($this->item1));
$this->assertEquals(0, $this->map->priorityOf($this->item3));
@@ -249,74 +249,74 @@ class TPriorityMapTest extends PHPUnit_Framework_TestCase {
$this->assertEquals(1, $this->map->priorityOf($this->item5));
$this->assertEquals(false, $this->map->priorityOf(null));
$this->assertEquals(false, $this->map->priorityOf('foo'));
-
+
$this->assertEquals(10, $this->map->priorityAt('key1'));
$this->assertEquals(0, $this->map->priorityAt('key3'));
$this->assertEquals(100, $this->map->priorityAt('key4'));
$this->assertEquals(1, $this->map->priorityAt('key5'));
$this->assertEquals(false, $this->map->priorityAt(null));
$this->assertEquals(false, $this->map->priorityAt('foo'));
-
+
}
-
+
public function testRemoveWithPriorityAndItemsAtWithPriority() {
-
+
$this->setUpPriorities();
-
+
$this->assertEquals(5, $this->map->getCount());
$this->map->remove('key6');
$this->assertEquals(5, $this->map->getCount());
$this->map->remove('key6', null);
$this->assertEquals(5, $this->map->getCount());
-
-
+
+
// key5 is at priority 1... not the default priority defined by null... nothing should happen here
$this->map->remove('key5', null);
$this->assertEquals(5, $this->map->getCount());
-
+
// key5 is at priority 1... not 50... nothing should happen here
$this->map->remove('key5', 50);
$this->assertEquals(5, $this->map->getCount());
-
-
-
+
+
+
$this->assertEquals(array('key3'=>$this->item3), $this->map->itemsAtPriority(0));
$this->assertEquals(array('key1'=>$this->item1, 'key2'=>$this->item2), $this->map->itemsAtPriority($this->map->DefaultPriority));
-
+
$this->assertEquals($this->item2, $this->map->itemAt('key2'));
$this->assertEquals($this->item2, $this->map->itemAt('key2', 10));
$this->assertNull($this->map->itemAt('key2', 11)); //'key2' doesn't exist and priority 11... it is only at priority 10
$this->assertNull($this->map->itemAt('key2', 10.1)); //'key2' doesn't exist and priority 10.1... it is only at priority 10
-
+
$this->assertEquals($this->item4, $this->map->remove('key4'));
$this->assertEquals(4, $this->map->getCount());
-
+
$this->assertEquals($this->item5, $this->map->remove('key5'));
$this->assertEquals(3, $this->map->getCount());
}
public function testIteratorAndArrayWithPriorities() {
-
+
$this->setUpPriorities();
-
+
// This is the primary reason for a TPriorityMap
$array = $this->map->toArray();
-
+
$ordered_keys = array_keys($array);
$this->assertEquals('key3', $ordered_keys[0]);
$this->assertEquals('key5', $ordered_keys[1]);
$this->assertEquals('key1', $ordered_keys[2]);
$this->assertEquals('key2', $ordered_keys[3]);
$this->assertEquals('key4', $ordered_keys[4]);
-
+
$ordered_values = array_values($array);
$this->assertEquals($this->item3, $ordered_values[0]);
$this->assertEquals($this->item5, $ordered_values[1]);
$this->assertEquals($this->item1, $ordered_values[2]);
$this->assertEquals($this->item2, $ordered_values[3]);
$this->assertEquals($this->item4, $ordered_values[4]);
-
+
$iter = $this->map->getIterator();
-
+
$this->assertTrue($iter->valid());
$this->assertEquals('key3', $iter->key());
$this->assertEquals($this->item1, $iter->current());
@@ -341,31 +341,31 @@ class TPriorityMapTest extends PHPUnit_Framework_TestCase {
$this->assertEquals(null, $iter->key());
$this->assertEquals(null, $iter->current());
}
-
-
+
+
public function testGetPriorities() {
$this->setUpPriorities();
-
+
$priorities = $this->map->getPriorities();
-
+
$this->assertEquals(0, $priorities[0]);
$this->assertEquals(1, $priorities[1]);
$this->assertEquals(10, $priorities[2]);
$this->assertEquals(100, $priorities[3]);
$this->assertEquals(false, isset($priorities[4]));
}
-
-
+
+
public function testCopyAndMergeWithPriorities() {
$this->setUpPriorities();
-
+
$map1 = new TPriorityMap();
$map1->add('key1', $this->item1);
$map1->add('keyc', 'valuec');
$map1->copyFrom($this->map);
-
+
$this->assertEquals(5, $map1->getCount());
-
+
$array = $map1->toArray();
$ordered_keys = array_keys($array);
$this->assertEquals('key3', $ordered_keys[0]);
@@ -373,24 +373,24 @@ class TPriorityMapTest extends PHPUnit_Framework_TestCase {
$this->assertEquals('key1', $ordered_keys[2]);
$this->assertEquals('key2', $ordered_keys[3]);
$this->assertEquals('key4', $ordered_keys[4]);
-
+
$ordered_values = array_values($array);
$this->assertEquals($this->item3, $ordered_values[0]);
$this->assertEquals($this->item5, $ordered_values[1]);
$this->assertEquals($this->item1, $ordered_values[2]);
$this->assertEquals($this->item2, $ordered_values[3]);
$this->assertEquals($this->item4, $ordered_values[4]);
-
-
-
+
+
+
$map2 = new TPriorityMap();
$map2->add('startkey', 'startvalue', -1000);
$map2->add('key5', 'value5', 40);
$map2->add('endkey', 'endvalue', 1000);
$map2->mergeWith($this->map);
-
+
$this->assertEquals(7, $map2->getCount());
-
+
$array = $map2->toArray();
$ordered_keys = array_keys($array);
$this->assertEquals('startkey', $ordered_keys[0]);
@@ -400,7 +400,7 @@ class TPriorityMapTest extends PHPUnit_Framework_TestCase {
$this->assertEquals('key2', $ordered_keys[4]);
$this->assertEquals('key4', $ordered_keys[5]);
$this->assertEquals('endkey', $ordered_keys[6]);
-
+
$ordered_values = array_values($array);
$this->assertEquals('startvalue', $ordered_values[0]);
$this->assertEquals($this->item3, $ordered_values[1]);
@@ -409,81 +409,80 @@ class TPriorityMapTest extends PHPUnit_Framework_TestCase {
$this->assertEquals($this->item2, $ordered_values[4]);
$this->assertEquals($this->item4, $ordered_values[5]);
$this->assertEquals('endvalue', $ordered_values[6]);
-
+
$this->assertEquals(1, $map2->priorityAt('key5'));
$this->assertEquals(1, $map2->priorityOf($this->item5));
}
-
+
public function testSetPriorityAt() {
-
+
$this->assertEquals(10, $this->map->priorityAt('key2'));
$this->assertEquals(10, $this->map->setPriorityAt('key2', 1));
$this->assertEquals(1, $this->map->priorityAt('key2'));
$this->assertEquals(1, $this->map->setPriorityAt('key2'));
$this->assertEquals(10, $this->map->priorityAt('key2'));
}
-
+
public function testToArrayBelowPriority() {
$this->setUpPriorities();
-
+
$array = $this->map->toArrayBelowPriority(1);
$this->assertEquals(array('key3'=> $this->item3), $array);
$this->assertEquals(1, count($array));
-
+
$array = $this->map->toArrayBelowPriority(1, true);
$this->assertEquals(array('key3'=> $this->item3, 'key5'=> $this->item5), $array);
$this->assertEquals(2, count($array));
-
+
$array = $this->map->toArrayBelowPriority(2);
$this->assertEquals(array('key3'=> $this->item3, 'key5'=> $this->item5), $array);
$this->assertEquals(2, count($array));
-
+
$array = $this->map->toArrayBelowPriority(10);
$this->assertEquals(array('key3'=> $this->item3, 'key5'=> $this->item5), $array);
$this->assertEquals(2, count($array));
-
+
$array = $this->map->toArrayBelowPriority(10, true);
$this->assertEquals(array('key3'=> $this->item3, 'key5'=> $this->item5, 'key1' => $this->item1, 'key2' => $this->item2), $array);
$this->assertEquals(4, count($array));
-
+
$array = $this->map->toArrayBelowPriority(100);
$this->assertEquals(array('key3'=> $this->item3, 'key5'=> $this->item5, 'key1' => $this->item1, 'key2' => $this->item2), $array);
$this->assertEquals(4, count($array));
-
+
$array = $this->map->toArrayBelowPriority(100, true);
$this->assertEquals(array('key3'=> $this->item3, 'key5'=> $this->item5, 'key1' => $this->item1, 'key2' => $this->item2, 'key4' => $this->item4), $array);
$this->assertEquals(5, count($array));
}
-
+
public function testToArrayAbovePriority() {
$this->setUpPriorities();
-
+
$array = $this->map->toArrayAbovePriority(100, false);
$this->assertEquals(0, count($array));
-
+
$array = $this->map->toArrayAbovePriority(100, true);
$this->assertEquals(1, count($array));
$this->assertEquals(array('key4' => $this->item4), $array);
-
+
$array = $this->map->toArrayAbovePriority(11);
$this->assertEquals(array('key4' => $this->item4), $array);
$this->assertEquals(1, count($array));
-
+
$array = $this->map->toArrayAbovePriority(10, false);
$this->assertEquals(array('key4' => $this->item4), $array);
$this->assertEquals(1, count($array));
-
+
$array = $this->map->toArrayAbovePriority(10);
$this->assertEquals(array('key1' => $this->item1, 'key2' => $this->item2, 'key4' => $this->item4), $array);
$this->assertEquals(3, count($array));
-
+
$array = $this->map->toArrayAbovePriority(0);
$this->assertEquals(array('key3' => $this->item3, 'key5' => $this->item5, 'key1' => $this->item1, 'key2' => $this->item2, 'key4' => $this->item4), $array);
$this->assertEquals(5, count($array));
}
-
-
-
+
+
+
}
-?>
diff --git a/tests/unit/Collections/TQueueTest.php b/tests/unit/Collections/TQueueTest.php
index efee7cb7..da60eae3 100644
--- a/tests/unit/Collections/TQueueTest.php
+++ b/tests/unit/Collections/TQueueTest.php
@@ -31,7 +31,7 @@ class TQueueTest extends PHPUnit_Framework_TestCase {
$queue->copyFrom($data);
self::assertEquals(array(4, 5, 6), $queue->toArray());
}
-
+
public function testCanNotCopyFromNonTraversableTypes() {
$queue = new TQueue();
$data = new stdClass();
@@ -42,7 +42,7 @@ class TQueueTest extends PHPUnit_Framework_TestCase {
}
self::fail('An expected TInvalidDataTypeException was not raised');
}
-
+
public function testClear() {
$queue = new TQueue(array(1, 2, 3));
$queue->clear();
@@ -59,7 +59,7 @@ class TQueueTest extends PHPUnit_Framework_TestCase {
$queue = new TQueue(array(1,2,3));
self::assertEquals(1, $queue->peek());
}
-
+
public function testCanNotPeekAnEmptyQueue() {
$queue = new TQueue();
try {
@@ -76,7 +76,7 @@ class TQueueTest extends PHPUnit_Framework_TestCase {
self::assertEquals(1, $first);
self::assertEquals(array(2, 3), $queue->toArray());
}
-
+
public function testCanNotDequeueAnEmptyQueue() {
$queue = new TQueue();
try {
@@ -105,7 +105,7 @@ class TQueueTest extends PHPUnit_Framework_TestCase {
$found++;
}
if($index === 1 && $item === 2) {
- $found++;
+ $found++;
}
}
self::assertTrue($n == 2 && $found == 2);
@@ -117,7 +117,7 @@ class TQueueTest extends PHPUnit_Framework_TestCase {
$queue = new TQueue(array(1, 2, 3));
self::assertEquals(3, $queue->getCount());
}
-
+
public function testCountable() {
$queue = new TQueue();
self::assertEquals(0, count($queue));
@@ -127,4 +127,3 @@ class TQueueTest extends PHPUnit_Framework_TestCase {
}
-?>
diff --git a/tests/unit/Collections/TStackTest.php b/tests/unit/Collections/TStackTest.php
index 89a42749..80dc77c3 100644
--- a/tests/unit/Collections/TStackTest.php
+++ b/tests/unit/Collections/TStackTest.php
@@ -31,7 +31,7 @@ class TStackTest extends PHPUnit_Framework_TestCase {
$stack->copyFrom($data);
self::assertEquals(array(4, 5, 6), $stack->toArray());
}
-
+
public function testCanNotCopyFromNonTraversableTypes() {
$stack = new TStack();
$data = new stdClass();
@@ -42,7 +42,7 @@ class TStackTest extends PHPUnit_Framework_TestCase {
}
self::fail('An expected TInvalidDataTypeException was not raised');
}
-
+
public function testClear() {
$stack = new TStack(array(1, 2, 3));
$stack->clear();
@@ -59,7 +59,7 @@ class TStackTest extends PHPUnit_Framework_TestCase {
$stack = new TStack(array(1));
self::assertEquals(1, $stack->peek());
}
-
+
public function testCanNotPeekAnEmptyStack() {
$stack = new TStack();
try {
@@ -76,7 +76,7 @@ class TStackTest extends PHPUnit_Framework_TestCase {
self::assertEquals(3, $last);
self::assertEquals(array(1, 2), $stack->toArray());
}
-
+
public function testCanNotPopAnEmptyStack() {
$stack = new TStack();
try {
@@ -105,7 +105,7 @@ class TStackTest extends PHPUnit_Framework_TestCase {
$found++;
}
if($index === 1 && $item === 2) {
- $found++;
+ $found++;
}
}
self::assertTrue($n == 2 && $found == 2);
@@ -117,7 +117,7 @@ class TStackTest extends PHPUnit_Framework_TestCase {
$stack = new TStack(array(1, 2, 3));
self::assertEquals(3, $stack->getCount());
}
-
+
public function testCount() {
$stack = new TStack();
self::assertEquals(0, count($stack));
@@ -127,4 +127,3 @@ class TStackTest extends PHPUnit_Framework_TestCase {
}
-?>
diff --git a/tests/unit/Data/DataGateway/AllTests.php b/tests/unit/Data/DataGateway/AllTests.php
index f9ba1ddc..6007ae70 100644
--- a/tests/unit/Data/DataGateway/AllTests.php
+++ b/tests/unit/Data/DataGateway/AllTests.php
@@ -12,12 +12,12 @@ class Data_DataGateway_AllTests {
public static function main() {
PHPUnit_TextUI_TestRunner::run(self::suite());
}
-
+
public static function suite() {
$suite = new PHPUnit_Framework_TestSuite('System.Data.DataGateway');
-
+
$suite->addTestSuite('TSqlCriteriaTest');
-
+
return $suite;
}
}
@@ -25,4 +25,3 @@ class Data_DataGateway_AllTests {
if(PHPUnit_MAIN_METHOD == 'Data_DataGateway_AllTests::main') {
Data_DataGateway_AllTests::main();
}
-?>
diff --git a/tests/unit/Data/DataGateway/TSqlCriteriaTest.php b/tests/unit/Data/DataGateway/TSqlCriteriaTest.php
index fb9c72b2..ce22ef1d 100644
--- a/tests/unit/Data/DataGateway/TSqlCriteriaTest.php
+++ b/tests/unit/Data/DataGateway/TSqlCriteriaTest.php
@@ -17,7 +17,7 @@ class TSqlCriteriaTest extends PHPUnit_Framework_TestCase {
public function testConstruct() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testConditionWithOrderByColumnNames() {
$criteria = new TSqlCriteria();
$criteria->Condition = "SELECT * FROM table_references ORDER BY field1 ASC, field2 DESC";
@@ -27,7 +27,7 @@ class TSqlCriteriaTest extends PHPUnit_Framework_TestCase {
self::assertEquals(true, isset($criteria->OrdersBy['field2']));
self::assertEquals('DESC', $criteria->OrdersBy['field2']);
}
-
+
public function testConditionWithOrderByExpression() {
$criteria = new TSqlCriteria();
$criteria->Condition = "SELECT * FROM table_references ORDER BY RAND()";
@@ -42,7 +42,7 @@ class TSqlCriteriaTest extends PHPUnit_Framework_TestCase {
self::assertEquals("SELECT * FROM table_references", $criteria->Condition);
self::assertEquals(2, $criteria->Limit);
}
-
+
public function testConditionWithOrderByAndLimitAndOffset() {
$criteria = new TSqlCriteria();
$criteria->Condition = "SELECT * FROM table_references ORDER BY field1 ASC, field2 DESC LIMIT 3, 2";
@@ -50,7 +50,7 @@ class TSqlCriteriaTest extends PHPUnit_Framework_TestCase {
self::assertEquals(2, $criteria->Limit);
self::assertEquals(3, $criteria->Offset);
}
-
+
public function testConditionWithOrderByAndLimitAndOffsetVariant() {
$criteria = new TSqlCriteria();
$criteria->Condition = "SELECT * FROM table_references ORDER BY field1 ASC, field2 DESC LIMIT 2 OFFSET 3";
@@ -58,14 +58,14 @@ class TSqlCriteriaTest extends PHPUnit_Framework_TestCase {
self::assertEquals(2, $criteria->Limit);
self::assertEquals(3, $criteria->Offset);
}
-
+
public function testConditionWithLimit() {
$criteria = new TSqlCriteria();
$criteria->Condition = "SELECT * FROM table_references LIMIT 2";
self::assertEquals("SELECT * FROM table_references", $criteria->Condition);
self::assertEquals(2, $criteria->Limit);
}
-
+
public function testConditionWithLimitAndOffset() {
$criteria = new TSqlCriteria();
$criteria->Condition = "SELECT * FROM table_references LIMIT 3, 2";
@@ -73,7 +73,7 @@ class TSqlCriteriaTest extends PHPUnit_Framework_TestCase {
self::assertEquals(2, $criteria->Limit);
self::assertEquals(3, $criteria->Offset);
}
-
+
public function testConditionWithLimitAndOffsetVariant() {
$criteria = new TSqlCriteria();
$criteria->Condition = "SELECT * FROM table_references LIMIT 2 OFFSET 3";
@@ -85,27 +85,26 @@ class TSqlCriteriaTest extends PHPUnit_Framework_TestCase {
public function testParameters() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testIsNamedParameters() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testOrdersBy() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testLimit() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testOffset() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testToString() {
throw new PHPUnit_Framework_IncompleteTestError();
}
}
-?>
diff --git a/tests/unit/Data/SqlMap/AllTests.php b/tests/unit/Data/SqlMap/AllTests.php
index 3adaa29c..08870eb3 100644
--- a/tests/unit/Data/SqlMap/AllTests.php
+++ b/tests/unit/Data/SqlMap/AllTests.php
@@ -27,4 +27,3 @@ class Data_SqlMap_AllTests {
if(PHPUnit_MAIN_METHOD == 'Data_SqlMap_AllTests::main') {
Data_SqlMap_AllTests::main();
}
-?>
diff --git a/tests/unit/Data/SqlMap/DataMapper/AllTests.php b/tests/unit/Data/SqlMap/DataMapper/AllTests.php
index 47b8522f..d685d474 100644
--- a/tests/unit/Data/SqlMap/DataMapper/AllTests.php
+++ b/tests/unit/Data/SqlMap/DataMapper/AllTests.php
@@ -24,5 +24,4 @@ class Data_SqlMap_DataMapper_AllTests {
if(PHPUnit_MAIN_METHOD == 'Data_SqlMap_DataMapper_AllTests::main') {
Data_SqlMap_DataMapper_AllTests::main();
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/unit/Data/SqlMap/DataMapper/TPropertyAccessTest.php b/tests/unit/Data/SqlMap/DataMapper/TPropertyAccessTest.php
index 61747c6b..3f5493c7 100644
--- a/tests/unit/Data/SqlMap/DataMapper/TPropertyAccessTest.php
+++ b/tests/unit/Data/SqlMap/DataMapper/TPropertyAccessTest.php
@@ -265,5 +265,3 @@ class _PropertyAccessTestHelperDynamicProperties
}
}
}
-
-?> \ No newline at end of file
diff --git a/tests/unit/Data/SqlMap/DynamicParameterTest.php b/tests/unit/Data/SqlMap/DynamicParameterTest.php
index 64f5e35c..136111db 100644
--- a/tests/unit/Data/SqlMap/DynamicParameterTest.php
+++ b/tests/unit/Data/SqlMap/DynamicParameterTest.php
@@ -105,5 +105,3 @@ class DynamicParameterTest extends PHPUnit_Framework_TestCase
}
}
-
-?> \ No newline at end of file
diff --git a/tests/unit/Data/TDbCommandTest.php b/tests/unit/Data/TDbCommandTest.php
index a75674bf..55d7d559 100644
--- a/tests/unit/Data/TDbCommandTest.php
+++ b/tests/unit/Data/TDbCommandTest.php
@@ -216,5 +216,3 @@ class TDbCommandTest extends PHPUnit_Framework_TestCase
}
}
}
-
-?> \ No newline at end of file
diff --git a/tests/unit/Data/TDbConnectionTest.php b/tests/unit/Data/TDbConnectionTest.php
index 8f6ff34f..e7e3ef74 100644
--- a/tests/unit/Data/TDbConnectionTest.php
+++ b/tests/unit/Data/TDbConnectionTest.php
@@ -121,5 +121,3 @@ class TDbConnectionTest extends PHPUnit_Framework_TestCase
$this->assertEquals(TDbNullConversionMode::NullToEmptyString,$this->_connection1->NullConversion);
}
}
-
-?> \ No newline at end of file
diff --git a/tests/unit/Data/TDbDataReaderTest.php b/tests/unit/Data/TDbDataReaderTest.php
index 98aa0385..0595f3e2 100644
--- a/tests/unit/Data/TDbDataReaderTest.php
+++ b/tests/unit/Data/TDbDataReaderTest.php
@@ -174,5 +174,3 @@ class TDbDataReaderTest extends PHPUnit_Framework_TestCase
$this->assertEquals($name,'my name 2');
}
}
-
-?> \ No newline at end of file
diff --git a/tests/unit/Data/TDbTransactionTest.php b/tests/unit/Data/TDbTransactionTest.php
index c608bce1..a901394d 100644
--- a/tests/unit/Data/TDbTransactionTest.php
+++ b/tests/unit/Data/TDbTransactionTest.php
@@ -68,5 +68,3 @@ class TDbTransactionTest extends PHPUnit_Framework_TestCase
$this->assertEquals(count($result),2);
}
}
-
-?> \ No newline at end of file
diff --git a/tests/unit/I18N/core/AllTests.php b/tests/unit/I18N/core/AllTests.php
index 43bbdb36..bf5fb813 100644
--- a/tests/unit/I18N/core/AllTests.php
+++ b/tests/unit/I18N/core/AllTests.php
@@ -15,16 +15,16 @@ class I18N_core_AllTests {
public static function main() {
PHPUnit_TextUI_TestRunner::run(self::suite());
}
-
+
public static function suite() {
$suite = new PHPUnit_Framework_TestSuite('System.I18N.core');
-
+
$suite->addTestSuite('CultureInfoTest');
$suite->addTestSuite('DateFormatTest');
$suite->addTestSuite('DateTimeFormatInfoTest');
$suite->addTestSuite('NumberFormatInfoTest');
$suite->addTestSuite('NumberFormatTest');
-
+
return $suite;
}
}
@@ -32,4 +32,3 @@ class I18N_core_AllTests {
if(PHPUnit_MAIN_METHOD == 'I18N_core_AllTests::main') {
I18N_core_AllTests::main();
}
-?>
diff --git a/tests/unit/I18N/core/ChoiceFormatTest.php b/tests/unit/I18N/core/ChoiceFormatTest.php
index ef397e05..2c8ab5cb 100644
--- a/tests/unit/I18N/core/ChoiceFormatTest.php
+++ b/tests/unit/I18N/core/ChoiceFormatTest.php
@@ -97,5 +97,3 @@ class ChoiceFormatTest extends PHPUnit_Framework_TestCase
}
}
}
-
-?> \ No newline at end of file
diff --git a/tests/unit/I18N/core/CultureInfoTest.php b/tests/unit/I18N/core/CultureInfoTest.php
index 6c1eda06..58c8f235 100644
--- a/tests/unit/I18N/core/CultureInfoTest.php
+++ b/tests/unit/I18N/core/CultureInfoTest.php
@@ -8,16 +8,16 @@ Prado::using('System.I18N.core.CultureInfo');
*/
class CultureInfoTest extends PHPUnit_Framework_TestCase {
protected $culture;
-
+
function setUp() {
$this->culture = CultureInfo::getInvariantCulture();
}
-
+
function testCultureName() {
$name = 'en';
-
+
$this->assertEquals($name, $this->culture->Name);
-
+
//the default/invariant culture should be neutral
$this->assertTrue($this->culture->IsNeutralCulture);
}
@@ -26,18 +26,18 @@ class CultureInfoTest extends PHPUnit_Framework_TestCase {
$allCultures = CultureInfo::getCultures();
$neutralCultures = CultureInfo::getCultures(CultureInfo::NEUTRAL);
$specificCultures = CultureInfo::getCultures(CultureInfo::SPECIFIC);
-
+
//there should be 246 cultures all together.
$this->assertEquals(count($allCultures),246);
$this->assertEquals(count($neutralCultures),76);
- $this->assertEquals(count($specificCultures),170);
+ $this->assertEquals(count($specificCultures),170);
}
function testParentCultures() {
$zh_CN = new CultureInfo('zh_CN');
$parent = $zh_CN->Parent;
$grandparent = $parent->Parent;
-
+
$this->assertEquals($zh_CN->Name, 'zh_CN');
$this->assertEquals($parent->Name, 'zh');
$this->assertEquals($grandparent->Name, 'en');
@@ -54,17 +54,17 @@ class CultureInfoTest extends PHPUnit_Framework_TestCase {
$au = array('$', 'Australian Dollar');
$this->assertEquals($au, $culture->Currencies['AUD']);
}
-
+
function testLanguages() {
$culture = new CultureInfo('fr_BE');
$this->assertEquals($culture->Languages['fr'], 'français');
}
-
+
function testScripts() {
$culture = new CultureInfo('fr');
$this->assertEquals($culture->Scripts['Armn'], 'arménien');
}
-
+
function testTimeZones() {
$culture = new CultureInfo('fi');
$zone = array(
@@ -83,5 +83,3 @@ class CultureInfoTest extends PHPUnit_Framework_TestCase {
$this->assertEquals($culture->getEnglishName(), 'iw');
}
}
-
-?> \ No newline at end of file
diff --git a/tests/unit/I18N/core/DateFormatTest.php b/tests/unit/I18N/core/DateFormatTest.php
index 8015bd74..d8350204 100644
--- a/tests/unit/I18N/core/DateFormatTest.php
+++ b/tests/unit/I18N/core/DateFormatTest.php
@@ -10,86 +10,84 @@ class DateFormatTest extends PHPUnit_Framework_TestCase {
public function testStandardPatterns() {
$dateFormatter = new DateFormat();
-
+
$time = @mktime(9, 9, 9, 9, 1, 2004);
$zone = @date('T', $time);
//var_dump(date('c',$time));
//for ShortDatePattern "M/d/yy"
$this->assertEquals('9/1/04', $dateFormatter->format($time, 'd'));
//var_dump(date('c',strtotime($dateFormatter->format($time,'d'))));
-
+
//for LongDatePattern "MMMM d, yyyy"
$wants = 'September 1, 2004';
$this->assertEquals($wants, $dateFormatter->format($time, 'D'));
//var_dump(date('c',strtotime($dateFormatter->format($time,'D'))));
-
+
//for Full date and time "MMMM d, yyyy h:mm a"
$wants = 'September 1, 2004 9:09 AM';
$this->assertEquals($wants, $dateFormatter->format($time, 'f'));
//var_dump(date('c',strtotime($dateFormatter->format($time,'f'))));
-
+
//for FullDateTimePattern "MMMM d, yyyy h:mm:ss a z"
$wants = 'September 1, 2004 9:09:09 AM '.$zone;
$this->assertEquals($wants, $dateFormatter->format($time, 'F'));
-
+
//for General "M/d/yy h:mm a"
$wants = '9/1/04 9:09 AM';
$this->assertEquals($wants, $dateFormatter->format($time, 'g'));
//var_dump(date('c',strtotime($dateFormatter->format($time,'g'))));
-
+
//for General "M/d/yy h:mm:ss a z"
$wants = '9/1/04 9:09:09 AM '.$zone;
- $this->assertEquals($wants, $dateFormatter->format($time, 'G'));
-
+ $this->assertEquals($wants, $dateFormatter->format($time, 'G'));
+
//for MonthDayPattern "MMMM dd" (invariant)
$wants = 'September 01';
$this->assertEquals($wants, $dateFormatter->format($time, 'm'));
//var_dump(date('c',strtotime($dateFormatter->format($time,'m'))));
-
+
//for RFC1123Pattern "EEE, dd MMM yyyy HH:mm:ss" (invariant)
$wants = 'Wed, 01 Sep 2004 09:09:09';
- $this->assertEquals($wants, $dateFormatter->format($time, 'r'));
+ $this->assertEquals($wants, $dateFormatter->format($time, 'r'));
//var_dump(date('c',strtotime($dateFormatter->format($time,'r'))));
-
+
//for SortableDateTimePattern "yyyy-MM-ddTHH:mm:ss" (invariant)
$wants = '2004-09-01T09:09:09';
- $this->assertEquals($wants, $dateFormatter->format($time, 's'));
+ $this->assertEquals($wants, $dateFormatter->format($time, 's'));
//var_dump(date('c',strtotime($dateFormatter->format($time,'s'))));
-
+
//for ShortTimePattern "H:mm a"
$wants = '9:09 AM';
- $this->assertEquals($wants, $dateFormatter->format($time, 't'));
+ $this->assertEquals($wants, $dateFormatter->format($time, 't'));
//(date('c',strtotime($dateFormatter->format($time,'t'))));
-
+
//for LongTimePattern "H:mm:ss a z"
$wants = '9:09:09 AM '.$zone;
- $this->assertEquals($wants, $dateFormatter->format($time, 'T'));
-
- //for UniversalSortableDateTimePattern "yyyy-MM-dd HH:mm:ss z"
+ $this->assertEquals($wants, $dateFormatter->format($time, 'T'));
+
+ //for UniversalSortableDateTimePattern "yyyy-MM-dd HH:mm:ss z"
//(invariant)
$wants = '2004-09-01 09:09:09 '.$zone;
- $this->assertEquals($wants, $dateFormatter->format($time, 'u'));
-
+ $this->assertEquals($wants, $dateFormatter->format($time, 'u'));
+
//for Full date and time "EEEE dd MMMM yyyy HH:mm:ss" (invariant)
$wants = 'Wednesday 01 September 2004 09:09:09';
- $this->assertEquals($wants, $dateFormatter->format($time, 'U'));
+ $this->assertEquals($wants, $dateFormatter->format($time, 'U'));
//var_dump(date('c',strtotime($dateFormatter->format($time,'U'))));
-
+
//for YearMonthPattern "yyyy MMMM" (invariant)
$wants = '2004 September';
- $this->assertEquals($wants, $dateFormatter->format($time, 'y'));
+ $this->assertEquals($wants, $dateFormatter->format($time, 'y'));
//var_dump(date('c',strtotime($dateFormatter->format($time,'y'))));
}
-
+
public function testCustomPatterns() {
$dateFormatter = new DateFormat();
-
+
$time = @mktime(9, 9, 9, 9, 1, 2004);
-
+
$pattern = "'Hello' EEEE, 'it should be' MMM yyyy HH:mm:ss!!!";
$wants = 'Hello Wednesday, it should be Sep 2004 09:09:09!!!';
- $this->assertEquals($wants, $dateFormatter->format($time, $pattern));
+ $this->assertEquals($wants, $dateFormatter->format($time, $pattern));
}
}
-
-?> \ No newline at end of file
diff --git a/tests/unit/I18N/core/DateTimeFormatInfoTest.php b/tests/unit/I18N/core/DateTimeFormatInfoTest.php
index 442a6b85..ac93e1c7 100644
--- a/tests/unit/I18N/core/DateTimeFormatInfoTest.php
+++ b/tests/unit/I18N/core/DateTimeFormatInfoTest.php
@@ -9,20 +9,20 @@ Prado::using('System.I18N.core.DateTimeFormatInfo');
class DateTimeFormatInfoTest extends PHPUnit_Framework_TestCase {
protected $format;
-
+
function setUp() {
$this->format = DateTimeFormatInfo::getInstance('en');
}
-
+
function testAbbreviatedDayNames() {
$names = $this->format->AbbreviatedDayNames;
$this->assertTrue(is_array($names),'Must be an array!');
$this->assertEquals(count($names),7,'Must have 7 day names');
-
+
//assuming invariant culture.
$days = array("Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat");
$this->assertEquals($names, $days);
-
+
//try to set the data
$data = array('Hel', 'wor');
$this->format->AbbreviatedDayNames = $data;
@@ -31,16 +31,16 @@ class DateTimeFormatInfoTest extends PHPUnit_Framework_TestCase {
$this->assertEquals(count($newNames),2,'Must have 2 entries');
$this->assertEquals($newNames, $data);
}
-
+
function testNarrowDayNames() {
$names = $this->format->NarrowDayNames;
$this->assertTrue(is_array($names),'Must be an array!');
$this->assertEquals(count($names),7,'Must have 7 day names');
-
+
//assuming invariant culture.
$days = array("S", "M", "T", "W", "T", "F", "S");
$this->assertEquals($names, $days);
-
+
//try to set the data
$data = array('H', 'w');
$this->format->NarrowDayNames = $data;
@@ -49,17 +49,17 @@ class DateTimeFormatInfoTest extends PHPUnit_Framework_TestCase {
$this->assertEquals(count($newNames),2,'Must have 2 entries');
$this->assertEquals($newNames, $data);
}
-
+
function testDayNames() {
$names = $this->format->DayNames;
$this->assertTrue(is_array($names),'Must be an array!');
$this->assertEquals(count($names),7,'Must have 7 day names');
-
+
//assuming invariant culture.
$days = array( "Sunday","Monday", "Tuesday", "Wednesday",
"Thursday", "Friday", "Saturday");
$this->assertEquals($names, $days);
-
+
//try to set the data
$data = array('Hello', 'world');
$this->format->DayNames = $data;
@@ -68,18 +68,18 @@ class DateTimeFormatInfoTest extends PHPUnit_Framework_TestCase {
$this->assertEquals(count($newNames),2,'Must have 2 entries');
$this->assertEquals($newNames, $data);
}
-
+
function testMonthNames() {
$names = $this->format->MonthNames;
$this->assertTrue(is_array($names),'Must be an array!');
$this->assertEquals(count($names),12,'Must have 12 month names');
-
+
//assuming invariant culture.
$days = array( "January", "February", "March", "April",
"May", "June", "July", "August", "September",
"October", "November", "December");
$this->assertEquals($names, $days);
-
+
//try to set the data
$data = array('Hello', 'world');
$this->format->MonthNames = $data;
@@ -88,17 +88,17 @@ class DateTimeFormatInfoTest extends PHPUnit_Framework_TestCase {
$this->assertEquals(count($newNames),2,'Must have 2 entries');
$this->assertEquals($newNames, $data);
}
-
+
function testNarrowMonthNames() {
$names = $this->format->NarrowMonthNames;
$this->assertTrue(is_array($names),'Must be an array!');
$this->assertEquals(count($names),12,'Must have 12 month names');
-
+
//assuming invariant culture.
$days = array( "J", "F", "M", "A", "M", "J", "J",
"A", "S", "O", "N", "D");
$this->assertEquals($names, $days);
-
+
//try to set the data
$data = array('Hello', 'world');
$this->format->NarrowMonthNames = $data;
@@ -112,13 +112,13 @@ class DateTimeFormatInfoTest extends PHPUnit_Framework_TestCase {
$names = $this->format->AbbreviatedMonthNames;
$this->assertTrue(is_array($names),'Must be an array!');
$this->assertEquals(count($names),12,'Must have 12 month names');
-
+
//assuming invariant culture.
$days = array( "Jan", "Feb", "Mar", "Apr",
"May", "Jun", "Jul", "Aug", "Sep",
"Oct", "Nov", "Dec");
$this->assertEquals($names, $days);
-
+
//try to set the data
$data = array('Hello', 'world');
$this->format->AbbreviatedMonthNames = $data;
@@ -134,7 +134,7 @@ class DateTimeFormatInfoTest extends PHPUnit_Framework_TestCase {
$this->assertEquals('AD', $this->format->getEra(1));
$this->assertEquals('BC', $this->format->getEra(0));
}
-
+
function testAMPMMarkers() {
$am_pm = array('AM','PM');
$data = $this->format->AMPMMarkers;
@@ -142,7 +142,7 @@ class DateTimeFormatInfoTest extends PHPUnit_Framework_TestCase {
$this->assertEquals($am_pm, $data);
$this->assertEquals('AM', $this->format->AMDesignator);
$this->assertEquals('PM', $this->format->PMDesignator);
-
+
//try to set the data
$data = array('Hello', 'world');
$this->format->AMPMMarkers = $data;
@@ -150,10 +150,10 @@ class DateTimeFormatInfoTest extends PHPUnit_Framework_TestCase {
$this->assertTrue(is_array($newNames),'Must be an array!');
$this->assertEquals(count($newNames),2,'Must have 2 entries');
$this->assertEquals($newNames, $data);
-
+
$this->format->AMDesignator = 'TTTT';
$this->assertEquals('TTTT',$this->format->AMDesignator);
-
+
$this->format->PMDesignator = 'SSS';
$this->assertEquals('SSS',$this->format->PMDesignator);
}
@@ -171,37 +171,36 @@ class DateTimeFormatInfoTest extends PHPUnit_Framework_TestCase {
'ShortDatePattern' => 'M/d/yy',
'DateTimeOrderPattern' => '{1} {0}'
);
-
+
foreach($patterns as $property => $pattern) {
$this->assertEquals($pattern, $this->format->$property);
}
-
+
$hello = 'Hello';
$world = 'world';
$expectedResult = $hello.' '.$world;
$this->assertEquals($expectedResult,
$this->format->formatDateTime($hello, $world));
}
-
+
function testInvariantInfo() {
$format = DateTimeFormatInfo::getInstance();
-
+
//the variant datetime format for medium date
//should be the follow
$pattern = 'MMM d, yyyy';
-
+
$this->assertEquals($pattern, $format->MediumDatePattern);
-
+
$invariant = $format->getInvariantInfo();
-
+
$this->assertSame($format, $invariant);
}
-
+
function testGetInstance() {
$format = DateTimeFormatInfo::getInstance('zh_CN');
-
+
$pattern = 'yyyy-M-d';
$this->assertEquals($pattern, $format->MediumDatePattern);
- }
-}
-?> \ No newline at end of file
+ }
+} \ No newline at end of file
diff --git a/tests/unit/I18N/core/NumberFormatInfoTest.php b/tests/unit/I18N/core/NumberFormatInfoTest.php
index d522144f..6243095a 100644
--- a/tests/unit/I18N/core/NumberFormatInfoTest.php
+++ b/tests/unit/I18N/core/NumberFormatInfoTest.php
@@ -8,27 +8,27 @@ Prado::using('System.I18N.core.NumberFormatInfo');
* @package System.I18N.core
*/
class NumberFormatInfoTest extends PHPUnit_Framework_TestCase {
-
+
function testCurrencyPatterns() {
$numberInfo = NumberFormatInfo::getCurrencyInstance();
-
+
//there should be 2 decimal places.
$this->assertEquals($numberInfo->DecimalDigits,2);
$this->assertEquals($numberInfo->DecimalSeparator,'.');
$this->assertEquals($numberInfo->GroupSeparator,',');
-
+
//there should be only 1 grouping of size 3
$groupsize = array(3,false);
$this->assertEquals($numberInfo->GroupSizes, $groupsize);
-
+
//the default negative pattern prefix and postfix
$negPattern = array('-¤','');
$this->assertEquals($numberInfo->NegativePattern, $negPattern);
-
+
//the default positive pattern prefix and postfix
$negPattern = array('¤','');
$this->assertEquals($numberInfo->PositivePattern, $negPattern);
-
+
//the default currency symbol
$this->assertEquals($numberInfo->CurrencySymbol, 'US$');
$this->assertEquals($numberInfo->getCurrencySymbol('JPY'), 'Â¥');
@@ -38,51 +38,49 @@ class NumberFormatInfoTest extends PHPUnit_Framework_TestCase {
$this->assertEquals($numberInfo->PositiveSign, '+');
$this->assertEquals($numberInfo->NaNSymbol, '�');
$this->assertEquals($numberInfo->PercentSymbol, '%');
- $this->assertEquals($numberInfo->PerMilleSymbol, '‰');
+ $this->assertEquals($numberInfo->PerMilleSymbol, '‰');
}
function testPatternsSet() {
$numberInfo = NumberFormatInfo::getInstance();
-
+
$numberInfo->DecimalDigits = 0;
$this->assertEquals($numberInfo->DecimalDigits,0);
-
+
$numberInfo->DecimalSeparator = ',';
$this->assertEquals($numberInfo->DecimalSeparator,',');
-
+
$numberInfo->GroupSeparator = ' ';
$this->assertEquals($numberInfo->GroupSeparator,' ');
-
+
$numberInfo->GroupSizes = array(2,3);
$groupsize = array(2,3);
$this->assertEquals($numberInfo->GroupSizes, $groupsize);
-
+
$numberInfo->NegativePattern = array('-$$','.');
$negPattern = array('-$$','.');
$this->assertEquals($numberInfo->NegativePattern, $negPattern);
-
+
$numberInfo->PositivePattern = array('YY','.');
$negPattern = array('YY','.');
$this->assertEquals($numberInfo->PositivePattern, $negPattern);
-
+
//the default CurrencySymbol symbol
$numberInfo->CurrencySymbol = '$$$';
$this->assertEquals($numberInfo->CurrencySymbol, '$$$');
}
-
+
function testLocalizedPatterns() {
$fr = NumberFormatInfo::getInstance('fr');
$de = NumberFormatInfo::getInstance('de');
$en = NumberFormatInfo::getInstance('en_US');
-
+
$this->assertEquals($fr->DecimalSeparator, ',');
$this->assertEquals($de->DecimalSeparator, ',');
$this->assertEquals($en->DecimalSeparator, '.');
-
+
$this->assertEquals($fr->GroupSeparator, ' ');
$this->assertEquals($de->GroupSeparator, '.');
$this->assertEquals($en->GroupSeparator, ',');
}
}
-
-?> \ No newline at end of file
diff --git a/tests/unit/I18N/core/NumberFormatTest.php b/tests/unit/I18N/core/NumberFormatTest.php
index 958f05f4..ef8add77 100644
--- a/tests/unit/I18N/core/NumberFormatTest.php
+++ b/tests/unit/I18N/core/NumberFormatTest.php
@@ -14,7 +14,7 @@ class NumberFormatTest extends PHPUnit_Framework_TestCase {
$wanted = '123,456,789.125156';
$this->assertEquals($wanted, $formatter->format($number));
-
+
//currency
$wanted = 'US$123,456,789.13';
$this->assertEquals($wanted, $formatter->format($number,'c'));
@@ -25,21 +25,21 @@ class NumberFormatTest extends PHPUnit_Framework_TestCase {
$de = new NumberFormat('de');
$ja = new NumberFormat('ja_JP');
$it = new NumberFormat('it_IT');
-
+
$number = '123456789.125156';
-
+
//french
$wanted = '123 456 789,13 F';
$this->assertEquals($wanted, $fr->format($number,'c','FRF'));
-
+
//german
$wanted = 'DES 123.456.789,13';
$this->assertEquals($wanted, $de->format($number,'c','DES'));
-
+
//japanese
$wanted = 'ï¿¥123,456,789';
$this->assertEquals($wanted, $ja->format($number,'c','JPY'));
-
+
//custom/unkown currency
$wanted = 'DLL123,456,789';
$this->assertEquals($wanted, $ja->format($number,'c','DLL'));
@@ -52,54 +52,54 @@ class NumberFormatTest extends PHPUnit_Framework_TestCase {
function testCustomFormat() {
$formatter = new NumberFormat();
$number = '123456789.125156';
-
+
//primay and secondary grouping test
$pattern = '#,###,##.###';
$wanted = '1,234,567,89.125156';
$this->assertEquals($wanted, $formatter->format($number, $pattern));
-
+
//4 digits grouping test
$pattern = '#,####.###';
$wanted = '1,2345,6789.125156';
$this->assertEquals($wanted, $formatter->format($number, $pattern));
-
+
//custom percentage
$pattern = '#,###.00%';
$wanted = '123,456,789.13%';
$this->assertEquals($wanted, $formatter->format($number, $pattern));
}
-
+
function testPercentageFormat() {
$formatter = new NumberFormat();
$number = '0.125156';
$wanted = '12%';
$this->assertEquals($wanted, $formatter->format($number, 'p'));
}
-
+
function testQuotes() {
$formatter = new NumberFormat();
$number = '123456789.125156';
-
+
$pattern = "# o'clock";
$wanted = "123456789 o'clock";
$this->assertEquals($wanted, $formatter->format($number, $pattern));
-
+
}
-
+
function testPadding() {
$formatter = new NumberFormat();
$number = '5';
-
+
$pattern = '0000';
$wanted = '0005';
-
+
$this->assertEquals($wanted, $formatter->format($number, $pattern));
}
-
+
function testFormatWithANegativeValue() {
$formatter = new NumberFormat();
$number = "-1.2";
-
+
$wanted = "-1.2";
$this->assertEquals($wanted, $formatter->format($number));
}
@@ -110,33 +110,33 @@ class NumberFormatTest extends PHPUnit_Framework_TestCase {
$expected = "10E";
$this->assertEquals('10E', $formatter->format($number, 'e'));
}
-
+
function testRounding()
{
$formatter = new NumberFormat();
-
+
$number = 349.999;
$pattern = '#.00';
$expected = '350.00';
-
+
$this->assertEquals($expected, $formatter->format($number, $pattern));
}
function testRounding2()
{
$formatter = new NumberFormat();
-
+
$number = 349.99;
$pattern = '#.00';
$expected = '349.99';
-
+
$this->assertEquals($expected, $formatter->format($number, $pattern));
}
function testLocalizedCurrencyFormats2() {
$it = new NumberFormat('it_IT');
-
+
$number = 12.41;
$wanted = '12,41';
$this->assertEquals($wanted, $it->format($number,'d'));
@@ -149,7 +149,7 @@ class NumberFormatTest extends PHPUnit_Framework_TestCase {
$wanted = '10.010,23';
$this->assertEquals($wanted, $it->format($number,'d'));
- $old= setlocale(LC_ALL,"0");
+ $old= setlocale(LC_ALL,"0");
setlocale(LC_ALL,"it_IT");
$number = 12.41;
@@ -167,5 +167,3 @@ class NumberFormatTest extends PHPUnit_Framework_TestCase {
setlocale(LC_ALL,$old);
}
}
-
-?> \ No newline at end of file
diff --git a/tests/unit/IO/AllTests.php b/tests/unit/IO/AllTests.php
index 01bbd95d..c789169f 100644
--- a/tests/unit/IO/AllTests.php
+++ b/tests/unit/IO/AllTests.php
@@ -11,13 +11,13 @@ class IO_AllTests {
public static function main() {
PHPUnit_TextUI_TestRunner::run(self::suite());
}
-
+
public static function suite() {
$suite = new PHPUnit_Framework_TestSuite('System.IO');
-
+
$suite->addTestSuite('TTarFileExtractorTest');
$suite->addTestSuite('TTextWriterTest');
-
+
return $suite;
}
}
@@ -25,4 +25,3 @@ class IO_AllTests {
if(PHPUnit_MAIN_METHOD == 'IO_AllTests::main') {
IO_AllTests::main();
}
-?>
diff --git a/tests/unit/IO/TTarFileExtractorTest.php b/tests/unit/IO/TTarFileExtractorTest.php
index 66b66831..860560b1 100644
--- a/tests/unit/IO/TTarFileExtractorTest.php
+++ b/tests/unit/IO/TTarFileExtractorTest.php
@@ -14,10 +14,9 @@ class TTarFileExtractorTest extends PHPUnit_Framework_TestCase {
public function testDestruct() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testExtract() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/unit/IO/TTextWriterTest.php b/tests/unit/IO/TTextWriterTest.php
index d23fec36..087812d7 100644
--- a/tests/unit/IO/TTextWriterTest.php
+++ b/tests/unit/IO/TTextWriterTest.php
@@ -20,7 +20,7 @@ class TTextWriterTest extends PHPUnit_Framework_TestCase {
$writer->write("more text\n");
self::assertEquals("some text\nmore text\n", $writer->flush());
}
-
+
public function testWriteLine() {
$writer = new TTextWriter();
$writer->writeLine('some text');
@@ -28,4 +28,3 @@ class TTextWriterTest extends PHPUnit_Framework_TestCase {
}
}
-?>
diff --git a/tests/unit/Security/AllTests.php b/tests/unit/Security/AllTests.php
index 40316719..e71307a9 100644
--- a/tests/unit/Security/AllTests.php
+++ b/tests/unit/Security/AllTests.php
@@ -14,16 +14,16 @@ class Security_AllTests {
public static function main() {
PHPUnit_TextUI_TestRunner::run(self::suite());
}
-
+
public static function suite() {
$suite = new PHPUnit_Framework_TestSuite('System.Security');
-
+
$suite->addTestSuite('TAuthManagerTest');
$suite->addTestSuite('TAuthorizationRuleTest');
$suite->addTestSuite('TSecurityManagerTest');
$suite->addTestSuite('TUserManagerTest');
$suite->addTestSuite('TUserTest');
-
+
return $suite;
}
}
@@ -31,4 +31,3 @@ class Security_AllTests {
if(PHPUnit_MAIN_METHOD == 'Security_AllTests::main') {
Security_AllTests::main();
}
-?>
diff --git a/tests/unit/Security/TAuthManagerTest.php b/tests/unit/Security/TAuthManagerTest.php
index 03244a22..3b8b9305 100644
--- a/tests/unit/Security/TAuthManagerTest.php
+++ b/tests/unit/Security/TAuthManagerTest.php
@@ -8,7 +8,7 @@ Prado::using('System.Xml.TXmlDocument');
* @package System.Security
*/
class TAuthManagerTest extends PHPUnit_Framework_TestCase {
-
+
public static $app = null;
public static $usrMgr = null;
@@ -18,7 +18,7 @@ class TAuthManagerTest extends PHPUnit_Framework_TestCase {
if(self::$app === null) {
self::$app = new TApplication(dirname(__FILE__).'/app');
}
-
+
// Make a fake user manager module
if (self::$usrMgr === null) {
self::$usrMgr=new TUserManager ();
@@ -39,26 +39,26 @@ class TAuthManagerTest extends PHPUnit_Framework_TestCase {
$authManager->init(null);
self::fail ('Expected TConfigurationException not thrown');
} catch (TConfigurationException $e) {}
-
+
$authManager->setUserManager('users');
$authManager->init (null);
self::assertEquals(self::$usrMgr, $authManager->getUserManager());
}
-
+
public function testUserManager() {
$authManager=new TAuthManager ();
$authManager->setUserManager('users');
$authManager->init(null);
self::assertEquals(self::$usrMgr, $authManager->getUserManager());
-
+
// test change
try {
$authManager->setUserManager('invalid');
self::fail ('Expected TInvalidOperationException not thrown');
} catch (TInvalidOperationException $e) {}
-
+
}
-
+
public function testLoginPage() {
$authManager=new TAuthManager ();
$authManager->setUserManager('users');
@@ -66,7 +66,7 @@ class TAuthManagerTest extends PHPUnit_Framework_TestCase {
$authManager->setLoginPage ('LoginPage');
self::assertEquals('LoginPage', $authManager->getLoginPage());
}
-
+
public function testDoAuthentication() {
throw new PHPUnit_Framework_IncompleteTestError();
// Not yet finished, Session won't start because of headers :( :(
@@ -76,41 +76,40 @@ class TAuthManagerTest extends PHPUnit_Framework_TestCase {
$authManager->init(null);
$authManager->setLoginPage ('LoginPage');
self::$app->raiseEvent ('onAuthentication', self::$app, null);
-
+
}
-
+
public function testDoAuthorization() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testLeave() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testReturnUrl() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testOnAuthenticate() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testOnAuthorize() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testUpdateSessionUser() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testLogin() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testLogout() {
throw new PHPUnit_Framework_IncompleteTestError();
}
}
-?>
diff --git a/tests/unit/Security/TAuthorizationRuleTest.php b/tests/unit/Security/TAuthorizationRuleTest.php
index 5d5f2d97..5bfa6c2c 100644
--- a/tests/unit/Security/TAuthorizationRuleTest.php
+++ b/tests/unit/Security/TAuthorizationRuleTest.php
@@ -16,35 +16,34 @@ class TAuthorizationRuleTest extends PHPUnit_Framework_TestCase {
public function testConstruct() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testAction() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testUsers() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testRoles() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testVerb() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGuestApplied() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testEveryoneApplied() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testIsUserAllowed() {
throw new PHPUnit_Framework_IncompleteTestError();
}
}
-?>
diff --git a/tests/unit/Security/TSecurityManagerTest.php b/tests/unit/Security/TSecurityManagerTest.php
index 09c261cf..9c319a5a 100644
--- a/tests/unit/Security/TSecurityManagerTest.php
+++ b/tests/unit/Security/TSecurityManagerTest.php
@@ -22,39 +22,39 @@ class TSecurityManagerTest extends PHPUnit_Framework_TestCase {
$sec->init(null);
self::assertEquals ($sec, self::$app->getSecurityManager());
}
-
+
public function testValidationKey() {
$sec=new TSecurityManager ();
$sec->init (null);
// Random validation key
$valkey=$sec->getValidationKey ();
self::assertEquals($valkey, self::$app->getGlobalState(TSecurityManager::STATE_VALIDATION_KEY));
-
+
$sec->setValidationKey ('aKey');
self::assertEquals('aKey',$sec->getValidationKey());
-
+
try {
$sec->setValidationKey ('');
self::fail ('Expected TInvalidDataValueException not thrown');
} catch (TInvalidDataValueException $e) {}
}
-
+
public function testEncryptionKey() {
$sec=new TSecurityManager ();
$sec->init (null);
// Random encryption key
$valkey=$sec->getEncryptionKey ();
self::assertEquals($valkey, self::$app->getGlobalState(TSecurityManager::STATE_ENCRYPTION_KEY));
-
+
$sec->setEncryptionKey ('aKey');
self::assertEquals('aKey',$sec->getEncryptionKey());
-
+
try {
$sec->setEncryptionKey ('');
self::fail ('Expected TInvalidDataValueException not thrown');
} catch (TInvalidDataValueException $e) {}
}
-
+
public function testValidation() {
$sec=new TSecurityManager ();
$sec->init (null);
@@ -67,7 +67,7 @@ class TSecurityManagerTest extends PHPUnit_Framework_TestCase {
self::fail ('Expected TInvalidDataValueException not thrown');
} catch (TInvalidDataValueException $e) {}
}
-
+
public function testEncryption() {
$sec=new TSecurityManager ();
$sec->init (null);
@@ -79,7 +79,7 @@ class TSecurityManagerTest extends PHPUnit_Framework_TestCase {
self::assertEquals('NotExisting', $sec->getCryptAlgorithm());
}
}
-
+
public function testEncryptDecrypt() {
$sec=new TSecurityManager ();
$sec->init (null);
@@ -101,13 +101,13 @@ class TSecurityManagerTest extends PHPUnit_Framework_TestCase {
self::assertEquals($plainText,$decrypted);
- // try change key
+ // try change key
$sec->setEncryptionKey ('anotherKey');
self::assertNotEquals($plainText, $sec->decrypt($encrypted));
}
}
-
-
+
+
public function testHashData() {
$sec=new TSecurityManager ();
$sec->init (null);
@@ -118,7 +118,7 @@ class TSecurityManagerTest extends PHPUnit_Framework_TestCase {
self::assertEquals (54, strlen($hashed));
// The initial text should be after the initial hash
self::assertEquals ('A text to hash', substr($hashed,40));
-
+
// Same tests with MD5
$sec->setValidationKey('AnotherKey');
$sec->setValidation('MD5');
@@ -128,7 +128,7 @@ class TSecurityManagerTest extends PHPUnit_Framework_TestCase {
// The initial text should be after the initial hash
self::assertEquals ('A text to hash', substr($hashed,32));
}
-
+
public function testValidateData() {
$sec=new TSecurityManager ();
$sec->init (null);
@@ -142,8 +142,7 @@ class TSecurityManagerTest extends PHPUnit_Framework_TestCase {
// and a test without tampered data
self::assertFalse($sec->validateData('bad'));
}
-
+
}
-?>
diff --git a/tests/unit/Security/TUserManagerTest.php b/tests/unit/Security/TUserManagerTest.php
index edb7ea6f..91b9d0c6 100644
--- a/tests/unit/Security/TUserManagerTest.php
+++ b/tests/unit/Security/TUserManagerTest.php
@@ -6,18 +6,18 @@ Prado::using('System.Security.TUserManager');
* @package System.Security
*/
class TUserManagerTest extends PHPUnit_Framework_TestCase {
-
+
public static $app=null;
public static $config=null;
-
+
public function setUp() {
-
+
if(self::$app === null) {
self::$app = new TApplication(dirname(__FILE__).'/app');
prado::setPathofAlias('App', dirname(__FILE__));
}
-
+
if (self::$config === null) {
// Simulate a config file
self::$config=new TXmlDocument('1.0','utf8');
@@ -41,21 +41,21 @@ class TUserManagerTest extends PHPUnit_Framework_TestCase {
$userManager->init (new TXmlDocument()); // Empty config
self::assertEquals(array('joe'=>'demo','john'=>'demo', 'test' => 'test'), $userManager->getUsers());
unlink (dirname(__FILE__).'/users.xml');
- }
+ }
}
-
+
public function testUsers() {
$userManager=new TUserManager ();
$userManager->init (self::$config);
self::assertEquals(array('joe'=>'demo','john'=>'demo', 'test' => 'test'), $userManager->getUsers());
}
-
+
public function testRoles() {
$userManager=new TUserManager ();
$userManager->init (self::$config);
self::assertEquals(array('joe'=>array ('Writer'), 'john'=>array ('Administrator','Writer'), 'test' => array ('Reader', 'User')), $userManager->getRoles());
}
-
+
public function testUserFile() {
$userManager=new TUserManager ();
try {
@@ -71,7 +71,7 @@ class TUserManagerTest extends PHPUnit_Framework_TestCase {
self::assertEquals(dirname(__FILE__).'/users.xml', $userManager->getUserFile());
unlink (dirname(__FILE__).'/users.xml');
$userManager=null;
- }
+ }
$userManager=new TUserManager ();
$userManager->init (self::$config);
try {
@@ -79,14 +79,14 @@ class TUserManagerTest extends PHPUnit_Framework_TestCase {
self::fail ('Exception TInvalidOperationException not thrown');
} catch (TInvalidOperationException $e) {}
}
-
+
public function testGuestName() {
$userManager=new TUserManager ();
self::assertEquals('Guest', $userManager->getGuestName());
$userManager->setGuestName('Invite');
self::assertEquals('Invite', $userManager->getGuestName());
}
-
+
public function testPasswordMode() {
$userManager=new TUserManager ();
$userManager->setPasswordMode('Clear');
@@ -99,9 +99,9 @@ class TUserManagerTest extends PHPUnit_Framework_TestCase {
$userManager->setPasswordMode('Invalid');
self::fail ('Exception TInvalidDataValueException not thrown');
} catch (TInvalidDataValueException $e) {}
-
+
}
-
+
public function testValidateUser() {
$userManager=new TUserManager ();
$userManager->init (self::$config);
@@ -109,7 +109,7 @@ class TUserManagerTest extends PHPUnit_Framework_TestCase {
self::assertTrue($userManager->validateUser('Joe', 'demo'));
self::assertFalse($userManager->validateUser('John', 'bad'));
}
-
+
public function testUser() {
$userManager=new TUserManager ();
$userManager->init (self::$config);
@@ -123,7 +123,7 @@ class TUserManagerTest extends PHPUnit_Framework_TestCase {
self::assertFalse($user->getIsGuest());
self::assertNull($userManager->getUser('badUser'));
}
-
+
public function testSwitchToGuest() {
$userManager=new TUserManager ();
$userManager->init (self::$config);
@@ -134,4 +134,3 @@ class TUserManagerTest extends PHPUnit_Framework_TestCase {
}
-?>
diff --git a/tests/unit/Security/TUserTest.php b/tests/unit/Security/TUserTest.php
index 6fa337e0..3692b97c 100644
--- a/tests/unit/Security/TUserTest.php
+++ b/tests/unit/Security/TUserTest.php
@@ -32,18 +32,18 @@ class TUserTest extends PHPUnit_Framework_TestCase {
self::assertEquals('Guest', $user->getName());
self::assertEquals(self::$mgr, $user->getManager());
}
-
+
public function testManager() {
$user = new TUser (self::$mgr);
self::assertEquals(self::$mgr, $user->getManager());
}
-
+
public function testName() {
$user = new TUser (self::$mgr);
$user->setName('joe');
self::assertEquals('joe', $user->getName());
}
-
+
public function testIsGuest() {
$user = new TUser (self::$mgr);
$user->setName('John');
@@ -54,7 +54,7 @@ class TUserTest extends PHPUnit_Framework_TestCase {
self::assertTrue($user->getIsGuest());
self::assertEquals(array(),$user->getRoles());
}
-
+
public function testRoles() {
$user=new TUser(self::$mgr);
$user->setRoles(array('Administrator','Writer'));
@@ -62,7 +62,7 @@ class TUserTest extends PHPUnit_Framework_TestCase {
$user->setRoles('Reader,User');
self::assertEquals(array('Reader','User'), $user->getRoles());
}
-
+
public function testIsInRole() {
$user=new TUser(self::$mgr);
$user->setRoles(array('Administrator','Writer'));
@@ -71,7 +71,7 @@ class TUserTest extends PHPUnit_Framework_TestCase {
self::assertTrue($user->IsInRole('Writer'));
self::assertFalse($user->isInRole('Reader'));
}
-
+
public function testSaveToString() {
$user = new TUser (self::$mgr);
$user->setName('John');
@@ -81,20 +81,20 @@ class TUserTest extends PHPUnit_Framework_TestCase {
$assumedState=array ('Name' => 'John', 'IsGuest' => false, 'Roles' => array ('Administrator', 'Writer'));
self::assertEquals(serialize($assumedState), $user->saveToString());
}
-
+
public function testLoadFromString() {
$user = new TUser (self::$mgr);
$user->setName('John');
$user->setIsGuest(false);
$user->setRoles('Administrator, Writer');
$save=$user->saveToString();
-
+
$user2 = new TUser (self::$mgr);
$user2->loadFromString($save);
-
+
self::assertEquals($user, $user2);
}
-
+
/* getState & setState are protected methods, will be tested with other tests.
public function testState() {
throw new PHPUnit_Framework_IncompleteTestError();
@@ -111,4 +111,3 @@ class TUserTest extends PHPUnit_Framework_TestCase {
}
-?>
diff --git a/tests/unit/TComponentTest.php b/tests/unit/TComponentTest.php
index 93668dc0..9a2299da 100644
--- a/tests/unit/TComponentTest.php
+++ b/tests/unit/TComponentTest.php
@@ -13,24 +13,24 @@ class NewComponent extends TComponent {
public function getAutoGlobalListen() {
return true;
- }
+ }
public function getText() {
return $this->_text;
}
-
+
public function setText($value) {
$this->_text=$value;
}
-
+
public function getReadOnlyProperty() {
return 'read only';
}
-
+
public function getJsReadOnlyJsProperty() {
return 'js read only';
}
-
+
public function getObject() {
if(!$this->_object) {
$this->_object=new NewComponent;
@@ -38,19 +38,19 @@ class NewComponent extends TComponent {
}
return $this->_object;
}
-
+
public function onMyEvent($param) {
$this->raiseEvent('OnMyEvent',$this,$param);
}
-
+
public function myEventHandler($sender,$param) {
$this->_eventHandled=true;
}
-
+
public function eventReturnValue($sender,$param) {
return $param->Return;
}
-
+
public function isEventHandled() {
return $this->_eventHandled;
}
@@ -82,14 +82,14 @@ class NewComponentNoListen extends NewComponent {
class DynamicCatchingComponent extends NewComponentNoListen implements IDynamicMethods {
public function __dycall($method, $args) {
-
+
}
}
class GlobalRaiseComponent extends NewComponent implements IDynamicMethods {
private $_callorder = array();
-
+
public function getCallOrders()
{
return $this->_callorder;
@@ -128,7 +128,7 @@ class FooClassBehavior extends TClassBehavior {
class FooFooClassBehavior extends FooClassBehavior {
public function faafaaEverMore($object, $laa, $sol) {
-
+
}
}
@@ -146,7 +146,7 @@ class FooBehavior extends TBehavior {
}
}
class FooFooBehavior extends FooBehavior {
-
+
public function faafaaEverMore($laa, $sol) {
return sqrt($laa * $laa + $sol * $sol);
}
@@ -162,11 +162,11 @@ class PreBarBehavior extends TBehavior {
class BarBehavior extends PreBarBehavior implements IInstanceCheck {
private $_instanceReturn = null;
-
+
public function moreFunction($laa, $sol) {
return pow($laa+$sol+1, 2);
}
-
+
public function isinstanceof($class, $instance=null) {
return $this->_instanceReturn;
}
@@ -200,7 +200,7 @@ class BehaviorTestBehavior extends TBehavior {
public function getReadOnly() {
return true;
}
-
+
public function onBehaviorEvent($sender, $param,$responsetype=null,$postfunction=null) {
return $this->getOwner()->raiseEvent('onBehaviorEvent',$sender,$param,$responsetype,$postfunction);
}
@@ -264,40 +264,40 @@ class dy3ClassTextReplace extends dy1ClassTextReplace {
class IntraObjectExtenderBehavior extends TBehavior {
-
+
private $lastCall = null;
private $arglist = null;
-
+
public function getLastCall() {
$v = $this->lastCall;
$this->lastCall = null;
return $v;
}
-
+
public function getLastArgumentList() {
$v = $this->arglist;
$this->arglist = null;
return $v;
}
-
-
-
+
+
+
public function dyListen($fx, $chain) {
$this->lastCall = 1;
$this->arglist = func_get_args();
-
+
return $chain->dyListen($fx); // Calls the next event, within a chain
}
public function dyUnlisten($fx, $chain) {
$this->lastCall = 2;
$this->arglist = func_get_args();
-
+
return $chain->dyUnlisten($fx);
}
public function dyPreRaiseEvent($name,$sender,$param,$responsetype,$postfunction, $chain) {
$this->lastCall = 3;
$this->arglist = func_get_args();
-
+
return $chain->dyPreRaiseEvent($name);// Calls the next event, within a chain, if parameters are left off, they are filled in with
// the original parameters passed to the dynamic event. Parameters can be passed if they are changed.
}
@@ -409,7 +409,7 @@ class TDynamicClassBehavior extends TClassBehavior implements IDynamicMethods {
* @package System
*/
class TComponentTest extends PHPUnit_Framework_TestCase {
-
+
protected $component;
public function setUp() {
@@ -424,21 +424,21 @@ class TComponentTest extends PHPUnit_Framework_TestCase {
$this->component->unlisten();
$this->component = null;
}
-
-
+
+
public function testGetListeningToGlobalEvents() {
$this->assertEquals(true, $this->component->getListeningToGlobalEvents());
$this->component->unlisten();
$this->assertEquals(false, $this->component->getListeningToGlobalEvents());
}
-
-
+
+
public function testConstructorAutoListen() {
// the default object auto installs class behavior hooks
$this->assertEquals(1, $this->component->getEventHandlers('fxAttachClassBehavior')->getCount());
$this->assertEquals(1, $this->component->getEventHandlers('fxDetachClassBehavior')->getCount());
$this->assertTrue($this->component->getListeningToGlobalEvents());
-
+
// this object does not auto install class behavior hooks, thus not changing the global event structure.
// Creating a new instance should _not_ influence the fxAttachClassBehavior and fxDetachClassBehavior
// count.
@@ -447,655 +447,655 @@ class TComponentTest extends PHPUnit_Framework_TestCase {
$this->assertEquals(1, $this->component->getEventHandlers('fxDetachClassBehavior')->getCount());
$this->assertEquals(1, $component_nolisten->getEventHandlers('fxAttachClassBehavior')->getCount());
$this->assertEquals(1, $component_nolisten->getEventHandlers('fxDetachClassBehavior')->getCount());
-
- // tests order of class behaviors when a parent and class have class behavior.
+
+ // tests order of class behaviors when a parent and class have class behavior.
// The child should override the parent object-oriented programming style
$this->component->attachClassBehavior('Bar', 'BarBehavior', 'NewComponentNoListen');
$this->component->attachClassBehavior('FooBar', 'FooBarBehavior', 'NewComponent');
-
+
//create new object with new class behaviors built in, defined in the two lines above
$component = new NewComponentNoListen;
-
+
$this->assertEquals(25, $component->moreFunction(2, 2));
-
+
$this->assertEquals(25, $component->Bar->moreFunction(2, 2));
$this->assertEquals(8, $component->FooBar->moreFunction(2, 2));
-
+
$component->unlisten();// unwind object and class behaviors
$this->component->detachClassBehavior('FooBar', 'NewComponent');
$this->component->detachClassBehavior('Bar', 'NewComponentNoListen');
-
+
}
-
-
+
+
public function testListenAndUnlisten() {
-
+
$component = new NewComponentNoListen();
-
+
$this->assertEquals(false, $component->getListeningToGlobalEvents());
-
+
//This is from $this->component being instanced and listening. $component is accessing the global event structure
$this->assertEquals(1, $component->getEventHandlers('fxAttachClassBehavior')->getCount());
-
+
$this->assertEquals(2, $component->listen());
-
+
$this->assertEquals(true, $component->getListeningToGlobalEvents());
-
+
//This is from $this->component being instanced and listening. $component is accessing the global event structure
$this->assertEquals(2, $component->getEventHandlers('fxAttachClassBehavior')->getCount());
-
+
$this->assertEquals(2, $component->unlisten());
-
+
$this->assertEquals(false, $component->getListeningToGlobalEvents());
-
+
//This is from $this->component being instanced and listening. $component is accessing the global event structure
$this->assertEquals(1, $component->getEventHandlers('fxAttachClassBehavior')->getCount());
}
-
-
+
+
public function testListenAndUnlistenWithDynamicEventCatching() {
-
+
$component = new DynamicCatchingComponent();
-
+
$this->assertEquals(false, $component->getListeningToGlobalEvents());
-
+
//This is from $this->component being instanced and listening. $component is accessing the global event structure
$this->assertEquals(0, $component->getEventHandlers(TComponent::GLOBAL_RAISE_EVENT_LISTENER)->getCount());
-
+
// this adds the fxAttachClassBehavior, fxDetachClassBehavior, and __dycall of the component
$this->assertEquals(3, $component->listen());
-
+
$this->assertEquals(true, $component->getListeningToGlobalEvents());
-
+
//This is from $this->component being instanced and listening. $component is accessing the global event structure
$this->assertEquals(1, $component->getEventHandlers(TComponent::GLOBAL_RAISE_EVENT_LISTENER)->getCount());
-
+
$this->assertEquals(3, $component->unlisten());
-
+
$this->assertEquals(false, $component->getListeningToGlobalEvents());
-
+
//This is from $this->component being instanced and listening. $component is accessing the global event structure
$this->assertEquals(0, $component->getEventHandlers(TComponent::GLOBAL_RAISE_EVENT_LISTENER)->getCount());
}
-
-
-
+
+
+
//Test Class behaviors
public function testAttachClassBehavior() {
-
+
// ensure that the class is listening
$this->assertEquals(1, $this->component->getEventHandlers('fxAttachClassBehavior')->getCount());
-
+
//Test that the component is not a FooClassBehavior
$this->assertNull($this->component->asa('FooClassBehavior'), "Component is already a FooClassBehavior and should not have this behavior");
-
+
//Add the FooClassBehavior
$this->component->attachClassBehavior('FooClassBehavior', new FooClassBehavior);
-
+
//Test that the existing listening component can be a FooClassBehavior
$this->assertNotNull($this->component->asa('FooClassBehavior'), "Component is does not have the FooClassBehavior and should have this behavior");
-
+
// test if the function modifies new instances of the object
$anothercomponent = new NewComponent();
-
+
//The new component should be a FooClassBehavior
$this->assertNotNull($anothercomponent->asa('FooClassBehavior'), "anothercomponent does not have the FooClassBehavior");
-
+
// test when overwriting an existing class behavior, it should throw an TInvalidOperationException
try {
$this->component->attachClassBehavior('FooClassBehavior', new BarClassBehavior);
$this->fail('TInvalidOperationException not raised when overwriting an existing behavior');
} catch(TInvalidOperationException $e) {
}
-
-
+
+
// test when overwriting an existing class behavior, it should throw an TInvalidOperationException
try {
$this->component->attachClassBehavior('FooBarBehavior', 'FooBarBehavior', 'TComponent');
$this->fail('TInvalidOperationException not raised when trying to place a behavior on the root object TComponent');
} catch(TInvalidOperationException $e) {
}
-
-
+
+
// test if the function does not modify any existing objects that are not listening
// The FooClassBehavior is already a part of the class behaviors thus the new instance gets the behavior.
$nolistencomponent = new NewComponentNoListen();
-
+
// test if the function modifies all existing objects that are listening
// Adding a behavior to the first object, the second instance should automatically get the class behavior.
// This is because the second object is listening to the global events of class behaviors
$this->component->attachClassBehavior('BarClassBehavior', new BarClassBehavior);
$this->assertNotNull($anothercomponent->asa('BarClassBehavior'), "anothercomponent is does not have the BarClassBehavior");
-
+
// The no listen object should not have the BarClassBehavior because it was added as a class behavior after the object was instanced
$this->assertNull($nolistencomponent->asa('BarClassBehavior'), "nolistencomponent has the BarClassBehavior and should not");
-
+
// But the no listen object should have the FooClassBehavior because the class behavior was installed before the object was instanced
$this->assertNotNull($nolistencomponent->asa('FooClassBehavior'), "nolistencomponent is does not have the FooClassBehavior");
-
+
//Clear out what was done during this test
$anothercomponent->unlisten();
$this->component->detachClassBehavior('FooClassBehavior');
$this->component->detachClassBehavior('BarClassBehavior');
-
+
// Test attaching of single object behaviors as class-wide behaviors
$this->component->attachClassBehavior('BarBehaviorObject', 'BarBehavior');
$this->assertTrue($this->component->asa('BarBehaviorObject') instanceof BarBehavior);
$this->assertEquals($this->component->BarBehaviorObject->Owner, $this->component);
$this->component->detachClassBehavior('BarBehaviorObject');
}
-
-
-
-
-
+
+
+
+
+
public function testDetachClassBehavior() {
// ensure that the component is listening
$this->assertEquals(1, $this->component->getEventHandlers('fxDetachClassBehavior')->getCount());
-
+
$prenolistencomponent = new NewComponentNoListen();
-
+
//Attach a class behavior
$this->component->attachClassBehavior('FooClassBehavior', new FooClassBehavior);
-
+
//Create new components that listen and don't listen to global events
$anothercomponent = new NewComponent();
$postnolistencomponent = new NewComponentNoListen();
-
+
//ensures that all the Components are properly initialized
$this->assertEquals(2, $this->component->getEventHandlers('fxDetachClassBehavior')->getCount());
$this->assertNotNull($this->component->asa('FooClassBehavior'), "Component does not have the FooClassBehavior and should have this behavior");
$this->assertNull($prenolistencomponent->asa('FooClassBehavior'), "Component has the FooClassBehavior and should _not_ have this behavior");
$this->assertNotNull($anothercomponent->asa('FooClassBehavior'), "Component does not have the FooClassBehavior and should have this behavior");
$this->assertNotNull($postnolistencomponent->asa('FooClassBehavior'), "Component does not have the FooClassBehavior and should have this behavior");
-
-
+
+
$this->component->detachClassBehavior('FooClassBehavior');
-
+
$this->assertNull($this->component->asa('FooClassBehavior'), "Component has the FooClassBehavior and should _not_ have this behavior");
$this->assertNull($prenolistencomponent->asa('FooClassBehavior'), "Component has the FooClassBehavior and should _not_ have this behavior");
$this->assertNull($anothercomponent->asa('FooClassBehavior'), "Component has the FooClassBehavior and should _not_ have this behavior");
$this->assertNotNull($postnolistencomponent->asa('FooClassBehavior'), "Component does not have the FooClassBehavior and should have this behavior");
-
-
+
+
//tear down function variables
$anothercomponent->unlisten();
}
-
+
public function testGetClassHierarchy() {
$component = new DynamicCatchingComponent;
$this->assertEquals(array('TComponent', 'NewComponent', 'NewComponentNoListen', 'DynamicCatchingComponent'), $component->getClassHierarchy());
$this->assertEquals(array('TComponent', 'NewComponent', 'NewComponentNoListen', 'DynamicCatchingComponent'), $component->getClassHierarchy(false));
$this->assertEquals(array('tcomponent', 'newcomponent', 'newcomponentnolisten', 'dynamiccatchingcomponent'), $component->getClassHierarchy(true));
}
-
-
+
+
public function testAsA() {
$anothercomponent = new NewComponent();
-
+
// ensure the component does not have the FooClassBehavior
$this->assertNull($this->component->asa('FooClassBehavior'));
$this->assertNull($this->component->asa('FooFooClassBehavior'));
$this->assertNull($this->component->asa('BarClassBehavior'));
$this->assertNull($this->component->asa('NonExistantClassBehavior'));
-
+
$this->assertNull($anothercomponent->asa('FooClassBehavior'));
$this->assertNull($anothercomponent->asa('FooFooClassBehavior'));
$this->assertNull($anothercomponent->asa('BarClassBehavior'));
$this->assertNull($anothercomponent->asa('NonExistantClassBehavior'));
-
+
// add the class behavior
$this->component->attachClassBehavior('FooClassBehavior', new FooClassBehavior);
-
+
//Check that the component has only the class behavior assigned
$this->assertNotNull($this->component->asa('FooClassBehavior'));
$this->assertNull($this->component->asa('FooFooClassBehavior'));
$this->assertNull($this->component->asa('BarClassBehavior'));
$this->assertNull($this->component->asa('NonExistantClassBehavior'));
-
+
//Check that the component has only the class behavior assigned
$this->assertNotNull($anothercomponent->asa('FooClassBehavior'));
$this->assertNull($anothercomponent->asa('FooFooClassBehavior'));
$this->assertNull($anothercomponent->asa('BarClassBehavior'));
$this->assertNull($anothercomponent->asa('NonExistantClassBehavior'));
-
+
// remove the class behavior
$this->component->detachClassBehavior('FooClassBehavior');
-
+
// Check the function doesn't have the behavior any more
$this->assertNull($this->component->asa('FooClassBehavior'));
$this->assertNull($this->component->asa('FooFooClassBehavior'));
$this->assertNull($this->component->asa('BarClassBehavior'));
$this->assertNull($this->component->asa('NonExistantClassBehavior'));
-
+
$this->assertNull($anothercomponent->asa('FooClassBehavior'));
$this->assertNull($anothercomponent->asa('FooFooClassBehavior'));
$this->assertNull($anothercomponent->asa('BarClassBehavior'));
$this->assertNull($anothercomponent->asa('NonExistantClassBehavior'));
-
-
-
-
+
+
+
+
$this->component->attachBehavior('BarBehavior', new BarBehavior);
-
+
//Check that the component has only the object behavior assigned
$this->assertNull($this->component->asa('FooBehavior'));
$this->assertNull($this->component->asa('FooFooBehavior'));
$this->assertNotNull($this->component->asa('BarBehavior'));
$this->assertNull($this->component->asa('NonExistantBehavior'));
-
+
//Check that the component has the behavior assigned
$this->assertNull($anothercomponent->asa('FooBehavior'));
$this->assertNull($anothercomponent->asa('FooFooBehavior'));
$this->assertNull($anothercomponent->asa('BarBehavior'));
$this->assertNull($anothercomponent->asa('NonExistantBehavior'));
-
+
$this->component->detachBehavior('BarBehavior');
-
+
//Check that the component has no object behaviors assigned
$this->assertNull($this->component->asa('FooBehavior'));
$this->assertNull($this->component->asa('FooFooBehavior'));
$this->assertNull($this->component->asa('BarBehavior'));
$this->assertNull($this->component->asa('NonExistantBehavior'));
-
+
//Check that the component has no behavior assigned
$this->assertNull($anothercomponent->asa('FooBehavior'));
$this->assertNull($anothercomponent->asa('FooFooBehavior'));
$this->assertNull($anothercomponent->asa('BarBehavior'));
$this->assertNull($anothercomponent->asa('NonExistantBehavior'));
-
+
$anothercomponent->unlisten();
}
-
+
public function testIsA() {
//This doesn't check the IInstanceCheck functionality, separate function
-
+
$this->assertTrue($this->component->isa('TComponent'));
$this->assertTrue($this->component->isa('NewComponent'));
$this->assertFalse($this->component->isa(new FooBehavior));
$this->assertFalse($this->component->isa('FooBehavior'));
-
+
//Ensure there is no BarBehavior
$this->assertNull($this->component->asa('FooFooBehavior'));
-
+
$this->assertFalse($this->component->isa('FooBehavior'));
$this->assertFalse($this->component->isa('FooFooBehavior'));
-
+
$this->component->attachBehavior('FooFooBehavior', new FooFooBehavior);
-
+
$this->assertNotNull($this->component->asa('FooFooBehavior'));
-
+
$this->assertTrue($this->component->isa('FooBehavior'));
$this->assertTrue($this->component->isa('FooFooBehavior'));
-
+
$this->component->disableBehaviors();
// It still has the behavior
$this->assertNotNull($this->component->asa('FooFooBehavior'));
-
+
// But it is not expressed
$this->assertFalse($this->component->isa('FooBehavior'));
$this->assertFalse($this->component->isa('FooFooBehavior'));
-
+
$this->component->enableBehaviors();
$this->assertNotNull($this->component->asa('FooFooBehavior'));
-
+
$this->assertTrue($this->component->isa('FooFooBehavior'));
-
-
-
+
+
+
$this->component->attachBehavior('FooBarBehavior', new FooBarBehavior);
-
+
$this->assertTrue($this->component->isa('FooBehavior'));
$this->assertTrue($this->component->isa('FooBarBehavior'));
-
+
$this->component->disableBehavior('FooBarBehavior');
-
+
$this->assertTrue($this->component->isa('FooBehavior'));
$this->assertFalse($this->component->isa('FooBarBehavior'));
-
+
$this->component->enableBehavior('FooBarBehavior');
$this->component->disableBehavior('FooFooBehavior');
$this->assertFalse($this->component->isa('FooBehavior'));
$this->assertFalse($this->component->isa('FooFooBehavior'));
$this->assertTrue($this->component->isa('FooBarBehavior'));
-
+
$this->component->disableBehavior('FooBarBehavior');
$this->component->disableBehavior('FooFooBehavior');
-
+
$this->assertFalse($this->component->isa('FooBehavior'));
$this->assertFalse($this->component->isa('FooFooBehavior'));
$this->assertFalse($this->component->isa('FooBarBehavior'));
-
+
$this->component->enableBehavior('FooBarBehavior');
$this->component->enableBehavior('FooFooBehavior');
-
+
$this->assertTrue($this->component->isa('FooFooBehavior'));
$this->assertTrue($this->component->isa('FooBarBehavior'));
-
-
+
+
$this->component->detachBehavior('FooFooBehavior');
$this->component->detachBehavior('FooBarBehavior');
-
+
$this->assertFalse($this->component->isa(new FooBehavior));
$this->assertFalse($this->component->isa('FooBehavior'));
$this->assertFalse($this->component->isa(new FooFooBehavior));
$this->assertFalse($this->component->isa('FooFooBehavior'));
$this->assertFalse($this->component->isa(new FooBarBehavior));
$this->assertFalse($this->component->isa('FooBarBehavior'));
-
+
}
-
+
public function testIsA_with_IInstanceCheck() {
-
+
$this->assertTrue($this->component->isa('NewComponent'));
$this->assertFalse($this->component->isa('PreBarBehavior'));
-
+
$this->component->attachBehavior('BarBehavior', $behavior = new BarBehavior);
-
+
$behavior->setInstanceReturn(null);
-
+
$this->assertTrue($this->component->isa('NewComponent'));
$this->assertTrue($this->component->isa('PreBarBehavior'));
$this->assertFalse($this->component->isa('FooBehavior'));
-
+
// This forces the iso on the BarBehavior to respond to any class with false
$behavior->setInstanceReturn(false);
$this->assertFalse($this->component->isa('PreBarBehavior'));
$this->assertFalse($this->component->isa('FooBehavior'));
-
+
//This forces the isa on the BarBehavior to respond to any class with true
$behavior->setInstanceReturn(true);
$this->assertTrue($this->component->isa('FooBehavior'));
-
-
+
+
}
-
+
public function testAttachDetachBehavior() {
-
+
try {
$this->component->faaEverMore(true, true);
$this->fail('TApplicationException not raised trying to execute a undefined class method');
} catch(TApplicationException $e) {}
-
+
$this->assertNull($this->component->asa('FooBehavior'));
$this->assertFalse($this->component->isa('FooBehavior'));
$this->assertNull($this->component->asa('BarBehavior'));
$this->assertFalse($this->component->isa('BarBehavior'));
-
+
try {
$this->component->attachBehavior('FooBehavior', new TComponent);
$this->fail('TApplicationException not raised trying to execute a undefined class method');
} catch(TInvalidDataTypeException $e) {}
-
+
$this->component->attachBehavior('FooBehavior', new FooBehavior);
-
+
$this->assertNotNull($this->component->asa('FooBehavior'));
$this->assertTrue($this->component->isa('FooBehavior'));
$this->assertNull($this->component->asa('BarBehavior'));
$this->assertFalse($this->component->isa('BarBehavior'));
-
+
try {
$this->assertTrue($this->component->faaEverMore(true, true));
} catch(TApplicationException $e) {
$this->fail('TApplicationException raised while trying to execute a behavior class method');
}
-
+
try {
$this->component->noMethodHere(true);
$this->fail('TApplicationException not raised trying to execute a undefined class method');
} catch(TApplicationException $e) {}
-
+
$this->assertTrue($this->component->disableBehavior('FooBehavior'));
-
+
//BarBehavior is not a behavior at this time
$this->assertNull($this->component->disableBehavior('BarBehavior'));
-
+
try {
$this->component->faaEverMore(true, true);
$this->fail('TApplicationException not raised trying to execute a undefined class method');
} catch(TApplicationException $e) {}
-
+
$this->assertTrue($this->component->enableBehavior('FooBehavior'));
-
+
//BarBehavior is not a behavior at this time
$this->assertNull($this->component->enableBehavior('BarBehavior'));
-
+
try {
$this->assertTrue($this->component->faaEverMore(true, true));
} catch(TApplicationException $e) {
$this->fail('TApplicationException raised while trying to execute a behavior class method');
}
-
+
$this->component->detachBehavior('FooBehavior');
-
+
$this->assertNull($this->component->asa('FooBehavior'));
$this->assertFalse($this->component->isa('FooBehavior'));
$this->assertNull($this->component->asa('BarBehavior'));
$this->assertFalse($this->component->isa('BarBehavior'));
-
+
}
-
+
public function testAttachDetachBehaviors() {
$this->assertNull($this->component->asa('FooBehavior'));
$this->assertNull($this->component->asa('BarBehavior'));
$this->assertNull($this->component->asa('FooBarBehavior'));
$this->assertNull($this->component->asa('PreBarBehavior'));
-
+
$this->component->attachBehaviors(array('FooFooBehavior' => new FooFooBehavior, 'BarBehavior' => new BarBehavior, 'PreBarBehavior' => new PreBarBehavior));
-
+
$this->assertNull($this->component->asa('FooBehavior'));
$this->assertNotNull($this->component->asa('FooFooBehavior'));
$this->assertNotNull($this->component->asa('BarBehavior'));
$this->assertNull($this->component->asa('FooBarBehavior'));
$this->assertNotNull($this->component->asa('PreBarBehavior'));
-
+
$this->assertTrue($this->component->isa('FooFooBehavior'));
$this->assertTrue($this->component->isa('FooBehavior'));
$this->assertTrue($this->component->isa('BarBehavior'));
$this->assertTrue($this->component->isa('PreBarBehavior'));
$this->assertFalse($this->component->isa('FooBarBehavior'));
-
+
$this->component->detachBehaviors(array('FooFooBehavior' => new FooFooBehavior, 'BarBehavior' => new BarBehavior));
-
+
$this->assertNull($this->component->asa('FooBehavior'));
$this->assertNull($this->component->asa('FooFooBehavior'));
$this->assertNull($this->component->asa('BarBehavior'));
$this->assertNull($this->component->asa('FooBarBehavior'));
$this->assertNotNull($this->component->asa('PreBarBehavior'));
-
+
$this->assertFalse($this->component->isa('FooFooBehavior'));
$this->assertFalse($this->component->isa('FooBehavior'));
$this->assertFalse($this->component->isa('BarBehavior'));
$this->assertFalse($this->component->isa('FooBarBehavior'));
$this->assertTrue($this->component->isa('PreBarBehavior'));
-
-
-
+
+
+
// testing if we can detachBehaviors just by the name of the behavior instead of an array of the behavior
$this->component->attachBehaviors(array('FooFooBehavior' => new FooFooBehavior, 'BarBehavior' => new BarBehavior));
-
+
$this->assertTrue($this->component->isa('FooBehavior'));
$this->assertTrue($this->component->isa('BarBehavior'));
-
+
$this->component->detachBehaviors(array('FooFooBehavior', 'BarBehavior'));
-
+
$this->assertNull($this->component->asa('FooBehavior'));
$this->assertNull($this->component->asa('FooFooBehavior'));
$this->assertNull($this->component->asa('BarBehavior'));
$this->assertNull($this->component->asa('FooBarBehavior'));
-
+
$this->assertFalse($this->component->isa('FooFooBehavior'));
$this->assertFalse($this->component->isa('FooBehavior'));
$this->assertFalse($this->component->isa('BarBehavior'));
$this->assertFalse($this->component->isa('FooBarBehavior'));
}
-
-
+
+
public function testClearBehaviors() {
-
+
$this->assertNull($this->component->asa('FooBehavior'));
$this->assertNull($this->component->asa('BarBehavior'));
$this->assertNull($this->component->asa('FooBarBehavior'));
$this->assertNull($this->component->asa('PreBarBehavior'));
-
+
$this->component->attachBehaviors(array('FooFooBehavior' => new FooFooBehavior, 'BarBehavior' => new BarBehavior, 'PreBarBehavior' => new PreBarBehavior));
-
+
$this->assertNull($this->component->asa('FooBehavior'));
$this->assertNotNull($this->component->asa('FooFooBehavior'));
$this->assertNotNull($this->component->asa('BarBehavior'));
$this->assertNull($this->component->asa('FooBarBehavior'));
$this->assertNotNull($this->component->asa('PreBarBehavior'));
-
+
$this->component->clearBehaviors();
-
+
$this->assertNull($this->component->asa('FooBehavior'));
$this->assertNull($this->component->asa('BarBehavior'));
$this->assertNull($this->component->asa('FooBarBehavior'));
$this->assertNull($this->component->asa('PreBarBehavior'));
}
-
+
public function testEnableDisableBehavior() {
-
+
$this->assertNull($this->component->enableBehavior('FooBehavior'));
$this->assertNull($this->component->disableBehavior('FooBehavior'));
-
+
try {
$this->component->faaEverMore(true, true);
$this->fail('TApplicationException not raised trying to execute a undefined class method');
} catch(TApplicationException $e) {}
-
+
$this->component->attachBehavior('FooBehavior', new FooBehavior);
-
+
$this->assertTrue($this->component->isa('FooBehavior'));
try {
$this->assertTrue($this->component->faaEverMore(true, true));
} catch(TApplicationException $e) {
$this->fail('TApplicationException raised while trying to execute a behavior class method');
}
-
+
$this->assertTrue($this->component->disableBehavior('FooBehavior'));
-
+
$this->assertFalse($this->component->isa('FooBehavior'));
-
+
try {
$this->component->faaEverMore(true, true);
$this->fail('TApplicationException not raised trying to execute a undefined class method');
} catch(TApplicationException $e) {}
-
+
$this->assertTrue($this->component->enableBehavior('FooBehavior'));
-
+
$this->assertTrue($this->component->isa('FooBehavior'));
try {
$this->assertTrue($this->component->faaEverMore(true, true));
} catch(TApplicationException $e) {
$this->fail('TApplicationException raised while trying to execute a behavior class method');
}
-
-
-
+
+
+
$this->assertNull($this->component->enableBehavior('BarClassBehavior'));
$this->assertNull($this->component->disableBehavior('BarClassBehavior'));
-
+
try {
$this->component->moreFunction(true, true);
$this->fail('TApplicationException not raised trying to execute an undefined class method');
} catch(TApplicationException $e) {}
-
+
$this->component->attachClassBehavior('BarClassBehavior', new BarClassBehavior);
-
+
$this->assertFalse($this->component->enableBehavior('BarClassBehavior'));
$this->assertFalse($this->component->disableBehavior('BarClassBehavior'));
-
+
try {
$this->assertTrue($this->component->moreFunction(true, true));
} catch(TApplicationException $e) {
$this->fail('TApplicationException raised while trying to execute a behavior class method');
}
-
+
$this->component->detachClassBehavior('BarClassBehavior');
}
-
-
+
+
public function testBehaviorFunctionCalls() {
-
+
$this->component->attachBehavior('FooBarBehavior', $behavior = new FooBarBehavior);
$this->component->attachClassBehavior('FooClassBehavior', $classbehavior = new FooClassBehavior);
-
+
// Test the Class Methods
$this->assertEquals(12, $this->component->faaEverMore(3, 4));
-
+
// Check that the called object is shifted in front of the array of a class behavior call
$this->assertEquals($this->component, $this->component->getLastClassObject());
-
-
+
+
//Test the FooBarBehavior
$this->assertEquals(27, $this->component->moreFunction(3, 3));
-
+
$this->assertTrue($this->component->disableBehavior('FooBarBehavior'));
try {
$this->assertNull($this->component->moreFunction(3, 4));
$this->fail('TApplicationException not raised trying to execute a disabled behavior');
} catch(TApplicationException $e) {}
$this->assertTrue($this->component->enableBehavior('FooBarBehavior'));
-
+
// Test the global event space, this should work and return false because no function implements these methods
$this->assertNull($this->component->fxSomeUndefinedGlobalEvent());
$this->assertNull($this->component->dySomeUndefinedIntraObjectEvent());
-
+
$this->component->detachClassBehavior('FooClassBehavior');
-
-
-
+
+
+
// test object instance behaviors implemented through class-wide behaviors
$this->component->attachClassBehavior('FooFooBehaviorAsClass', 'FooFooBehavior');
-
+
$component = new NewComponent;
-
+
$this->assertEquals(5, $this->component->faafaaEverMore(3, 4));
$this->assertEquals(10, $component->faafaaEverMore(6, 8));
-
+
$this->component->detachClassBehavior('FooFooBehaviorAsClass');
$component->unlisten();
$component = null;
-
+
try {
$this->component->faafaaEverMore(3, 4);
$this->fail('TApplicationException not raised trying to execute a disabled behavior');
} catch(TApplicationException $e) {}
-
-
-
+
+
+
// make a call to an unpatched fx and dy call so that it's passed through to the __dycall function
$dynamicComponent = new DynamicCallComponent;
-
+
$this->assertNull($dynamicComponent->fxUndefinedEvent());
$this->assertNull($dynamicComponent->dyUndefinedEvent());
-
+
//This tests the dynamic __dycall function
$this->assertEquals(1024, $dynamicComponent->dyPowerFunction(2, 10));
$this->assertEquals(5, $dynamicComponent->dyDivisionFunction(10, 2));
-
+
$this->assertEquals(2048, $dynamicComponent->fxPowerFunction(2, 10));
$this->assertEquals(10, $dynamicComponent->fxDivisionFunction(10, 2));
-
+
$dynamicComponent->unlisten();
-
+
}
-
+
public function testHasProperty() {
$this->assertTrue($this->component->hasProperty('Text'), "Component hasn't property Text");
$this->assertTrue($this->component->hasProperty('text'), "Component hasn't property text");
$this->assertFalse($this->component->hasProperty('Caption'), "Component has property Caption");
-
+
$this->assertTrue($this->component->hasProperty('ColorAttribute'), "Component hasn't property JsColorAttribute");
$this->assertTrue($this->component->hasProperty('colorattribute'), "Component hasn't property JsColorAttribute");
$this->assertFalse($this->component->canGetProperty('PastelAttribute'), "Component has property JsPastelAttribute");
-
+
$this->assertTrue($this->component->hasProperty('JSColorAttribute'), "Component hasn't property JsColorAttribute");
$this->assertTrue($this->component->hasProperty('jscolorattribute'), "Component hasn't property JsColorAttribute");
$this->assertFalse($this->component->hasProperty('jsPastelAttribute'), "Component has property JsPastelAttribute");
-
+
$this->assertFalse($this->component->hasProperty('Excitement'), "Component has property Excitement");
$this->component->attachBehavior('ExcitementPropBehavior', new BehaviorTestBehavior);
$this->assertTrue($this->component->hasProperty('Excitement'), "Component hasn't property Excitement");
@@ -1107,27 +1107,27 @@ class TComponentTest extends PHPUnit_Framework_TestCase {
$this->assertFalse($this->component->hasProperty('Excitement'), "Component has property Excitement");
$this->component->enableBehavior('ExcitementPropBehavior');
$this->assertTrue($this->component->hasProperty('Excitement'), "Component hasn't property Excitement");
-
+
$this->component->detachBehavior('ExcitementPropBehavior');
-
+
$this->assertFalse($this->component->hasProperty('Excitement'), "Component has property Excitement");
-
+
}
public function testCanGetProperty() {
$this->assertTrue($this->component->canGetProperty('Text'));
$this->assertTrue($this->component->canGetProperty('text'));
$this->assertFalse($this->component->canGetProperty('Caption'));
-
+
$this->assertTrue($this->component->canGetProperty('ColorAttribute'));
$this->assertTrue($this->component->canGetProperty('colorattribute'));
$this->assertFalse($this->component->canGetProperty('PastelAttribute'));
-
+
$this->assertTrue($this->component->canGetProperty('JSColorAttribute'));
$this->assertTrue($this->component->canGetProperty('jscolorattribute'));
$this->assertFalse($this->component->canGetProperty('jsPastelAttribute'));
-
-
+
+
$this->assertFalse($this->component->canGetProperty('Excitement'), "Component has property Excitement");
$this->component->attachBehavior('ExcitementPropBehavior', new BehaviorTestBehavior);
$this->assertTrue($this->component->canGetProperty('Excitement'), "Component hasn't property Excitement");
@@ -1139,9 +1139,9 @@ class TComponentTest extends PHPUnit_Framework_TestCase {
$this->assertFalse($this->component->canGetProperty('Excitement'), "Component has property Excitement");
$this->component->enableBehavior('ExcitementPropBehavior');
$this->assertTrue($this->component->canGetProperty('Excitement'), "Component hasn't property Excitement");
-
+
$this->component->detachBehavior('ExcitementPropBehavior');
-
+
$this->assertFalse($this->component->canGetProperty('Excitement'), "Component has property Excitement");
}
@@ -1149,15 +1149,15 @@ class TComponentTest extends PHPUnit_Framework_TestCase {
$this->assertTrue($this->component->canSetProperty('Text'));
$this->assertTrue($this->component->canSetProperty('text'));
$this->assertFalse($this->component->canSetProperty('Caption'));
-
+
$this->assertTrue($this->component->canSetProperty('ColorAttribute'));
$this->assertTrue($this->component->canSetProperty('colorattribute'));
$this->assertFalse($this->component->canSetProperty('PastelAttribute'));
-
+
$this->assertTrue($this->component->canSetProperty('JSColorAttribute'));
$this->assertTrue($this->component->canSetProperty('jscolorattribute'));
$this->assertFalse($this->component->canSetProperty('jsPastelAttribute'));
-
+
$this->assertFalse($this->component->canSetProperty('Excitement'), "Component has property Excitement");
$this->component->attachBehavior('ExcitementPropBehavior', new BehaviorTestBehavior);
$this->assertTrue($this->component->canSetProperty('Excitement'), "Component hasn't property Excitement");
@@ -1169,7 +1169,7 @@ class TComponentTest extends PHPUnit_Framework_TestCase {
$this->assertFalse($this->component->canSetProperty('Excitement'), "Component has property Excitement");
$this->component->enableBehavior('ExcitementPropBehavior');
$this->assertTrue($this->component->canSetProperty('Excitement'), "Component hasn't property Excitement");
-
+
$this->component->detachBehavior('ExcitementPropBehavior');
}
@@ -1180,55 +1180,55 @@ class TComponentTest extends PHPUnit_Framework_TestCase {
$this->fail('exception not raised when getting undefined property');
} catch(TInvalidOperationException $e) {
}
-
+
$this->assertTrue($this->component->OnMyEvent instanceof TPriorityList);
try {
$value2=$this->component->onUndefinedEvent;
$this->fail('exception not raised when getting undefined property');
} catch(TInvalidOperationException $e) {
}
-
- //Without the function parenthesis, the function is _not_ called but the __get
+
+ //Without the function parenthesis, the function is _not_ called but the __get
// method is called and the global events (list) are accessed
$this->assertTrue($this->component->fxAttachClassBehavior instanceof TPriorityList);
$this->assertTrue($this->component->fxDetachClassBehavior instanceof TPriorityList);
-
+
// even undefined global events have a list as every object is able to access every event
$this->assertTrue($this->component->fxUndefinedEvent instanceof TPriorityList);
-
-
+
+
// Test the behaviors within the __get function
$this->component->enableBehaviors();
-
+
try {
$value2=$this->component->Excitement;
$this->fail('exception not raised when getting undefined property');
} catch(TInvalidOperationException $e) {
}
-
+
$this->component->attachBehavior('BehaviorTestBehavior', $behavior = new BehaviorTestBehavior);
$this->assertEquals('faa', $this->component->Excitement);
-
+
$this->component->disableBehaviors();
-
+
try {
$this->assertEquals('faa', $this->component->Excitement);
$this->fail('exception not raised when getting undefined property');
} catch(TInvalidOperationException $e) {
}
-
+
$this->component->enableBehaviors();
$this->assertEquals('faa', $this->component->getExcitement());
-
+
$this->component->disableBehavior('BehaviorTestBehavior');
-
+
$this->assertEquals($behavior, $this->component->BehaviorTestBehavior);
try {
$behavior = $this->component->BehaviorTestBehavior2;
$this->fail('exception not raised when getting undefined property');
} catch(TInvalidOperationException $e) {
}
-
+
try {
$this->assertEquals('faa', $this->component->Excitement);
$this->fail('exception not raised when getting undefined property');
@@ -1236,13 +1236,13 @@ class TComponentTest extends PHPUnit_Framework_TestCase {
}
$this->component->enableBehavior('BehaviorTestBehavior');
$this->assertEquals('faa', $this->component->getExcitement());
-
-
+
+
// behaviors allow on and fx events to be passed through.
$this->assertTrue($this->component->onBehaviorEvent instanceof TPriorityList);
-
+
}
-
+
public function testSetProperty() {
$value='new value';
$this->component->Text=$value;
@@ -1253,64 +1253,64 @@ class TComponentTest extends PHPUnit_Framework_TestCase {
$this->fail('exception not raised when setting undefined property');
} catch(TInvalidOperationException $e) {
}
-
+
// Test get only properties is a set function
try {
$this->component->ReadOnlyProperty = 'setting read only';
$this->fail('a property without a set function was set to a new value without error');
} catch(TInvalidOperationException $e) {
}
-
+
try {
$this->component->ReadOnlyJsProperty = 'jssetting read only';
$this->fail('a js property without a set function was set to a new value without error');
} catch(TInvalidOperationException $e) {
}
-
+
try {
$this->component->JsReadOnlyJsProperty = 'jssetting read only';
$this->fail('a js property without a set function was set to a new value without error');
} catch(TInvalidOperationException $e) {
}
-
+
$this->assertEquals(0, $this->component->getEventHandlers('onMyEvent')->getCount());
$this->component->onMyEvent = array($this->component,'myEventHandler');
$this->assertEquals(1, $this->component->getEventHandlers('onMyEvent')->getCount());
$this->component->onMyEvent[] = array($this->component,'Object.myEventHandler');
$this->assertEquals(2, $this->component->getEventHandlers('onMyEvent')->getCount());
-
+
$this->component->getEventHandlers('onMyEvent')->clear();
-
+
// Test the behaviors within the __get function
$this->component->enableBehaviors();
-
+
try {
$this->component->Excitement = 'laa';
$this->fail('exception not raised when getting undefined property');
} catch(TInvalidOperationException $e) {
}
-
+
$this->component->attachBehavior('BehaviorTestBehavior', $behavior1 = new BehaviorTestBehavior);
$this->component->Excitement = 'laa';
$this->assertEquals('laa', $this->component->Excitement);
$this->assertEquals('sol', $this->component->Excitement = 'sol');
-
-
+
+
$this->component->disableBehaviors();
-
+
try {
$this->component->Excitement = false;
$this->assertEquals(false, $this->component->Excitement);
$this->fail('exception not raised when getting undefined property');
} catch(TInvalidOperationException $e) {
}
-
+
$this->component->enableBehaviors();
$this->component->Excitement = 'faa';
$this->assertEquals('faa', $this->component->getExcitement());
-
+
$this->component->disableBehavior('BehaviorTestBehavior');
-
+
try {
$this->component->Excitement = false;
$this->assertEquals(false, $this->component->Excitement);
@@ -1320,82 +1320,82 @@ class TComponentTest extends PHPUnit_Framework_TestCase {
$this->component->enableBehavior('BehaviorTestBehavior');
$this->component->Excitement = 'sol';
$this->assertEquals('sol', $this->component->Excitement);
-
-
+
+
$this->component->attachBehavior('BehaviorTestBehavior2', $behavior2 = new BehaviorTestBehavior);
-
+
$this->assertEquals('sol', $this->component->Excitement);
$this->assertEquals('faa', $behavior2->Excitement);
-
+
// this sets Excitement for both because they are not uniquely named
$this->component->Excitement = 'befaad';
-
+
$this->assertEquals('befaad', $this->component->Excitement);
$this->assertEquals('befaad', $behavior1->Excitement);
$this->assertEquals('befaad', $behavior2->Excitement);
-
-
+
+
$this->component->detachBehavior('BehaviorTestBehavior2');
-
+
// behaviors allow on and fx events to be passed through.
$this->assertTrue($this->component->BehaviorTestBehavior->onBehaviorEvent instanceof TPriorityList);
-
+
$this->assertEquals(0, $this->component->BehaviorTestBehavior->getEventHandlers('onBehaviorEvent')->getCount());
$this->component->onBehaviorEvent = array($this->component,'myEventHandler');
$this->assertEquals(1, $this->component->BehaviorTestBehavior->getEventHandlers('onBehaviorEvent')->getCount());
$this->component->onBehaviorEvent[] = array($this->component,'Object.myEventHandler');
$this->assertEquals(2, $this->component->BehaviorTestBehavior->getEventHandlers('onBehaviorEvent')->getCount());
-
+
$this->component->BehaviorTestBehavior->getEventHandlers('onBehaviorEvent')->clear();
}
-
-
+
+
public function testIsSetFunction() {
$this->assertTrue(isset($this->component->fxAttachClassBehavior));
$this->component->unlisten();
-
+
$this->assertFalse(isset($this->component->onMyEvent));
$this->assertFalse(isset($this->component->undefinedEvent));
$this->assertFalse(isset($this->component->fxAttachClassBehavior));
-
+
$this->assertFalse(isset($this->component->BehaviorTestBehavior));
$this->assertFalse(isset($this->component->onBehaviorEvent));
-
+
$this->component->attachBehavior('BehaviorTestBehavior', new BehaviorTestBehavior);
-
+
$this->assertTrue(isset($this->component->BehaviorTestBehavior));
$this->assertFalse(isset($this->component->onBehaviorEvent));
-
+
$this->component->attachEventHandler('onBehaviorEvent','foo');
$this->assertTrue(isset($this->component->onBehaviorEvent));
-
+
$this->component->attachEventHandler('onMyEvent','foo');
$this->assertTrue(isset($this->component->onMyEvent));
-
+
$this->assertTrue(isset($this->component->Excitement));
$this->component->Excitement = null;
$this->assertFalse(isset($this->component->Excitement));
$this->assertFalse(isset($this->component->UndefinedBehaviorProperty));
-
-
+
+
}
-
-
+
+
public function testUnsetFunction() {
-
+
$this->assertEquals('default', $this->component->getText());
unset($this->component->Text);
$this->assertNull($this->component->getText());
-
+
unset($this->component->UndefinedProperty);
-
+
// object events
$this->assertEquals(0, $this->component->onMyEvent->Count);
$this->component->attachEventHandler('onMyEvent','foo');
$this->assertEquals(1, $this->component->onMyEvent->Count);
unset($this->component->onMyEvent);
$this->assertEquals(0, $this->component->onMyEvent->Count);
-
+
//global events
$this->assertEquals(1, $this->component->fxAttachClassBehavior->Count);
$component = new NewComponent();
@@ -1404,22 +1404,22 @@ class TComponentTest extends PHPUnit_Framework_TestCase {
// retain the other object event
$this->assertEquals(1, $this->component->fxAttachClassBehavior->Count);
$component->unlisten();
-
+
try {
unset($this->component->Object);
$this->fail('TInvalidOperationException not raised when unsetting get only property');
} catch(TInvalidOperationException $e) {}
-
+
$this->component->attachBehavior('BehaviorTestBehavior', new BehaviorTestBehavior);
$this->assertTrue($this->component->asa('BehaviorTestBehavior') instanceof BehaviorTestBehavior);
$this->assertFalse($this->component->asa('BehaviorTestBehavior2') instanceof BehaviorTestBehavior);
-
+
$this->assertEquals('faa', $this->component->Excitement);
unset($this->component->Excitement);
$this->assertNull($this->component->Excitement);
$this->component->Excitement = 'sol';
$this->assertEquals('sol', $this->component->Excitement);
-
+
// Test the disabling of unset within behaviors
$this->component->disableBehaviors();
unset($this->component->Excitement);
@@ -1430,60 +1430,60 @@ class TComponentTest extends PHPUnit_Framework_TestCase {
unset($this->component->Excitement);
$this->component->enableBehavior('BehaviorTestBehavior');
$this->assertEquals('sol', $this->component->Excitement);
-
+
unset($this->component->Excitement);
$this->assertNull($this->component->Excitement);
-
+
try {
unset($this->component->ReadOnly);
$this->fail('TInvalidOperationException not raised when unsetting get only property');
} catch(TInvalidOperationException $e) {}
-
+
$this->component->onBehaviorEvent = 'foo';
$this->assertEquals(1, count($this->component->onBehaviorEvent));
$this->assertEquals(1, count($this->component->BehaviorTestBehavior->onBehaviorEvent));
unset($this->component->onBehaviorEvent);
$this->assertEquals(0, count($this->component->onBehaviorEvent));
$this->assertEquals(0, count($this->component->BehaviorTestBehavior->onBehaviorEvent));
-
+
// Remove behavior via unset
unset($this->component->BehaviorTestBehavior);
$this->assertFalse($this->component->asa('BehaviorTestBehavior') instanceof BehaviorTestBehavior);
-
+
}
public function testGetSubProperty() {
$this->assertTrue('object text'===$this->component->getSubProperty('Object.Text'));
}
-
+
public function testSetSubProperty() {
$this->component->setSubProperty('Object.Text','new object text');
$this->assertEquals('new object text',$this->component->getSubProperty('Object.Text'));
}
-
+
public function testHasEvent() {
$this->assertTrue($this->component->hasEvent('OnMyEvent'));
$this->assertTrue($this->component->hasEvent('onmyevent'));
$this->assertFalse($this->component->hasEvent('onYourEvent'));
-
+
// fx won't throw an error if any of these fx function are called on an object.
// It is a special prefix event designation that every object responds to all events.
$this->assertTrue($this->component->hasEvent('fxAttachClassBehavior'));
$this->assertTrue($this->component->hasEvent('fxattachclassbehavior'));
-
+
$this->assertTrue($this->component->hasEvent('fxNonExistantGlobalEvent'));
$this->assertTrue($this->component->hasEvent('fxnonexistantglobalevent'));
-
+
$this->assertTrue($this->component->hasEvent('dyNonExistantLocalEvent'));
$this->assertTrue($this->component->hasEvent('fxnonexistantlocalevent'));
-
-
+
+
//Test behavior events
$this->assertFalse($this->component->hasEvent('onBehaviorEvent'));
$this->component->attachBehavior('BehaviorTestBehavior', new BehaviorTestBehavior);
$this->assertTrue($this->component->hasEvent('onBehaviorEvent'));
$this->assertTrue($this->component->BehaviorTestBehavior->hasEvent('onBehaviorEvent'));
-
+
$this->component->disableBehavior('BehaviorTestBehavior');
$this->assertFalse($this->component->hasEvent('onBehaviorEvent'));
$this->component->enableBehavior('BehaviorTestBehavior');
@@ -1494,20 +1494,20 @@ class TComponentTest extends PHPUnit_Framework_TestCase {
$this->assertFalse($this->component->hasEventHandler('OnMyEvent'));
$this->component->attachEventHandler('OnMyEvent','foo');
$this->assertTrue($this->component->hasEventHandler('OnMyEvent'));
-
+
$this->assertFalse($this->component->hasEventHandler('fxNonExistantGlobalEvent'));
$this->component->attachEventHandler('fxNonExistantGlobalEvent','foo');
$this->assertTrue($this->component->hasEventHandler('fxNonExistantGlobalEvent'));
-
+
//Test behavior events
$this->assertFalse($this->component->hasEventHandler('onBehaviorEvent'));
$this->component->attachBehavior('BehaviorTestBehavior', new BehaviorTestBehavior);
$this->assertFalse($this->component->hasEventHandler('onBehaviorEvent'));
$this->assertFalse($this->component->BehaviorTestBehavior->hasEventHandler('onBehaviorEvent'));
-
+
$this->component->attachEventHandler('onBehaviorEvent','foo');
$this->assertTrue($this->component->hasEventHandler('onBehaviorEvent'));
-
+
$this->component->disableBehavior('BehaviorTestBehavior');
$this->assertFalse($this->component->hasEvent('onBehaviorEvent'));
$this->assertFalse($this->component->hasEventHandler('onBehaviorEvent'));
@@ -1526,7 +1526,7 @@ class TComponentTest extends PHPUnit_Framework_TestCase {
$this->fail('exception not raised when getting event handlers for undefined event');
} catch(TInvalidOperationException $e) {
}
-
+
$list=$this->component->getEventHandlers('fxRandomEvent');
$this->assertTrue(($list instanceof TPriorityList) && ($list->getCount()===0));
$this->component->attachEventHandler('fxRandomEvent','foo');
@@ -1536,9 +1536,9 @@ class TComponentTest extends PHPUnit_Framework_TestCase {
} catch(TInvalidOperationException $e) {
$this->fail('exception raised when getting event handlers for universal global event');
}
-
-
-
+
+
+
//Test behavior events
try {
$list=$this->component->getEventHandlers('onBehaviorEvent');
@@ -1546,13 +1546,13 @@ class TComponentTest extends PHPUnit_Framework_TestCase {
} catch(TInvalidOperationException $e) {
}
$this->assertFalse($this->component->hasEventHandler('onBehaviorEvent'));
-
+
$this->component->attachBehavior('BehaviorTestBehavior', new BehaviorTestBehavior);
$list=$this->component->getEventHandlers('onBehaviorEvent');
$this->assertTrue(($list instanceof TPriorityList) && ($list->getCount()===0));
$this->component->attachEventHandler('onBehaviorEvent','foo');
$this->assertTrue(($list instanceof TPriorityList) && ($list->getCount()===1));
-
+
$this->component->disableBehavior('BehaviorTestBehavior');
try {
$list=$this->component->getEventHandlers('onBehaviorEvent');
@@ -1561,11 +1561,11 @@ class TComponentTest extends PHPUnit_Framework_TestCase {
}
$this->component->enableBehavior('BehaviorTestBehavior');
$this->assertTrue(($this->component->getEventHandlers('onBehaviorEvent') instanceof TPriorityList) && ($list->getCount()===1));
-
+
}
public function testAttachEventHandler() {
-
+
$this->component->attachEventHandler('OnMyEvent','foo');
$this->assertEquals(1, $this->component->getEventHandlers('OnMyEvent')->getCount());
try {
@@ -1573,7 +1573,7 @@ class TComponentTest extends PHPUnit_Framework_TestCase {
$this->fail('exception not raised when attaching event handlers for undefined event');
} catch(TInvalidOperationException $e) {
}
-
+
//Testing the priorities of attaching events
$this->component->attachEventHandler('OnMyEvent','foopre', 5);
$this->component->attachEventHandler('OnMyEvent','foopost', 15);
@@ -1584,8 +1584,8 @@ class TComponentTest extends PHPUnit_Framework_TestCase {
$this->assertEquals('foo', $list[1]);
$this->assertEquals('foobar', $list[2]);
$this->assertEquals('foopost', $list[3]);
-
-
+
+
//Test attaching behavior events
try {
$this->component->attachEventHandler('onBehaviorEvent','foo');
@@ -1593,9 +1593,9 @@ class TComponentTest extends PHPUnit_Framework_TestCase {
} catch(TInvalidOperationException $e) {
}
$this->component->attachBehavior('BehaviorTestBehavior', new BehaviorTestBehavior);
-
+
$this->component->attachEventHandler('onBehaviorEvent','foo');
-
+
//Testing the priorities of attaching behavior events
$this->component->attachEventHandler('onBehaviorEvent','foopre', 5);
$this->component->attachEventHandler('onBehaviorEvent','foopost', 15);
@@ -1608,7 +1608,7 @@ class TComponentTest extends PHPUnit_Framework_TestCase {
$this->assertEquals('foobar', $list[2]);
$this->assertEquals('foobarfoobar', $list[3]);
$this->assertEquals('foopost', $list[4]);
-
+
$this->component->disableBehavior('BehaviorTestBehavior');
try {
$this->component->attachEventHandler('onBehaviorEvent','bar');
@@ -1616,37 +1616,37 @@ class TComponentTest extends PHPUnit_Framework_TestCase {
} catch(TInvalidOperationException $e) {
}
$this->component->enableBehavior('BehaviorTestBehavior');
-
+
}
public function testDetachEventHandler() {
-
+
$this->component->attachEventHandler('OnMyEvent','foo');
$this->assertEquals(1, $this->component->getEventHandlers('OnMyEvent')->getCount());
-
+
$this->component->attachEventHandler('OnMyEvent','foopre', 5);
$this->component->attachEventHandler('OnMyEvent','foopost', 15);
$this->component->attachEventHandler('OnMyEvent','foobar', 10);
$this->component->attachEventHandler('OnMyEvent','foobarfoobar', 10);
-
-
-
+
+
+
$this->component->detachEventHandler('OnMyEvent','foo');
$list = $this->component->getEventHandlers('OnMyEvent');
$this->assertEquals(4, $list->getCount());
-
+
$this->assertEquals('foopre', $list[0]);
$this->assertEquals('foobar', $list[1]);
$this->assertEquals('foobarfoobar', $list[2]);
$this->assertEquals('foopost', $list[3]);
-
+
$this->component->detachEventHandler('OnMyEvent','foopre', null);
$this->assertEquals(4, $list->getCount());
-
+
$this->component->detachEventHandler('OnMyEvent','foopre', 5);
$this->assertEquals(3, $list->getCount());
-
-
+
+
// Now do detaching of behavior on events
try {
$this->component->attachEventHandler('onBehaviorEvent','foo');
@@ -1654,29 +1654,29 @@ class TComponentTest extends PHPUnit_Framework_TestCase {
} catch(TInvalidOperationException $e) {
}
$this->component->attachBehavior('BehaviorTestBehavior', new BehaviorTestBehavior);
-
+
$this->component->attachEventHandler('onBehaviorEvent','foo');
$this->assertEquals(1, $this->component->getEventHandlers('onBehaviorEvent')->getCount());
-
+
$this->component->attachEventHandler('onBehaviorEvent','foopre', 5);
$this->component->attachEventHandler('onBehaviorEvent','foopost', 15);
$this->component->attachEventHandler('onBehaviorEvent','foobar', 10);
$this->component->attachEventHandler('onBehaviorEvent','foobarfoobar', 10);
-
-
-
+
+
+
$this->component->detachEventHandler('onBehaviorEvent','foo');
$list = $this->component->getEventHandlers('onBehaviorEvent');
$this->assertEquals(4, $list->getCount());
-
+
$this->assertEquals('foopre', $list[0]);
$this->assertEquals('foobar', $list[1]);
$this->assertEquals('foobarfoobar', $list[2]);
$this->assertEquals('foopost', $list[3]);
-
+
$this->component->detachEventHandler('onBehaviorEvent','foopre', null);
$this->assertEquals(4, $list->getCount());
-
+
$this->component->detachEventHandler('onBehaviorEvent','foopre', 5);
$this->assertEquals(3, $list->getCount());
}
@@ -1693,14 +1693,14 @@ class TComponentTest extends PHPUnit_Framework_TestCase {
$this->assertFalse($this->component->Object->isEventHandled());
$this->component->raiseEvent('OnMyEvent',$this,null);
$this->assertTrue($this->component->Object->isEventHandled());
-
+
$this->component->resetEventHandled();
$this->component->Object->resetEventHandled();
-
-
+
+
// Test a behavior on event
$this->component->attachBehavior('test', new BehaviorTestBehavior);
-
+
$this->component->attachEventHandler('onBehaviorEvent',array($this->component,'myEventHandler'));
$this->assertFalse($this->component->isEventHandled());
$this->component->raiseEvent('onBehaviorEvent',$this,null);
@@ -1709,13 +1709,13 @@ class TComponentTest extends PHPUnit_Framework_TestCase {
$this->assertFalse($this->component->Object->isEventHandled());
$this->component->raiseEvent('onBehaviorEvent',$this,null);
$this->assertTrue($this->component->Object->isEventHandled());
-
+
//test behavior enabled/disabled events
$this->component->disableBehavior('test');
-
+
$this->component->resetEventHandled();
$this->component->Object->resetEventHandled();
-
+
try {
$this->component->attachEventHandler('onBehaviorEvent',array($this->component,'myEventHandler'));
$this->fail('exception not raised when getting event handlers for undefined event');
@@ -1726,172 +1726,172 @@ class TComponentTest extends PHPUnit_Framework_TestCase {
$this->fail('exception not raised when getting event handlers for undefined event');
} catch(TInvalidOperationException $e) {}
$this->assertFalse($this->component->isEventHandled());
-
+
$this->component->enableBehavior('test');
-
-
-
+
+
+
//Test the return types of this function
-
+
$this->assertFalse($this->component->isEventHandled());
$this->assertFalse($this->component->Object->isEventHandled());
$this->assertEquals(array(), $this->component->onBehaviorEvent($this,$this->component));
$this->assertTrue($this->component->isEventHandled());
$this->assertTrue($this->component->Object->isEventHandled());
-
+
// This accumulates all the responses from each of the events
$arr=$this->component->onBehaviorEvent($this, $this->component, TEventResults::EVENT_RESULT_ALL);
$this->assertEquals($this, $arr[0]['sender']);
$this->assertEquals($this->component, $arr[0]['param']);
$this->assertTrue(null === $arr[0]['response']);
-
+
$this->assertEquals($this, $arr[1]['sender']);
$this->assertEquals($this->component, $arr[1]['param']);
$this->assertTrue(null === $arr[1]['response']);
-
+
$this->assertEquals(2, count($arr));
-
+
// This tests without the default filtering-out of null
$arr=$this->component->onBehaviorEvent($this, $this->component, false);
$this->assertEquals(array(null, null), $arr);
-
-
+
+
unset($this->component->onBehaviorEvent);
$this->assertEquals(0, $this->component->onBehaviorEvent->Count);
-
+
$this->component->onBehaviorEvent = array($this, 'returnValue4');
$this->component->onBehaviorEvent = array($this, 'returnValue1');
-
+
// Test the per event post processing function
$arr=$this->component->onBehaviorEvent($this, $this->component, array($this, 'postEventFunction'));
$this->assertEquals(array(exp(4), exp(1)), $arr);
$arr=$this->component->onBehaviorEvent($this, $this->component, array($this, 'postEventFunction2'));
$this->assertEquals(array(sin(4), sin(1)), $arr);
-
-
+
+
//Testing Feed-forward functionality
unset($this->component->onBehaviorEvent);
-
+
$this->component->onBehaviorEvent = array($this, 'ffValue4');
$this->component->onBehaviorEvent = array($this, 'ffValue2');
$arr=$this->component->onBehaviorEvent($this, 5, TEventResults::EVENT_RESULT_FEED_FORWARD);
$this->assertEquals(array(20, 40), $arr);
-
-
+
+
unset($this->component->onBehaviorEvent);
-
+
//Order of these events affects the response order in feed forward
$this->component->onBehaviorEvent = array($this, 'ffValue2');
$this->component->onBehaviorEvent = array($this, 'ffValue4');
$arr=$this->component->onBehaviorEvent($this, 5, TEventResults::EVENT_RESULT_FEED_FORWARD);
$this->assertEquals(array(10, 40), $arr);
}
-
+
public function returnValue1(){return 1;}
public function returnValue4(){return 4;}
public function postEventFunction($sender, $param, $caller, $response){return exp($response);}
public function postEventFunction2($sender, $param, $caller, $response){return sin($response);}
public function ffValue2($sender, $param){return $param*2;}
public function ffValue4($sender, $param){return $param*4;}
-
-
+
+
public function testGlobalEventListenerInRaiseEvent() {
//TODO Test the Global Event Listener
}
-
-
+
+
public function testIDynamicMethodsOnBehavior() {
-
+
//Add Behavior with dynamic call
$this->component->attachBehavior('TDynamicBehavior', new TDynamicBehavior);
-
+
//Check that the behavior is working as it should
$this->assertTrue($this->component->isa('TDynamicBehavior'));
$this->assertNull($this->component->getLastBehaviorDynamicMethodCalled());
-
+
// call basic behavior implemented method from object (containing behavior)
$this->assertEquals(42, $this->component->TestBehaviorMethod(6, 7));
-
+
//Test out undefined behavior/host object method
try {
$this->component->objectAndBehaviorUndefinedMethod();
$this->fail('exception not raised when evaluating an undefined method by the object and behavior');
} catch(TApplicationException $e) {
}
-
+
// calling undefined dynamic method, caught by the __dycall method in the behavior and implemented
// this behavior catches undefined dynamic event and divides param1 by param 2
$this->assertEquals(22, $this->component->dyTestDynamicBehaviorMethod(242, 11));
$this->assertEquals('dyTestDynamicBehaviorMethod', $this->component->getLastBehaviorDynamicMethodCalled());
-
+
// calling undefined dynamic method, caught by the __dycall in the behavior and ignored
$this->assertNull($this->component->dyUndefinedIntraEvent(242, 11));
$this->assertEquals('dyUndefinedIntraEvent', $this->component->getLastBehaviorDynamicMethodCalled());
-
+
//call behavior defined dynamic event
// param1 * 2 * param2
$this->assertEquals(2420, $this->component->dyTestIntraEvent(121, 10));
-
+
$this->component->detachBehavior('TDynamicBehavior');
$this->assertFalse($this->component->isa('TDynamicBehavior'));
-
-
-
+
+
+
//Add Class Behavior with dynamic call
$this->component->attachBehavior('TDynamicClassBehavior', new TDynamicClassBehavior);
-
+
//Check that the behavior is working as it should
$this->assertTrue($this->component->isa('TDynamicClassBehavior'));
$this->assertNull($this->component->getLastBehaviorDynamicMethodCalled());
-
+
// call basic behavior implemented method from object (containing behavior)
$this->assertEquals(42, $this->component->TestBehaviorMethod(6, 7));
-
+
//Test out undefined behavior/host object method
try {
$this->component->objectAndBehaviorUndefinedMethod();
$this->fail('exception not raised when evaluating an undefined method by the object and behavior');
} catch(TApplicationException $e) {
}
-
+
// calling undefined dynamic method, caught by the __dycall method in the behavior and implemented
// this behavior catches undefined dynamic event and divides param1 by param 2
$this->assertEquals(22, $this->component->dyTestDynamicClassBehaviorMethod(242, 11));
$this->assertEquals('dyTestDynamicClassBehaviorMethod', $this->component->getLastBehaviorDynamicMethodCalled());
-
+
// calling undefined dynamic method, caught by the __dycall in the behavior and ignored
$this->assertNull($this->component->dyUndefinedIntraEvent(242, 11));
$this->assertEquals('dyUndefinedIntraEvent', $this->component->getLastBehaviorDynamicMethodCalled());
-
+
//call behavior defined dynamic event
// param1 * 2 * param2
$this->assertEquals(2420, $this->component->dyTestIntraEvent(121, 10));
-
+
$this->component->detachBehavior('TDynamicClassBehavior');
$this->assertFalse($this->component->isa('TDynamicClassBehavior'));
-
+
}
-
+
// This also tests the priority of the common global raiseEvent events
public function testIDynamicMethodsOnBehaviorGlobalEvents() {
$component = new GlobalRaiseComponent();
-
+
// common function has a default priority of 10
$component->attachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER, array($component, 'commonRaiseEventListener'));
$component->attachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER, array($component, 'postglobalRaiseEventListener'), 1);
$component->attachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER, array($component, 'preglobalRaiseEventListener'), -1);
-
+
$this->assertEquals(5, $this->component->fxGlobalListener->getCount());
$this->assertEquals(1, $this->component->fxPrimaryGlobalEvent->getCount());
$this->assertEquals(1, $this->component->fxPrimaryGlobalEvent->getCount(), 'fxPrimaryGlobalEvent is not installed on test object');
-
+
// call the global event on a different object than the test object
$res = $this->component->raiseEvent('fxPrimaryGlobalEvent', $this, null, TEventResults::EVENT_RESULT_ALL);
-
+
$this->assertEquals(6, count($res));
$this->assertEquals(array('pregl', 'primary', 'postgl', 'fxGL', 'fxcall', 'com'), $component->getCallOrders());
-
+
$component->unlisten();
}
@@ -1907,10 +1907,10 @@ class TComponentTest extends PHPUnit_Framework_TestCase {
} catch(Exception $e) {
}
}
-
-
-
-
+
+
+
+
public function testEvaluateStatements() {
$statements='$a="test string"; echo $a;';
$this->assertEquals('test string',$this->component->evaluateStatements($statements));
@@ -1921,169 +1921,167 @@ class TComponentTest extends PHPUnit_Framework_TestCase {
} catch(Exception $e) {
}
}
-
-
+
+
public function testDynamicFunctionCall() {
-
+
$this->assertEquals(' aa bb cc __ .. ++ || !! ?? ', $this->component->dyTextFilter(' aa bb cc __ .. ++ || !! ?? '));
-
+
$this->component->attachBehavior('dy1', new dy1TextReplace);
$this->assertFalse($this->component->dy1->isCalled());
$this->assertEquals(' aa bb cc __ __ ++ || !! ?? ', $this->component->dyTextFilter(' aa bb cc __ .. ++ || !! ?? '));
$this->assertTrue($this->component->dy1->isCalled());
-
+
$this->component->attachBehavior('dy2', new dy2TextReplace);
$this->assertFalse($this->component->dy2->isCalled());
$this->assertEquals(' aa bb cc __ __ || || !! ?? ', $this->component->dyTextFilter(' aa bb cc __ .. ++ || !! ?? '));
$this->assertTrue($this->component->dy2->isCalled());
-
+
$this->component->attachBehavior('dy3', new dy3TextReplace);
$this->assertFalse($this->component->dy3->isCalled());
$this->assertEquals(' aa bb cc __ __ || || ?? ?? ', $this->component->dyTextFilter(' aa bb cc __ .. ++ || !! ?? '));
$this->assertTrue($this->component->dy3->isCalled());
-
+
$this->assertEquals(' aa bb cc __ .. ++ || !! ?? ', $this->component->dyUndefinedEvent(' aa bb cc __ .. ++ || !! ?? '));
-
+
$this->assertEquals(0.25, $this->component->dyPowerFunction(2,2));
-
-
+
+
$this->component->detachBehavior('dy1');
$this->component->detachBehavior('dy2');
$this->component->detachBehavior('dy3');
-
+
//test class behaviors of dynamic events and the argument list order
-
+
$this->assertEquals(' aa bb cc __ .. ++ || !! ?? ', $this->component->dyTextFilter(' aa bb cc __ .. ++ || !! ?? '));
-
+
$this->component->attachBehavior('dy1', new dy1ClassTextReplace);
$this->assertFalse($this->component->dy1->isCalled());
$this->assertEquals(' aa bb cc .. .. ++ || !! ?? ', $this->component->dyTextFilter(' aa bb cc __ .. ++ || !! ?? '));
$this->assertTrue($this->component->dy1->isCalled());
-
+
$this->component->attachBehavior('dy2', new dy2ClassTextReplace);
$this->assertFalse($this->component->dy2->isCalled());
$this->assertEquals(' aa bb cc .. .. ++ ++ !! ?? ', $this->component->dyTextFilter(' aa bb cc __ .. ++ || !! ?? '));
$this->assertTrue($this->component->dy2->isCalled());
-
+
$this->component->attachBehavior('dy3', new dy3ClassTextReplace);
$this->assertFalse($this->component->dy3->isCalled());
$this->assertEquals(' aa bb cc .. .. ++ ++ !! ^_^ ', $this->component->dyTextFilter(' aa bb cc __ .. ++ || !! ?? '));
$this->assertTrue($this->component->dy3->isCalled());
-
+
$this->assertEquals(' aa bb cc __ .. ++ || !! ?? ', $this->component->dyUndefinedEvent(' aa bb cc __ .. ++ || !! ?? '));
-
+
$this->assertEquals(0.25, $this->component->dyPowerFunction(2,2));
-
-
+
+
}
-
-
-
-
+
+
+
+
public function testDynamicIntraObjectEvents() {
-
+
$this->component->attachBehavior('IntraEvents', new IntraObjectExtenderBehavior);
-
+
$this->assertNull($this->component->IntraEvents->LastCall);
-
+
//unlisten first, this object listens upon instantiation.
$this->component->unlisten();
$this->assertEquals(2, $this->component->IntraEvents->LastCall);
-
+
// ensures that IntraEvents nulls the last call variable when calling this getter
$this->assertNull($this->component->IntraEvents->LastCall);
-
+
//listen next to undo the unlisten
$this->component->listen();
$this->assertEquals(1, $this->component->IntraEvents->LastCall);
-
-
+
+
$this->assertEquals(3, $this->component->evaluateExpression('1+2'));
$this->assertEquals(7, $this->component->IntraEvents->LastCall);
-
+
$statements='$a="test string"; echo $a;';
$this->assertEquals('test string', $this->component->evaluateStatements($statements));
$this->assertEquals(8, $this->component->IntraEvents->LastCall);
-
+
$component2 = new NewComponentNoListen();
$this->assertNull($this->component->createdOnTemplate($component2));
$this->assertEquals(9, $this->component->IntraEvents->LastCall);
-
+
$this->assertNull($this->component->addParsedObject($component2));
$this->assertEquals(10, $this->component->IntraEvents->LastCall);
-
-
-
+
+
+
$behavior = new BarBehavior;
$this->assertEquals($behavior, $this->component->attachBehavior('BarBehavior', $behavior));
$this->assertEquals(11, $this->component->IntraEvents->LastCall);
-
+
$this->assertNull($this->component->disableBehaviors());
$this->assertNull($this->component->enableBehaviors());
$this->assertEquals(27, $this->component->IntraEvents->LastCall);
-
+
$this->assertTrue($this->component->disableBehavior('BarBehavior'));
$this->assertEquals(16, $this->component->IntraEvents->LastCall);
-
+
$this->assertTrue($this->component->enableBehavior('BarBehavior'));
$this->assertEquals(15, $this->component->IntraEvents->LastCall);
-
+
$this->assertEquals($behavior, $this->component->detachBehavior('BarBehavior'));
$this->assertEquals(12, $this->component->IntraEvents->LastCall);
-
-
+
+
$this->component->attachEventHandler('OnMyEvent',array($this->component,'myEventHandler'));
$this->component->raiseEvent('OnMyEvent',$this,null);
-
+
//3 + 4 + 5 + 6 = 18 (the behavior adds these together when each raiseEvent dynamic intra event is called)
$this->assertEquals(18, $this->component->IntraEvents->LastCall);
}
-
-
-
+
+
+
public function testJavascriptGetterSetter() {
-
+
$this->assertFalse(isset($this->component->ColorAttribute));
$this->assertFalse(isset($this->component->JsColorAttribute));
-
+
$this->component->ColorAttribute = "('#556677', '#abcdef', 503987)";
$this->assertEquals("('#556677', '#abcdef', 503987)", $this->component->ColorAttribute);
-
+
$this->assertTrue(isset($this->component->ColorAttribute));
$this->assertTrue(isset($this->component->JsColorAttribute));
-
+
$this->component->ColorAttribute = "new Array(1, 2, 3, 4, 5)";
$this->assertEquals("new Array(1, 2, 3, 4, 5)", $this->component->JsColorAttribute);
-
+
$this->component->JsColorAttribute = "['#112233', '#fedcba', 22009837]";
$this->assertEquals("['#112233', '#fedcba', 22009837]", $this->component->ColorAttribute);
}
-
-
+
+
public function testJavascriptIssetUnset() {
-
+
$this->component->JsColorAttribute = "['#112233', '#fedcba', 22009837]";
$this->assertEquals("['#112233', '#fedcba', 22009837]", $this->component->ColorAttribute);
-
+
unset($this->component->ColorAttribute);
-
+
$this->assertFalse(isset($this->component->ColorAttribute));
$this->assertFalse(isset($this->component->JsColorAttribute));
-
+
$this->component->JsColorAttribute = "['#112233', '#fedcba', 22009837]";
-
+
$this->assertTrue(isset($this->component->ColorAttribute));
$this->assertTrue(isset($this->component->JsColorAttribute));
-
+
unset($this->component->JsColorAttribute);
-
+
$this->assertFalse(isset($this->component->ColorAttribute));
$this->assertFalse(isset($this->component->JsColorAttribute));
-
+
}
-
-
-
-}
-?> \ No newline at end of file
+
+
+}
diff --git a/tests/unit/Util/AllTests.php b/tests/unit/Util/AllTests.php
index 8ab99a50..a6a217d7 100644
--- a/tests/unit/Util/AllTests.php
+++ b/tests/unit/Util/AllTests.php
@@ -11,13 +11,13 @@ class Util_AllTests {
public static function main() {
PHPUnit_TextUI_TestRunner::run(self::suite());
}
-
+
public static function suite() {
$suite = new PHPUnit_Framework_TestSuite('System.Util');
-
+
$suite->addTestSuite('TDateTimeStampTest');
$suite->addTestSuite('TLoggerTest');
-
+
return $suite;
}
}
@@ -25,4 +25,3 @@ class Util_AllTests {
if(PHPUnit_MAIN_METHOD == 'Util_AllTests::main') {
Util_AllTests::main();
}
-?>
diff --git a/tests/unit/Util/TDateTimeStampTest.php b/tests/unit/Util/TDateTimeStampTest.php
index 6ae4b128..37784ef3 100644
--- a/tests/unit/Util/TDateTimeStampTest.php
+++ b/tests/unit/Util/TDateTimeStampTest.php
@@ -7,7 +7,7 @@ Prado::using('System.Util.TDateTimeStamp');
* @package System.Util
*/
class TDateTimeStampTest extends PHPUnit_Framework_TestCase {
-
+
public function testGetTimeStampAndFormat() {
$s = new TDateTimeStamp;
$t = $s->getTimeStamp(0,0,0);
@@ -126,4 +126,3 @@ class TDateTimeStampTest extends PHPUnit_Framework_TestCase {
}
}
-?>
diff --git a/tests/unit/Util/TLoggerTest.php b/tests/unit/Util/TLoggerTest.php
index 49d5d316..03b36c5b 100644
--- a/tests/unit/Util/TLoggerTest.php
+++ b/tests/unit/Util/TLoggerTest.php
@@ -16,11 +16,10 @@ class TLoggerTest extends PHPUnit_Framework_TestCase {
public function testLog() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetLogs() {
throw new PHPUnit_Framework_IncompleteTestError();
}
}
-?>
diff --git a/tests/unit/Util/TSimpleDateFormatterTest.php b/tests/unit/Util/TSimpleDateFormatterTest.php
index b989fcf5..ce6f1234 100644
--- a/tests/unit/Util/TSimpleDateFormatterTest.php
+++ b/tests/unit/Util/TSimpleDateFormatterTest.php
@@ -16,49 +16,48 @@ class TSimpleDateFormatterTest extends PHPUnit_Framework_TestCase {
public function testConstruct() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testPattern() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testCharset() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testFormat() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testMonthPattern() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testDayPattern() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testYearPattern() {
$formatter = new TSimpleDateFormatter("yyyy");
self::assertEquals("2008-01-01", date('Y-m-d', $formatter->parse("2008")));
}
-
+
public function testMissingYearPattern() {
$formatter = new TSimpleDateFormatter("MM/dd");
self::assertEquals(date("Y-10-22"), date('Y-m-d', $formatter->parse("10/22")));
}
-
+
public function testDayMonthYearOrdering() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testIsValidDate() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testParse() {
throw new PHPUnit_Framework_IncompleteTestError();
}
}
-?>
diff --git a/tests/unit/Web/AllTests.php b/tests/unit/Web/AllTests.php
index f9b3b91d..ffd98978 100644
--- a/tests/unit/Web/AllTests.php
+++ b/tests/unit/Web/AllTests.php
@@ -20,10 +20,10 @@ class Web_AllTests {
public static function main() {
PHPUnit_TextUI_TestRunner::run(self::suite());
}
-
+
public static function suite() {
$suite = new PHPUnit_Framework_TestSuite('System.Web');
-
+
$suite->addTestSuite('TAssetManagerTest');
$suite->addTestSuite('TCacheHttpSessionTest');
$suite->addTestSuite('THttpCookieCollectionTest');
@@ -33,9 +33,9 @@ class Web_AllTests {
$suite->addTestSuite('THttpSessionTest');
$suite->addTestSuite('THttpUtilityTest');
$suite->addTestSuite('TUriTest');
-
+
$suite->addTest(Web_UI_AllTests::suite());
-
+
return $suite;
}
}
@@ -43,4 +43,3 @@ class Web_AllTests {
if(PHPUnit_MAIN_METHOD == 'Web_AllTests::main') {
Web_AllTests::main();
}
-?>
diff --git a/tests/unit/Web/TAssetManagerTest.php b/tests/unit/Web/TAssetManagerTest.php
index 89349a0d..13d2d6c1 100644
--- a/tests/unit/Web/TAssetManagerTest.php
+++ b/tests/unit/Web/TAssetManagerTest.php
@@ -26,26 +26,26 @@ class TAssetManagerTest extends PHPUnit_Framework_TestCase {
$_SERVER['REMOTE_ADDR'] = '127.0.0.1';
$_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1.3) Gecko/20070309 Firefox/2.0.0.3';
$_SERVER['REMOTE_HOST'] = 'localhost';
-
+
if (self::$app===null) {
self::$app=new TApplication(dirname(__FILE__).'/app');
}
-
+
if (self::$assetDir===null) self::$assetDir= dirname(__FILE__).'/assets';
- // Make asset directory if not exists
+ // Make asset directory if not exists
if (!file_exists (self::$assetDir)) {
- if (is_writable(dirname(self::$assetDir)))
+ if (is_writable(dirname(self::$assetDir)))
mkdir (self::$assetDir) ;
- else
+ else
throw new Exception ('Directory '.dirname(self::$assetDir).' is not writable');
} elseif (!is_dir (self::$assetDir)) {
throw new Exception (self::$assetDir.' exists and is not a directory');
}
// Define an alias to asset directory
prado::setPathofAlias('AssetAlias', self::$assetDir);
-
+
}
-
+
private function removeDirectory ($dir) {
// Let's be sure $dir is a directory to avoir any error. Clear the cache !
clearstatcache();
@@ -53,7 +53,7 @@ class TAssetManagerTest extends PHPUnit_Framework_TestCase {
foreach (scandir($dir) as $content) {
if ($content==='.' or $content==='..') continue; // skip . and ..
$content=$dir.'/'.$content;
- if (is_dir($content))
+ if (is_dir($content))
$this->removeDirectory ($content); // Recursivly remove directories
else
unlink ($content); // Remove file
@@ -62,21 +62,21 @@ class TAssetManagerTest extends PHPUnit_Framework_TestCase {
rmdir ($dir);
}
}
-
+
public function tearDown () {
// Make some cleaning :)
- $this->removeDirectory(self::$assetDir);
+ $this->removeDirectory(self::$assetDir);
}
-
+
public function testInit() {
-
+
$manager=new TAssetManager ();
$manager->init (null);
-
+
self::assertEquals(self::$assetDir, $manager->getBasePath());
self::assertEquals($manager, self::$app->getAssetManager());
-
+
// No, remove asset directory, and catch the exception
if (is_dir(self::$assetDir)) $this->removeDirectory (self::$assetDir);
try {
@@ -92,12 +92,12 @@ class TAssetManagerTest extends PHPUnit_Framework_TestCase {
$manager->setBasePath('invalid');
self::fail('Expected TInvalidDataValueException not thrown');
} catch (TInvalidDataValueException $e) {}
-
+
// Next, standard asset directory, should work
-
+
$manager->setBasePath ('AssetAlias');
self::assertEquals(self::$assetDir, $manager->getBasePath());
-
+
// Finally, test to change after init
$manager->init (null);
try {
@@ -111,20 +111,20 @@ class TAssetManagerTest extends PHPUnit_Framework_TestCase {
$manager=new TAssetManager ();
$manager->setBaseUrl ('/assets/');
self::assertEquals("/assets", $manager->getBaseUrl());
-
+
$manager->init (null);
try {
$manager->setBaseUrl ('/test');
self::fail ('Expected TInvalidOperationException not thrown');
} catch (TInvalidOperationException $e) {}
-
+
}
public function testPublishFilePath() {
$manager=new TAssetManager();
$manager->setBaseUrl('/');
$manager->init (null);
-
+
// Try to publish a single file
$fileToPublish=dirname(__FILE__).'/data/pradoheader.gif';
$publishedUrl = $manager->publishFilePath($fileToPublish);
@@ -132,19 +132,19 @@ class TAssetManagerTest extends PHPUnit_Framework_TestCase {
self::assertEquals($publishedFile, $manager->getPublishedPath($fileToPublish));
self::assertEquals($publishedUrl, $manager->getPublishedUrl($fileToPublish));
self::assertTrue(is_file($publishedFile));
-
+
// try to publish invalid file
try {
$manager->publishFilePath('invalid_file');
self::fail('Expected TInvalidDataValueException not thrown');
} catch (TInvalidDataValueException $e) {}
}
-
+
public function testPublishFilePathWithDirectory () {
$manager=new TAssetManager();
$manager->setBaseUrl('/');
$manager->init (null);
-
+
// Try to publish a directory
$dirToPublish=dirname(__FILE__).'/data';
$publishedUrl = $manager->publishFilePath($dirToPublish);
@@ -153,23 +153,23 @@ class TAssetManagerTest extends PHPUnit_Framework_TestCase {
self::assertEquals($publishedUrl, $manager->getPublishedUrl($dirToPublish));
self::assertTrue(is_dir($publishedDir));
self::assertTrue(is_file($publishedDir.'/pradoheader.gif'));
-
+
}
public function testPublishTarFile() {
$manager=new TAssetManager();
$manager->setBaseUrl('/');
$manager->init (null);
-
+
$tarFile=dirname(__FILE__).'/data/aTarFile.tar';
$md5File=dirname(__FILE__).'/data/aTarFile.md5';
-
+
// First, try with bad md5
try {
$manager->publishTarFile($tarFile, 'badMd5File');
self::fail('Expected TInvalidDataValueException not thrown');
} catch (TInvalidDataValueException $e) {}
-
+
// Then, try with real md5 file
$publishedUrl=$manager->publishTarFile($tarFile, $md5File);
$publishedDir=self::$assetDir.$publishedUrl;
@@ -178,5 +178,4 @@ class TAssetManagerTest extends PHPUnit_Framework_TestCase {
self::assertTrue(is_file($publishedDir.'/aTarFile.md5'));
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/unit/Web/TCacheHttpSessionTest.php b/tests/unit/Web/TCacheHttpSessionTest.php
index 15c2a382..8475cd37 100644
--- a/tests/unit/Web/TCacheHttpSessionTest.php
+++ b/tests/unit/Web/TCacheHttpSessionTest.php
@@ -11,14 +11,14 @@ class TCacheHttpSessionTest extends PHPUnit_Framework_TestCase
protected $app = null;
protected static $cache = null;
protected static $session = null;
-
+
protected function setUp()
{
if(!extension_loaded('memcache'))
{
self::markTestSkipped('The memcache extension is not available');
}
- else
+ else
{
$basePath = dirname(__FILE__).'/app';
$runtimePath = $basePath.'/runtime';
@@ -33,14 +33,14 @@ class TCacheHttpSessionTest extends PHPUnit_Framework_TestCase
$this->app->setModule('MyCache',self::$cache);
}
}
-
+
protected function tearDown()
{
$this->app = null;
$this->cache = null;
$this->session = null;
}
-
+
public function testInit()
{
$session = new TCacheHttpSession();
@@ -53,7 +53,7 @@ class TCacheHttpSessionTest extends PHPUnit_Framework_TestCase
{
}
unset($session);
-
+
$session = new TCacheHttpSession();
try
{
@@ -66,12 +66,12 @@ class TCacheHttpSessionTest extends PHPUnit_Framework_TestCase
{
}
unset($session);
-
+
self::$session = new TCacheHttpSession();
try
{
self::$session->setCacheModuleID('MyCache');
- self::$session->init(null);
+ self::$session->init(null);
}
catch(TConfigurationException $e)
{
@@ -79,50 +79,49 @@ class TCacheHttpSessionTest extends PHPUnit_Framework_TestCase
self::markTestSkipped('Cannot continue this test');
}
}
-
+
public function testGetCache()
{
$cache = self::$session->getCache();
$this->assertEquals(true, $cache instanceof TMemCache);
}
-
+
public function testCacheModuleID()
{
$id = 'value';
self::$session->setCacheModuleID($id);
self::assertEquals($id, self::$session->getCacheModuleID());
}
-
+
public function testKeyPrefix()
{
$id = 'value';
self::$session->setKeyPrefix($id);
self::assertEquals($id, self::$session->getKeyPrefix());
}
-
+
public function testSetAndGet()
{
self::$session['key'] = 'value';
self::assertEquals('value', self::$session['key']);
}
-
+
public function testAdd()
{
self::$session->add('anotherkey', 'value');
self::assertEquals('value', self::$session['anotherkey']);
}
-
+
public function testRemove()
{
self::$session->remove('key');
self::assertEquals(false, self::$session['key']);
}
-
+
public function testDestroyAndIsStarted()
{
$this->testSetAndGet();
self::$session->destroy();
self::assertEquals(false, self::$session->getIsStarted());
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/unit/Web/THttpCookieCollectionTest.php b/tests/unit/Web/THttpCookieCollectionTest.php
index 68ea8777..aa091788 100644
--- a/tests/unit/Web/THttpCookieCollectionTest.php
+++ b/tests/unit/Web/THttpCookieCollectionTest.php
@@ -28,7 +28,7 @@ class THttpCookieCollectionTest extends PHPUnit_Framework_TestCase {
$coll->removeAt(0);
self::fail('Invalid Value exception not raised');
} catch (TInvalidDataValueException $e) {}
-
+
$coll->insertAt(0, new THttpCookie('name','value'));
self::assertEquals('value',$coll->removeAt(0)->getValue());
}
@@ -46,5 +46,4 @@ class THttpCookieCollectionTest extends PHPUnit_Framework_TestCase {
self::assertEquals ('value', $coll->findCookieByName('name')->getValue());
self::assertNull ($coll->findCookieByName('invalid'));
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/unit/Web/THttpCookieTest.php b/tests/unit/Web/THttpCookieTest.php
index 31d8e572..206ef105 100644
--- a/tests/unit/Web/THttpCookieTest.php
+++ b/tests/unit/Web/THttpCookieTest.php
@@ -49,5 +49,4 @@ class THttpCookieTest extends PHPUnit_Framework_TestCase {
$cookie->setSecure(true);
self::assertTrue($cookie->getSecure());
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/unit/Web/THttpRequestTest.php b/tests/unit/Web/THttpRequestTest.php
index 1807bbe2..7f5da17d 100644
--- a/tests/unit/Web/THttpRequestTest.php
+++ b/tests/unit/Web/THttpRequestTest.php
@@ -503,5 +503,4 @@ class THttpRequestTest extends PHPUnit_Framework_TestCase {
$module->init ($config);
self::assertEquals('testService', $request->resolveRequest(array ('page', 'testService')));
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/unit/Web/THttpResponseTest.php b/tests/unit/Web/THttpResponseTest.php
index dadbd768..0855bf4d 100644
--- a/tests/unit/Web/THttpResponseTest.php
+++ b/tests/unit/Web/THttpResponseTest.php
@@ -7,18 +7,18 @@ Prado::using('System.Web.THttpResponse');
* @package System.Web
*/
class THttpResponseTest extends PHPUnit_Framework_TestCase {
-
+
public static $app=null;
public function setUp () {
if (self::$app===null) self::$app=new TApplication(dirname(__FILE__).'/app');
ob_start();
}
-
+
public function tearDown () {
ob_end_flush();
}
-
+
public function testInit() {
$response=new THttpResponse ();
$response->init (null);
@@ -43,7 +43,7 @@ class THttpResponseTest extends PHPUnit_Framework_TestCase {
$response->setCacheControl('invalid');
self::fail ('Expected TInvalidDataValueException not thrown');
} catch (TInvalidDataValueException $e) {}
-
+
}
public function testSetContentType() {
@@ -62,7 +62,7 @@ class THttpResponseTest extends PHPUnit_Framework_TestCase {
self::assertEquals('UTF-8', $response->getCharset());
$response->setCharset ('ISO8859-1');
self::assertEquals('ISO8859-1', $response->getCharset());
-
+
}
public function testSetBufferOutput() {
@@ -101,17 +101,17 @@ class THttpResponseTest extends PHPUnit_Framework_TestCase {
}
public function testWriteFile() {
-
+
// Don't know how to test headers :(( ...
throw new PHPUnit_Framework_IncompleteTestError();
-
+
$response=new THttpResponse ();
$response->setBufferOutput(true);
// Suppress warning with headers
$response->writeFile(dirname(__FILE__).'/data/aTarFile.md5', null, 'text/plain', array ('Pragma: public', 'Expires: 0'));
-
+
self::assertContains('4b1ecb0b243918a8bbfbb4515937be98 aTarFile.tar', ob_get_clean());
-
+
}
public function testRedirect() {
@@ -157,5 +157,4 @@ class THttpResponseTest extends PHPUnit_Framework_TestCase {
public function testCreateHtmlWriter() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/unit/Web/THttpSessionTest.php b/tests/unit/Web/THttpSessionTest.php
index 7de0f8a5..aca83077 100644
--- a/tests/unit/Web/THttpSessionTest.php
+++ b/tests/unit/Web/THttpSessionTest.php
@@ -110,5 +110,4 @@ class THttpSessionTest extends PHPUnit_Framework_TestCase {
public function testOffsetUnset() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/unit/Web/THttpUtilityTest.php b/tests/unit/Web/THttpUtilityTest.php
index 85fcf7f4..7f4e6705 100644
--- a/tests/unit/Web/THttpUtilityTest.php
+++ b/tests/unit/Web/THttpUtilityTest.php
@@ -18,5 +18,4 @@ class THttpUtilityTest extends PHPUnit_Framework_TestCase {
$html = THttpUtility::htmlDecode('&lt;tag key=&quot;value&quot;&gt;');
self::assertEquals('<tag key="value">', $html);
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/unit/Web/TUriTest.php b/tests/unit/Web/TUriTest.php
index a8c65b9e..b610cd1b 100644
--- a/tests/unit/Web/TUriTest.php
+++ b/tests/unit/Web/TUriTest.php
@@ -6,17 +6,17 @@ Prado::using('System.Web.THttpRequest');
* @package System.Web
*/
class TUriTest extends PHPUnit_Framework_TestCase {
-
+
const URISTR='http://login:p@ssw0rd:compl3x@www.pradosoft.com:80/demos/quickstart/index.php?page=test&param1=test2#anchor';
-
+
public function setUp () {
$this->uri=new TUri(self::URISTR);
}
-
+
public function tearDown() {
$this->uri=null;
}
-
+
public function testConstruct() {
$url="http://www.pradosoft.com/";
$uri=new TUri ($url);
@@ -27,7 +27,7 @@ class TUriTest extends PHPUnit_Framework_TestCase {
$url=new TUri($url);
self::fail ('exception not raised with an invalid URL');
} catch (TInvalidDataValueException $e) {
-
+
}
}
@@ -66,5 +66,4 @@ class TUriTest extends PHPUnit_Framework_TestCase {
public function testGetFragment() {
self::assertEquals('anchor', $this->uri->getFragment());
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/unit/Web/UI/ActiveControls/AllTests.php b/tests/unit/Web/UI/ActiveControls/AllTests.php
index ef2dfb91..68989996 100644
--- a/tests/unit/Web/UI/ActiveControls/AllTests.php
+++ b/tests/unit/Web/UI/ActiveControls/AllTests.php
@@ -11,11 +11,11 @@ class Web_UI_ActiveControls_AllTests {
public static function main() {
PHPUnit_TextUI_TestRunner::run(self::suite());
}
-
+
public static function suite() {
$suite = new PHPUnit_Framework_TestSuite('System.Web.UI.ActiveControls');
-
- $suite->addTestSuite('TActiveHiddenFieldTest');
+
+ $suite->addTestSuite('TActiveHiddenFieldTest');
return $suite;
}
}
@@ -23,4 +23,3 @@ class Web_UI_ActiveControls_AllTests {
if(PHPUnit_MAIN_METHOD == 'Web_UI_ActiveControls_AllTests::main') {
Web_UI_ActiveControls_AllTests::main();
}
-?>
diff --git a/tests/unit/Web/UI/ActiveControls/TActiveHiddenFieldTest.php b/tests/unit/Web/UI/ActiveControls/TActiveHiddenFieldTest.php
index 58821747..6e80bd12 100644
--- a/tests/unit/Web/UI/ActiveControls/TActiveHiddenFieldTest.php
+++ b/tests/unit/Web/UI/ActiveControls/TActiveHiddenFieldTest.php
@@ -14,5 +14,3 @@ class TActiveHiddenFieldTest extends PHPUnit_Framework_TestCase {
$this->assertEquals('Test', $field->getValue());
}
}
-
-?> \ No newline at end of file
diff --git a/tests/unit/Web/UI/AllTests.php b/tests/unit/Web/UI/AllTests.php
index 71b088e4..6885c337 100644
--- a/tests/unit/Web/UI/AllTests.php
+++ b/tests/unit/Web/UI/AllTests.php
@@ -23,10 +23,10 @@ class Web_UI_AllTests {
public static function main() {
PHPUnit_TextUI_TestRunner::run(self::suite());
}
-
+
public static function suite() {
$suite = new PHPUnit_Framework_TestSuite('System.Web.UI');
-
+
$suite->addTestSuite('TClientScriptManagerTest');
$suite->addTestSuite('TControlAdapterTest');
$suite->addTestSuite('TControlTest');
@@ -40,7 +40,7 @@ class Web_UI_AllTests {
$suite->addTestSuite('THtmlWriterTest');
$suite->addTestSuite('TPageStatePersisterTest');
$suite->addTestSuite('TSessionPageStatePersisterTest');
-
+
return $suite;
}
}
@@ -48,4 +48,3 @@ class Web_UI_AllTests {
if(PHPUnit_MAIN_METHOD == 'Web_UI_AllTests::main') {
Web_UI_AllTests::main();
}
-?>
diff --git a/tests/unit/Web/UI/TClientScriptManagerTest.php b/tests/unit/Web/UI/TClientScriptManagerTest.php
index ea360f91..efce0009 100644
--- a/tests/unit/Web/UI/TClientScriptManagerTest.php
+++ b/tests/unit/Web/UI/TClientScriptManagerTest.php
@@ -144,5 +144,4 @@ class TClientScriptManagerTest extends PHPUnit_Framework_TestCase {
throw new PHPUnit_Framework_IncompleteTestError();
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/unit/Web/UI/TControlAdapterTest.php b/tests/unit/Web/UI/TControlAdapterTest.php
index 2a173fd8..ff687cc8 100644
--- a/tests/unit/Web/UI/TControlAdapterTest.php
+++ b/tests/unit/Web/UI/TControlAdapterTest.php
@@ -15,46 +15,45 @@ class TControlAdapterTest extends PHPUnit_Framework_TestCase {
public function testGetControl() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetPage() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testCreateChildControls() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testLoadState() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSaveState() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testOnInit() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testOnLoad() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testOnPreRender() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testOnUnload() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testRender() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testRenderChildren() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/unit/Web/UI/TControlTest.php b/tests/unit/Web/UI/TControlTest.php
index 670926be..b6741167 100644
--- a/tests/unit/Web/UI/TControlTest.php
+++ b/tests/unit/Web/UI/TControlTest.php
@@ -15,266 +15,265 @@ class TControlTest extends PHPUnit_Framework_TestCase {
public function test__get() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetHasAdapter() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetAdapter() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetParent() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetNamingContainer() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetPage() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetTemplateControl() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetSourceTemplateControl() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetControlStage() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetID() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetUniqueID() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testFocus() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetClientID() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetSkinID() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetEnableTheming() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetCustomData() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetHasControls() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetControls() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetVisible() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetEnabled() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetHasAttributes() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetAttributes() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testHasAttribute() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetAttribute() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testRemoveAttribute() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetEnableViewState() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetControlState() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testTrackViewState() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetViewState() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testClearViewState() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testBindProperty() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testUnbindProperty() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testAutoBindProperty() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testDataBind() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testEnsureChildControls() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testCreateChildControls() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testFindControl() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testFindControlsByType() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testFindControlsByID() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testClearNamingContainer() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testRegisterObject() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testUnregisterObject() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testIsObjectRegistered() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetHasChildInitialized() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetHasInitialized() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetHasLoadedPostData() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetHasLoaded() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetHasPreRendered() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetRegisteredObject() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetAllowChildControls() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testAddParsedObject() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testAddedControl() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testRemovedControl() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testOnInit() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testOnLoad() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testOnDataBinding() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testOnUnload() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testOnPreRender() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testBubbleEvent() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testBroadcastEvent() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testRenderControl() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testRender() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testRenderChildren() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSaveState() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testLoadState() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testApplyStyleSheetSkin() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/unit/Web/UI/TFormTest.php b/tests/unit/Web/UI/TFormTest.php
index 74cbdb59..7fb6d2b7 100644
--- a/tests/unit/Web/UI/TFormTest.php
+++ b/tests/unit/Web/UI/TFormTest.php
@@ -15,22 +15,21 @@ class TFormTest extends PHPUnit_Framework_TestCase {
public function testRender() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetDefaultButton() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetMethod() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetEnctype() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetName() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/unit/Web/UI/THtmlWriterTest.php b/tests/unit/Web/UI/THtmlWriterTest.php
index 080e2e26..cf3b27e3 100644
--- a/tests/unit/Web/UI/THtmlWriterTest.php
+++ b/tests/unit/Web/UI/THtmlWriterTest.php
@@ -31,7 +31,7 @@ class TestWriter extends TComponent implements ITextWriter
{
$this->write($str."\n");
}
-
+
// Accessors to get value of private vars during tests
public function getFlushedContent() { return $this->_flushedContent; }
public function getStr() { return $this->_str; }
@@ -77,7 +77,7 @@ class THtmlWriterTest extends PHPUnit_Framework_TestCase {
$writer->addAttribute('value','Prado & Cie');
$result=self::readAttribute($writer, '_attributes');
self::assertEquals('text',$result['type']);
- self::assertEquals(THttpUtility::htmlEncode('Prado & Cie'), $result['value']);
+ self::assertEquals(THttpUtility::htmlEncode('Prado & Cie'), $result['value']);
}
public function testRemoveAttribute() {
@@ -129,21 +129,21 @@ class THtmlWriterTest extends PHPUnit_Framework_TestCase {
$writer=new THtmlWriter(self::$output);
$writer->write('Some Text');;
self::assertEquals('Some Text', self::$output->flush());
-
+
}
public function testWriteLine() {
$writer=new THtmlWriter(self::$output);
$writer->writeLine('Some Text');;
self::assertEquals("Some Text\n", self::$output->flush());
-
+
}
public function testWriteBreak() {
$writer=new THtmlWriter(self::$output);
$writer->writeBreak();
self::assertEquals("<br/>", self::$output->flush());
-
+
}
public function testRenderBeginTag() {
@@ -163,5 +163,4 @@ class THtmlWriterTest extends PHPUnit_Framework_TestCase {
self::assertEquals('<div>Div Content</div>', self::$output->flush());
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/unit/Web/UI/TPageStatePersisterTest.php b/tests/unit/Web/UI/TPageStatePersisterTest.php
index 2734b142..8ee1cfc9 100644
--- a/tests/unit/Web/UI/TPageStatePersisterTest.php
+++ b/tests/unit/Web/UI/TPageStatePersisterTest.php
@@ -7,18 +7,17 @@ Prado::using('System.Web.UI.TPageStatePersister');
* @package System.Web.UI
*/
class TPageStatePersisterTest extends PHPUnit_Framework_TestCase {
-
+
public function testSetAndGetPage() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSave() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testLoad() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/unit/Web/UI/TPageTest.php b/tests/unit/Web/UI/TPageTest.php
index a10d9e59..c1593816 100644
--- a/tests/unit/Web/UI/TPageTest.php
+++ b/tests/unit/Web/UI/TPageTest.php
@@ -15,173 +15,172 @@ class TPageTest extends PHPUnit_Framework_TestCase {
public function testRun() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetCallbackClient() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetCallbackEventTarget() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetCallbackEventParameter() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetForm() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetValidators() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testValidate() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetIsValid() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetTheme() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetStyleSheetTheme() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testApplyControlSkin() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testApplyControlStyleSheet() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetClientScript() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testOnPreInit() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testOnInitComplete() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testOnPreLoad() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testOnLoadComplete() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testOnPreRenderComplete() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testOnSaveStateComplete() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetIsPostBack() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetIsCallback() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSaveState() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testLoadState() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testRegisterRequiresPostData() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetPostBackEventTarget() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetPostBackEventParameter() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetIsLoadingPostData() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testEnsureRenderInForm() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testBeginFormRender() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testEndFormRender() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetFocus() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetClientSupportsJavaScript() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetHead() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetTitle() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetClientState() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetRequestClientState() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetStatePersisterClass() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetStatePersister() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetEnableStateValidation() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetEnableStateEncryption() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetPagePath() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testRegisterCachingAction() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetCachingStack() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/unit/Web/UI/TSessionPageStatePersisterTest.php b/tests/unit/Web/UI/TSessionPageStatePersisterTest.php
index b8758b30..9153ad42 100644
--- a/tests/unit/Web/UI/TSessionPageStatePersisterTest.php
+++ b/tests/unit/Web/UI/TSessionPageStatePersisterTest.php
@@ -7,22 +7,21 @@ Prado::using('System.Web.UI.TSessionPageStatePersister');
* @package System.Web.UI
*/
class TSessionPageStatePersisterTest extends PHPUnit_Framework_TestCase {
-
+
public function testSetAndGetPage() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetHistorySize() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSave() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testLoad() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/unit/Web/UI/TTemplateControlTest.php b/tests/unit/Web/UI/TTemplateControlTest.php
index 97ea8c1d..7276a2b0 100644
--- a/tests/unit/Web/UI/TTemplateControlTest.php
+++ b/tests/unit/Web/UI/TTemplateControlTest.php
@@ -15,34 +15,33 @@ class TTemplateControlTest extends PHPUnit_Framework_TestCase {
public function testGetIsSourceTemplateControl() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetTemplateDirectory() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testCreateChildControls() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testRegisterContent() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testRegisterContentPlaceHolder() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetMasterClass() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetMaster() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testInjectContent() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/unit/Web/UI/TTemplateManagerTest.php b/tests/unit/Web/UI/TTemplateManagerTest.php
index 46c17538..dfe452bf 100644
--- a/tests/unit/Web/UI/TTemplateManagerTest.php
+++ b/tests/unit/Web/UI/TTemplateManagerTest.php
@@ -7,18 +7,17 @@ Prado::using('System.Web.UI.TTemplateManager');
* @package System.Web.UI
*/
class TTemplateManagerTest extends PHPUnit_Framework_TestCase {
-
+
public function testInit() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetTemplateByClassName() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetTemplateByFileName() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
-}
-?> \ No newline at end of file
+
+} \ No newline at end of file
diff --git a/tests/unit/Web/UI/TTemplateTest.php b/tests/unit/Web/UI/TTemplateTest.php
index 2bb6599b..2d802094 100644
--- a/tests/unit/Web/UI/TTemplateTest.php
+++ b/tests/unit/Web/UI/TTemplateTest.php
@@ -7,42 +7,41 @@ Prado::using('System.Web.UI.TTemplateManager');
* @package System.Web.UI
*/
class TTemplateTest extends PHPUnit_Framework_TestCase {
-
+
public function testConstruct() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetTemplateFile() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetIsSourceTemplate() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetContextPath() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetDirective() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetHashCode() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetItems() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testInstantiateIn() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetIncludedFiles() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
-}
-?> \ No newline at end of file
+
+} \ No newline at end of file
diff --git a/tests/unit/Web/UI/TThemeManagerTest.php b/tests/unit/Web/UI/TThemeManagerTest.php
index 1a514d2b..028b222a 100644
--- a/tests/unit/Web/UI/TThemeManagerTest.php
+++ b/tests/unit/Web/UI/TThemeManagerTest.php
@@ -7,26 +7,25 @@ Prado::using('System.Web.UI.TThemeManager');
* @package System.Web.UI
*/
class TThemeManagerTest extends PHPUnit_Framework_TestCase {
-
+
public function testInit() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetTheme() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetAvailableThemes() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetBasePath() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testSetAndGetBaseUrl() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/unit/Web/UI/TThemeTest.php b/tests/unit/Web/UI/TThemeTest.php
index e7fa376d..aeeeee65 100644
--- a/tests/unit/Web/UI/TThemeTest.php
+++ b/tests/unit/Web/UI/TThemeTest.php
@@ -7,34 +7,33 @@ Prado::using('System.Web.UI.TThemeManager');
* @package System.Web.UI
*/
class TThemeTest extends PHPUnit_Framework_TestCase {
-
+
public function testConstruct() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetName() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetBaseUrl() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetBasePath() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testApplySkin() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetStyleSheetFiles() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-
+
public function testGetJavaScriptFiles() {
throw new PHPUnit_Framework_IncompleteTestError();
}
-}
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/tests/unit/Web/UI/WebControls/AllTests.php b/tests/unit/Web/UI/WebControls/AllTests.php
index 7d0b1632..5ffa45a2 100644
--- a/tests/unit/Web/UI/WebControls/AllTests.php
+++ b/tests/unit/Web/UI/WebControls/AllTests.php
@@ -14,15 +14,15 @@ class Web_UI_WebControls_AllTests {
public static function main() {
PHPUnit_TextUI_TestRunner::run(self::suite());
}
-
+
public static function suite() {
$suite = new PHPUnit_Framework_TestSuite('System.Web.UI.WebControls');
-
+
$suite->addTestSuite('TDropDownListTest');
$suite->addTestSuite('TLabelTest');
$suite->addTestSuite('TRequiredFieldValidatorTest');
$suite->addTestSuite('TXmlTransformTest');
-
+
return $suite;
}
}
@@ -30,4 +30,3 @@ class Web_UI_WebControls_AllTests {
if(PHPUnit_MAIN_METHOD == 'Web_UI_WebControls_AllTests::main') {
Web_UI_WebControls_AllTests::main();
}
-?>
diff --git a/tests/unit/Web/UI/WebControls/TDropDownListTest.php b/tests/unit/Web/UI/WebControls/TDropDownListTest.php
index 503466fe..d27ebb9c 100644
--- a/tests/unit/Web/UI/WebControls/TDropDownListTest.php
+++ b/tests/unit/Web/UI/WebControls/TDropDownListTest.php
@@ -27,4 +27,3 @@ class TDropDownListTest extends PHPUnit_Framework_TestCase {
}
}
-?>
diff --git a/tests/unit/Web/UI/WebControls/TLabelTest.php b/tests/unit/Web/UI/WebControls/TLabelTest.php
index 0e5577d5..88d8aec8 100644
--- a/tests/unit/Web/UI/WebControls/TLabelTest.php
+++ b/tests/unit/Web/UI/WebControls/TLabelTest.php
@@ -15,5 +15,3 @@ class TLabelTest extends PHPUnit_Framework_TestCase {
$this->assertEquals('Test', $label->getText());
}
}
-
-?> \ No newline at end of file
diff --git a/tests/unit/Web/UI/WebControls/TRequiredFieldValidatorTest.php b/tests/unit/Web/UI/WebControls/TRequiredFieldValidatorTest.php
index 894c3899..43ed2c9d 100644
--- a/tests/unit/Web/UI/WebControls/TRequiredFieldValidatorTest.php
+++ b/tests/unit/Web/UI/WebControls/TRequiredFieldValidatorTest.php
@@ -19,5 +19,3 @@ class TRequiredFieldValidatorTest extends PHPUnit_Framework_TestCase {
$this->assertEquals('', $value);
}
}
-
-?> \ No newline at end of file
diff --git a/tests/unit/Web/UI/WebControls/TXmlTransformTest.php b/tests/unit/Web/UI/WebControls/TXmlTransformTest.php
index 6c6d9456..f93e9897 100644
--- a/tests/unit/Web/UI/WebControls/TXmlTransformTest.php
+++ b/tests/unit/Web/UI/WebControls/TXmlTransformTest.php
@@ -51,7 +51,7 @@ class TXmlTransformTest extends PHPUnit_Framework_TestCase {
$transform->setTransformContent($expected);
$this->assertEquals($expected, $transform->getTransformContent());
}
-
+
public function testSetTransformPathAsFile() {
$expected = $this->transformPath;
$transform = new TXmlTransform();
@@ -120,10 +120,9 @@ class TXmlTransformTest extends PHPUnit_Framework_TestCase {
$actual = $textWriter->flush();
self::assertEquals($expected, $actual);
}
-
+
public function testRenderWithBodyAsDocumentAndTransformPath() {
throw new PHPUnit_Framework_IncompleteTestError();
}
}
-?>
diff --git a/tests/unit/Xml/AllTests.php b/tests/unit/Xml/AllTests.php
index d934786b..afb4c7a8 100644
--- a/tests/unit/Xml/AllTests.php
+++ b/tests/unit/Xml/AllTests.php
@@ -12,14 +12,14 @@ class Xml_AllTests {
public static function main() {
PHPUnit_TextUI_TestRunner::run(self::suite());
}
-
+
public static function suite() {
$suite = new PHPUnit_Framework_TestSuite('System.Xml');
-
+
$suite->addTestSuite('TXmlDocumentTest');
$suite->addTestSuite('TXmlElementTest');
$suite->addTestSuite('TXmlElementListTest');
-
+
return $suite;
}
}
@@ -27,4 +27,3 @@ class Xml_AllTests {
if(PHPUnit_MAIN_METHOD == 'Xml_AllTests::main') {
Xml_AllTests::main();
}
-?>
diff --git a/tests/unit/Xml/TXmlDocumentTest.php b/tests/unit/Xml/TXmlDocumentTest.php
index 2ab95641..54e4b5aa 100644
--- a/tests/unit/Xml/TXmlDocumentTest.php
+++ b/tests/unit/Xml/TXmlDocumentTest.php
@@ -34,7 +34,7 @@ class TXmlDocumentTest extends PHPUnit_Framework_TestCase {
$xmldoc->loadFromFile('unexistentXmlFile.xml');
self::fail('Expected TIOException not thrown');
} catch (TIOException $e) {}
-
+
self::assertTrue($xmldoc->loadFromFile($file));
self::assertEquals('1.0', $xmldoc->getVersion());
self::assertEquals('UTF-8',$xmldoc->getEncoding());
@@ -61,9 +61,9 @@ class TXmlDocumentTest extends PHPUnit_Framework_TestCase {
// Result string should be :
$resultString="<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<root>\n <node param=\"attribute1\"\n</root>";
self::assertEquals($xmlString, $magicString);
-
+
}
-
+
public function testSaveToFile() {
$file=dirname(__FILE__).'/data/tmp.xml';
if (!is_writable(dirname($file))) self::markTestSkipped(dirname($file).' must be writable for this test');
@@ -77,4 +77,3 @@ class TXmlDocumentTest extends PHPUnit_Framework_TestCase {
if (is_file($file)) unlink ($file);
}
}
-?>
diff --git a/tests/unit/Xml/TXmlElementListTest.php b/tests/unit/Xml/TXmlElementListTest.php
index b124dfbe..7667c64d 100644
--- a/tests/unit/Xml/TXmlElementListTest.php
+++ b/tests/unit/Xml/TXmlElementListTest.php
@@ -23,7 +23,7 @@ class TXmlElementListTest extends PHPUnit_Framework_TestCase {
$newElement=new TXmlElement('newTag');
$list->insertAt(0,$newElement);
self::assertEquals($newElement,$list->itemAt(0));
-
+
}
public function testRemoveAt() {
@@ -34,4 +34,3 @@ class TXmlElementListTest extends PHPUnit_Framework_TestCase {
self::assertEquals($newElement,$list->removeAt(0));
}
}
-?>
diff --git a/tests/unit/Xml/TXmlElementTest.php b/tests/unit/Xml/TXmlElementTest.php
index d7b86832..49cae36f 100644
--- a/tests/unit/Xml/TXmlElementTest.php
+++ b/tests/unit/Xml/TXmlElementTest.php
@@ -7,7 +7,7 @@ Prado::using('System.Xml.TXmlDocument');
*/
class TXmlElementTest extends PHPUnit_Framework_TestCase {
- public function setUp() {
+ public function setUp() {
}
public function testConstruct() {
@@ -80,4 +80,3 @@ class TXmlElementTest extends PHPUnit_Framework_TestCase {
self::assertEquals('<tag key="value">value</tag>', (string)$element);
}
}
-?>