ISIS-903: fixing unit tests
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/7c28fbeb Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/7c28fbeb Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/7c28fbeb Branch: refs/heads/master Commit: 7c28fbebdbf97817978439e5744ce08f3f492933 Parents: 3f5fbc4 Author: Dan Haywood <[email protected]> Authored: Wed Feb 18 07:46:25 2015 +0000 Committer: Dan Haywood <[email protected]> Committed: Wed Feb 18 14:07:49 2015 +0000 ---------------------------------------------------------------------- .../actions/ActionMethodsFacetFactoryTest.java | 22 ++++++++++++++++++ .../CollectionFieldMethodsFacetFactoryTest.java | 24 ++++++++++++++++++++ .../ObjectDisabledMethodFacetFactoryTest.java | 20 ++++++++++++++-- .../title/TitleFacetViaMethodsFactoryTest.java | 22 ++++++++++++++++-- .../ObjectValidMethodFacetFactoryTest.java | 20 ++++++++++++++++ .../PropertyMethodsFacetFactoryTest.java | 24 ++++++++++++++++++++ .../src/main/java/dom/simple/SimpleObject.java | 4 +++- .../tests/smoke/SimpleObjectIntegTest.java | 2 +- .../src/main/webapp/WEB-INF/translations.po | 4 ++-- 9 files changed, 134 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/7c28fbeb/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java index 29c26e6..88ff5cd 100644 --- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java +++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java @@ -24,9 +24,11 @@ import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Set; +import org.jmock.Expectations; import org.apache.isis.applib.annotation.Named; import org.apache.isis.applib.annotation.When; import org.apache.isis.applib.security.UserMemento; +import org.apache.isis.applib.services.i18n.TranslationService; import org.apache.isis.core.metamodel.facetapi.Facet; import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest; import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext; @@ -69,15 +71,33 @@ import org.apache.isis.core.metamodel.facets.param.choices.methodnum.ActionParam import org.apache.isis.core.metamodel.facets.param.defaults.ActionParameterDefaultsFacet; import org.apache.isis.core.metamodel.facets.param.defaults.methodnum.ActionParameterDefaultsFacetViaMethod; import org.apache.isis.core.metamodel.facets.param.defaults.methodnum.ActionParameterDefaultsFacetViaMethodFactory; +import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector; import org.apache.isis.core.metamodel.spec.ObjectSpecification; import org.apache.isis.core.metamodel.testspec.ObjectSpecificationStub; +import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2; public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest { + private JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES); + private final ObjectSpecification voidSpec = new ObjectSpecificationStub("VOID"); private final ObjectSpecification stringSpec = new ObjectSpecificationStub("java.lang.String"); private final ObjectSpecification customerSpec = new ObjectSpecificationStub("Customer"); + private ServicesInjector mockServicesInjector; + private TranslationService mockTranslationService; + + public void setUp() throws Exception { + super.setUp(); + mockServicesInjector = context.mock(ServicesInjector.class); + mockTranslationService = context.mock(TranslationService.class); + + context.checking(new Expectations() {{ + allowing(mockServicesInjector).lookupService(TranslationService.class); + will(returnValue(mockTranslationService)); + }}); + } + public void testProvidesDefaultNameForActionButIgnoresAnyNamedAnnotation() { final ActionNamedDebugExplorationFacetFactory facetFactory = new ActionNamedDebugExplorationFacetFactory(); facetFactory.setSpecificationLookup(programmableReflector); @@ -193,6 +213,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest { public void testInstallsValidateMethodNoArgsFacetAndRemovesMethod() { final ActionValidationFacetViaMethodFactory facetFactory = new ActionValidationFacetViaMethodFactory(); facetFactory.setSpecificationLookup(programmableReflector); + facetFactory.setServicesInjector(mockServicesInjector); programmableReflector.setLoadSpecificationStringReturn(voidSpec); class Customer { @@ -222,6 +243,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest { public void testInstallsValidateMethodSomeArgsFacetAndRemovesMethod() { final ActionValidationFacetViaMethodFactory facetFactory = new ActionValidationFacetViaMethodFactory(); facetFactory.setSpecificationLookup(programmableReflector); + facetFactory.setServicesInjector(mockServicesInjector); programmableReflector.setLoadSpecificationStringReturn(voidSpec); class Customer { http://git-wip-us.apache.org/repos/asf/isis/blob/7c28fbeb/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java index 1adbade..5884120 100644 --- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java +++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java @@ -23,8 +23,10 @@ import java.lang.reflect.Method; import java.util.Collection; import java.util.List; import java.util.Set; +import org.jmock.Expectations; import org.apache.isis.applib.annotation.When; import org.apache.isis.applib.security.UserMemento; +import org.apache.isis.applib.services.i18n.TranslationService; import org.apache.isis.core.metamodel.facetapi.Facet; import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest; import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext; @@ -65,9 +67,28 @@ import org.apache.isis.core.metamodel.facets.members.hidden.staticmethod.HiddenF import org.apache.isis.core.metamodel.facets.members.named.staticmethod.NamedFacetStaticMethod; import org.apache.isis.core.metamodel.facets.members.named.staticmethod.NamedFacetStaticMethodFactory; import org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet; +import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector; +import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2; public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactoryTest { + private JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES); + + private ServicesInjector mockServicesInjector; + private TranslationService mockTranslationService; + + public void setUp() throws Exception { + super.setUp(); + mockServicesInjector = context.mock(ServicesInjector.class); + mockTranslationService = context.mock(TranslationService.class); + + context.checking(new Expectations() {{ + allowing(mockServicesInjector).lookupService(TranslationService.class); + will(returnValue(mockTranslationService)); + }}); + } + + public void testPropertyAccessorFacetIsInstalledForJavaUtilCollectionAndMethodRemoved() { final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory(); facetFactory.setSpecificationLookup(programmableReflector); @@ -430,6 +451,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory public void testValidateAddToFacetIsInstalledAndMethodRemoved() { final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory(); facetFactory.setSpecificationLookup(programmableReflector); + facetFactory.setServicesInjector(mockServicesInjector); @SuppressWarnings("hiding") class Order { @@ -466,6 +488,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory public void testValidateRemoveFromFacetIsInstalledAndMethodRemoved() { final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory(); facetFactory.setSpecificationLookup(programmableReflector); + facetFactory.setServicesInjector(mockServicesInjector); @SuppressWarnings("hiding") class Order { @@ -532,6 +555,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory facetFactoryForAccessor.setSpecificationLookup(programmableReflector); final CollectionAddToRemoveFromAndValidateFacetFactory facetFactoryForHelpers = new CollectionAddToRemoveFromAndValidateFacetFactory(); facetFactoryForHelpers.setSpecificationLookup(programmableReflector); + facetFactoryForHelpers.setServicesInjector(mockServicesInjector); @SuppressWarnings("hiding") class Order { http://git-wip-us.apache.org/repos/asf/isis/blob/7c28fbeb/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/disabled/ObjectDisabledMethodFacetFactoryTest.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/disabled/ObjectDisabledMethodFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/disabled/ObjectDisabledMethodFacetFactoryTest.java index 219a03a..d15f97e 100644 --- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/disabled/ObjectDisabledMethodFacetFactoryTest.java +++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/disabled/ObjectDisabledMethodFacetFactoryTest.java @@ -21,23 +21,39 @@ package org.apache.isis.core.metamodel.facets.object.disabled; import java.lang.reflect.Method; +import org.jmock.Expectations; import org.apache.isis.applib.Identifier; import org.apache.isis.applib.Identifier.Type; +import org.apache.isis.applib.services.i18n.TranslationService; import org.apache.isis.core.metamodel.facetapi.Facet; import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext; import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest; import org.apache.isis.core.metamodel.facets.object.disabled.method.DisabledObjectFacetViaMethod; import org.apache.isis.core.metamodel.facets.object.disabled.method.DisabledObjectFacetViaMethodFactory; +import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector; +import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2; public class ObjectDisabledMethodFacetFactoryTest extends AbstractFacetFactoryTest { + private JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES); + + private ServicesInjector mockServicesInjector; + private TranslationService mockTranslationService; + private DisabledObjectFacetViaMethodFactory facetFactory; - @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); + mockServicesInjector = context.mock(ServicesInjector.class); + mockTranslationService = context.mock(TranslationService.class); + + context.checking(new Expectations() {{ + allowing(mockServicesInjector).lookupService(TranslationService.class); + will(returnValue(mockTranslationService)); + }}); facetFactory = new DisabledObjectFacetViaMethodFactory(); + facetFactory.setServicesInjector(mockServicesInjector); } @Override http://git-wip-us.apache.org/repos/asf/isis/blob/7c28fbeb/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacetViaMethodsFactoryTest.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacetViaMethodsFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacetViaMethodsFactoryTest.java index 99d199c..6c0b242 100644 --- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacetViaMethodsFactoryTest.java +++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacetViaMethodsFactoryTest.java @@ -21,26 +21,44 @@ package org.apache.isis.core.metamodel.facets.object.ident.title; import java.lang.reflect.Method; +import org.jmock.Expectations; +import org.apache.isis.applib.services.i18n.TranslationService; import org.apache.isis.core.metamodel.facetapi.Facet; import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext; import org.apache.isis.core.metamodel.facets.object.title.TitleFacet; import org.apache.isis.core.metamodel.facets.object.title.methods.TitleFacetViaMethodsFactory; +import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector; import org.apache.isis.core.metamodel.specloader.specimpl.ObjectSpecificationAbstract; import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest; import org.apache.isis.core.metamodel.facets.object.title.methods.TitleFacetViaTitleMethod; import org.apache.isis.core.metamodel.facets.object.title.methods.TitleFacetViaToStringMethod; +import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2; public class TitleFacetViaMethodsFactoryTest extends AbstractFacetFactoryTest { + private JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES); + + private ServicesInjector mockServicesInjector; + private TranslationService mockTranslationService; + private TitleFacetViaMethodsFactory facetFactory; - @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); + mockServicesInjector = context.mock(ServicesInjector.class); + mockTranslationService = context.mock(TranslationService.class); + + context.checking(new Expectations() {{ + allowing(mockServicesInjector).lookupService(TranslationService.class); + will(returnValue(mockTranslationService)); + }}); facetFactory = new TitleFacetViaMethodsFactory(); + + facetFactory.setServicesInjector(mockServicesInjector); } + @Override protected void tearDown() throws Exception { facetFactory = null; http://git-wip-us.apache.org/repos/asf/isis/blob/7c28fbeb/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/validating/validateobject/ObjectValidMethodFacetFactoryTest.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/validating/validateobject/ObjectValidMethodFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/validating/validateobject/ObjectValidMethodFacetFactoryTest.java index 8e8cdba..c625d06 100644 --- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/validating/validateobject/ObjectValidMethodFacetFactoryTest.java +++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/validating/validateobject/ObjectValidMethodFacetFactoryTest.java @@ -21,21 +21,41 @@ package org.apache.isis.core.metamodel.facets.object.validating.validateobject; import java.lang.reflect.Method; +import org.jmock.Expectations; +import org.apache.isis.applib.services.i18n.TranslationService; import org.apache.isis.core.metamodel.facetapi.Facet; import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext; import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest; import org.apache.isis.core.metamodel.facets.object.validating.validateobject.method.ValidateObjectFacetMethod; import org.apache.isis.core.metamodel.facets.object.validating.validateobject.method.ValidateObjectFacetMethodFactory; +import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector; +import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2; public class ObjectValidMethodFacetFactoryTest extends AbstractFacetFactoryTest { + private JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES); + + private ServicesInjector mockServicesInjector; + private TranslationService mockTranslationService; + + private ValidateObjectFacetMethodFactory facetFactory; @Override protected void setUp() throws Exception { super.setUp(); + mockServicesInjector = context.mock(ServicesInjector.class); + mockTranslationService = context.mock(TranslationService.class); + + context.checking(new Expectations() {{ + allowing(mockServicesInjector).lookupService(TranslationService.class); + will(returnValue(mockTranslationService)); + }}); + facetFactory = new ValidateObjectFacetMethodFactory(); + + facetFactory.setServicesInjector(mockServicesInjector); } @Override http://git-wip-us.apache.org/repos/asf/isis/blob/7c28fbeb/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java index fb0db91..e84fe9f 100644 --- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java +++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java @@ -20,7 +20,9 @@ package org.apache.isis.core.metamodel.facets.properties; import java.lang.reflect.Method; +import org.jmock.Expectations; import org.apache.isis.applib.security.UserMemento; +import org.apache.isis.applib.services.i18n.TranslationService; import org.apache.isis.core.metamodel.facetapi.Facet; import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest; import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext; @@ -75,9 +77,27 @@ import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySe import org.apache.isis.core.metamodel.facets.properties.validating.PropertyValidateFacet; import org.apache.isis.core.metamodel.facets.properties.validating.method.PropertyValidateFacetViaMethod; import org.apache.isis.core.metamodel.facets.properties.validating.method.PropertyValidateFacetViaMethodFactory; +import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector; +import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2; public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest { + private JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES); + + private ServicesInjector mockServicesInjector; + private TranslationService mockTranslationService; + + public void setUp() throws Exception { + super.setUp(); + mockServicesInjector = context.mock(ServicesInjector.class); + mockTranslationService = context.mock(TranslationService.class); + + context.checking(new Expectations() {{ + allowing(mockServicesInjector).lookupService(TranslationService.class); + will(returnValue(mockTranslationService)); + }}); + } + public void testPropertyAccessorFacetIsInstalledAndMethodRemoved() { final PropertyAccessorFacetViaAccessorFactory facetFactory = new PropertyAccessorFacetViaAccessorFactory(); facetFactory.setSpecificationLookup(programmableReflector); @@ -427,6 +447,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest { public void testValidateFacetFoundAndMethodRemoved() { final PropertyValidateFacetViaMethodFactory facetFactory = new PropertyValidateFacetViaMethodFactory(); facetFactory.setSpecificationLookup(programmableReflector); + facetFactory.setServicesInjector(mockServicesInjector); class Customer { @SuppressWarnings("unused") @@ -456,6 +477,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest { public void testDisableFacetFoundAndMethodRemoved() { final DisableForContextFacetViaMethodFactory facetFactory = new DisableForContextFacetViaMethodFactory(); facetFactory.setSpecificationLookup(programmableReflector); + facetFactory.setServicesInjector(mockServicesInjector); class Customer { @SuppressWarnings("unused") @@ -485,6 +507,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest { public void testDisableFacetNoArgsFoundAndMethodRemoved() { final DisableForContextFacetViaMethodFactory facetFactory = new DisableForContextFacetViaMethodFactory(); facetFactory.setSpecificationLookup(programmableReflector); + facetFactory.setServicesInjector(mockServicesInjector); class Customer { @SuppressWarnings("unused") @@ -601,6 +624,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest { facetFactoryForHide.setSpecificationLookup(programmableReflector); final DisableForContextFacetViaMethodFactory facetFactoryForDisable = new DisableForContextFacetViaMethodFactory(); facetFactoryForDisable.setSpecificationLookup(programmableReflector); + facetFactoryForDisable.setServicesInjector(mockServicesInjector); class Customer { @SuppressWarnings("unused") http://git-wip-us.apache.org/repos/asf/isis/blob/7c28fbeb/example/application/simpleapp/dom/src/main/java/dom/simple/SimpleObject.java ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/dom/src/main/java/dom/simple/SimpleObject.java b/example/application/simpleapp/dom/src/main/java/dom/simple/SimpleObject.java index 11d0d80..351504b 100644 --- a/example/application/simpleapp/dom/src/main/java/dom/simple/SimpleObject.java +++ b/example/application/simpleapp/dom/src/main/java/dom/simple/SimpleObject.java @@ -52,9 +52,11 @@ import org.apache.isis.applib.util.ObjectContracts; public class SimpleObject implements Comparable<SimpleObject> { + //region > identificatiom public TranslatableString title() { - return TranslatableString.tr("Title is: {name}", "name", getName()); + return TranslatableString.tr("Object: {name}", "name", getName()); } + //endregion //region > name (property) http://git-wip-us.apache.org/repos/asf/isis/blob/7c28fbeb/example/application/simpleapp/integtests/src/test/java/integration/tests/smoke/SimpleObjectIntegTest.java ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/integtests/src/test/java/integration/tests/smoke/SimpleObjectIntegTest.java b/example/application/simpleapp/integtests/src/test/java/integration/tests/smoke/SimpleObjectIntegTest.java index 0055242..88da436 100644 --- a/example/application/simpleapp/integtests/src/test/java/integration/tests/smoke/SimpleObjectIntegTest.java +++ b/example/application/simpleapp/integtests/src/test/java/integration/tests/smoke/SimpleObjectIntegTest.java @@ -126,7 +126,7 @@ public class SimpleObjectIntegTest extends SimpleAppIntegTest { final String title = container().titleOf(simpleObjectWrapped); // then - assertThat(title, is("Title is: " + name)); + assertThat(title, is("Object: " + name)); } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/isis/blob/7c28fbeb/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/translations.po ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/translations.po b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/translations.po index a5c4afa..b9fd68c 100644 --- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/translations.po +++ b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/translations.po @@ -38,8 +38,8 @@ msgstr "" #: dom.simple.SimpleObject#title() -msgid "Title is: {name}" -msgstr "'{name}' is the title" +msgid "Object: {name}" +msgstr "'{name}'" #: dom.simple.SimpleObject#updateName()
