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 2017/09/14 17:46:34 UTC
[12/13] isis git commit: ISIS-1715: adds unit test,
removes commented out code.
ISIS-1715: adds unit test, removes commented out code.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4de5824f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4de5824f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4de5824f
Branch: refs/heads/master
Commit: 4de5824f98c8092c32a4a84ce3b0f691b65dc5b4
Parents: e54952a
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 14 17:17:56 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 14 17:45:03 2017 +0100
----------------------------------------------------------------------
.../domainservice/DomainServiceMenuOrder.java | 7 ---
.../DomainServiceMenuOrder_UnitTest.java | 65 ++++++++++++++++++++
2 files changed, 65 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/4de5824f/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceMenuOrder.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceMenuOrder.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceMenuOrder.java
index 67224b1..5443d41 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceMenuOrder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceMenuOrder.java
@@ -27,13 +27,6 @@ public class DomainServiceMenuOrder {
private final static String UNDEFINED = "" + Integer.MAX_VALUE;
- //TODO can be safely removed
-// public static int compare(ObjectAdapter serviceAdapter1, ObjectAdapter serviceAdapter2) {
-// return SequenceCompare.compareNullLast(
-// orderOf(serviceAdapter1.getSpecification().getCorrespondingClass()),
-// orderOf(serviceAdapter2.getSpecification().getCorrespondingClass()) );
-// }
-
public static String orderOf(final Class<?> cls) {
final DomainServiceLayout domainServiceLayout = cls.getAnnotation(DomainServiceLayout.class);
String dslayoutOrder = domainServiceLayout != null ? domainServiceLayout.menuOrder(): null;
http://git-wip-us.apache.org/repos/asf/isis/blob/4de5824f/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceMenuOrder_UnitTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceMenuOrder_UnitTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceMenuOrder_UnitTest.java
new file mode 100644
index 0000000..2960ea1
--- /dev/null
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceMenuOrder_UnitTest.java
@@ -0,0 +1,65 @@
+package org.apache.isis.core.metamodel.facets.object.domainservice;
+
+import org.junit.Test;
+
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.DomainServiceLayout;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+public class DomainServiceMenuOrder_UnitTest {
+
+ @DomainService(menuOrder = "100")
+ public static class ServiceWithDomainService100 {
+ }
+
+ @DomainServiceLayout(menuOrder = "100")
+ public static class ServiceWithDomainServiceLayout100 {
+ }
+
+ @DomainService(menuOrder = "100")
+ @DomainServiceLayout(menuOrder = "101")
+ public static class ServiceWithDomainService100AndDomainServiceLayout101 {
+ }
+
+ @DomainService(menuOrder = "101")
+ @DomainServiceLayout(menuOrder = "100")
+ public static class ServiceWithDomainService101AndDomainServiceLayout100 {
+ }
+
+ @DomainService()
+ @DomainServiceLayout()
+ public static class ServiceWithDomainServiceAndDomainServiceLayout {
+ }
+
+ @DomainService()
+ public static class ServiceWithDomainService {
+ }
+
+ @DomainServiceLayout()
+ public static class ServiceWithDomainServiceLayout {
+ }
+
+ @Test
+ public void orderOf() throws Exception {
+ assertOrder(ServiceWithDomainService.class, Integer.MAX_VALUE - 100);
+ assertOrder(ServiceWithDomainServiceLayout.class, Integer.MAX_VALUE - 100);
+ assertOrder(ServiceWithDomainServiceAndDomainServiceLayout.class, Integer.MAX_VALUE - 100);
+
+ assertOrder(ServiceWithDomainService100.class, 100);
+ assertOrder(ServiceWithDomainServiceLayout100.class, 100);
+
+ assertOrder(ServiceWithDomainService100AndDomainServiceLayout101.class, 100);
+ assertOrder(ServiceWithDomainService101AndDomainServiceLayout100.class, 100);
+ }
+
+ private static void assertOrder(final Class<?> cls, final int expected) {
+ String menuOrder = DomainServiceMenuOrder.orderOf(cls);
+ assertThat(menuOrder, is(equalTo("" + expected)));
+ }
+
+
+
+}
\ No newline at end of file