You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/02/21 15:09:28 UTC
[isis] branch master updated: ISIS-1866 fix tests after changed
default behavior
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 75a936e ISIS-1866 fix tests after changed default behavior
75a936e is described below
commit 75a936e5c95c47ae7f8c35bb6d3e435bab517982
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Feb 21 16:09:24 2018 +0100
ISIS-1866 fix tests after changed default behavior
fixes 3 failing tests
---
.../DomainObjectLayoutFactoryTest.java | 45 +++++++++++++---------
1 file changed, 26 insertions(+), 19 deletions(-)
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
index 8b8a66d..aca65fd 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
@@ -52,6 +52,8 @@ public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4Tes
DomainObjectLayoutFacetFactory facetFactory;
+ // -- TEST LIFE CYCLING
+
@Before
public void setUp() throws Exception {
facetFactory = new DomainObjectLayoutFacetFactory();
@@ -64,6 +66,8 @@ public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4Tes
super.tearDown();
}
+ // -- DOMAIN OBJECTS FOR TESTING
+
@DomainObjectLayout(
bookmarking = BookmarkPolicy.AS_ROOT,
cssClass = "foobar",
@@ -74,12 +78,10 @@ public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4Tes
paged = 20,
plural = "Customers Plural Form"
)
- class Customer {
- }
- @DomainObjectLayout(
- )
- class CustomerWithDefaults {
- }
+ class Customer { }
+
+ @DomainObjectLayout
+ class CustomerWithDefaults { }
@ViewModelLayout(
bookmarking = BookmarkPolicy.AS_ROOT,
@@ -91,12 +93,12 @@ public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4Tes
paged = 20,
plural = "Customers Plural Form"
)
- class CustomerViewModel {
- }
- @ViewModelLayout(
- )
- class CustomerViewModelWithDefaults {
- }
+ class CustomerViewModel { }
+
+ @ViewModelLayout
+ class CustomerViewModelWithDefaults { }
+
+ // -- LAYOUT TESTS
public static class Bookmarking extends DomainObjectLayoutFactoryTest {
@@ -118,7 +120,9 @@ public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4Tes
assertNotNull(facet);
assertTrue(facet instanceof BookmarkPolicyFacetForDomainObjectLayoutAnnotation);
- final BookmarkPolicyFacetForDomainObjectLayoutAnnotation facetImpl = (BookmarkPolicyFacetForDomainObjectLayoutAnnotation) facet;
+ final BookmarkPolicyFacetForDomainObjectLayoutAnnotation facetImpl =
+ (BookmarkPolicyFacetForDomainObjectLayoutAnnotation) facet;
+
Assert.assertThat(facetImpl.value(), is(BookmarkPolicy.AS_ROOT));
expectNoMethodsRemoved();
@@ -131,8 +135,8 @@ public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4Tes
facetFactory.process(new FacetFactory.ProcessClassContext(cls, mockMethodRemover, facetHolder));
- final Facet facet = facetHolder.getFacet(BookmarkPolicyFacet.class);
- assertNull(facet);
+ final BookmarkPolicyFacet facet = facetHolder.getFacet(BookmarkPolicyFacet.class);
+ Assert.assertThat(facet.value(), is(BookmarkPolicy.NOT_SPECIFIED));
expectNoMethodsRemoved();
}
@@ -165,14 +169,16 @@ public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4Tes
facetFactory.process(new FacetFactory.ProcessClassContext(cls, mockMethodRemover, facetHolder));
- final Facet facet = facetHolder.getFacet(BookmarkPolicyFacet.class);
- assertNull(facet);
+ final BookmarkPolicyFacet facet = facetHolder.getFacet(BookmarkPolicyFacet.class);
+ Assert.assertThat(facet.value(), is(BookmarkPolicy.NOT_SPECIFIED));
expectNoMethodsRemoved();
}
}
}
+
+ // --
public static class CssClass extends DomainObjectLayoutFactoryTest {
@@ -608,8 +614,9 @@ public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4Tes
facetFactory.process(new FacetFactory.ProcessClassContext(cls, mockMethodRemover, facetHolder));
- final Facet facet = facetHolder.getFacet(PluralFacet.class);
- assertNull(facet);
+ final PluralFacet facet = facetHolder.getFacet(PluralFacet.class);
+ assertNotNull(facet);
+ Assert.assertThat(facet.value(), is(""));
expectNoMethodsRemoved();
}
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.