You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2011/05/03 09:53:11 UTC
svn commit: r1098951 [1/11] - in /incubator/isis/trunk/viewer:
junit/src/main/java/org/apache/isis/viewer/junit/
junit/src/main/java/org/apache/isis/viewer/junit/internal/
junit/src/test/java/org/apache/isis/viewer/junit/
junit/src/test/java/org/apache...
Author: danhaywood
Date: Tue May 3 07:53:06 2011
New Revision: 1098951
URL: http://svn.apache.org/viewvc?rev=1098951&view=rev
Log:
ISIS-38, ISIS-40: code cleanup of viewers:junit and scimpi
Modified:
incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/ConfigDir.java
incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/Fixture.java
incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/Fixtures.java
incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java
incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/Service.java
incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/Services.java
incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/FixtureInstallerAnnotatedClass.java
incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/InMemoryPersistenceMechanismInstallerWithinJunit.java
incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/IsisSystemUsingInstallersWithinJunit.java
incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/ServicesInstallerAnnotatedClass.java
incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/AbstractTest.java
incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/DefaultAndChoicesTest.java
incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/InteractionListenerTest.java
incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberDisabledTest.java
incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberHiddenTest.java
incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberInvalidTest.java
incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberModifyTest.java
incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberReadTest.java
incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/ObjectImmutableTest.java
incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/SaveObjectsTest.java
incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/TitleTest.java
incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/ViewObjectTest.java
incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/domain/Country.java
incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/domain/Customer.java
incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/domain/Order.java
incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/domain/Product.java
incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/fixtures/CountriesFixture.java
incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/fixtures/CustomerOrdersFixture.java
incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/fixtures/CustomersFixture.java
incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/fixtures/JoeBloggsFixture.java
incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/fixtures/ProductsFixture.java
incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/service/CountryRepository.java
incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/service/CustomerRepository.java
incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/service/OrderRepository.java
incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/service/ProductRepository.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/AbstractElementProcessor.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/AbstractObjectProcessor.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Action.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/BlockContent.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/DispatchException.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/ElementContentProcessor.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/ElementProcessor.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/ForbiddenException.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Names.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/NotLoggedInException.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/ScimpiException.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/ScimpiNotFoundException.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/TagOrderException.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/UserManager.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/UserlessSession.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/action/ActionAction.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/action/Attributes.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/action/PropertyException.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/action/RequiredPropertyException.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultOidObjectMapping.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultVersionMapping.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/IndirectObjectMapping.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/Mapping.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/ObjectMapping.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/RequestContext.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/VersionMapping.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/DebugAction.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/DebugWriter.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/LogAction.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/edit/EditAction.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/edit/FieldEditState.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/edit/FormState.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/edit/RemoveAction.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/logon/LogonAction.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/logon/LogoutAction.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/processor/HtmlFileParser.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/processor/PageWriter.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/processor/ProcessorLookup.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/processor/Request.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/processor/TagProcessingException.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/util/MethodsUtils.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/HelpLink.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/History.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/HtmlSnippet.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/RevisionNumber.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/Snippet.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/SwfTag.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionButton.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionContent.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionForm.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionLink.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/CreateFormParameter.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/Methods.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/Parameter.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/RunAction.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/Services.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/collection/Collection.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Debug.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/DebugAccessCheck.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/DebuggerLink.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Diagnostics.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/LogLevel.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Members.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/PrintAuthorizationClause.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/ShowDebug.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Specification.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/ThrowException.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/AbstractFormView.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/AbstractTableView.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/AddMessage.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/AddWarning.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/Feedback.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/FieldLabel.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/FieldValue.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/GetField.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/IncludeObject.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/ListView.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/LongFormView.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/Messages.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/SelectedObject.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/ShortFormView.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableBlock.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableBuilder.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableCell.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableContentWriter.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableEmpty.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableHeader.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableRow.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableView.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/Title.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/Warnings.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/EditObject.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FieldFactory.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FormEntry.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FormField.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FormFieldBlock.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/HiddenField.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/RadioListField.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/Selector.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/field/ExcludeField.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/field/IncludeField.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/field/InclusionList.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/field/LinkField.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/field/LinkedFieldsBlock.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/field/LinkedObject.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/form/HiddenInputField.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/form/HtmlFormBuilder.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/form/InputField.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/logon/Logon.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/logon/Secure.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/logon/User.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/AbstractConditionalBlock.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/AbstractLink.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/BlockDefine.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/BlockUse.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Commit.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/ContentTag.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/DefaultValue.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/EditLink.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/EndSession.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Forward.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/GetCookie.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Import.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/InitializeFromCookie.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/InitializeFromResult.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Mark.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/NewActionLink.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/ObjectLink.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/PageTitle.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Redirect.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/RemoveElement.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/ScopeTag.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/SetCookie.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/SetCookieFromField.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/SetFieldFromCookie.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/StartSession.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/TemplateTag.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Unless.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/Variable.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/When.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/ActionName.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/CountElements.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/ElementType.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/FieldName.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/ParameterName.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/TitleString.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/Type.java
incubator/isis/trunk/viewer/scimpi/servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/DispatchException.java
incubator/isis/trunk/viewer/scimpi/servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/DispatcherServlet.java
incubator/isis/trunk/viewer/scimpi/servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/ImageLookup.java
incubator/isis/trunk/viewer/scimpi/servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/ServletRequestContext.java
Modified: incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/ConfigDir.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/ConfigDir.java?rev=1098951&r1=1098950&r2=1098951&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/ConfigDir.java (original)
+++ incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/ConfigDir.java Tue May 3 07:53:06 2011
@@ -17,22 +17,20 @@
* under the License.
*/
+package org.apache.isis.viewer.junit;
-package org.apache.isis.viewer.junit;
-
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-
/**
* The location of the <tt>config</tt> directory, relative to the base.
- */
-@Target(ElementType.TYPE)
-@Inherited
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ConfigDir {
- String value();
-}
+ */
+@Target(ElementType.TYPE)
+@Inherited
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ConfigDir {
+ String value();
+}
Modified: incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/Fixture.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/Fixture.java?rev=1098951&r1=1098950&r2=1098951&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/Fixture.java (original)
+++ incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/Fixture.java Tue May 3 07:53:06 2011
@@ -17,19 +17,17 @@
* under the License.
*/
+package org.apache.isis.viewer.junit;
-package org.apache.isis.viewer.junit;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-
-@Target(ElementType.TYPE)
-@Inherited
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Fixture {
- Class<?> value();
-}
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
+@Inherited
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Fixture {
+ Class<?> value();
+}
Modified: incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/Fixtures.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/Fixtures.java?rev=1098951&r1=1098950&r2=1098951&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/Fixtures.java (original)
+++ incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/Fixtures.java Tue May 3 07:53:06 2011
@@ -17,19 +17,17 @@
* under the License.
*/
+package org.apache.isis.viewer.junit;
-package org.apache.isis.viewer.junit;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-
-@Target(ElementType.TYPE)
-@Inherited
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Fixtures {
- Fixture[] value();
-}
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
+@Inherited
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Fixtures {
+ Fixture[] value();
+}
Modified: incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java?rev=1098951&r1=1098950&r2=1098951&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java (original)
+++ incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java Tue May 3 07:53:06 2011
@@ -17,23 +17,12 @@
* under the License.
*/
+package org.apache.isis.viewer.junit;
-package org.apache.isis.viewer.junit;
-
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import org.jmock.Mockery;
-import org.junit.internal.runners.InitializationError;
-import org.junit.internal.runners.JUnit4ClassRunner;
-import org.junit.internal.runners.MethodRoadie;
-import org.junit.internal.runners.TestClass;
-import org.junit.internal.runners.TestMethod;
-import org.junit.runner.Description;
-import org.junit.runner.notification.Failure;
-import org.junit.runner.notification.RunNotifier;
-
import org.apache.isis.applib.fixtures.LogonFixture;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
@@ -49,179 +38,180 @@ import org.apache.isis.runtimes.dflt.run
import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
import org.apache.isis.runtimes.dflt.runtime.system.transaction.IsisTransactionManager;
import org.apache.isis.viewer.junit.internal.IsisSystemUsingInstallersWithinJunit;
-
-
-/**
- * Copied from JMock, and with the same support.
- *
- */
-public class IsisTestRunner extends JUnit4ClassRunner {
-
- private final Field mockeryField;
-
-
- /**
- * Only used during object construction.
- */
- public IsisTestRunner(final Class<?> testClass) throws InitializationError {
- super(testClass);
-
- // JMock initialization, adapted to allow for no mockery field.
- mockeryField = findFieldAndMakeAccessible(testClass, Mockery.class);
- }
+import org.jmock.Mockery;
+import org.junit.internal.runners.InitializationError;
+import org.junit.internal.runners.JUnit4ClassRunner;
+import org.junit.internal.runners.MethodRoadie;
+import org.junit.internal.runners.TestClass;
+import org.junit.internal.runners.TestMethod;
+import org.junit.runner.Description;
+import org.junit.runner.notification.Failure;
+import org.junit.runner.notification.RunNotifier;
+
+/**
+ * Copied from JMock, and with the same support.
+ *
+ */
+public class IsisTestRunner extends JUnit4ClassRunner {
- private static String getConfigDir(Class<?> javaClass) {
+ private final Field mockeryField;
+
+ /**
+ * Only used during object construction.
+ */
+ public IsisTestRunner(final Class<?> testClass) throws InitializationError {
+ super(testClass);
+
+ // JMock initialization, adapted to allow for no mockery field.
+ mockeryField = findFieldAndMakeAccessible(testClass, Mockery.class);
+ }
+
+ private static String getConfigDir(final Class<?> javaClass) {
final ConfigDir fixturesAnnotation = javaClass.getAnnotation(ConfigDir.class);
if (fixturesAnnotation != null) {
return fixturesAnnotation.value();
}
return null;
}
-
- @Override
- protected void invokeTestMethod(final Method method, final RunNotifier notifier) {
+
+ @Override
+ protected void invokeTestMethod(final Method method, final RunNotifier notifier) {
final TestClass testClass = getTestClass();
final String configDirIfAny = getConfigDir(testClass.getJavaClass());
-
- final Description description = methodDescription(method);
-
- IsisConfigurationBuilder isisConfigurationBuilder = new IsisConfigurationBuilderDefault(configDirIfAny);
- isisConfigurationBuilder.add(SystemConstants.NOSPLASH_KEY, ""+true); // switch off splash
-
- InstallerLookupDefault installerLookup = new InstallerLookupDefault(getClass());
- isisConfigurationBuilder.injectInto(installerLookup);
- installerLookup.init();
-
- IsisSystemUsingInstallersWithinJunit system = null;
- AuthenticationSession session = null;
- try {
- // init the system; cf similar code in Isis and IsisServletContextInitializer
- final DeploymentType deploymentType = DeploymentType.PROTOTYPE;
-
- // TODO: replace with regular IsisSystem and remove this subclass.
- system = new IsisSystemUsingInstallersWithinJunit(
- deploymentType, installerLookup, testClass);
-
- system.init();
-
- // specific to this bootstrap mechanism
- AuthenticationRequest request;
- final LogonFixture logonFixture = system.getFixturesInstaller().getLogonFixture();
- if (logonFixture != null) {
- request = new AuthenticationRequestLogonFixture(logonFixture);
- } else {
- request = new AuthenticationRequestExploration(logonFixture);
- }
- session = IsisContext.getAuthenticationManager().authenticate(request);
-
- IsisContext.openSession(session);
- getTransactionManager().startTransaction();
-
- Object test = createTest();
- getServicesInjector().injectDependencies(test);
-
- final TestMethod testMethod = wrapMethod(method);
- new MethodRoadie(test, testMethod, notifier, description).run();
-
- getTransactionManager().endTransaction();
-
+
+ final Description description = methodDescription(method);
+
+ final IsisConfigurationBuilder isisConfigurationBuilder = new IsisConfigurationBuilderDefault(configDirIfAny);
+ isisConfigurationBuilder.add(SystemConstants.NOSPLASH_KEY, "" + true); // switch off splash
+
+ final InstallerLookupDefault installerLookup = new InstallerLookupDefault(getClass());
+ isisConfigurationBuilder.injectInto(installerLookup);
+ installerLookup.init();
+
+ IsisSystemUsingInstallersWithinJunit system = null;
+ AuthenticationSession session = null;
+ try {
+ // init the system; cf similar code in Isis and IsisServletContextInitializer
+ final DeploymentType deploymentType = DeploymentType.PROTOTYPE;
+
+ // TODO: replace with regular IsisSystem and remove this subclass.
+ system = new IsisSystemUsingInstallersWithinJunit(deploymentType, installerLookup, testClass);
+
+ system.init();
+
+ // specific to this bootstrap mechanism
+ AuthenticationRequest request;
+ final LogonFixture logonFixture = system.getFixturesInstaller().getLogonFixture();
+ if (logonFixture != null) {
+ request = new AuthenticationRequestLogonFixture(logonFixture);
+ } else {
+ request = new AuthenticationRequestExploration(logonFixture);
+ }
+ session = IsisContext.getAuthenticationManager().authenticate(request);
+
+ IsisContext.openSession(session);
+ getTransactionManager().startTransaction();
+
+ final Object test = createTest();
+ getServicesInjector().injectDependencies(test);
+
+ final TestMethod testMethod = wrapMethod(method);
+ new MethodRoadie(test, testMethod, notifier, description).run();
+
+ getTransactionManager().endTransaction();
+
} catch (final InvocationTargetException e) {
- testAborted(notifier, description, e.getCause());
- getTransactionManager().abortTransaction();
- return;
- } catch (final Exception e) {
- testAborted(notifier, description, e);
- return;
- } finally {
- if (system != null) {
- if (session != null) {
- IsisContext.closeSession();
- }
- system.shutdown();
- }
- }
- }
-
-
- private void testAborted(RunNotifier notifier, Description description,
- Throwable e) {
- notifier.fireTestStarted(description);
- notifier.fireTestFailure(new Failure(description, e));
- notifier.fireTestFinished(description);
- }
-
- /**
- * Taken from JMock's runner.
- */
- @Override
- protected TestMethod wrapMethod(final Method method) {
- return new TestMethod(method, getTestClass()) {
- @Override
- public void invoke(final Object testFixture) throws IllegalAccessException, InvocationTargetException {
-
- super.invoke(testFixture);
-
- if (mockeryField != null) {
- mockeryOf(testFixture).assertIsSatisfied();
- }
- }
- };
- }
-
- /**
- * JMock code.
- *
- * @param test
- * @return
- */
- protected Mockery mockeryOf(final Object test) {
- if (mockeryField == null) {
- return null;
- }
- try {
- final Mockery mockery = (Mockery) mockeryField.get(test);
- if (mockery == null) {
- throw new IllegalStateException(String.format("Mockery named '%s' is null", mockeryField.getName()));
- }
- return mockery;
- } catch (final IllegalAccessException e) {
- throw new IllegalStateException(String.format("cannot get value of field %s", mockeryField.getName()), e);
- }
- }
-
- /**
- * Adapted from JMock code.
- */
- static Field findFieldAndMakeAccessible(final Class<?> testClass, final Class<?> clazz) throws InitializationError {
- for (Class<?> c = testClass; c != Object.class; c = c.getSuperclass()) {
- for (final Field field : c.getDeclaredFields()) {
- if (clazz.isAssignableFrom(field.getType())) {
- field.setAccessible(true);
- return field;
- }
- }
- }
- return null;
- }
-
-
-
- ///////////////////////////////////////////////////////
- // Dependencies (from context)
- ///////////////////////////////////////////////////////
-
- private static PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
- }
-
- private static ServicesInjector getServicesInjector() {
- return getPersistenceSession().getServicesInjector();
- }
-
- private static IsisTransactionManager getTransactionManager() {
- return getPersistenceSession().getTransactionManager();
- }
-
-
-}
+ testAborted(notifier, description, e.getCause());
+ getTransactionManager().abortTransaction();
+ return;
+ } catch (final Exception e) {
+ testAborted(notifier, description, e);
+ return;
+ } finally {
+ if (system != null) {
+ if (session != null) {
+ IsisContext.closeSession();
+ }
+ system.shutdown();
+ }
+ }
+ }
+
+ private void testAborted(final RunNotifier notifier, final Description description, final Throwable e) {
+ notifier.fireTestStarted(description);
+ notifier.fireTestFailure(new Failure(description, e));
+ notifier.fireTestFinished(description);
+ }
+
+ /**
+ * Taken from JMock's runner.
+ */
+ @Override
+ protected TestMethod wrapMethod(final Method method) {
+ return new TestMethod(method, getTestClass()) {
+ @Override
+ public void invoke(final Object testFixture) throws IllegalAccessException, InvocationTargetException {
+
+ super.invoke(testFixture);
+
+ if (mockeryField != null) {
+ mockeryOf(testFixture).assertIsSatisfied();
+ }
+ }
+ };
+ }
+
+ /**
+ * JMock code.
+ *
+ * @param test
+ * @return
+ */
+ protected Mockery mockeryOf(final Object test) {
+ if (mockeryField == null) {
+ return null;
+ }
+ try {
+ final Mockery mockery = (Mockery) mockeryField.get(test);
+ if (mockery == null) {
+ throw new IllegalStateException(String.format("Mockery named '%s' is null", mockeryField.getName()));
+ }
+ return mockery;
+ } catch (final IllegalAccessException e) {
+ throw new IllegalStateException(String.format("cannot get value of field %s", mockeryField.getName()), e);
+ }
+ }
+
+ /**
+ * Adapted from JMock code.
+ */
+ static Field findFieldAndMakeAccessible(final Class<?> testClass, final Class<?> clazz) throws InitializationError {
+ for (Class<?> c = testClass; c != Object.class; c = c.getSuperclass()) {
+ for (final Field field : c.getDeclaredFields()) {
+ if (clazz.isAssignableFrom(field.getType())) {
+ field.setAccessible(true);
+ return field;
+ }
+ }
+ }
+ return null;
+ }
+
+ // /////////////////////////////////////////////////////
+ // Dependencies (from context)
+ // /////////////////////////////////////////////////////
+
+ private static PersistenceSession getPersistenceSession() {
+ return IsisContext.getPersistenceSession();
+ }
+
+ private static ServicesInjector getServicesInjector() {
+ return getPersistenceSession().getServicesInjector();
+ }
+
+ private static IsisTransactionManager getTransactionManager() {
+ return getPersistenceSession().getTransactionManager();
+ }
+
+}
Modified: incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/Service.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/Service.java?rev=1098951&r1=1098950&r2=1098951&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/Service.java (original)
+++ incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/Service.java Tue May 3 07:53:06 2011
@@ -17,19 +17,17 @@
* under the License.
*/
+package org.apache.isis.viewer.junit;
-package org.apache.isis.viewer.junit;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-
-@Target(ElementType.TYPE)
-@Inherited
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Service {
- Class<?> value();
-}
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
+@Inherited
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Service {
+ Class<?> value();
+}
Modified: incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/Services.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/Services.java?rev=1098951&r1=1098950&r2=1098951&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/Services.java (original)
+++ incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/Services.java Tue May 3 07:53:06 2011
@@ -17,19 +17,17 @@
* under the License.
*/
+package org.apache.isis.viewer.junit;
-package org.apache.isis.viewer.junit;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-
-@Target(ElementType.TYPE)
-@Inherited
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Services {
- Service[] value();
-}
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
+@Inherited
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Services {
+ Service[] value();
+}
Modified: incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/FixtureInstallerAnnotatedClass.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/FixtureInstallerAnnotatedClass.java?rev=1098951&r1=1098950&r2=1098951&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/FixtureInstallerAnnotatedClass.java (original)
+++ incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/FixtureInstallerAnnotatedClass.java Tue May 3 07:53:06 2011
@@ -17,75 +17,71 @@
* under the License.
*/
+package org.apache.isis.viewer.junit.internal;
+
+import java.util.ArrayList;
+import java.util.List;
-package org.apache.isis.viewer.junit.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.isis.runtimes.dflt.runtime.fixtures.FixturesInstallerAbstract;
import org.apache.isis.runtimes.dflt.runtime.fixtures.FixturesInstallerDelegate;
import org.apache.isis.viewer.junit.Fixture;
import org.apache.isis.viewer.junit.Fixtures;
-
-
-public class FixtureInstallerAnnotatedClass extends FixturesInstallerAbstract {
-
- private List<Object> fixtures = new ArrayList<Object>();
-
-
- /**
- * @see #addFixturesAnnotatedOn(Class)
- */
- public FixtureInstallerAnnotatedClass() {
- super("annotated");
- }
-
-
- /////////////////////////////////////////////
- // Hook method
- /////////////////////////////////////////////
-
- /**
- * Just copies the fixtures added using {@link #addFixturesAnnotatedOn(Class)}
- * into the delegate.
- */
- @Override
- protected void addFixturesTo(FixturesInstallerDelegate delegate) {
- for(Object fixture: fixtures) {
- delegate.addFixture(fixture);
- }
- }
-
- /////////////////////////////////////////////
- // addFixturesAnnotatedOn (not API)
- /////////////////////////////////////////////
-
- /**
- * Should be called prior to installing; typically called immediately after instantiation.
- *
- * <p>
- * Note: an alternative design would be to have a 1-arg constructor, but the convention for
- * installers is to make them no-arg.
- */
- public void addFixturesAnnotatedOn(Class<?> javaClass) throws InstantiationException, IllegalAccessException {
- final Fixtures fixturesAnnotation = javaClass.getAnnotation(Fixtures.class);
- if (fixturesAnnotation != null) {
- final Fixture[] fixtureAnnotations = fixturesAnnotation.value();
- for (final Fixture fixtureAnnotation : fixtureAnnotations) {
- addFixtureRepresentedBy(fixtureAnnotation, fixtures);
- }
- }
-
- final Fixture fixtureAnnotation = javaClass.getAnnotation(Fixture.class);
- if (fixtureAnnotation != null) {
- addFixtureRepresentedBy(fixtureAnnotation, fixtures);
- }
- }
-
- private void addFixtureRepresentedBy(final Fixture fixtureAnnotation, final List<Object> fixtures) throws InstantiationException, IllegalAccessException {
- final Class<?> fixtureClass = fixtureAnnotation.value();
- fixtures.add(fixtureClass.newInstance());
- }
-
-}
+
+public class FixtureInstallerAnnotatedClass extends FixturesInstallerAbstract {
+
+ private final List<Object> fixtures = new ArrayList<Object>();
+
+ /**
+ * @see #addFixturesAnnotatedOn(Class)
+ */
+ public FixtureInstallerAnnotatedClass() {
+ super("annotated");
+ }
+
+ // ///////////////////////////////////////////
+ // Hook method
+ // ///////////////////////////////////////////
+
+ /**
+ * Just copies the fixtures added using {@link #addFixturesAnnotatedOn(Class)} into the delegate.
+ */
+ @Override
+ protected void addFixturesTo(final FixturesInstallerDelegate delegate) {
+ for (final Object fixture : fixtures) {
+ delegate.addFixture(fixture);
+ }
+ }
+
+ // ///////////////////////////////////////////
+ // addFixturesAnnotatedOn (not API)
+ // ///////////////////////////////////////////
+
+ /**
+ * Should be called prior to installing; typically called immediately after instantiation.
+ *
+ * <p>
+ * Note: an alternative design would be to have a 1-arg constructor, but the convention for installers is to make
+ * them no-arg.
+ */
+ public void addFixturesAnnotatedOn(final Class<?> javaClass) throws InstantiationException, IllegalAccessException {
+ final Fixtures fixturesAnnotation = javaClass.getAnnotation(Fixtures.class);
+ if (fixturesAnnotation != null) {
+ final Fixture[] fixtureAnnotations = fixturesAnnotation.value();
+ for (final Fixture fixtureAnnotation : fixtureAnnotations) {
+ addFixtureRepresentedBy(fixtureAnnotation, fixtures);
+ }
+ }
+
+ final Fixture fixtureAnnotation = javaClass.getAnnotation(Fixture.class);
+ if (fixtureAnnotation != null) {
+ addFixtureRepresentedBy(fixtureAnnotation, fixtures);
+ }
+ }
+
+ private void addFixtureRepresentedBy(final Fixture fixtureAnnotation, final List<Object> fixtures)
+ throws InstantiationException, IllegalAccessException {
+ final Class<?> fixtureClass = fixtureAnnotation.value();
+ fixtures.add(fixtureClass.newInstance());
+ }
+
+}
Modified: incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/InMemoryPersistenceMechanismInstallerWithinJunit.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/InMemoryPersistenceMechanismInstallerWithinJunit.java?rev=1098951&r1=1098950&r2=1098951&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/InMemoryPersistenceMechanismInstallerWithinJunit.java (original)
+++ incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/InMemoryPersistenceMechanismInstallerWithinJunit.java Tue May 3 07:53:06 2011
@@ -17,25 +17,21 @@
* under the License.
*/
+package org.apache.isis.viewer.junit.internal;
-package org.apache.isis.viewer.junit.internal;
-
import org.apache.isis.applib.DomainObjectContainer;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.runtimes.dflt.objectstores.dflt.InMemoryPersistenceMechanismInstaller;
import org.apache.isis.progmodel.wrapper.metamodel.DomainObjectContainerWrapperFactory;
-
-public class InMemoryPersistenceMechanismInstallerWithinJunit extends InMemoryPersistenceMechanismInstaller {
-
- /**
- * Returns a {@link DomainObjectContainerHeadlessViewer}.
- */
- @Override
- protected DomainObjectContainer createContainer(
- final IsisConfiguration configuration) {
- return new DomainObjectContainerWrapperFactory();
- }
-
-}
-
-
+import org.apache.isis.runtimes.dflt.objectstores.dflt.InMemoryPersistenceMechanismInstaller;
+
+public class InMemoryPersistenceMechanismInstallerWithinJunit extends InMemoryPersistenceMechanismInstaller {
+
+ /**
+ * Returns a {@link DomainObjectContainerHeadlessViewer}.
+ */
+ @Override
+ protected DomainObjectContainer createContainer(final IsisConfiguration configuration) {
+ return new DomainObjectContainerWrapperFactory();
+ }
+
+}
Modified: incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/IsisSystemUsingInstallersWithinJunit.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/IsisSystemUsingInstallersWithinJunit.java?rev=1098951&r1=1098950&r2=1098951&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/IsisSystemUsingInstallersWithinJunit.java (original)
+++ incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/IsisSystemUsingInstallersWithinJunit.java Tue May 3 07:53:06 2011
@@ -17,63 +17,59 @@
* under the License.
*/
-
-package org.apache.isis.viewer.junit.internal;
-
-import org.junit.internal.runners.TestClass;
+package org.apache.isis.viewer.junit.internal;
import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.runtimes.dflt.profilestores.dflt.InMemoryUserProfileStoreInstaller;
import org.apache.isis.runtimes.dflt.runtime.installerregistry.InstallerLookup;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
import org.apache.isis.runtimes.dflt.runtime.systemusinginstallers.IsisSystemUsingInstallers;
-import org.apache.isis.runtimes.dflt.profilestores.dflt.InMemoryUserProfileStoreInstaller;
import org.apache.isis.security.dflt.authentication.NoopAuthenticationManagerInstaller;
import org.apache.isis.security.dflt.authorization.NoopAuthorizationManagerInstaller;
-
-public class IsisSystemUsingInstallersWithinJunit extends IsisSystemUsingInstallers {
+import org.junit.internal.runners.TestClass;
+
+public class IsisSystemUsingInstallersWithinJunit extends IsisSystemUsingInstallers {
+
+ private final TestClass testClass;
- private final TestClass testClass;
+ public IsisSystemUsingInstallersWithinJunit(final DeploymentType deploymentType,
+ final InstallerLookup installerLookup, final TestClass testClass) {
+ super(deploymentType, installerLookup);
+ this.testClass = testClass;
+
+ setAuthenticationInstaller(getInstallerLookup()
+ .injectDependenciesInto(new NoopAuthenticationManagerInstaller()));
+ setAuthorizationInstaller(getInstallerLookup().injectDependenciesInto(new NoopAuthorizationManagerInstaller()));
+ setPersistenceMechanismInstaller(getInstallerLookup().injectDependenciesInto(
+ new InMemoryPersistenceMechanismInstallerWithinJunit()));
+ setUserProfileStoreInstaller(getInstallerLookup().injectDependenciesInto(
+ new InMemoryUserProfileStoreInstaller()));
+
+ // fixture installer
+ final FixtureInstallerAnnotatedClass fixtureInstaller = new FixtureInstallerAnnotatedClass();
+ try {
+ fixtureInstaller.addFixturesAnnotatedOn(this.testClass.getJavaClass());
+ } catch (final InstantiationException e) {
+ throw new IsisException(e);
+ } catch (final IllegalAccessException e) {
+ throw new IsisException(e);
+ }
+ setFixtureInstaller(fixtureInstaller);
+
+ // services installer
+ final ServicesInstallerAnnotatedClass servicesInstaller = new ServicesInstallerAnnotatedClass();
+ try {
+ servicesInstaller.addServicesAnnotatedOn(this.testClass.getJavaClass());
+ } catch (final InstantiationException e) {
+ throw new IsisException(e);
+ } catch (final IllegalAccessException e) {
+ throw new IsisException(e);
+ }
+ setServicesInstaller(servicesInstaller);
+ }
+
+ public TestClass getTestClass() {
+ return testClass;
+ }
- public IsisSystemUsingInstallersWithinJunit(
- final DeploymentType deploymentType,
- final InstallerLookup installerLookup,
- final TestClass testClass) {
- super(deploymentType, installerLookup);
- this.testClass = testClass;
-
- setAuthenticationInstaller(getInstallerLookup().injectDependenciesInto(new NoopAuthenticationManagerInstaller()));
- setAuthorizationInstaller(getInstallerLookup().injectDependenciesInto(new NoopAuthorizationManagerInstaller()));
- setPersistenceMechanismInstaller(getInstallerLookup().injectDependenciesInto(new InMemoryPersistenceMechanismInstallerWithinJunit()));
- setUserProfileStoreInstaller(getInstallerLookup().injectDependenciesInto(new InMemoryUserProfileStoreInstaller()));
-
- // fixture installer
- FixtureInstallerAnnotatedClass fixtureInstaller = new FixtureInstallerAnnotatedClass();
- try {
- fixtureInstaller.addFixturesAnnotatedOn(this.testClass.getJavaClass());
- } catch (InstantiationException e) {
- throw new IsisException(e);
- } catch (IllegalAccessException e) {
- throw new IsisException(e);
- }
- setFixtureInstaller(fixtureInstaller);
-
- // services installer
- ServicesInstallerAnnotatedClass servicesInstaller = new ServicesInstallerAnnotatedClass();
- try {
- servicesInstaller.addServicesAnnotatedOn(this.testClass.getJavaClass());
- } catch (InstantiationException e) {
- throw new IsisException(e);
- } catch (IllegalAccessException e) {
- throw new IsisException(e);
- }
- setServicesInstaller(servicesInstaller);
- }
-
- public TestClass getTestClass() {
- return testClass;
- }
-
-
-}
-
-
+}
Modified: incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/ServicesInstallerAnnotatedClass.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/ServicesInstallerAnnotatedClass.java?rev=1098951&r1=1098950&r2=1098951&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/ServicesInstallerAnnotatedClass.java (original)
+++ incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/ServicesInstallerAnnotatedClass.java Tue May 3 07:53:06 2011
@@ -17,59 +17,54 @@
* under the License.
*/
+package org.apache.isis.viewer.junit.internal;
+
+import java.util.ArrayList;
+import java.util.List;
-package org.apache.isis.viewer.junit.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.isis.runtimes.dflt.runtime.services.ServicesInstallerAbstract;
import org.apache.isis.viewer.junit.Service;
import org.apache.isis.viewer.junit.Services;
-
-
-public class ServicesInstallerAnnotatedClass extends ServicesInstallerAbstract {
-
- public ServicesInstallerAnnotatedClass() {
- super("annotated");
- }
-
- public void addServicesAnnotatedOn(Class<?> javaClass) throws InstantiationException, IllegalAccessException {
- List<Object> services = new ArrayList<Object>();
- addServicesAnnotatedOn(javaClass, services);
- addServices(services);
- }
-
- private void addServicesAnnotatedOn(final Class<?> testClass, final List<Object> services) throws InstantiationException, IllegalAccessException {
- final Services servicesAnnotation = testClass.getAnnotation(Services.class);
- if (servicesAnnotation != null) {
- final Service[] serviceAnnotations = servicesAnnotation.value();
- for (final Service serviceAnnotation : serviceAnnotations) {
- addServiceRepresentedBy(serviceAnnotation, services);
- }
- }
-
- final Service serviceAnnotation = testClass.getAnnotation(Service.class);
- if (serviceAnnotation != null) {
- addServiceRepresentedBy(serviceAnnotation, services);
- }
- }
-
- private void addServiceRepresentedBy(final Service serviceAnnotation, final List<Object> services) throws InstantiationException, IllegalAccessException {
- final Class<?> serviceClass = serviceAnnotation.value();
- // there's no need to unravel any Collections of services,
- // because the ServiceLoader will do it for us later.
- services.add(serviceClass.newInstance());
- }
-
-
- @Override
- public List<Class<?>> getTypes() {
- return listOf(List.class); // ie List<Object.class>, of services
- }
-
-
-
-}
-
-
+
+public class ServicesInstallerAnnotatedClass extends ServicesInstallerAbstract {
+
+ public ServicesInstallerAnnotatedClass() {
+ super("annotated");
+ }
+
+ public void addServicesAnnotatedOn(final Class<?> javaClass) throws InstantiationException, IllegalAccessException {
+ final List<Object> services = new ArrayList<Object>();
+ addServicesAnnotatedOn(javaClass, services);
+ addServices(services);
+ }
+
+ private void addServicesAnnotatedOn(final Class<?> testClass, final List<Object> services)
+ throws InstantiationException, IllegalAccessException {
+ final Services servicesAnnotation = testClass.getAnnotation(Services.class);
+ if (servicesAnnotation != null) {
+ final Service[] serviceAnnotations = servicesAnnotation.value();
+ for (final Service serviceAnnotation : serviceAnnotations) {
+ addServiceRepresentedBy(serviceAnnotation, services);
+ }
+ }
+
+ final Service serviceAnnotation = testClass.getAnnotation(Service.class);
+ if (serviceAnnotation != null) {
+ addServiceRepresentedBy(serviceAnnotation, services);
+ }
+ }
+
+ private void addServiceRepresentedBy(final Service serviceAnnotation, final List<Object> services)
+ throws InstantiationException, IllegalAccessException {
+ final Class<?> serviceClass = serviceAnnotation.value();
+ // there's no need to unravel any Collections of services,
+ // because the ServiceLoader will do it for us later.
+ services.add(serviceClass.newInstance());
+ }
+
+ @Override
+ public List<Class<?>> getTypes() {
+ return listOf(List.class); // ie List<Object.class>, of services
+ }
+
+}
Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/AbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/AbstractTest.java?rev=1098951&r1=1098950&r2=1098951&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/AbstractTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/AbstractTest.java Tue May 3 07:53:06 2011
@@ -93,7 +93,7 @@ public abstract class AbstractTest {
return wrapperFactory;
}
- public void setWrapperFactory(WrapperFactory headlessViewer) {
+ public void setWrapperFactory(final WrapperFactory headlessViewer) {
this.wrapperFactory = headlessViewer;
}
Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/DefaultAndChoicesTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/DefaultAndChoicesTest.java?rev=1098951&r1=1098950&r2=1098951&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/DefaultAndChoicesTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/DefaultAndChoicesTest.java Tue May 3 07:53:06 2011
@@ -17,28 +17,26 @@
* under the License.
*/
+package org.apache.isis.viewer.junit;
-package org.apache.isis.viewer.junit;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import org.junit.Ignore;
import org.junit.Test;
-
-
-public class DefaultAndChoicesTest extends AbstractTest {
-
- @Test
- public void defaults() {
- final Object[] defaultPlaceOrder = custJsWO.defaultPlaceOrder();
- assertThat(defaultPlaceOrder.length, is(2));
- }
-
- @Ignore("not yet tested")
- @Test
- public void choicesDefaults() {
- // not tested.
- }
-
-}
+
+public class DefaultAndChoicesTest extends AbstractTest {
+
+ @Test
+ public void defaults() {
+ final Object[] defaultPlaceOrder = custJsWO.defaultPlaceOrder();
+ assertThat(defaultPlaceOrder.length, is(2));
+ }
+
+ @Ignore("not yet tested")
+ @Test
+ public void choicesDefaults() {
+ // not tested.
+ }
+
+}
Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/InteractionListenerTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/InteractionListenerTest.java?rev=1098951&r1=1098950&r2=1098951&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/InteractionListenerTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/InteractionListenerTest.java Tue May 3 07:53:06 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.viewer.junit;
-package org.apache.isis.viewer.junit;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.junit.Assert.assertThat;
@@ -30,26 +29,25 @@ import org.apache.isis.progmodel.wrapper
import org.apache.isis.progmodel.wrapper.applib.listeners.InteractionListener;
import org.apache.isis.viewer.junit.sample.domain.Customer;
import org.junit.Test;
-
-
-public class InteractionListenerTest extends AbstractTest {
-
- @Test
- public void shouldBeAbleToAddListener() {
- final Customer proxiedCustRP = getWrapperFactory().wrap(custJsDO);
- final InteractionEvent[] events = { null };
- final InteractionListener l = new InteractionAdapter() {
- @Override
- public void propertyAccessed(PropertyAccessEvent ev) {
- events[0] = ev;
- }
- };
- getWrapperFactory().addInteractionListener(l);
-
- proxiedCustRP.getFirstName();
- assertThat(events[0], notNullValue());
- final PropertyAccessEvent ev = (PropertyAccessEvent) events[0];
- assertThat(ev.getMemberNaturalName(), is("First Name"));
- }
-
-}
+
+public class InteractionListenerTest extends AbstractTest {
+
+ @Test
+ public void shouldBeAbleToAddListener() {
+ final Customer proxiedCustRP = getWrapperFactory().wrap(custJsDO);
+ final InteractionEvent[] events = { null };
+ final InteractionListener l = new InteractionAdapter() {
+ @Override
+ public void propertyAccessed(final PropertyAccessEvent ev) {
+ events[0] = ev;
+ }
+ };
+ getWrapperFactory().addInteractionListener(l);
+
+ proxiedCustRP.getFirstName();
+ assertThat(events[0], notNullValue());
+ final PropertyAccessEvent ev = (PropertyAccessEvent) events[0];
+ assertThat(ev.getMemberNaturalName(), is("First Name"));
+ }
+
+}
Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberDisabledTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberDisabledTest.java?rev=1098951&r1=1098950&r2=1098951&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberDisabledTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberDisabledTest.java Tue May 3 07:53:06 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.viewer.junit;
-package org.apache.isis.viewer.junit;
-
import static org.apache.isis.core.commons.matchers.IsisMatchers.classEqualTo;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat;
@@ -32,101 +31,100 @@ import org.apache.isis.core.progmodel.fa
import org.apache.isis.progmodel.wrapper.applib.DisabledException;
import org.apache.isis.viewer.junit.sample.domain.Order;
import org.junit.Test;
-
-
-public class MemberDisabledTest extends AbstractTest {
-
- @Test
- public void whenValueDisabledForValueThenThrowsException() {
- custJsDO.disableFirstName = "cannot alter";
- try {
- custJsWO.setFirstName("Dick");
- fail("Should have thrown exception");
- } catch (final DisabledException ex) {
- assertThat(ex.getAdvisorClass(), classEqualTo(DisableForContextFacetViaMethod.class));
- assertThat(ex.getIdentifier().getMemberNaturalName(), equalTo("First Name"));
- assertThat(ex.getMessage(), equalTo("cannot alter"));
- }
- }
-
- @Test
- public void whenValueDisabledForNullThenThrowsException() {
- custJsDO.disableFirstName = "cannot alter";
- try {
- custJsWO.setFirstName(null);
- fail("Should have thrown exception");
- } catch (final DisabledException ex) {
- assertThat(ex.getAdvisorClass(), classEqualTo(DisableForContextFacetViaMethod.class));
- assertThat(ex.getIdentifier().getMemberNaturalName(), equalTo("First Name"));
- assertThat(ex.getMessage(), equalTo("cannot alter"));
- }
- }
-
- @Test
- public void whenAssociationDisabledForReferenceThenThrowsException() {
- custJsDO.disableCountryOfBirth = "cannot alter";
- try {
- custJsWO.setCountryOfBirth(countryUsaDO);
- fail("Should have thrown exception");
- } catch (final DisabledException ex) {
- assertThat(ex.getAdvisorClass(), classEqualTo(DisableForContextFacetViaMethod.class));
- assertThat(ex.getIdentifier().getMemberNaturalName(), equalTo("Country Of Birth"));
- assertThat(ex.getMessage(), equalTo("cannot alter"));
- }
- }
-
- @Test
- public void whenAssociationDisabledForNullThenThrowsException() {
- custJsDO.disableCountryOfBirth = "cannot alter";
- try {
- custJsWO.setCountryOfBirth(null);
- fail("Should have thrown exception");
- } catch (final DisabledException ex) {
- assertThat(ex.getAdvisorClass(), classEqualTo(DisableForContextFacetViaMethod.class));
- assertThat(ex.getIdentifier().getMemberNaturalName(), equalTo("Country Of Birth"));
- assertThat(ex.getMessage(), equalTo("cannot alter"));
- }
- }
-
- @Test
- public void whenCollectionDisabledThenAddToThrowsException() {
- List<Order> orders = custJsWO.getOrders();
- final Order order = orders.get(0);
- try {
- custJsWO.addToMoreOrders(order);
- fail("Should have thrown exception");
- } catch (final DisabledException ex) {
- assertThat(ex.getAdvisorClass(), classEqualTo(DisabledFacetAnnotation.class));
- assertThat(ex.getIdentifier().getMemberNaturalName(), equalTo("More Orders"));
- assertThat(ex.getMessage(), equalTo("Always disabled"));
- }
- }
-
- @Test
- public void whenCollectionDisabledThenRemovefromThrowsException() {
- custJsDO.addToVisitedCountries(countryUsaDO);
- custJsDO.disableVisitedCountries = "cannot alter";
- try {
- custJsWO.removeFromVisitedCountries(countryUsaDO);
- fail("Should have thrown exception");
- } catch (final DisabledException ex) {
- assertThat(ex.getAdvisorClass(), classEqualTo(DisableForContextFacetViaMethod.class));
- assertThat(ex.getIdentifier().getMemberNaturalName(), equalTo("Visited Countries"));
- assertThat(ex.getMessage(), equalTo("cannot alter"));
- }
- }
-
- @Test
- public void whenActionDisabledThenThrowsException() {
- custJsDO.disablePlaceOrder = "cannot invoke";
- try {
- custJsWO.placeOrder(product355DO, 3);
- fail("Should have thrown exception");
- } catch (final DisabledException ex) {
- assertThat(ex.getAdvisorClass(), classEqualTo(DisableForContextFacetViaMethod.class));
- assertThat(ex.getIdentifier().getMemberNaturalName(), equalTo("Place Order"));
- assertThat(ex.getMessage(), equalTo("cannot invoke"));
- }
- }
-
-}
+
+public class MemberDisabledTest extends AbstractTest {
+
+ @Test
+ public void whenValueDisabledForValueThenThrowsException() {
+ custJsDO.disableFirstName = "cannot alter";
+ try {
+ custJsWO.setFirstName("Dick");
+ fail("Should have thrown exception");
+ } catch (final DisabledException ex) {
+ assertThat(ex.getAdvisorClass(), classEqualTo(DisableForContextFacetViaMethod.class));
+ assertThat(ex.getIdentifier().getMemberNaturalName(), equalTo("First Name"));
+ assertThat(ex.getMessage(), equalTo("cannot alter"));
+ }
+ }
+
+ @Test
+ public void whenValueDisabledForNullThenThrowsException() {
+ custJsDO.disableFirstName = "cannot alter";
+ try {
+ custJsWO.setFirstName(null);
+ fail("Should have thrown exception");
+ } catch (final DisabledException ex) {
+ assertThat(ex.getAdvisorClass(), classEqualTo(DisableForContextFacetViaMethod.class));
+ assertThat(ex.getIdentifier().getMemberNaturalName(), equalTo("First Name"));
+ assertThat(ex.getMessage(), equalTo("cannot alter"));
+ }
+ }
+
+ @Test
+ public void whenAssociationDisabledForReferenceThenThrowsException() {
+ custJsDO.disableCountryOfBirth = "cannot alter";
+ try {
+ custJsWO.setCountryOfBirth(countryUsaDO);
+ fail("Should have thrown exception");
+ } catch (final DisabledException ex) {
+ assertThat(ex.getAdvisorClass(), classEqualTo(DisableForContextFacetViaMethod.class));
+ assertThat(ex.getIdentifier().getMemberNaturalName(), equalTo("Country Of Birth"));
+ assertThat(ex.getMessage(), equalTo("cannot alter"));
+ }
+ }
+
+ @Test
+ public void whenAssociationDisabledForNullThenThrowsException() {
+ custJsDO.disableCountryOfBirth = "cannot alter";
+ try {
+ custJsWO.setCountryOfBirth(null);
+ fail("Should have thrown exception");
+ } catch (final DisabledException ex) {
+ assertThat(ex.getAdvisorClass(), classEqualTo(DisableForContextFacetViaMethod.class));
+ assertThat(ex.getIdentifier().getMemberNaturalName(), equalTo("Country Of Birth"));
+ assertThat(ex.getMessage(), equalTo("cannot alter"));
+ }
+ }
+
+ @Test
+ public void whenCollectionDisabledThenAddToThrowsException() {
+ final List<Order> orders = custJsWO.getOrders();
+ final Order order = orders.get(0);
+ try {
+ custJsWO.addToMoreOrders(order);
+ fail("Should have thrown exception");
+ } catch (final DisabledException ex) {
+ assertThat(ex.getAdvisorClass(), classEqualTo(DisabledFacetAnnotation.class));
+ assertThat(ex.getIdentifier().getMemberNaturalName(), equalTo("More Orders"));
+ assertThat(ex.getMessage(), equalTo("Always disabled"));
+ }
+ }
+
+ @Test
+ public void whenCollectionDisabledThenRemovefromThrowsException() {
+ custJsDO.addToVisitedCountries(countryUsaDO);
+ custJsDO.disableVisitedCountries = "cannot alter";
+ try {
+ custJsWO.removeFromVisitedCountries(countryUsaDO);
+ fail("Should have thrown exception");
+ } catch (final DisabledException ex) {
+ assertThat(ex.getAdvisorClass(), classEqualTo(DisableForContextFacetViaMethod.class));
+ assertThat(ex.getIdentifier().getMemberNaturalName(), equalTo("Visited Countries"));
+ assertThat(ex.getMessage(), equalTo("cannot alter"));
+ }
+ }
+
+ @Test
+ public void whenActionDisabledThenThrowsException() {
+ custJsDO.disablePlaceOrder = "cannot invoke";
+ try {
+ custJsWO.placeOrder(product355DO, 3);
+ fail("Should have thrown exception");
+ } catch (final DisabledException ex) {
+ assertThat(ex.getAdvisorClass(), classEqualTo(DisableForContextFacetViaMethod.class));
+ assertThat(ex.getIdentifier().getMemberNaturalName(), equalTo("Place Order"));
+ assertThat(ex.getMessage(), equalTo("cannot invoke"));
+ }
+ }
+
+}