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/04/27 12:33:01 UTC
[15/35] isis git commit: ISIS-1603: further fix for unit tests
ISIS-1603: further fix for unit tests
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4bdfb869
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4bdfb869
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4bdfb869
Branch: refs/heads/ISIS-1603
Commit: 4bdfb86991f35a02309f784eeb47cf33c2626783
Parents: 20d442c
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Apr 23 17:59:37 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Apr 27 13:26:39 2017 +0100
----------------------------------------------------------------------
.../PropertyLayoutFacetFactory.java | 4 +-
...tForPropertyLayoutAnnotationFactoryTest.java | 60 ---------------
...tForPropertyLayoutAnnotationFactoryTest.java | 80 --------------------
3 files changed, 2 insertions(+), 142 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/4bdfb869/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PropertyLayoutFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PropertyLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PropertyLayoutFacetFactory.java
index f7365b7..985395e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PropertyLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PropertyLayoutFacetFactory.java
@@ -57,7 +57,7 @@ public class PropertyLayoutFacetFactory extends FacetFactoryAbstract implements
processDescribedAs(holder, properties, propertyLayout);
- processEditStyle(holder, properties, propertyLayout);
+ processPromptStyle(holder, properties, propertyLayout);
processHidden(holder, properties, propertyLayout);
@@ -91,7 +91,7 @@ public class PropertyLayoutFacetFactory extends FacetFactoryAbstract implements
FacetUtil.addFacet(describedAsFacet);
}
- void processEditStyle(final FacetHolder holder, final Properties properties, final PropertyLayout propertyLayout) {
+ void processPromptStyle(final FacetHolder holder, final Properties properties, final PropertyLayout propertyLayout) {
PromptStyleFacet promptStyleFacet = PromptStyleFacetOnPropertyFromLayoutProperties
.create(properties, holder);
if(promptStyleFacet == null) {
http://git-wip-us.apache.org/repos/asf/isis/blob/4bdfb869/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/layout/annotation/LabelAtFacetForPropertyLayoutAnnotationFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/layout/annotation/LabelAtFacetForPropertyLayoutAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/layout/annotation/LabelAtFacetForPropertyLayoutAnnotationFactoryTest.java
deleted file mode 100644
index e798dbf..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/layout/annotation/LabelAtFacetForPropertyLayoutAnnotationFactoryTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.properties.layout.annotation;
-
-import java.lang.reflect.Method;
-import org.apache.isis.applib.annotation.LabelPosition;
-import org.apache.isis.applib.annotation.PropertyLayout;
-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;
-import org.apache.isis.core.metamodel.facets.properties.propertylayout.LabelAtFacetForPropertyLayoutAnnotation;
-import org.apache.isis.core.metamodel.facets.properties.propertylayout.PropertyLayoutFacetFactory;
-import org.apache.isis.core.metamodel.facets.objectvalue.labelat.LabelAtFacet;
-
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assert.assertThat;
-
-public class LabelAtFacetForPropertyLayoutAnnotationFactoryTest extends AbstractFacetFactoryTest {
-
- public void testPropertyLayoutAnnotationPickedUp() {
- final PropertyLayoutFacetFactory facetFactory = new PropertyLayoutFacetFactory();
-
- class Customer {
- @SuppressWarnings("unused")
- @PropertyLayout(labelPosition = LabelPosition.LEFT)
- public String getFirstName() {
- return null;
- }
- }
- final Method method = findMethod(Customer.class, "getFirstName");
-
- facetFactory.process(new ProcessMethodContext(Customer.class, null, null, method, methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(LabelAtFacet.class);
- assertThat(facet, is(notNullValue()));
- assertThat(facet, is(instanceOf(LabelAtFacetForPropertyLayoutAnnotation.class)));
- final LabelAtFacetForPropertyLayoutAnnotation layoutAnnotation = (LabelAtFacetForPropertyLayoutAnnotation) facet;
- assertThat(layoutAnnotation.label(), is(equalTo(LabelPosition.LEFT)));
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/4bdfb869/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/layout/annotation/NamedFacetForPropertyLayoutAnnotationFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/layout/annotation/NamedFacetForPropertyLayoutAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/layout/annotation/NamedFacetForPropertyLayoutAnnotationFactoryTest.java
deleted file mode 100644
index f0acd1b..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/layout/annotation/NamedFacetForPropertyLayoutAnnotationFactoryTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.properties.layout.annotation;
-
-import java.lang.reflect.Method;
-import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
-import org.apache.isis.core.metamodel.facets.properties.propertylayout.NamedFacetForPropertyLayoutAnnotation;
-import org.apache.isis.core.metamodel.facets.properties.propertylayout.PropertyLayoutFacetFactory;
-
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assert.assertThat;
-
-public class NamedFacetForPropertyLayoutAnnotationFactoryTest extends AbstractFacetFactoryTest {
-
- public void testPropertyLayoutAnnotationNamed() {
- final PropertyLayoutFacetFactory facetFactory = new PropertyLayoutFacetFactory();
-
- class Customer {
- @SuppressWarnings("unused")
- @PropertyLayout(named = "1st name")
- public String getFirstName() {
- return null;
- }
- }
- final Method method = findMethod(Customer.class, "getFirstName");
-
- facetFactory.process(new ProcessMethodContext(Customer.class, null, null, method, methodRemover, facetedMethod));
-
- final NamedFacet facet = facetedMethod.getFacet(NamedFacet.class);
- assertThat(facet, is(notNullValue()));
- assertThat(facet, is(instanceOf(NamedFacetForPropertyLayoutAnnotation.class)));
- assertThat(facet.value(), is(equalTo("1st name")));
- assertThat(facet.escaped(), is(true));
- }
-
- public void testPropertyLayoutAnnotationNamedEscapedFalse() {
- final PropertyLayoutFacetFactory facetFactory = new PropertyLayoutFacetFactory();
-
- class Customer {
- @SuppressWarnings("unused")
- @PropertyLayout(named = "1st name", namedEscaped = false)
- public String getFirstName() {
- return null;
- }
- }
- final Method method = findMethod(Customer.class, "getFirstName");
-
- facetFactory.process(new ProcessMethodContext(Customer.class, null, null, method, methodRemover, facetedMethod));
-
- final NamedFacet facet = facetedMethod.getFacet(NamedFacet.class);
- assertThat(facet, is(notNullValue()));
- assertThat(facet, is(instanceOf(NamedFacetForPropertyLayoutAnnotation.class)));
- assertThat(facet.value(), is(equalTo("1st name")));
- assertThat(facet.escaped(), is(false));
- }
-
-}