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 16:21:19 UTC
[isis] branch master updated (01af65d -> 238655c)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 01af65d Merge branch 'ISIS-1867'
new 2201436 ISIS-1841 cleanup switch statement
new b8c51e8 Merge branch 'master' of https://github.com/apache/isis
new 238655c ISIS-1866 further fixing tests
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
...lishedObjectFacetForDomainObjectAnnotation.java | 3 ++
.../DomainObjectAnnotationFacetFactoryTest.java | 61 +++++++++++++++-------
2 files changed, 45 insertions(+), 19 deletions(-)
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.
[isis] 01/03: ISIS-1841 cleanup switch statement
Posted by ah...@apache.org.
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
commit 2201436245be317bdba7841bd77fb6dc92d7b2b3
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Feb 21 17:03:25 2018 +0100
ISIS-1841 cleanup switch statement
removes compiler warning, stating a missing case statement
---
.../publishing/PublishedObjectFacetForDomainObjectAnnotation.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java
index 94816e7..b30f930 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java
@@ -23,6 +23,7 @@ import java.util.List;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Publishing;
+import org.apache.isis.applib.internal.exceptions._Exceptions;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObjectFacet;
@@ -51,6 +52,8 @@ public class PublishedObjectFacetForDomainObjectAnnotation extends PublishedObje
return null;
case ENABLED:
return new PublishedObjectFacetForDomainObjectAnnotation(holder);
+ case NOT_SPECIFIED:
+ throw _Exceptions.unexpectedCodeReach(); // case filtered out above
}
throw new IllegalStateException("domainObject.publishing() not recognised, is " + publishing);
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.
[isis] 03/03: ISIS-1866 further fixing tests
Posted by ah...@apache.org.
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
commit 238655c6a9bc1f1aab121675fe2c3c03bbeaebff
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Feb 21 17:20:47 2018 +0100
ISIS-1866 further fixing tests
fixes 6 failing tests
adding FIXME markers to tests, I don't yet know how to fix
---
.../DomainObjectAnnotationFacetFactoryTest.java | 61 +++++++++++++++-------
1 file changed, 42 insertions(+), 19 deletions(-)
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index 5715674..414d3df 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -161,8 +161,9 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
facetFactory.process(new ProcessClassContext(DomainObjectAnnotationFacetFactoryTest.Customer.class, mockMethodRemover, facetHolder));
- final Facet facet = facetHolder.getFacet(AuditableFacet.class);
- Assert.assertNull(facet);
+ final AuditableFacet facet = facetHolder.getFacet(AuditableFacet.class);
+ Assert.assertNotNull(facet);
+ Assert.assertThat(facet.isDisabled(), is(false));
expectNoMethodsRemoved();
}
@@ -173,8 +174,9 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
facetFactory.process(new ProcessClassContext(DomainObjectAnnotationFacetFactoryTest.Customer.class, mockMethodRemover, facetHolder));
- final Facet facet = facetHolder.getFacet(AuditableFacet.class);
- Assert.assertNull(facet);
+ final AuditableFacet facet = facetHolder.getFacet(AuditableFacet.class);
+ Assert.assertNotNull(facet);
+ Assert.assertThat(facet.isDisabled(), is(false));
expectNoMethodsRemoved();
}
@@ -201,8 +203,9 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
facetFactory.process(new ProcessClassContext(CustomerWithDomainObjectAndAuditingSetToAsConfigured.class, mockMethodRemover, facetHolder));
- final Facet facet = facetHolder.getFacet(AuditableFacet.class);
- Assert.assertNull(facet);
+ final AuditableFacet facet = facetHolder.getFacet(AuditableFacet.class);
+ Assert.assertNotNull(facet);
+ Assert.assertThat(facet.isDisabled(), is(false));
expectNoMethodsRemoved();
}
@@ -213,8 +216,9 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
facetFactory.process(new ProcessClassContext(CustomerWithDomainObjectAndAuditingSetToAsConfigured.class, mockMethodRemover, facetHolder));
- final Facet facet = facetHolder.getFacet(AuditableFacet.class);
- Assert.assertNull(facet);
+ final AuditableFacet facet = facetHolder.getFacet(AuditableFacet.class);
+ Assert.assertNotNull(facet);
+ Assert.assertThat(facet.isDisabled(), is(false));
expectNoMethodsRemoved();
}
@@ -245,8 +249,13 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
facetFactory.process(new ProcessClassContext(CustomerWithDomainObjectAndAuditingSetToDisabled.class, mockMethodRemover, facetHolder));
- final Facet facet = facetHolder.getFacet(AuditableFacet.class);
- Assert.assertNull(facet);
+ final AuditableFacet facet = facetHolder.getFacet(AuditableFacet.class);
+ Assert.assertNotNull(facet);
+
+ Assert.assertThat(facet.isDisabled(), is(true));
+ Assert.assertThat(facet.alwaysReplace(), is(true));
+ Assert.assertThat(facet.isNoop(), is(false));
+ Assert.assertThat(facet.isDerived(), is(false));
expectNoMethodsRemoved();
}
@@ -333,7 +342,12 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
final Facet facet = facetHolder.getFacet(PublishedObjectFacet.class);
Assert.assertNotNull(facet);
- Assert.assertTrue(facet instanceof PublishedObjectFacetForDomainObjectAnnotationAsConfigured);
+
+ System.out.println("debug: "+facet.getClass().getName()); //FIXME remove debug
+
+ //FIXME test fails because type is
+ //org.apache.isis.core.metamodel.facets.object.domainobject.publishing.PublishedObjectFacetFromConfiguration
+ Assert.assertTrue(facet instanceof PublishedObjectFacetForDomainObjectAnnotationAsConfigured); //FIXME
expectNoMethodsRemoved();
}
@@ -345,7 +359,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
facetFactory.process(new ProcessClassContext(CustomerWithDomainObjectAndPublishingSetToAsConfigured.class, mockMethodRemover, facetHolder));
final Facet facet = facetHolder.getFacet(PublishedObjectFacet.class);
- Assert.assertNull(facet);
+ Assert.assertNull(facet); //FIXME test fails
expectNoMethodsRemoved();
}
@@ -357,7 +371,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
facetFactory.process(new ProcessClassContext(CustomerWithDomainObjectAndPublishingSetToAsConfigured.class, mockMethodRemover, facetHolder));
final Facet facet = facetHolder.getFacet(PublishedObjectFacet.class);
- Assert.assertNull(facet);
+ Assert.assertNull(facet); //FIXME test fails
expectNoMethodsRemoved();
}
@@ -389,8 +403,13 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
facetFactory.process(new ProcessClassContext(CustomerWithDomainObjectAndPublishingSetToDisabled.class, mockMethodRemover, facetHolder));
- final Facet facet = facetHolder.getFacet(AuditableFacet.class);
- Assert.assertNull(facet);
+ final AuditableFacet facet = facetHolder.getFacet(AuditableFacet.class);
+ Assert.assertNotNull(facet);
+
+ Assert.assertThat(facet.isDisabled(), is(false));
+ Assert.assertThat(facet.alwaysReplace(), is(true));
+ Assert.assertThat(facet.isNoop(), is(false));
+ Assert.assertThat(facet.isDerived(), is(false));
expectNoMethodsRemoved();
}
@@ -421,10 +440,12 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
ignoringConfiguration();
}
+ //FIXME test fails with
+ // java.lang.AssertionError: unexpected invocation: mockServicesInjector.isRegisteredService(<class org.apache.isis.core.metamodel.facets.object.domainobject.DomainObjectAnnotationFacetFactoryTest$AutoComplete$CustomerRepository>)
@Test
public void whenDomainObjectAndAutoCompleteRepositoryAndAction() {
- facetFactory.process(new ProcessClassContext(CustomerWithDomainObjectAndAutoCompleteRepositoryAndAction.class, mockMethodRemover, facetHolder));
+ facetFactory.process(new ProcessClassContext(CustomerWithDomainObjectAndAutoCompleteRepositoryAndAction.class, mockMethodRemover, facetHolder)); //FIXME
final Facet facet = facetHolder.getFacet(AutoCompleteFacet.class);
Assert.assertNotNull(facet);
@@ -439,10 +460,12 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
expectNoMethodsRemoved();
}
+ //FIXME test fails with
+ // java.lang.AssertionError: unexpected invocation: mockServicesInjector.isRegisteredService(<class org.apache.isis.core.metamodel.facets.object.domainobject.DomainObjectAnnotationFacetFactoryTest$AutoComplete$CustomerRepository>)
@Test
public void whenDomainObjectAndAutoCompleteRepository() {
- facetFactory.process(new ProcessClassContext(CustomerWithDomainObjectAndAutoCompleteRepository.class, mockMethodRemover, facetHolder));
+ facetFactory.process(new ProcessClassContext(CustomerWithDomainObjectAndAutoCompleteRepository.class, mockMethodRemover, facetHolder)); //FIXME
final Facet facet = facetHolder.getFacet(AutoCompleteFacet.class);
Assert.assertNotNull(facet);
@@ -645,8 +668,8 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
facetFactory.process(new ProcessClassContext(CustomerWithDomainObjectAndEditingSetToEnabled.class, mockMethodRemover, facetHolder));
- final Facet facet = facetHolder.getFacet(ImmutableFacet.class);
- Assert.assertNull(facet);
+ final ImmutableFacet facet = facetHolder.getFacet(ImmutableFacet.class);
+ Assert.assertNull(facet); //FIXME test fails
expectNoMethodsRemoved();
}
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.
[isis] 02/03: Merge branch 'master' of
https://github.com/apache/isis
Posted by ah...@apache.org.
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
commit b8c51e8297cd72ddf48113b8737a7f5f7457e23a
Merge: 2201436 01af65d
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Feb 21 17:06:47 2018 +0100
Merge branch 'master' of https://github.com/apache/isis
.../isis/applib/services/jaxb/JaxbService.java | 36 +++++++++++-----------
.../java/org/apache/isis/applib/util/JaxbUtil.java | 27 ++++++++++------
.../apache/isis/schema/utils/ChangesDtoUtils.java | 7 ++---
.../apache/isis/schema/utils/CommandDtoUtils.java | 7 ++---
.../isis/schema/utils/InteractionDtoUtils.java | 7 ++---
.../isis/schema/utils/MemberExecutionDtoUtils.java | 7 ++++-
.../services/grid/GridLoaderServiceDefault.java | 36 +++++++++++++---------
.../core/unittestsupport/jaxb/JaxbMatchers.java | 25 ++++++++++-----
8 files changed, 86 insertions(+), 66 deletions(-)
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.