You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by mg...@apache.org on 2015/01/04 20:29:32 UTC

isis git commit: ISIS-995 Add unit tests for parsing 'namedEscaped' from .layout.json file

Repository: isis
Updated Branches:
  refs/heads/ISIS-995-namedEscaped 8d929b944 -> 7750d0f7e


ISIS-995 Add unit tests for parsing 'namedEscaped' from .layout.json file


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/7750d0f7
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/7750d0f7
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/7750d0f7

Branch: refs/heads/ISIS-995-namedEscaped
Commit: 7750d0f7e91f926346ee2caea938e50a9930b85b
Parents: 8d929b9
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Jan 4 21:28:47 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Jan 4 21:28:47 2015 +0200

----------------------------------------------------------------------
 .../metamodel/layoutmetadata/PropertyLayoutFacetRepr.java    | 2 +-
 .../json/LayoutMetadataReaderFromJsonTest_read.java          | 2 +-
 .../json/LayoutMetadataReaderFromJsonTest_readMetadata.java  | 5 +++++
 .../layoutmetadata/json/ExampleDomainObject.layout.json      | 8 ++++++--
 .../json/ExampleDomainObject.layout.properties               | 4 ++--
 5 files changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/7750d0f7/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/PropertyLayoutFacetRepr.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/PropertyLayoutFacetRepr.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/PropertyLayoutFacetRepr.java
index 2619428..95c3891 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/PropertyLayoutFacetRepr.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/PropertyLayoutFacetRepr.java
@@ -28,7 +28,7 @@ public class PropertyLayoutFacetRepr {
     public LabelPosition labelPosition;
     public int multiLine;
     public String named;
-    public boolean namedEscaped;
+    public boolean namedEscaped = true;
     public boolean renderedAsDayBefore;
     public int typicalLength;
 

http://git-wip-us.apache.org/repos/asf/isis/blob/7750d0f7/core/metamodel/src/test/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJsonTest_read.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJsonTest_read.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJsonTest_read.java
index a84bc6f..3290237 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJsonTest_read.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJsonTest_read.java
@@ -50,7 +50,7 @@ public class LayoutMetadataReaderFromJsonTest_read {
         
         final Set<Object> expectedSet = expectedProperties.keySet();
         final Set<Object> actualSet = properties.keySet();
-        final SortedSet<Object> keys = new TreeSet<Object>();
+        final SortedSet<Object> keys = new TreeSet<>();
         keys.addAll(expectedSet);
         keys.addAll(actualSet);
         

http://git-wip-us.apache.org/repos/asf/isis/blob/7750d0f7/core/metamodel/src/test/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJsonTest_readMetadata.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJsonTest_readMetadata.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJsonTest_readMetadata.java
index 468939a..aaf956f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJsonTest_readMetadata.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJsonTest_readMetadata.java
@@ -16,6 +16,7 @@
  */
 package org.apache.isis.core.metamodel.layoutmetadata.json;
 
+import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
@@ -56,6 +57,8 @@ public class LayoutMetadataReaderFromJsonTest_readMetadata {
         assertThat(metadata.getColumns().get(0).memberGroups.get("General").members.get("complete").actions, is(not(nullValue())));
         assertThat(metadata.getColumns().get(0).memberGroups.get("General").members.get("complete").actions.size(), is(2));
         assertThat(metadata.getColumns().get(0).memberGroups.get("General").members.get("complete").actions.containsKey("completed"), is(true));
+        assertThat(metadata.getColumns().get(0).memberGroups.get("General").members.get("complete").propertyLayout.named, is(equalTo("the name of complete property")));
+        assertThat(metadata.getColumns().get(0).memberGroups.get("General").members.get("complete").propertyLayout.namedEscaped, is(true));
 
         assertThat(metadata.getColumns().get(3).collections, is(not(nullValue())));
         assertThat(metadata.getColumns().get(3).collections.containsKey("dependencies"), is(true));
@@ -74,6 +77,8 @@ public class LayoutMetadataReaderFromJsonTest_readMetadata {
         assertThat(metadata.getActions(), is(not(nullValue())));
         assertThat(metadata.getActions().size(), is(2));
         assertThat(metadata.getActions().containsKey("delete"), is(true));
+
+        assertThat(metadata.getColumns().get(0).memberGroups.get("Misc").members.get("versionSequence").propertyLayout.namedEscaped, is(false));
     }
 
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/7750d0f7/core/metamodel/src/test/resources/org/apache/isis/core/metamodel/layoutmetadata/json/ExampleDomainObject.layout.json
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/resources/org/apache/isis/core/metamodel/layoutmetadata/json/ExampleDomainObject.layout.json b/core/metamodel/src/test/resources/org/apache/isis/core/metamodel/layoutmetadata/json/ExampleDomainObject.layout.json
index 390d5a0..eb580c3 100644
--- a/core/metamodel/src/test/resources/org/apache/isis/core/metamodel/layoutmetadata/json/ExampleDomainObject.layout.json
+++ b/core/metamodel/src/test/resources/org/apache/isis/core/metamodel/layoutmetadata/json/ExampleDomainObject.layout.json
@@ -37,7 +37,9 @@
                             },
                             notYetCompleted: {}
                         },
-			            named: { value: "Done" },
+                        propertyLayout: {
+                            named: "the name of complete property"
+                        },
 			            describedAs: {
 			                value: "Whether this todo item has been completed"
 			            },
@@ -55,6 +57,9 @@
                         hidden: {
                             where: ALL_TABLES,
                             when: ALWAYS 
+                        },
+                        propertyLayout: {
+                            namedEscaped: false
                         }
                     }
                 }
@@ -129,4 +134,3 @@
         }
     }
 }
- 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/isis/blob/7750d0f7/core/metamodel/src/test/resources/org/apache/isis/core/metamodel/layoutmetadata/json/ExampleDomainObject.layout.properties
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/resources/org/apache/isis/core/metamodel/layoutmetadata/json/ExampleDomainObject.layout.properties b/core/metamodel/src/test/resources/org/apache/isis/core/metamodel/layoutmetadata/json/ExampleDomainObject.layout.properties
index 917a187..095535b 100644
--- a/core/metamodel/src/test/resources/org/apache/isis/core/metamodel/layoutmetadata/json/ExampleDomainObject.layout.properties
+++ b/core/metamodel/src/test/resources/org/apache/isis/core/metamodel/layoutmetadata/json/ExampleDomainObject.layout.properties
@@ -34,7 +34,7 @@ member.description.memberOrder.name=General
 member.description.typicalLength.value=50
 member.category.memberOrder.name=General
 member.complete.memberOrder.name=General
-member.complete.named.value=Done
+member.complete.propertyLayout.named=the name of complete property
 member.complete.cssClass.value=x-highlight
 member.complete.describedAs.value=Whether this todo item has been completed
 member.complete.disabled.where=ANYWHERE
@@ -49,7 +49,7 @@ member.versionSequence.memberOrder.name=Misc
 member.versionSequence.memberOrder.sequence=4
 member.versionSequence.hidden.where=ALL_TABLES
 member.versionSequence.hidden.when=ALWAYS
-
+member.versionSequence.propertyLayout.namedEscaped=false
 
 # Properties (Detail)
 member.dueBy.memberOrder.name=Detail