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 2010/12/22 17:22:32 UTC
svn commit: r1051971 [15/18] - in /incubator/isis/trunk:
alternatives/bytecode/identity/src/main/java/org/apache/isis/alternatives/bytecode/identity/objectfactory/
alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/java...
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/encodable/EncodableFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/encodable/EncodableFacetFactoryTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/encodable/EncodableFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/encodable/EncodableFacetFactoryTest.java Wed Dec 22 16:22:08 2010
@@ -25,7 +25,7 @@ import org.apache.isis.applib.adapters.E
import org.apache.isis.applib.annotation.Encodable;
import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.feature.FeatureType;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.progmodel.facets.object.encodeable.EncodableAnnotationFacetFactory;
import org.apache.isis.core.progmodel.facets.object.encodeable.EncodableFacetAbstract;
@@ -53,12 +53,12 @@ public class EncodableFacetFactoryTest e
@Override
public void testFeatureTypes() {
- final List<ObjectFeatureType> featureTypes = facetFactory.getFeatureTypes();
- assertTrue(contains(featureTypes, ObjectFeatureType.OBJECT));
- assertFalse(contains(featureTypes, ObjectFeatureType.PROPERTY));
- assertFalse(contains(featureTypes, ObjectFeatureType.COLLECTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION_PARAMETER));
+ final List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+ assertTrue(contains(featureTypes, FeatureType.OBJECT));
+ assertFalse(contains(featureTypes, FeatureType.PROPERTY));
+ assertFalse(contains(featureTypes, FeatureType.COLLECTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION_PARAMETER));
}
public void testFacetPickedUp() {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/facets/FacetsAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/facets/FacetsAnnotationFacetFactoryTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/facets/FacetsAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/facets/FacetsAnnotationFacetFactoryTest.java Wed Dec 22 16:22:08 2010
@@ -27,7 +27,8 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.FacetFactory;
import org.apache.isis.core.metamodel.facets.FacetHolder;
import org.apache.isis.core.metamodel.facets.MethodRemover;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.facets.facets.FacetsFacet;
+import org.apache.isis.core.metamodel.feature.FeatureType;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
public class FacetsAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
@@ -49,17 +50,17 @@ public class FacetsAnnotationFacetFactor
@Override
public void testFeatureTypes() {
- final List<ObjectFeatureType> featureTypes = facetFactory.getFeatureTypes();
- assertTrue(contains(featureTypes, ObjectFeatureType.OBJECT));
- assertFalse(contains(featureTypes, ObjectFeatureType.PROPERTY));
- assertFalse(contains(featureTypes, ObjectFeatureType.COLLECTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION_PARAMETER));
+ final List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+ assertTrue(contains(featureTypes, FeatureType.OBJECT));
+ assertFalse(contains(featureTypes, FeatureType.PROPERTY));
+ assertFalse(contains(featureTypes, FeatureType.COLLECTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION_PARAMETER));
}
public static class CustomerFacetFactory implements FacetFactory {
@Override
- public List<ObjectFeatureType> getFeatureTypes() {
+ public List<FeatureType> getFeatureTypes() {
return null;
}
@@ -82,7 +83,7 @@ public class FacetsAnnotationFacetFactor
public static class CustomerFacetFactory2 implements FacetFactory {
@Override
- public List<ObjectFeatureType> getFeatureTypes() {
+ public List<FeatureType> getFeatureTypes() {
return null;
}
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/icon/IconFacetViaMethodTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/icon/IconFacetViaMethodTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/icon/IconFacetViaMethodTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/icon/IconFacetViaMethodTest.java Wed Dec 22 16:22:08 2010
@@ -20,23 +20,23 @@
package org.apache.isis.core.progmodel.facets.object.ident.icon;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
-import java.lang.reflect.Method;
-
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
+import java.lang.reflect.Method;
+
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.FacetHolder;
-import org.apache.isis.core.progmodel.facets.object.ident.icon.IconFacetViaMethod;
@RunWith(JMock.class)
public class IconFacetViaMethodTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/icon/IconMethodFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/icon/IconMethodFacetFactoryTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/icon/IconMethodFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/icon/IconMethodFacetFactoryTest.java Wed Dec 22 16:22:08 2010
@@ -24,7 +24,8 @@ import java.lang.reflect.Method;
import java.util.List;
import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.facets.object.ident.icon.IconFacet;
+import org.apache.isis.core.metamodel.feature.FeatureType;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
@@ -47,12 +48,12 @@ public class IconMethodFacetFactoryTest
@Override
public void testFeatureTypes() {
- final List<ObjectFeatureType> featureTypes = facetFactory.getFeatureTypes();
- assertTrue(contains(featureTypes, ObjectFeatureType.OBJECT));
- assertFalse(contains(featureTypes, ObjectFeatureType.PROPERTY));
- assertFalse(contains(featureTypes, ObjectFeatureType.COLLECTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION_PARAMETER));
+ final List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+ assertTrue(contains(featureTypes, FeatureType.OBJECT));
+ assertFalse(contains(featureTypes, FeatureType.PROPERTY));
+ assertFalse(contains(featureTypes, FeatureType.COLLECTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION_PARAMETER));
}
public void testIconNameMethodPickedUpOnClassAndMethodRemoved() {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/plural/PluralAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/plural/PluralAnnotationFacetFactoryTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/plural/PluralAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/plural/PluralAnnotationFacetFactoryTest.java Wed Dec 22 16:22:08 2010
@@ -24,7 +24,8 @@ import java.util.List;
import org.apache.isis.applib.annotation.Plural;
import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.facets.object.ident.plural.PluralFacet;
+import org.apache.isis.core.metamodel.feature.FeatureType;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
@@ -47,12 +48,12 @@ public class PluralAnnotationFacetFactor
@Override
public void testFeatureTypes() {
- final List<ObjectFeatureType> featureTypes = facetFactory.getFeatureTypes();
- assertTrue(contains(featureTypes, ObjectFeatureType.OBJECT));
- assertFalse(contains(featureTypes, ObjectFeatureType.PROPERTY));
- assertFalse(contains(featureTypes, ObjectFeatureType.COLLECTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION_PARAMETER));
+ final List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+ assertTrue(contains(featureTypes, FeatureType.OBJECT));
+ assertFalse(contains(featureTypes, FeatureType.PROPERTY));
+ assertFalse(contains(featureTypes, FeatureType.COLLECTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION_PARAMETER));
}
public void testPluralAnnotationMethodPickedUpOnClass() {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/plural/PluralMethodFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/plural/PluralMethodFacetFactoryTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/plural/PluralMethodFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/plural/PluralMethodFacetFactoryTest.java Wed Dec 22 16:22:08 2010
@@ -24,7 +24,8 @@ import java.lang.reflect.Method;
import java.util.List;
import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.facets.object.ident.plural.PluralFacet;
+import org.apache.isis.core.metamodel.feature.FeatureType;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
@@ -47,12 +48,12 @@ public class PluralMethodFacetFactoryTes
@Override
public void testFeatureTypes() {
- final List<ObjectFeatureType> featureTypes = facetFactory.getFeatureTypes();
- assertTrue(contains(featureTypes, ObjectFeatureType.OBJECT));
- assertFalse(contains(featureTypes, ObjectFeatureType.PROPERTY));
- assertFalse(contains(featureTypes, ObjectFeatureType.COLLECTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION_PARAMETER));
+ final List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+ assertTrue(contains(featureTypes, FeatureType.OBJECT));
+ assertFalse(contains(featureTypes, FeatureType.PROPERTY));
+ assertFalse(contains(featureTypes, FeatureType.COLLECTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION_PARAMETER));
}
public static class Customer {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/singular/SingularMethodFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/singular/SingularMethodFacetFactoryTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/singular/SingularMethodFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/singular/SingularMethodFacetFactoryTest.java Wed Dec 22 16:22:08 2010
@@ -25,7 +25,7 @@ import java.util.List;
import org.apache.isis.core.metamodel.facets.Facet;
import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.feature.FeatureType;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
@@ -48,12 +48,12 @@ public class SingularMethodFacetFactoryT
@Override
public void testFeatureTypes() {
- final List<ObjectFeatureType> featureTypes = facetFactory.getFeatureTypes();
- assertTrue(contains(featureTypes, ObjectFeatureType.OBJECT));
- assertFalse(contains(featureTypes, ObjectFeatureType.PROPERTY));
- assertFalse(contains(featureTypes, ObjectFeatureType.COLLECTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION_PARAMETER));
+ final List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+ assertTrue(contains(featureTypes, FeatureType.OBJECT));
+ assertFalse(contains(featureTypes, FeatureType.PROPERTY));
+ assertFalse(contains(featureTypes, FeatureType.COLLECTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION_PARAMETER));
}
public static class Customer {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/TitleFacetViaMethodTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/TitleFacetViaMethodTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/TitleFacetViaMethodTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/TitleFacetViaMethodTest.java Wed Dec 22 16:22:08 2010
@@ -20,23 +20,23 @@
package org.apache.isis.core.progmodel.facets.object.ident.title;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
-import java.lang.reflect.Method;
-
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
+import java.lang.reflect.Method;
+
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.FacetHolder;
-import org.apache.isis.core.progmodel.facets.object.ident.title.TitleFacetViaTitleMethod;
@RunWith(JMock.class)
public class TitleFacetViaMethodTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/TitleMethodFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/TitleMethodFacetFactoryTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/TitleMethodFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/TitleMethodFacetFactoryTest.java Wed Dec 22 16:22:08 2010
@@ -24,8 +24,9 @@ import java.lang.reflect.Method;
import java.util.List;
import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.runtimecontext.spec.IntrospectableSpecificationAbstract;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.facets.object.ident.title.TitleFacet;
+import org.apache.isis.core.metamodel.feature.FeatureType;
+import org.apache.isis.core.metamodel.spec.IntrospectableSpecificationAbstract;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
@@ -48,12 +49,12 @@ public class TitleMethodFacetFactoryTest
@Override
public void testFeatureTypes() {
- final List<ObjectFeatureType> featureTypes = facetFactory.getFeatureTypes();
- assertTrue(contains(featureTypes, ObjectFeatureType.OBJECT));
- assertFalse(contains(featureTypes, ObjectFeatureType.PROPERTY));
- assertFalse(contains(featureTypes, ObjectFeatureType.COLLECTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION_PARAMETER));
+ final List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+ assertTrue(contains(featureTypes, FeatureType.OBJECT));
+ assertFalse(contains(featureTypes, FeatureType.PROPERTY));
+ assertFalse(contains(featureTypes, FeatureType.COLLECTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION_PARAMETER));
}
public void testTitleMethodPickedUpOnClassAndMethodRemoved() {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/immutable/ImmutableAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/immutable/ImmutableAnnotationFacetFactoryTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/immutable/ImmutableAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/immutable/ImmutableAnnotationFacetFactoryTest.java Wed Dec 22 16:22:08 2010
@@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation
import org.apache.isis.applib.annotation.When;
import org.apache.isis.core.metamodel.facets.Facet;
import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.feature.FeatureType;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
@@ -49,12 +49,12 @@ public class ImmutableAnnotationFacetFac
@Override
public void testFeatureTypes() {
- final List<ObjectFeatureType> featureTypes = facetFactory.getFeatureTypes();
- assertTrue(contains(featureTypes, ObjectFeatureType.OBJECT));
- assertTrue(contains(featureTypes, ObjectFeatureType.PROPERTY));
- assertTrue(contains(featureTypes, ObjectFeatureType.COLLECTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION_PARAMETER));
+ final List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+ assertTrue(contains(featureTypes, FeatureType.OBJECT));
+ assertTrue(contains(featureTypes, FeatureType.PROPERTY));
+ assertTrue(contains(featureTypes, FeatureType.COLLECTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION_PARAMETER));
}
public void testImmutableAnnotationPickedUpOnClassAndDefaultsToAlways() {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/immutable/ImmutableMarkerInterfaceFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/immutable/ImmutableMarkerInterfaceFacetFactoryTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/immutable/ImmutableMarkerInterfaceFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/immutable/ImmutableMarkerInterfaceFacetFactoryTest.java Wed Dec 22 16:22:08 2010
@@ -28,7 +28,7 @@ import org.apache.isis.applib.marker.Imm
import org.apache.isis.applib.marker.NeverImmutable;
import org.apache.isis.core.metamodel.facets.Facet;
import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.feature.FeatureType;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
@@ -51,12 +51,12 @@ public class ImmutableMarkerInterfaceFac
@Override
public void testFeatureTypes() {
- final List<ObjectFeatureType> featureTypes = facetFactory.getFeatureTypes();
- assertTrue(contains(featureTypes, ObjectFeatureType.OBJECT));
- assertFalse(contains(featureTypes, ObjectFeatureType.PROPERTY));
- assertFalse(contains(featureTypes, ObjectFeatureType.COLLECTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION_PARAMETER));
+ final List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+ assertTrue(contains(featureTypes, FeatureType.OBJECT));
+ assertFalse(contains(featureTypes, FeatureType.PROPERTY));
+ assertFalse(contains(featureTypes, FeatureType.COLLECTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION_PARAMETER));
}
public void testAlwaysImmutable() {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableAnnotationFacetFactoryTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableAnnotationFacetFactoryTest.java Wed Dec 22 16:22:08 2010
@@ -25,7 +25,8 @@ import java.util.List;
import org.apache.isis.applib.annotation.NotPersistable;
import org.apache.isis.applib.annotation.NotPersistable.By;
import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.facets.object.notpersistable.NotPersistableFacet;
+import org.apache.isis.core.metamodel.feature.FeatureType;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
@@ -48,12 +49,12 @@ public class NotPersistableAnnotationFac
@Override
public void testFeatureTypes() {
- final List<ObjectFeatureType> featureTypes = facetFactory.getFeatureTypes();
- assertTrue(contains(featureTypes, ObjectFeatureType.OBJECT));
- assertFalse(contains(featureTypes, ObjectFeatureType.PROPERTY));
- assertFalse(contains(featureTypes, ObjectFeatureType.COLLECTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION_PARAMETER));
+ final List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+ assertTrue(contains(featureTypes, FeatureType.OBJECT));
+ assertFalse(contains(featureTypes, FeatureType.PROPERTY));
+ assertFalse(contains(featureTypes, FeatureType.COLLECTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION_PARAMETER));
}
public void testNotPersistableAnnotationPickedUpOnClassAndDefaultsToUserOrProgram() {
@@ -66,8 +67,8 @@ public class NotPersistableAnnotationFac
assertNotNull(facet);
assertTrue(facet instanceof NotPersistableFacetAnnotation);
final NotPersistableFacetAnnotation notPersistableFacetAnnotation = (NotPersistableFacetAnnotation) facet;
- final org.apache.isis.core.progmodel.facets.object.notpersistable.InitiatedBy value = notPersistableFacetAnnotation.value();
- assertEquals(org.apache.isis.core.progmodel.facets.object.notpersistable.InitiatedBy.USER_OR_PROGRAM, value);
+ final org.apache.isis.core.metamodel.facets.object.notpersistable.InitiatedBy value = notPersistableFacetAnnotation.value();
+ assertEquals(org.apache.isis.core.metamodel.facets.object.notpersistable.InitiatedBy.USER_OR_PROGRAM, value);
assertNoMethodsRemoved();
}
@@ -82,8 +83,8 @@ public class NotPersistableAnnotationFac
assertNotNull(facet);
assertTrue(facet instanceof NotPersistableFacetAnnotation);
final NotPersistableFacetAnnotation notPersistableFacetAnnotation = (NotPersistableFacetAnnotation) facet;
- final org.apache.isis.core.progmodel.facets.object.notpersistable.InitiatedBy value = notPersistableFacetAnnotation.value();
- assertEquals(org.apache.isis.core.progmodel.facets.object.notpersistable.InitiatedBy.USER_OR_PROGRAM, value);
+ final org.apache.isis.core.metamodel.facets.object.notpersistable.InitiatedBy value = notPersistableFacetAnnotation.value();
+ assertEquals(org.apache.isis.core.metamodel.facets.object.notpersistable.InitiatedBy.USER_OR_PROGRAM, value);
assertNoMethodsRemoved();
}
@@ -98,8 +99,8 @@ public class NotPersistableAnnotationFac
assertNotNull(facet);
assertTrue(facet instanceof NotPersistableFacetAnnotation);
final NotPersistableFacetAnnotation notPersistableFacetAnnotation = (NotPersistableFacetAnnotation) facet;
- final org.apache.isis.core.progmodel.facets.object.notpersistable.InitiatedBy value = notPersistableFacetAnnotation.value();
- assertEquals(org.apache.isis.core.progmodel.facets.object.notpersistable.InitiatedBy.USER, value);
+ final org.apache.isis.core.metamodel.facets.object.notpersistable.InitiatedBy value = notPersistableFacetAnnotation.value();
+ assertEquals(org.apache.isis.core.metamodel.facets.object.notpersistable.InitiatedBy.USER, value);
assertNoMethodsRemoved();
}
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableMarkerInterfaceFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableMarkerInterfaceFacetFactoryTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableMarkerInterfaceFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableMarkerInterfaceFacetFactoryTest.java Wed Dec 22 16:22:08 2010
@@ -25,7 +25,8 @@ import java.util.List;
import org.apache.isis.applib.marker.NonPersistable;
import org.apache.isis.applib.marker.ProgramPersistable;
import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.facets.object.notpersistable.NotPersistableFacet;
+import org.apache.isis.core.metamodel.feature.FeatureType;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
@@ -48,12 +49,12 @@ public class NotPersistableMarkerInterfa
@Override
public void testFeatureTypes() {
- final List<ObjectFeatureType> featureTypes = facetFactory.getFeatureTypes();
- assertTrue(contains(featureTypes, ObjectFeatureType.OBJECT));
- assertFalse(contains(featureTypes, ObjectFeatureType.PROPERTY));
- assertFalse(contains(featureTypes, ObjectFeatureType.COLLECTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION_PARAMETER));
+ final List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+ assertTrue(contains(featureTypes, FeatureType.OBJECT));
+ assertFalse(contains(featureTypes, FeatureType.PROPERTY));
+ assertFalse(contains(featureTypes, FeatureType.COLLECTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION_PARAMETER));
}
public void testProgramPersistableMeansNotPersistableByUser() {
@@ -65,8 +66,8 @@ public class NotPersistableMarkerInterfa
assertNotNull(facet);
assertTrue(facet instanceof NotPersistableFacetMarkerInterface);
final NotPersistableFacetMarkerInterface notPersistableFacetMarkerInterface = (NotPersistableFacetMarkerInterface) facet;
- final org.apache.isis.core.progmodel.facets.object.notpersistable.InitiatedBy value = notPersistableFacetMarkerInterface.value();
- assertEquals(org.apache.isis.core.progmodel.facets.object.notpersistable.InitiatedBy.USER, value);
+ final org.apache.isis.core.metamodel.facets.object.notpersistable.InitiatedBy value = notPersistableFacetMarkerInterface.value();
+ assertEquals(org.apache.isis.core.metamodel.facets.object.notpersistable.InitiatedBy.USER, value);
assertNoMethodsRemoved();
}
@@ -80,8 +81,8 @@ public class NotPersistableMarkerInterfa
assertNotNull(facet);
assertTrue(facet instanceof NotPersistableFacetMarkerInterface);
final NotPersistableFacetMarkerInterface notPersistableFacetMarkerInterface = (NotPersistableFacetMarkerInterface) facet;
- final org.apache.isis.core.progmodel.facets.object.notpersistable.InitiatedBy value = notPersistableFacetMarkerInterface.value();
- assertEquals(org.apache.isis.core.progmodel.facets.object.notpersistable.InitiatedBy.USER_OR_PROGRAM, value);
+ final org.apache.isis.core.metamodel.facets.object.notpersistable.InitiatedBy value = notPersistableFacetMarkerInterface.value();
+ assertEquals(org.apache.isis.core.metamodel.facets.object.notpersistable.InitiatedBy.USER_OR_PROGRAM, value);
assertNoMethodsRemoved();
}
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/parseable/ParseableFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/parseable/ParseableFacetFactoryTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/parseable/ParseableFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/parseable/ParseableFacetFactoryTest.java Wed Dec 22 16:22:08 2010
@@ -25,7 +25,7 @@ import org.apache.isis.applib.adapters.P
import org.apache.isis.applib.annotation.Parseable;
import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.feature.FeatureType;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
public class ParseableFacetFactoryTest extends AbstractFacetFactoryTest {
@@ -50,12 +50,12 @@ public class ParseableFacetFactoryTest e
@Override
public void testFeatureTypes() {
- final List<ObjectFeatureType> featureTypes = facetFactory.getFeatureTypes();
- assertTrue(contains(featureTypes, ObjectFeatureType.OBJECT));
- assertFalse(contains(featureTypes, ObjectFeatureType.PROPERTY));
- assertFalse(contains(featureTypes, ObjectFeatureType.COLLECTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION_PARAMETER));
+ final List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+ assertTrue(contains(featureTypes, FeatureType.OBJECT));
+ assertFalse(contains(featureTypes, FeatureType.PROPERTY));
+ assertFalse(contains(featureTypes, FeatureType.COLLECTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION_PARAMETER));
}
public void testFacetPickedUp() {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/validate/ObjectValidMethodFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/validate/ObjectValidMethodFacetFactoryTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/validate/ObjectValidMethodFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/validate/ObjectValidMethodFacetFactoryTest.java Wed Dec 22 16:22:08 2010
@@ -24,7 +24,7 @@ import java.lang.reflect.Method;
import java.util.List;
import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.feature.FeatureType;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
@@ -47,12 +47,12 @@ public class ObjectValidMethodFacetFacto
@Override
public void testFeatureTypes() {
- final List<ObjectFeatureType> featureTypes = facetFactory.getFeatureTypes();
- assertTrue(contains(featureTypes, ObjectFeatureType.OBJECT));
- assertFalse(contains(featureTypes, ObjectFeatureType.PROPERTY));
- assertFalse(contains(featureTypes, ObjectFeatureType.COLLECTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION_PARAMETER));
+ final List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+ assertTrue(contains(featureTypes, FeatureType.OBJECT));
+ assertFalse(contains(featureTypes, FeatureType.PROPERTY));
+ assertFalse(contains(featureTypes, FeatureType.COLLECTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION_PARAMETER));
}
public void testValidateMethodPickedUpAndMethodRemoved() {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/value/ValueFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/value/ValueFacetFactoryTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/value/ValueFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/value/ValueFacetFactoryTest.java Wed Dec 22 16:22:08 2010
@@ -28,16 +28,16 @@ import org.apache.isis.applib.adapters.P
import org.apache.isis.applib.annotation.Value;
import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
+import org.apache.isis.core.metamodel.facets.object.ident.title.TitleFacet;
import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
import org.apache.isis.core.metamodel.facets.propparam.typicallength.TypicalLengthFacet;
+import org.apache.isis.core.metamodel.feature.FeatureType;
import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.progmodel.facets.object.defaults.DefaultedFacet;
import org.apache.isis.core.progmodel.facets.object.ebc.EqualByContentFacet;
-import org.apache.isis.core.progmodel.facets.object.ident.title.TitleFacet;
public class ValueFacetFactoryTest extends AbstractFacetFactoryTest {
@@ -62,12 +62,12 @@ public class ValueFacetFactoryTest exten
@Override
public void testFeatureTypes() {
- final List<ObjectFeatureType> featureTypes = facetFactory.getFeatureTypes();
- assertTrue(contains(featureTypes, ObjectFeatureType.OBJECT));
- assertFalse(contains(featureTypes, ObjectFeatureType.PROPERTY));
- assertFalse(contains(featureTypes, ObjectFeatureType.COLLECTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION_PARAMETER));
+ final List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+ assertTrue(contains(featureTypes, FeatureType.OBJECT));
+ assertFalse(contains(featureTypes, FeatureType.PROPERTY));
+ assertFalse(contains(featureTypes, FeatureType.COLLECTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION_PARAMETER));
}
@Value(semanticsProviderName = "org.apache.isis.core.progmodel.facets.object.value.ValueFacetFactoryTest$MyParseableUsingParserName2")
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/actionorder/ActionOrderAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/actionorder/ActionOrderAnnotationFacetFactoryTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/actionorder/ActionOrderAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/actionorder/ActionOrderAnnotationFacetFactoryTest.java Wed Dec 22 16:22:08 2010
@@ -24,7 +24,8 @@ import java.util.List;
import org.apache.isis.applib.annotation.ActionOrder;
import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.facets.ordering.actionorder.ActionOrderFacet;
+import org.apache.isis.core.metamodel.feature.FeatureType;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
@@ -47,12 +48,12 @@ public class ActionOrderAnnotationFacetF
@Override
public void testFeatureTypes() {
- final List<ObjectFeatureType> featureTypes = facetFactory.getFeatureTypes();
- assertTrue(contains(featureTypes, ObjectFeatureType.OBJECT));
- assertFalse(contains(featureTypes, ObjectFeatureType.PROPERTY));
- assertFalse(contains(featureTypes, ObjectFeatureType.COLLECTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION_PARAMETER));
+ final List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+ assertTrue(contains(featureTypes, FeatureType.OBJECT));
+ assertFalse(contains(featureTypes, FeatureType.PROPERTY));
+ assertFalse(contains(featureTypes, FeatureType.COLLECTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION_PARAMETER));
}
public void testActionOrderAnnotationPickedUpOnClass() {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/fieldorder/FieldOrderAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/fieldorder/FieldOrderAnnotationFacetFactoryTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/fieldorder/FieldOrderAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/fieldorder/FieldOrderAnnotationFacetFactoryTest.java Wed Dec 22 16:22:08 2010
@@ -24,7 +24,8 @@ import java.util.List;
import org.apache.isis.applib.annotation.FieldOrder;
import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.facets.ordering.FieldOrderFacet;
+import org.apache.isis.core.metamodel.feature.FeatureType;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
@@ -47,12 +48,12 @@ public class FieldOrderAnnotationFacetFa
@Override
public void testFeatureTypes() {
- final List<ObjectFeatureType> featureTypes = facetFactory.getFeatureTypes();
- assertTrue(contains(featureTypes, ObjectFeatureType.OBJECT));
- assertFalse(contains(featureTypes, ObjectFeatureType.PROPERTY));
- assertFalse(contains(featureTypes, ObjectFeatureType.COLLECTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION_PARAMETER));
+ final List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+ assertTrue(contains(featureTypes, FeatureType.OBJECT));
+ assertFalse(contains(featureTypes, FeatureType.PROPERTY));
+ assertFalse(contains(featureTypes, FeatureType.COLLECTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION_PARAMETER));
}
public void testFieldOrderAnnotationPickedUpOnClass() {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/DeweyOrderSetTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/DeweyOrderSetTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/DeweyOrderSetTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/DeweyOrderSetTest.java Wed Dec 22 16:22:08 2010
@@ -30,8 +30,9 @@ import org.apache.log4j.LogManager;
import com.google.common.collect.ImmutableList;
-import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectMemberPeer;
-import org.apache.isis.core.progmodel.facets.ordering.OrderSet;
+import org.apache.isis.core.metamodel.facets.ordering.DeweyOrderSet;
+import org.apache.isis.core.metamodel.facets.ordering.OrderSet;
+import org.apache.isis.core.metamodel.peer.FacetedMethod;
public class DeweyOrderSetTest extends TestCase {
@@ -42,20 +43,36 @@ public class DeweyOrderSetTest extends T
public static class Customer {
private String lastName;
+ private String firstName;
+ private String houseNumber;
+ private String streetName;
+ private String postalTown;
public String getLastName() {
return lastName;
}
+ public String getFirstName() {
+ return firstName;
+ }
+ public String getHouseNumber() {
+ return houseNumber;
+ }
+ public String getStreetName() {
+ return streetName;
+ }
+ public String getPostalTown() {
+ return postalTown;
+ }
}
- private final ObjectMemberPeer lastNameMember = MemberPeerStub.createProperty("LastName");
- private final ObjectMemberPeer firstNameMember = MemberPeerStub.createProperty("FirstName");
- private final ObjectMemberPeer houseNumberMember = MemberPeerStub.createProperty("HouseNumber");
- private final ObjectMemberPeer streetNameMember = MemberPeerStub.createProperty("StreetName");
- private final ObjectMemberPeer postalTownMember = MemberPeerStub.createProperty("PostalTown");
- private final List<ObjectMemberPeer> lastNameAndFirstName = ImmutableList.of( lastNameMember, firstNameMember );
- private final List<ObjectMemberPeer> nameAndAddressMembers = ImmutableList.of( lastNameMember, firstNameMember,
+ private final FacetedMethod lastNameMember = FacetedMethod.createProperty(Customer.class,"Last Name");
+ private final FacetedMethod firstNameMember = FacetedMethod.createProperty(Customer.class,"First Name");
+ private final FacetedMethod houseNumberMember = FacetedMethod.createProperty(Customer.class,"House Number");
+ private final FacetedMethod streetNameMember = FacetedMethod.createProperty(Customer.class,"Street Name");
+ private final FacetedMethod postalTownMember = FacetedMethod.createProperty(Customer.class,"Postal Town");
+ private final List<FacetedMethod> lastNameAndFirstName = ImmutableList.of( lastNameMember, firstNameMember );
+ private final List<FacetedMethod> nameAndAddressMembers = ImmutableList.of( lastNameMember, firstNameMember,
houseNumberMember, streetNameMember, postalTownMember );
- private final List<ObjectMemberPeer> lastNameFirstNameAndPostalTown = ImmutableList.of( lastNameMember,
+ private final List<FacetedMethod> lastNameFirstNameAndPostalTown = ImmutableList.of( lastNameMember,
firstNameMember, postalTownMember );
@Override
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java Wed Dec 22 16:22:08 2010
@@ -26,7 +26,8 @@ import java.util.List;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.facets.ordering.MemberOrderFacet;
+import org.apache.isis.core.metamodel.feature.FeatureType;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
@@ -49,12 +50,12 @@ public class MemberOrderAnnotationFacetF
@Override
public void testFeatureTypes() {
- final List<ObjectFeatureType> featureTypes = facetFactory.getFeatureTypes();
- assertFalse(contains(featureTypes, ObjectFeatureType.OBJECT));
- assertTrue(contains(featureTypes, ObjectFeatureType.PROPERTY));
- assertTrue(contains(featureTypes, ObjectFeatureType.COLLECTION));
- assertTrue(contains(featureTypes, ObjectFeatureType.ACTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION_PARAMETER));
+ final List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+ assertFalse(contains(featureTypes, FeatureType.OBJECT));
+ assertTrue(contains(featureTypes, FeatureType.PROPERTY));
+ assertTrue(contains(featureTypes, FeatureType.COLLECTION));
+ assertTrue(contains(featureTypes, FeatureType.ACTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION_PARAMETER));
}
public void testMemberOrderAnnotationPickedUpOnProperty() {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderComparatorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderComparatorTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderComparatorTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderComparatorTest.java Wed Dec 22 16:22:08 2010
@@ -26,6 +26,9 @@ import junit.framework.TestSuite;
import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
+import org.apache.isis.core.metamodel.facets.ordering.MemberOrderComparator;
+import org.apache.isis.core.metamodel.peer.FacetedMethod;
+
public class MemberOrderComparatorTest extends TestCase {
@@ -35,8 +38,14 @@ public class MemberOrderComparatorTest e
private MemberOrderComparator comparator, laxComparator;
- private final MemberPeerStub m1 = MemberPeerStub.createProperty("abc");
- private final MemberPeerStub m2 = MemberPeerStub.createProperty("abc");
+ public static class Customer {
+ private String abc;
+ public String getAbc() {
+ return abc;
+ }
+ }
+ private final FacetedMethod m1 = FacetedMethod.createProperty(Customer.class, "abc");
+ private final FacetedMethod m2 = FacetedMethod.createProperty(Customer.class, "abc");
@Override
protected void setUp() {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propcoll/notpersisted/NotPersistedAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propcoll/notpersisted/NotPersistedAnnotationFacetFactoryTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propcoll/notpersisted/NotPersistedAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propcoll/notpersisted/NotPersistedAnnotationFacetFactoryTest.java Wed Dec 22 16:22:08 2010
@@ -27,7 +27,7 @@ import java.util.List;
import org.apache.isis.applib.annotation.NotPersisted;
import org.apache.isis.core.metamodel.facets.Facet;
import org.apache.isis.core.metamodel.facets.propcoll.notpersisted.NotPersistedFacet;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.feature.FeatureType;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
@@ -50,12 +50,12 @@ public class NotPersistedAnnotationFacet
@Override
public void testFeatureTypes() {
- final List<ObjectFeatureType> featureTypes = facetFactory.getFeatureTypes();
- assertFalse(contains(featureTypes, ObjectFeatureType.OBJECT));
- assertTrue(contains(featureTypes, ObjectFeatureType.PROPERTY));
- assertTrue(contains(featureTypes, ObjectFeatureType.COLLECTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION_PARAMETER));
+ final List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+ assertFalse(contains(featureTypes, FeatureType.OBJECT));
+ assertTrue(contains(featureTypes, FeatureType.PROPERTY));
+ assertTrue(contains(featureTypes, FeatureType.COLLECTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION_PARAMETER));
}
public void testNotPersistedAnnotationPickedUpOnProperty() {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/properties/PropertyFieldMethodsFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/properties/PropertyFieldMethodsFacetFactoryTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/properties/PropertyFieldMethodsFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/properties/PropertyFieldMethodsFacetFactoryTest.java Wed Dec 22 16:22:08 2010
@@ -35,7 +35,7 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.properties.modify.PropertyClearFacet;
import org.apache.isis.core.metamodel.facets.properties.modify.PropertyInitializationFacet;
import org.apache.isis.core.metamodel.facets.properties.modify.PropertySetterFacet;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.feature.FeatureType;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.progmodel.facets.actions.DescribedAsFacetViaMethod;
import org.apache.isis.core.progmodel.facets.actions.NamedFacetViaMethod;
@@ -83,12 +83,12 @@ public class PropertyFieldMethodsFacetFa
@Override
public void testFeatureTypes() {
- final List<ObjectFeatureType> featureTypes = facetFactory.getFeatureTypes();
- assertFalse(contains(featureTypes, ObjectFeatureType.OBJECT));
- assertTrue(contains(featureTypes, ObjectFeatureType.PROPERTY));
- assertFalse(contains(featureTypes, ObjectFeatureType.COLLECTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION_PARAMETER));
+ final List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+ assertFalse(contains(featureTypes, FeatureType.OBJECT));
+ assertTrue(contains(featureTypes, FeatureType.PROPERTY));
+ assertFalse(contains(featureTypes, FeatureType.COLLECTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION_PARAMETER));
}
public void testPropertyAccessorFacetIsInstalledAndMethodRemoved() {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/multiline/MultiLineAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/multiline/MultiLineAnnotationFacetFactoryTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/multiline/MultiLineAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/multiline/MultiLineAnnotationFacetFactoryTest.java Wed Dec 22 16:22:08 2010
@@ -26,7 +26,7 @@ import java.util.List;
import org.apache.isis.applib.annotation.MultiLine;
import org.apache.isis.core.metamodel.facets.Facet;
import org.apache.isis.core.metamodel.facets.propparam.multiline.MultiLineFacet;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.feature.FeatureType;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
@@ -49,12 +49,12 @@ public class MultiLineAnnotationFacetFac
@Override
public void testFeatureTypes() {
- final List<ObjectFeatureType> featureTypes = facetFactory.getFeatureTypes();
- assertTrue(contains(featureTypes, ObjectFeatureType.OBJECT));
- assertTrue(contains(featureTypes, ObjectFeatureType.PROPERTY));
- assertFalse(contains(featureTypes, ObjectFeatureType.COLLECTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION));
- assertTrue(contains(featureTypes, ObjectFeatureType.ACTION_PARAMETER));
+ final List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+ assertTrue(contains(featureTypes, FeatureType.OBJECT));
+ assertTrue(contains(featureTypes, FeatureType.PROPERTY));
+ assertFalse(contains(featureTypes, FeatureType.COLLECTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION));
+ assertTrue(contains(featureTypes, FeatureType.ACTION_PARAMETER));
}
public void testMultiLineAnnotationPickedUpOnClass() {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/DomainObjectWithMustSatisfyAnnotations.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/DomainObjectWithMustSatisfyAnnotations.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/DomainObjectWithMustSatisfyAnnotations.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/DomainObjectWithMustSatisfyAnnotations.java Wed Dec 22 16:22:08 2010
@@ -20,8 +20,8 @@
package org.apache.isis.core.progmodel.facets.propparam.specification;
-import org.apache.isis.applib.AbstractDomainObject;
-import org.apache.isis.applib.annotation.MustSatisfy;
+import org.apache.isis.applib.AbstractDomainObject;
+import org.apache.isis.applib.annotation.MustSatisfy;
public class DomainObjectWithMustSatisfyAnnotations extends AbstractDomainObject {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/DomainObjectWithoutMustSatisfyAnnotations.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/DomainObjectWithoutMustSatisfyAnnotations.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/DomainObjectWithoutMustSatisfyAnnotations.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/DomainObjectWithoutMustSatisfyAnnotations.java Wed Dec 22 16:22:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.core.progmodel.facets.propparam.specification;
-import org.apache.isis.applib.AbstractDomainObject;
+import org.apache.isis.applib.AbstractDomainObject;
public class DomainObjectWithoutMustSatisfyAnnotations extends AbstractDomainObject {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryInstantiationTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryInstantiationTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryInstantiationTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryInstantiationTest.java Wed Dec 22 16:22:08 2010
@@ -20,8 +20,7 @@
package org.apache.isis.core.progmodel.facets.propparam.specification;
-import org.apache.isis.core.progmodel.facets.propparam.specification.MustSatisfySpecificationFacetFactory;
-import org.junit.Test;
+import org.junit.Test;
public class MustSatisfySpecificationFacetFactoryInstantiationTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessParameterTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessParameterTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessParameterTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessParameterTest.java Wed Dec 22 16:22:08 2010
@@ -21,22 +21,21 @@
package org.apache.isis.core.progmodel.facets.propparam.specification;
import static org.apache.isis.core.commons.matchers.IsisMatchers.anInstanceOf;
-
-import java.lang.reflect.Method;
-
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.jmock.lib.legacy.ClassImposteriser;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+
+import java.lang.reflect.Method;
+
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.jmock.lib.legacy.ClassImposteriser;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
import org.apache.isis.core.metamodel.facets.FacetHolder;
import org.apache.isis.core.metamodel.facets.MethodRemover;
-import org.apache.isis.core.progmodel.facets.propparam.specification.MustSatisfySpecificationFacet;
-import org.apache.isis.core.progmodel.facets.propparam.specification.MustSatisfySpecificationFacetFactory;
@RunWith(JMock.class)
public class MustSatisfySpecificationFacetFactoryProcessParameterTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessPropertyTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessPropertyTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessPropertyTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessPropertyTest.java Wed Dec 22 16:22:08 2010
@@ -21,22 +21,21 @@
package org.apache.isis.core.progmodel.facets.propparam.specification;
import static org.apache.isis.core.commons.matchers.IsisMatchers.anInstanceOf;
-
-import java.lang.reflect.Method;
-
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.jmock.lib.legacy.ClassImposteriser;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+
+import java.lang.reflect.Method;
+
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.jmock.lib.legacy.ClassImposteriser;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
import org.apache.isis.core.metamodel.facets.FacetHolder;
import org.apache.isis.core.metamodel.facets.MethodRemover;
-import org.apache.isis.core.progmodel.facets.propparam.specification.MustSatisfySpecificationFacet;
-import org.apache.isis.core.progmodel.facets.propparam.specification.MustSatisfySpecificationFacetFactory;
@RunWith(JMock.class)
public class MustSatisfySpecificationFacetFactoryProcessPropertyTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionMoreTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionMoreTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionMoreTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionMoreTest.java Wed Dec 22 16:22:08 2010
@@ -20,25 +20,25 @@
package org.apache.isis.core.progmodel.facets.propparam.specification;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.jmock.lib.legacy.ClassImposteriser;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.jmock.lib.legacy.ClassImposteriser;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.feature.IdentifiedHolder;
import org.apache.isis.core.metamodel.interactions.PropertyModifyContext;
-import org.apache.isis.core.metamodel.spec.identifier.Identified;
-import org.apache.isis.core.progmodel.facets.propparam.specification.MustSatisfySpecificationFacet;
@RunWith(JMock.class)
@@ -61,7 +61,7 @@ public class MustSatisfySpecificationVal
@Before
public void setUp() throws Exception {
- mockHolder = mockery.mock(Identified.class);
+ mockHolder = mockery.mock(IdentifiedHolder.class);
requiresFirstLetterToBeUpperCase = new SpecificationRequiresFirstLetterToBeUpperCase();
facetForSpecificationFirstLetterUpperCase = new MustSatisfySpecificationFacet(Utils.listOf(requiresFirstLetterToBeUpperCase), mockHolder);
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionTest.java Wed Dec 22 16:22:08 2010
@@ -20,25 +20,25 @@
package org.apache.isis.core.progmodel.facets.propparam.specification;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.jmock.lib.legacy.ClassImposteriser;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.jmock.lib.legacy.ClassImposteriser;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.feature.IdentifiedHolder;
import org.apache.isis.core.metamodel.interactions.PropertyModifyContext;
-import org.apache.isis.core.metamodel.spec.identifier.Identified;
-import org.apache.isis.core.progmodel.facets.propparam.specification.MustSatisfySpecificationFacet;
@RunWith(JMock.class)
@@ -64,7 +64,7 @@ public class MustSatisfySpecificationVal
@Before
public void setUp() throws Exception {
- mockHolder = mockery.mock(Identified.class);
+ mockHolder = mockery.mock(IdentifiedHolder.class);
specificationAlwaysSatisfied = new SpecificationAlwaysSatisfied();
specificationNeverSatisfied = new SpecificationNeverSatisfied();
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationAlwaysSatisfied.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationAlwaysSatisfied.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationAlwaysSatisfied.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationAlwaysSatisfied.java Wed Dec 22 16:22:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.core.progmodel.facets.propparam.specification;
-import org.apache.isis.applib.spec.Specification;
+import org.apache.isis.applib.spec.Specification;
public class SpecificationAlwaysSatisfied implements Specification {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationAndTests.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationAndTests.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationAndTests.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationAndTests.java Wed Dec 22 16:22:08 2010
@@ -20,14 +20,15 @@
package org.apache.isis.core.progmodel.facets.propparam.specification;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
-import org.junit.Test;
-import org.apache.isis.applib.spec.Specification;
-import org.apache.isis.applib.spec.SpecificationAnd;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Test;
+
+import org.apache.isis.applib.spec.Specification;
+import org.apache.isis.applib.spec.SpecificationAnd;
public class SpecificationAndTests {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationNeverSatisfied.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationNeverSatisfied.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationNeverSatisfied.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationNeverSatisfied.java Wed Dec 22 16:22:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.core.progmodel.facets.propparam.specification;
-import org.apache.isis.applib.spec.Specification;
+import org.apache.isis.applib.spec.Specification;
public class SpecificationNeverSatisfied implements Specification {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationNotTests.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationNotTests.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationNotTests.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationNotTests.java Wed Dec 22 16:22:08 2010
@@ -20,14 +20,15 @@
package org.apache.isis.core.progmodel.facets.propparam.specification;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
-import org.junit.Test;
-import org.apache.isis.applib.spec.Specification;
-import org.apache.isis.applib.spec.SpecificationNot;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Test;
+
+import org.apache.isis.applib.spec.Specification;
+import org.apache.isis.applib.spec.SpecificationNot;
public class SpecificationNotTests {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationOrTests.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationOrTests.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationOrTests.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationOrTests.java Wed Dec 22 16:22:08 2010
@@ -20,14 +20,15 @@
package org.apache.isis.core.progmodel.facets.propparam.specification;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
-import org.junit.Test;
-import org.apache.isis.applib.spec.Specification;
-import org.apache.isis.applib.spec.SpecificationOr;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Test;
+
+import org.apache.isis.applib.spec.Specification;
+import org.apache.isis.applib.spec.SpecificationOr;
public class SpecificationOrTests {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationRequiresFirstLetterToBeUpperCase.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationRequiresFirstLetterToBeUpperCase.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationRequiresFirstLetterToBeUpperCase.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/SpecificationRequiresFirstLetterToBeUpperCase.java Wed Dec 22 16:22:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.core.progmodel.facets.propparam.specification;
-import org.apache.isis.applib.spec.Specification;
+import org.apache.isis.applib.spec.Specification;
public class SpecificationRequiresFirstLetterToBeUpperCase implements Specification {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/Utils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/Utils.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/Utils.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/specification/Utils.java Wed Dec 22 16:22:08 2010
@@ -20,10 +20,10 @@
package org.apache.isis.core.progmodel.facets.propparam.specification;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.isis.applib.spec.Specification;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.isis.applib.spec.Specification;
public final class Utils {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthAnnotationFacetFactoryTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthAnnotationFacetFactoryTest.java Wed Dec 22 16:22:08 2010
@@ -26,7 +26,7 @@ import java.util.List;
import org.apache.isis.applib.annotation.TypicalLength;
import org.apache.isis.core.metamodel.facets.Facet;
import org.apache.isis.core.metamodel.facets.propparam.typicallength.TypicalLengthFacet;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.feature.FeatureType;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
@@ -49,12 +49,12 @@ public class TypicalLengthAnnotationFace
@Override
public void testFeatureTypes() {
- final List<ObjectFeatureType> featureTypes = facetFactory.getFeatureTypes();
- assertTrue(contains(featureTypes, ObjectFeatureType.OBJECT));
- assertTrue(contains(featureTypes, ObjectFeatureType.PROPERTY));
- assertFalse(contains(featureTypes, ObjectFeatureType.COLLECTION));
- assertFalse(contains(featureTypes, ObjectFeatureType.ACTION));
- assertTrue(contains(featureTypes, ObjectFeatureType.ACTION_PARAMETER));
+ final List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+ assertTrue(contains(featureTypes, FeatureType.OBJECT));
+ assertTrue(contains(featureTypes, FeatureType.PROPERTY));
+ assertFalse(contains(featureTypes, FeatureType.COLLECTION));
+ assertFalse(contains(featureTypes, FeatureType.ACTION));
+ assertTrue(contains(featureTypes, FeatureType.ACTION_PARAMETER));
}
public void testTypicalLengthAnnotationPickedUpOnProperty() {