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 2012/03/15 11:37:49 UTC

svn commit: r1300890 [4/5] - in /incubator/isis/trunk/framework: ./ core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/objecttype/ core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ core/webapp/src/main/java/org/...

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/GivenJpaColumnAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/GivenJpaColumnAnnotationFacetFactoryTest.java?rev=1300890&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/GivenJpaColumnAnnotationFacetFactoryTest.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/GivenJpaColumnAnnotationFacetFactoryTest.java Thu Mar 15 10:37:43 2012
@@ -0,0 +1,179 @@
+package org.apache.isis.extensions.jpa.metamodel.facets.prop.column;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import junit.framework.Assert;
+
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.facets.mandatory.MandatoryFacet;
+import org.apache.isis.core.metamodel.facets.maxlen.MaxLengthFacet;
+import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
+
+public class GivenJpaColumnAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
+
+    private JpaColumnAnnotationFacetFactory facetFactory;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        facetFactory = new JpaColumnAnnotationFacetFactory();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        facetFactory = null;
+        super.tearDown();
+    }
+
+    public void testFeatureTypes() {
+        final List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+        Assert.assertFalse(contains(featureTypes, FeatureType.OBJECT));
+        assertTrue(contains(featureTypes, FeatureType.PROPERTY));
+        assertFalse(contains(featureTypes, FeatureType.COLLECTION));
+        Assert.assertFalse(contains(featureTypes, FeatureType.ACTION));
+        assertFalse(contains(featureTypes, FeatureType.ACTION_PARAMETER));
+    }
+
+    public void testColumnAnnotationPickedUpOnProperty() throws Exception {
+
+        final Class<SimpleObjectWithColumnAnnotation> cls = SimpleObjectWithColumnAnnotation.class;
+        final Method method = cls.getMethod("getSomeColumn");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final Facet facet = facetedMethod.getFacet(JpaColumnFacet.class);
+        assertNotNull(facet);
+        assertTrue(facet instanceof JpaColumnFacetAnnotation);
+    }
+
+    public void testColumnAnnotationNameAttributeSet() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithColumnName.class;
+        final Method method = cls.getMethod("getSomeColumn");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final JpaColumnFacet facet = facetedMethod.getFacet(JpaColumnFacet.class);
+        assertEquals("someCol", facet.name());
+    }
+
+    public void testMaxLengthFacetDerivedForProperty() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithColumnAnnotation.class;
+        final Method method = cls.getMethod("getSomeColumn");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final MaxLengthFacet facet = facetedMethod.getFacet(MaxLengthFacet.class);
+        assertNotNull(facet);
+        Assert.assertTrue(facet instanceof MaxLengthFacetDerivedFromJpaColumnAnnotation);
+    }
+
+    public void testMaxLengthAttributeExplicitlySpecified() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithColumnMaxLength30.class;
+        final Method method = cls.getMethod("getSomeColumn");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final MaxLengthFacet facet = facetedMethod.getFacet(MaxLengthFacet.class);
+        assertEquals(30, facet.value());
+    }
+
+    public void testMaxLengthAttributeNotExplicitlySpecified() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithColumnAnnotation.class;
+        final Method method = cls.getMethod("getSomeColumn");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final MaxLengthFacet facet = facetedMethod.getFacet(MaxLengthFacet.class);
+        assertEquals(255, facet.value());
+    }
+
+    public void testMandatoryFacetDerivedForProperty() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithColumnAnnotation.class;
+        final Method method = cls.getMethod("getSomeColumn");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final MandatoryFacet facet = facetedMethod.getFacet(MandatoryFacet.class);
+        assertNotNull(facet);
+    }
+
+    public void testNullableAttributeExplicitlySpecifiedAsFalse() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithColumnNullableFalse.class;
+        final Method method = cls.getMethod("getSomeColumn");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final MandatoryFacet facet = facetedMethod.getFacet(MandatoryFacet.class);
+        assertNotNull(facet);
+        Assert.assertTrue(facet instanceof MandatoryFacetDerivedFromJpaColumnAnnotation);
+        assertFalse(facet.isInvertedSemantics());
+    }
+
+    public void testNullableAttributeExplicitlySpecifiedAsTrue() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithColumnNullableTrue.class;
+        final Method method = cls.getMethod("getSomeColumn");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final MandatoryFacet facet = facetedMethod.getFacet(MandatoryFacet.class);
+        assertNotNull(facet);
+        Assert.assertTrue(facet instanceof OptionalFacetDerivedFromJpaColumnAnnotation);
+        assertTrue(facet.isInvertedSemantics());
+    }
+
+    public void testNullableAttributeNotSpecifiedForColumnAnnotationProperty() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithColumnAnnotation.class;
+        final Method method = cls.getMethod("getSomeColumn");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final MandatoryFacet facet = facetedMethod.getFacet(MandatoryFacet.class);
+        assertNotNull(facet);
+        Assert.assertTrue(facet instanceof OptionalFacetDerivedFromJpaColumnAnnotation);
+    }
+
+    public void testIfNoColumnAnnotationThenNoColumnFacet() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithNoColumnAnnotation.class;
+        final Method method = cls.getMethod("getSomeColumn");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final Facet facet = facetedMethod.getFacet(JpaColumnFacet.class);
+        assertNull(facet);
+    }
+
+    public void testIfNoColumnAnnotationThenNoMaxLengthFacet() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithNoColumnAnnotation.class;
+        final Method method = cls.getMethod("getSomeColumn");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final Facet facet = facetedMethod.getFacet(MaxLengthFacet.class);
+        assertNull(facet);
+    }
+
+    public void testIfNoColumnAnnotationThenNoMandatoryFacet() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithNoColumnAnnotation.class;
+        final Method method = cls.getMethod("getSomeColumn");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final Facet facet = facetedMethod.getFacet(MandatoryFacet.class);
+        assertNull(facet);
+    }
+
+    public void testNoMethodsRemoved() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithColumnAnnotation.class;
+        final Method method = cls.getMethod("getSomeColumn");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        assertNoMethodsRemoved();
+    }
+
+}
+
+// Copyright (c) Naked Objects Group Ltd.

Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/GivenJpaColumnAnnotationFacetFactoryTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnAnnotation.java?rev=1300890&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnAnnotation.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnAnnotation.java Thu Mar 15 10:37:43 2012
@@ -0,0 +1,18 @@
+package org.apache.isis.extensions.jpa.metamodel.facets.prop.column;
+
+import javax.persistence.Column;
+
+public class SimpleObjectWithColumnAnnotation {
+
+
+    private Long someColumn;
+
+    @Column
+    public Long getSomeColumn() {
+        return someColumn;
+    }
+
+    public void setSomeColumn(final Long someColumn) {
+        this.someColumn = someColumn;
+    }
+}
\ No newline at end of file

Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnAnnotation.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnMaxLength30.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnMaxLength30.java?rev=1300890&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnMaxLength30.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnMaxLength30.java Thu Mar 15 10:37:43 2012
@@ -0,0 +1,18 @@
+package org.apache.isis.extensions.jpa.metamodel.facets.prop.column;
+
+import javax.persistence.Column;
+
+public class SimpleObjectWithColumnMaxLength30 {
+
+
+    private Long someColumn;
+
+    @Column(length = 30)
+    public Long getSomeColumn() {
+        return someColumn;
+    }
+
+    public void setSomeColumn(final Long someColumn) {
+        this.someColumn = someColumn;
+    }
+}
\ No newline at end of file

Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnMaxLength30.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnName.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnName.java?rev=1300890&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnName.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnName.java Thu Mar 15 10:37:43 2012
@@ -0,0 +1,18 @@
+package org.apache.isis.extensions.jpa.metamodel.facets.prop.column;
+
+import javax.persistence.Column;
+
+public class SimpleObjectWithColumnName {
+
+
+    private Long someColumn;
+
+    @Column(name = "someCol")
+    public Long getSomeColumn() {
+        return someColumn;
+    }
+
+    public void setSomeColumn(final Long someColumn) {
+        this.someColumn = someColumn;
+    }
+}
\ No newline at end of file

Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnName.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnNullableFalse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnNullableFalse.java?rev=1300890&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnNullableFalse.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnNullableFalse.java Thu Mar 15 10:37:43 2012
@@ -0,0 +1,18 @@
+package org.apache.isis.extensions.jpa.metamodel.facets.prop.column;
+
+import javax.persistence.Column;
+
+public class SimpleObjectWithColumnNullableFalse {
+
+
+    private Long someColumn;
+
+    @Column(nullable = false)
+    public Long getSomeColumn() {
+        return someColumn;
+    }
+
+    public void setSomeColumn(final Long someColumn) {
+        this.someColumn = someColumn;
+    }
+}
\ No newline at end of file

Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnNullableFalse.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnNullableTrue.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnNullableTrue.java?rev=1300890&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnNullableTrue.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnNullableTrue.java Thu Mar 15 10:37:43 2012
@@ -0,0 +1,18 @@
+package org.apache.isis.extensions.jpa.metamodel.facets.prop.column;
+
+import javax.persistence.Column;
+
+public class SimpleObjectWithColumnNullableTrue {
+
+
+    private Long someColumn;
+
+    @Column(name = "ColumnName", nullable = true)
+    public Long getSomeColumn() {
+        return someColumn;
+    }
+
+    public void setSomeColumn(final Long someColumn) {
+        this.someColumn = someColumn;
+    }
+}
\ No newline at end of file

Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithColumnNullableTrue.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithNoColumnAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithNoColumnAnnotation.java?rev=1300890&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithNoColumnAnnotation.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithNoColumnAnnotation.java Thu Mar 15 10:37:43 2012
@@ -0,0 +1,16 @@
+package org.apache.isis.extensions.jpa.metamodel.facets.prop.column;
+
+
+public class SimpleObjectWithNoColumnAnnotation {
+
+
+    private Long someColumn;
+
+    public Long getSomeColumn() {
+        return someColumn;
+    }
+
+    public void setSomeColumn(final Long someColumn) {
+        this.someColumn = someColumn;
+    }
+}
\ No newline at end of file

Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/column/SimpleObjectWithNoColumnAnnotation.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/id/GivenJpaIdAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/id/GivenJpaIdAnnotationFacetFactoryTest.java?rev=1300890&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/id/GivenJpaIdAnnotationFacetFactoryTest.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/id/GivenJpaIdAnnotationFacetFactoryTest.java Thu Mar 15 10:37:43 2012
@@ -0,0 +1,123 @@
+package org.apache.isis.extensions.jpa.metamodel.facets.prop.id;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import javax.persistence.Id;
+
+import junit.framework.Assert;
+
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.facets.mandatory.MandatoryFacet;
+import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
+import org.apache.isis.core.progmodel.facets.members.disable.DisabledFacet;
+
+public class GivenJpaIdAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
+
+    private JpaIdAnnotationFacetFactory facetFactory;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        facetFactory = new JpaIdAnnotationFacetFactory();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        facetFactory = null;
+        super.tearDown();
+    }
+
+    public void testFeatureTypes() {
+        final List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+        Assert.assertFalse(contains(featureTypes, FeatureType.OBJECT));
+        assertTrue(contains(featureTypes, FeatureType.PROPERTY));
+        assertFalse(contains(featureTypes, FeatureType.COLLECTION));
+        Assert.assertFalse(contains(featureTypes, FeatureType.ACTION));
+        assertFalse(contains(featureTypes, FeatureType.ACTION_PARAMETER));
+    }
+
+    public void testIdAnnotationPickedUpOnProperty() throws Exception {
+        final Class<?> cls = SimpleObjectWithId.class;
+        final Method method = cls.getMethod("getId");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final Facet facet = facetedMethod.getFacet(JpaIdFacet.class);
+        assertNotNull(facet);
+        assertTrue(facet instanceof JpaIdFacet);
+    }
+
+    public void testOptionalDerivedFromId() throws Exception {
+        final Class<?> cls = SimpleObjectWithId.class;
+        final Method method = cls.getMethod("getId");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final Facet facet = facetedMethod.getFacet(MandatoryFacet.class);
+        assertNotNull(facet);
+        Assert.assertTrue(facet instanceof OptionalFacetDerivedFromJpaIdAnnotation);
+    }
+
+    public void testDisabledDerivedFromId() throws Exception {
+        final Class<?> cls = SimpleObjectWithId.class;
+        final Method method = cls.getMethod("getId");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final Facet facet = facetedMethod.getFacet(DisabledFacet.class);
+        assertNotNull(facet);
+        Assert.assertTrue(facet instanceof DisabledFacetDerivedFromJpaIdAnnotation);
+    }
+
+    public void testIfNoIdAnnotationThenNoFacet() throws Exception {
+
+        class Customer {
+            private Long id;
+
+            // @Id missing
+            @SuppressWarnings("unused")
+            public Long getId() {
+                return id;
+            }
+
+            @SuppressWarnings("unused")
+            public void setId(final Long id) {
+                this.id = id;
+            }
+        }
+
+        final Class<?> cls = Customer.class;
+        final Method method = cls.getMethod("getId");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final Facet facet = facetedMethod.getFacet(JpaIdFacet.class);
+        assertNull(facet);
+    }
+
+    public void testNoMethodsRemoved() throws Exception {
+        class Customer {
+            private Long id;
+
+            @SuppressWarnings("unused")
+            @Id
+            public Long getId() {
+                return id;
+            }
+
+            @SuppressWarnings("unused")
+            public void setId(final Long id) {
+                this.id = id;
+            }
+        }
+
+        final Class<?> cls = Customer.class;
+        final Method method = cls.getMethod("getId");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        assertNoMethodsRemoved();
+    }
+
+}
+
+// Copyright (c) Naked Objects Group Ltd.

Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/id/GivenJpaIdAnnotationFacetFactoryTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/id/SimpleObjectWithId.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/id/SimpleObjectWithId.java?rev=1300890&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/id/SimpleObjectWithId.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/id/SimpleObjectWithId.java Thu Mar 15 10:37:43 2012
@@ -0,0 +1,20 @@
+/**
+ * 
+ */
+package org.apache.isis.extensions.jpa.metamodel.facets.prop.id;
+
+import javax.persistence.Id;
+
+public class SimpleObjectWithId {
+
+    private Long id;
+
+    @Id
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(final Long id) {
+        this.id = id;
+    }
+}
\ No newline at end of file

Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/id/SimpleObjectWithId.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/GivenJpaJoinColumnAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/GivenJpaJoinColumnAnnotationFacetFactoryTest.java?rev=1300890&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/GivenJpaJoinColumnAnnotationFacetFactoryTest.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/GivenJpaJoinColumnAnnotationFacetFactoryTest.java Thu Mar 15 10:37:43 2012
@@ -0,0 +1,137 @@
+package org.apache.isis.extensions.jpa.metamodel.facets.prop.joincolumn;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import junit.framework.Assert;
+
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.facets.mandatory.MandatoryFacet;
+import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
+
+public class GivenJpaJoinColumnAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
+
+    private JpaJoinColumnAnnotationFacetFactory facetFactory;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        facetFactory = new JpaJoinColumnAnnotationFacetFactory();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        facetFactory = null;
+        super.tearDown();
+    }
+
+    public void testFeatureTypes() {
+        final List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+        Assert.assertFalse(contains(featureTypes, FeatureType.OBJECT));
+        assertTrue(contains(featureTypes, FeatureType.PROPERTY));
+        assertFalse(contains(featureTypes, FeatureType.COLLECTION));
+        Assert.assertFalse(contains(featureTypes, FeatureType.ACTION));
+        assertFalse(contains(featureTypes, FeatureType.ACTION_PARAMETER));
+    }
+
+    public void testColumnAnnotationPickedUpOnProperty() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithJoinColumnAnnotation.class;
+        final Method method = cls.getMethod("getJoinColumn");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final Facet facet = facetedMethod.getFacet(JpaJoinColumnFacet.class);
+        assertNotNull(facet);
+        assertTrue(facet instanceof JpaJoinColumnFacetAnnotation);
+    }
+
+    public void testColumnAnnotationNameAttributeSet() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithJoinColumnName.class;
+        final Method method = cls.getMethod("getJoinColumn");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final JpaJoinColumnFacet facet = facetedMethod.getFacet(JpaJoinColumnFacet.class);
+        assertEquals("joinCol", facet.name());
+    }
+
+    public void testMandatoryFacetDerivedForProperty() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithJoinColumnAnnotation.class;
+        final Method method = cls.getMethod("getJoinColumn");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final MandatoryFacet facet = facetedMethod.getFacet(MandatoryFacet.class);
+        assertNotNull(facet);
+    }
+
+    public void testNullableAttributeExplicitlySpecifiedAsFalse() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithJoinColumnNullableFalse.class;
+        final Method method = cls.getMethod("getJoinColumn");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final MandatoryFacet facet = facetedMethod.getFacet(MandatoryFacet.class);
+        assertNotNull(facet);
+        Assert.assertTrue(facet instanceof MandatoryFacetDerivedFromJpaJoinColumnAnnotation);
+        assertFalse(facet.isInvertedSemantics());
+    }
+
+    public void testNullableAttributeExplicitlySpecifiedAsTrue() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithJoinColumnNullableTrue.class;
+        final Method method = cls.getMethod("getJoinColumn");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final MandatoryFacet facet = facetedMethod.getFacet(MandatoryFacet.class);
+        assertNotNull(facet);
+        Assert.assertTrue(facet instanceof OptionalFacetDerivedFromJpaJoinColumnAnnotation);
+        assertTrue(facet.isInvertedSemantics());
+    }
+
+    public void testNullableAttributeNotSpecified() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithJoinColumnAnnotation.class;
+        final Method method = cls.getMethod("getJoinColumn");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final MandatoryFacet facet = facetedMethod.getFacet(MandatoryFacet.class);
+        assertNotNull(facet);
+        Assert.assertTrue(facet instanceof OptionalFacetDerivedFromJpaJoinColumnAnnotation);
+    }
+
+    public void testIfNoJoinColumnAnnotationThenNoJoinColumnFacet() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithNoJoinColumnAnnotation.class;
+        final Method method = cls.getMethod("getJoinColumn");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final Facet facet = facetedMethod.getFacet(JpaJoinColumnFacet.class);
+        assertNull(facet);
+    }
+
+    public void testIfNoJoinColumnAnnotationThenNoMandatoryFacet() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithNoJoinColumnAnnotation.class;
+        final Method method = cls.getMethod("getJoinColumn");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final Facet facet = facetedMethod.getFacet(MandatoryFacet.class);
+        assertNull(facet);
+    }
+
+    public void testNoMethodsRemoved() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithJoinColumnAnnotation.class;
+        final Method method = cls.getMethod("getJoinColumn");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        assertNoMethodsRemoved();
+    }
+
+}
+
+// Copyright (c) Naked Objects Group Ltd.

Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/GivenJpaJoinColumnAnnotationFacetFactoryTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithJoinColumnAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithJoinColumnAnnotation.java?rev=1300890&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithJoinColumnAnnotation.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithJoinColumnAnnotation.java Thu Mar 15 10:37:43 2012
@@ -0,0 +1,18 @@
+package org.apache.isis.extensions.jpa.metamodel.facets.prop.joincolumn;
+
+import javax.persistence.JoinColumn;
+
+public class SimpleObjectWithJoinColumnAnnotation {
+
+
+    private Long joinColumn;
+
+    @JoinColumn
+    public Long getJoinColumn() {
+        return joinColumn;
+    }
+
+    public void setJoinColumn(final Long joinColumn) {
+        this.joinColumn = joinColumn;
+    }
+}
\ No newline at end of file

Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithJoinColumnAnnotation.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithJoinColumnName.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithJoinColumnName.java?rev=1300890&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithJoinColumnName.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithJoinColumnName.java Thu Mar 15 10:37:43 2012
@@ -0,0 +1,18 @@
+package org.apache.isis.extensions.jpa.metamodel.facets.prop.joincolumn;
+
+import javax.persistence.JoinColumn;
+
+public class SimpleObjectWithJoinColumnName {
+
+
+    private Long joinColumn;
+
+    @JoinColumn(name = "joinCol")
+    public Long getJoinColumn() {
+        return joinColumn;
+    }
+
+    public void setJoinColumn(final Long joinColumn) {
+        this.joinColumn = joinColumn;
+    }
+}
\ No newline at end of file

Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithJoinColumnName.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithJoinColumnNullableFalse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithJoinColumnNullableFalse.java?rev=1300890&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithJoinColumnNullableFalse.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithJoinColumnNullableFalse.java Thu Mar 15 10:37:43 2012
@@ -0,0 +1,18 @@
+package org.apache.isis.extensions.jpa.metamodel.facets.prop.joincolumn;
+
+import javax.persistence.JoinColumn;
+
+public class SimpleObjectWithJoinColumnNullableFalse {
+
+
+    private Long joinColumn;
+
+    @JoinColumn(nullable = false)
+    public Long getJoinColumn() {
+        return joinColumn;
+    }
+
+    public void setJoinColumn(final Long joinColumn) {
+        this.joinColumn = joinColumn;
+    }
+}
\ No newline at end of file

Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithJoinColumnNullableFalse.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithJoinColumnNullableTrue.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithJoinColumnNullableTrue.java?rev=1300890&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithJoinColumnNullableTrue.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithJoinColumnNullableTrue.java Thu Mar 15 10:37:43 2012
@@ -0,0 +1,18 @@
+package org.apache.isis.extensions.jpa.metamodel.facets.prop.joincolumn;
+
+import javax.persistence.JoinColumn;
+
+public class SimpleObjectWithJoinColumnNullableTrue {
+
+
+    private Long joinColumn;
+
+    @JoinColumn(nullable = true)
+    public Long getJoinColumn() {
+        return joinColumn;
+    }
+
+    public void setJoinColumn(final Long joinColumn) {
+        this.joinColumn = joinColumn;
+    }
+}
\ No newline at end of file

Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithJoinColumnNullableTrue.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithNoJoinColumnAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithNoJoinColumnAnnotation.java?rev=1300890&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithNoJoinColumnAnnotation.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithNoJoinColumnAnnotation.java Thu Mar 15 10:37:43 2012
@@ -0,0 +1,16 @@
+package org.apache.isis.extensions.jpa.metamodel.facets.prop.joincolumn;
+
+
+public class SimpleObjectWithNoJoinColumnAnnotation {
+
+
+    private Long joinColumn;
+
+    public Long getJoinColumn() {
+        return joinColumn;
+    }
+
+    public void setJoinColumn(final Long joinColumn) {
+        this.joinColumn = joinColumn;
+    }
+}
\ No newline at end of file

Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/joincolumn/SimpleObjectWithNoJoinColumnAnnotation.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/GivenJpaManyToOneAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/GivenJpaManyToOneAnnotationFacetFactoryTest.java?rev=1300890&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/GivenJpaManyToOneAnnotationFacetFactoryTest.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/GivenJpaManyToOneAnnotationFacetFactoryTest.java Thu Mar 15 10:37:43 2012
@@ -0,0 +1,185 @@
+package org.apache.isis.extensions.jpa.metamodel.facets.prop.manytoone;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import javax.persistence.FetchType;
+
+import junit.framework.Assert;
+
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.facets.mandatory.MandatoryFacet;
+import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
+import org.apache.isis.extensions.jpa.metamodel.facets.JpaFetchTypeFacet;
+
+public class GivenJpaManyToOneAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
+
+    private JpaManyToOneAnnotationFacetFactory facetFactory;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        facetFactory = new JpaManyToOneAnnotationFacetFactory();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        facetFactory = null;
+        super.tearDown();
+    }
+
+    public void testFeatureTypes() {
+        final List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+        Assert.assertFalse(contains(featureTypes, FeatureType.OBJECT));
+        assertTrue(contains(featureTypes, FeatureType.PROPERTY));
+        assertFalse(contains(featureTypes, FeatureType.COLLECTION));
+        Assert.assertFalse(contains(featureTypes, FeatureType.ACTION));
+        assertFalse(contains(featureTypes, FeatureType.ACTION_PARAMETER));
+    }
+
+    public void testColumnAnnotationPickedUpOnProperty() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithManyToOneAnnotation.class;
+        final Method method = cls.getMethod("getParent");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final Facet facet = facetedMethod.getFacet(JpaManyToOneFacet.class);
+        assertNotNull(facet);
+        assertTrue(facet instanceof JpaManyToOneFacetAnnotation);
+    }
+
+    public void testMandatoryFacetDerivedForProperty() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithManyToOneAnnotation.class;
+        final Method method = cls.getMethod("getParent");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final MandatoryFacet facet = facetedMethod.getFacet(MandatoryFacet.class);
+        assertNotNull(facet);
+    }
+
+    public void testOptionalAttributeExplicitlySpecifiedAsFalse() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithManyToOneOptionalFalse.class;
+        final Method method = cls.getMethod("getParent");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final MandatoryFacet facet = facetedMethod.getFacet(MandatoryFacet.class);
+        assertNotNull(facet);
+        Assert.assertTrue(facet instanceof MandatoryFacetDerivedFromJpaManyToOneAnnotation);
+        assertFalse(facet.isInvertedSemantics());
+    }
+
+    public void testOptionalAttributeExplicitlySpecifiedAsTrue() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithManyToOneOptionalTrue.class;
+        final Method method = cls.getMethod("getParent");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final MandatoryFacet facet = facetedMethod.getFacet(MandatoryFacet.class);
+        assertNotNull(facet);
+        Assert.assertTrue(facet instanceof OptionalFacetDerivedFromJpaManyToOneAnnotation);
+        assertTrue(facet.isInvertedSemantics());
+    }
+
+    public void testOptionalAttributeNotSpecified() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithManyToOneAnnotation.class;
+        final Method method = cls.getMethod("getParent");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final MandatoryFacet facet = facetedMethod.getFacet(MandatoryFacet.class);
+        assertNotNull(facet);
+        Assert.assertTrue(facet instanceof OptionalFacetDerivedFromJpaManyToOneAnnotation);
+        assertTrue(facet.isInvertedSemantics());
+    }
+
+    public void testJpaFetchTypeFacetDerivedForProperty() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithManyToOneAnnotation.class;
+        final Method method = cls.getMethod("getParent");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final JpaFetchTypeFacet facet = facetedMethod.getFacet(JpaFetchTypeFacet.class);
+        assertNotNull(facet);
+        Assert.assertTrue(facet instanceof JpaFetchTypeFacetDerivedFromJpaManyToOneAnnotation);
+    }
+
+    public void testFetchTypeAttributeExplicitlySpecifiedAsLazy() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithManyToOneFetchLazy.class;
+        final Method method = cls.getMethod("getParent");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final JpaFetchTypeFacet facet = facetedMethod.getFacet(JpaFetchTypeFacet.class);
+        assertNotNull(facet);
+        assertEquals(FetchType.LAZY, facet.getFetchType());
+    }
+
+    public void testFetchTypeAttributeExplicitlySpecifiedAsEager() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithManyToOneFetchEager.class;
+        final Method method = cls.getMethod("getParent");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final JpaFetchTypeFacet facet = facetedMethod.getFacet(JpaFetchTypeFacet.class);
+        assertNotNull(facet);
+        assertEquals(FetchType.EAGER, facet.getFetchType());
+    }
+
+    public void testFetchTypeAttributeNotSpecified() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithManyToOneAnnotation.class;
+        final Method method = cls.getMethod("getParent");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final JpaFetchTypeFacet facet = facetedMethod.getFacet(JpaFetchTypeFacet.class);
+        assertNotNull(facet);
+        assertEquals(FetchType.EAGER, facet.getFetchType());
+    }
+
+    public void testIfNoManyToOneColumnAnnotationThenNoManyToOneColumnFacet() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithNoManyToOneAnnotation.class;
+        final Method method = cls.getMethod("getParent");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final Facet facet = facetedMethod.getFacet(JpaManyToOneFacet.class);
+        assertNull(facet);
+    }
+
+    public void testIfNoManyToOneAnnotationThenNoMandatoryFacet() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithNoManyToOneAnnotation.class;
+        final Method method = cls.getMethod("getParent");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final Facet facet = facetedMethod.getFacet(MandatoryFacet.class);
+        assertNull(facet);
+    }
+
+    public void testIfNoManyToOneAnnotationThenNoJpaFetchTypeFacet() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithNoManyToOneAnnotation.class;
+        final Method method = cls.getMethod("getParent");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final Facet facet = facetedMethod.getFacet(JpaFetchTypeFacet.class);
+        assertNull(facet);
+    }
+
+    public void testNoMethodsRemoved() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithManyToOneAnnotation.class;
+        final Method method = cls.getMethod("getParent");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        assertNoMethodsRemoved();
+    }
+
+}
+
+// Copyright (c) Naked Objects Group Ltd.

Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/GivenJpaManyToOneAnnotationFacetFactoryTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneAnnotation.java?rev=1300890&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneAnnotation.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneAnnotation.java Thu Mar 15 10:37:43 2012
@@ -0,0 +1,18 @@
+package org.apache.isis.extensions.jpa.metamodel.facets.prop.manytoone;
+
+import javax.persistence.ManyToOne;
+
+public class SimpleObjectWithManyToOneAnnotation {
+
+    private Long parent;
+
+    @ManyToOne
+    public Long getParent() {
+        return parent;
+    }
+
+    public void setParent(final Long parent) {
+        this.parent = parent;
+    }
+
+}
\ No newline at end of file

Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneAnnotation.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneFetchEager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneFetchEager.java?rev=1300890&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneFetchEager.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneFetchEager.java Thu Mar 15 10:37:43 2012
@@ -0,0 +1,19 @@
+package org.apache.isis.extensions.jpa.metamodel.facets.prop.manytoone;
+
+import javax.persistence.FetchType;
+import javax.persistence.ManyToOne;
+
+public class SimpleObjectWithManyToOneFetchEager {
+
+    private Long parent;
+
+    @ManyToOne(fetch = FetchType.EAGER)
+    public Long getParent() {
+        return parent;
+    }
+
+    public void setParent(final Long parent) {
+        this.parent = parent;
+    }
+
+}
\ No newline at end of file

Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneFetchEager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneFetchLazy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneFetchLazy.java?rev=1300890&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneFetchLazy.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneFetchLazy.java Thu Mar 15 10:37:43 2012
@@ -0,0 +1,19 @@
+package org.apache.isis.extensions.jpa.metamodel.facets.prop.manytoone;
+
+import javax.persistence.FetchType;
+import javax.persistence.ManyToOne;
+
+public class SimpleObjectWithManyToOneFetchLazy {
+
+    private Long parent;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    public Long getParent() {
+        return parent;
+    }
+
+    public void setParent(final Long parent) {
+        this.parent = parent;
+    }
+
+}
\ No newline at end of file

Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneFetchLazy.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneOptionalFalse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneOptionalFalse.java?rev=1300890&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneOptionalFalse.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneOptionalFalse.java Thu Mar 15 10:37:43 2012
@@ -0,0 +1,18 @@
+package org.apache.isis.extensions.jpa.metamodel.facets.prop.manytoone;
+
+import javax.persistence.ManyToOne;
+
+public class SimpleObjectWithManyToOneOptionalFalse {
+
+    private Long parent;
+
+    @ManyToOne(optional = false)
+    public Long getParent() {
+        return parent;
+    }
+
+    public void setParent(final Long parent) {
+        this.parent = parent;
+    }
+
+}
\ No newline at end of file

Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneOptionalFalse.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneOptionalTrue.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneOptionalTrue.java?rev=1300890&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneOptionalTrue.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneOptionalTrue.java Thu Mar 15 10:37:43 2012
@@ -0,0 +1,18 @@
+package org.apache.isis.extensions.jpa.metamodel.facets.prop.manytoone;
+
+import javax.persistence.ManyToOne;
+
+public class SimpleObjectWithManyToOneOptionalTrue {
+
+    private Long parent;
+
+    @ManyToOne(optional = true)
+    public Long getParent() {
+        return parent;
+    }
+
+    public void setParent(final Long parent) {
+        this.parent = parent;
+    }
+
+}
\ No newline at end of file

Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithManyToOneOptionalTrue.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithNoManyToOneAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithNoManyToOneAnnotation.java?rev=1300890&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithNoManyToOneAnnotation.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithNoManyToOneAnnotation.java Thu Mar 15 10:37:43 2012
@@ -0,0 +1,16 @@
+package org.apache.isis.extensions.jpa.metamodel.facets.prop.manytoone;
+
+
+public class SimpleObjectWithNoManyToOneAnnotation {
+
+    private Long parent;
+
+    public Long getParent() {
+        return parent;
+    }
+
+    public void setParent(final Long parent) {
+        this.parent = parent;
+    }
+
+}
\ No newline at end of file

Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/manytoone/SimpleObjectWithNoManyToOneAnnotation.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/GivenJpaOneToOneAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/GivenJpaOneToOneAnnotationFacetFactoryTest.java?rev=1300890&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/GivenJpaOneToOneAnnotationFacetFactoryTest.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/GivenJpaOneToOneAnnotationFacetFactoryTest.java Thu Mar 15 10:37:43 2012
@@ -0,0 +1,185 @@
+package org.apache.isis.extensions.jpa.metamodel.facets.prop.onetoone;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import javax.persistence.FetchType;
+
+import junit.framework.Assert;
+
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.facets.mandatory.MandatoryFacet;
+import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
+import org.apache.isis.extensions.jpa.metamodel.facets.JpaFetchTypeFacet;
+
+public class GivenJpaOneToOneAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
+
+    private JpaOneToOneAnnotationFacetFactory facetFactory;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        facetFactory = new JpaOneToOneAnnotationFacetFactory();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        facetFactory = null;
+        super.tearDown();
+    }
+
+    public void testFeatureTypes() {
+        final List<FeatureType> featureTypes = facetFactory.getFeatureTypes();
+        Assert.assertFalse(contains(featureTypes, FeatureType.OBJECT));
+        assertTrue(contains(featureTypes, FeatureType.PROPERTY));
+        assertFalse(contains(featureTypes, FeatureType.COLLECTION));
+        Assert.assertFalse(contains(featureTypes, FeatureType.ACTION));
+        assertFalse(contains(featureTypes, FeatureType.ACTION_PARAMETER));
+    }
+
+    public void testColumnAnnotationPickedUpOnProperty() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithOneToOneAnnotation.class;
+        final Method method = cls.getMethod("getOther");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final Facet facet = facetedMethod.getFacet(JpaOneToOneFacet.class);
+        assertNotNull(facet);
+        assertTrue(facet instanceof JpaOneToOneFacetAnnotation);
+    }
+
+    public void testMandatoryFacetDerivedForProperty() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithOneToOneAnnotation.class;
+        final Method method = cls.getMethod("getOther");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final MandatoryFacet facet = facetedMethod.getFacet(MandatoryFacet.class);
+        assertNotNull(facet);
+    }
+
+    public void testOptionalAttributeExplicitlySpecifiedAsFalse() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithOneToOneOptionalFalse.class;
+        final Method method = cls.getMethod("getOther");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final MandatoryFacet facet = facetedMethod.getFacet(MandatoryFacet.class);
+        assertNotNull(facet);
+        Assert.assertTrue(facet instanceof MandatoryFacetDerivedFromJpaOneToOneAnnotation);
+        assertFalse(facet.isInvertedSemantics());
+    }
+
+    public void testOptionalAttributeExplicitlySpecifiedAsTrue() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithOneToOneOptionalTrue.class;
+        final Method method = cls.getMethod("getOther");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final MandatoryFacet facet = facetedMethod.getFacet(MandatoryFacet.class);
+        assertNotNull(facet);
+        Assert.assertTrue(facet instanceof OptionalFacetDerivedFromJpaOneToOneAnnotation);
+        assertTrue(facet.isInvertedSemantics());
+    }
+
+    public void testOptionalAttributeNotSpecified() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithOneToOneAnnotation.class;
+        final Method method = cls.getMethod("getOther");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final MandatoryFacet facet = facetedMethod.getFacet(MandatoryFacet.class);
+        assertNotNull(facet);
+        Assert.assertTrue(facet instanceof OptionalFacetDerivedFromJpaOneToOneAnnotation);
+        assertTrue(facet.isInvertedSemantics());
+    }
+
+    public void testJpaFetchTypeFacetDerivedForProperty() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithOneToOneAnnotation.class;
+        final Method method = cls.getMethod("getOther");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final JpaFetchTypeFacet facet = facetedMethod.getFacet(JpaFetchTypeFacet.class);
+        assertNotNull(facet);
+        Assert.assertTrue(facet instanceof JpaFetchTypeFacetDerivedFromJpaOneToOneAnnotation);
+    }
+
+    public void testFetchTypeAttributeExplicitlySpecifiedAsLazy() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithOneToOneFetchLazy.class;
+        final Method method = cls.getMethod("getOther");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final JpaFetchTypeFacet facet = facetedMethod.getFacet(JpaFetchTypeFacet.class);
+        assertNotNull(facet);
+        assertEquals(FetchType.LAZY, facet.getFetchType());
+    }
+
+    public void testFetchTypeAttributeExplicitlySpecifiedAsEager() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithOneToOneFetchEager.class;
+        final Method method = cls.getMethod("getOther");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final JpaFetchTypeFacet facet = facetedMethod.getFacet(JpaFetchTypeFacet.class);
+        assertNotNull(facet);
+        assertEquals(FetchType.EAGER, facet.getFetchType());
+    }
+
+    public void testFetchTypeAttributeNotSpecified() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithOneToOneAnnotation.class;
+        final Method method = cls.getMethod("getOther");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final JpaFetchTypeFacet facet = facetedMethod.getFacet(JpaFetchTypeFacet.class);
+        assertNotNull(facet);
+        assertEquals(FetchType.EAGER, facet.getFetchType());
+    }
+
+    public void testIfNoOneToOneColumnAnnotationThenNoOneToOneColumnFacet() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithNoOneToOneAnnotation.class;
+        final Method method = cls.getMethod("getOther");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final Facet facet = facetedMethod.getFacet(JpaOneToOneFacet.class);
+        assertNull(facet);
+    }
+
+    public void testIfNoOneToOneAnnotationThenNoMandatoryFacet() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithNoOneToOneAnnotation.class;
+        final Method method = cls.getMethod("getOther");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final Facet facet = facetedMethod.getFacet(MandatoryFacet.class);
+        assertNull(facet);
+    }
+
+    public void testIfNoOneToOneAnnotationThenNoJpaFetchTypeFacet() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithNoOneToOneAnnotation.class;
+        final Method method = cls.getMethod("getOther");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        final Facet facet = facetedMethod.getFacet(JpaFetchTypeFacet.class);
+        assertNull(facet);
+    }
+
+    public void testNoMethodsRemoved() throws Exception {
+
+        final Class<?> cls = SimpleObjectWithOneToOneAnnotation.class;
+        final Method method = cls.getMethod("getOther");
+        facetFactory.process(new FacetFactory.ProcessMethodContext(cls, method, methodRemover, facetedMethod));
+
+        assertNoMethodsRemoved();
+    }
+
+}
+
+// Copyright (c) Naked Objects Group Ltd.

Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/GivenJpaOneToOneAnnotationFacetFactoryTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithNoOneToOneAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithNoOneToOneAnnotation.java?rev=1300890&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithNoOneToOneAnnotation.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithNoOneToOneAnnotation.java Thu Mar 15 10:37:43 2012
@@ -0,0 +1,16 @@
+package org.apache.isis.extensions.jpa.metamodel.facets.prop.onetoone;
+
+
+public class SimpleObjectWithNoOneToOneAnnotation {
+
+    private Long other;
+
+    public Long getOther() {
+        return other;
+    }
+
+    public void setOther(final Long other) {
+        this.other = other;
+    }
+
+}
\ No newline at end of file

Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithNoOneToOneAnnotation.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneAnnotation.java?rev=1300890&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneAnnotation.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneAnnotation.java Thu Mar 15 10:37:43 2012
@@ -0,0 +1,18 @@
+package org.apache.isis.extensions.jpa.metamodel.facets.prop.onetoone;
+
+import javax.persistence.OneToOne;
+
+public class SimpleObjectWithOneToOneAnnotation {
+
+    private Long other;
+
+    @OneToOne
+    public Long getOther() {
+        return other;
+    }
+
+    public void setOther(final Long other) {
+        this.other = other;
+    }
+
+}
\ No newline at end of file

Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneAnnotation.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneFetchEager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneFetchEager.java?rev=1300890&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneFetchEager.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneFetchEager.java Thu Mar 15 10:37:43 2012
@@ -0,0 +1,19 @@
+package org.apache.isis.extensions.jpa.metamodel.facets.prop.onetoone;
+
+import javax.persistence.FetchType;
+import javax.persistence.OneToOne;
+
+public class SimpleObjectWithOneToOneFetchEager {
+
+    private Long other;
+
+    @OneToOne(fetch = FetchType.EAGER)
+    public Long getOther() {
+        return other;
+    }
+
+    public void setOther(final Long other) {
+        this.other = other;
+    }
+
+}
\ No newline at end of file

Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneFetchEager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneFetchLazy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneFetchLazy.java?rev=1300890&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneFetchLazy.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneFetchLazy.java Thu Mar 15 10:37:43 2012
@@ -0,0 +1,19 @@
+package org.apache.isis.extensions.jpa.metamodel.facets.prop.onetoone;
+
+import javax.persistence.FetchType;
+import javax.persistence.OneToOne;
+
+public class SimpleObjectWithOneToOneFetchLazy {
+
+    private Long other;
+
+    @OneToOne(fetch = FetchType.LAZY)
+    public Long getOther() {
+        return other;
+    }
+
+    public void setOther(final Long other) {
+        this.other = other;
+    }
+
+}
\ No newline at end of file

Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneFetchLazy.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneOptionalFalse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneOptionalFalse.java?rev=1300890&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneOptionalFalse.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneOptionalFalse.java Thu Mar 15 10:37:43 2012
@@ -0,0 +1,18 @@
+package org.apache.isis.extensions.jpa.metamodel.facets.prop.onetoone;
+
+import javax.persistence.OneToOne;
+
+public class SimpleObjectWithOneToOneOptionalFalse {
+
+    private Long other;
+
+    @OneToOne(optional = false)
+    public Long getOther() {
+        return other;
+    }
+
+    public void setOther(final Long other) {
+        this.other = other;
+    }
+
+}
\ No newline at end of file

Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneOptionalFalse.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneOptionalTrue.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneOptionalTrue.java?rev=1300890&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneOptionalTrue.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneOptionalTrue.java Thu Mar 15 10:37:43 2012
@@ -0,0 +1,18 @@
+package org.apache.isis.extensions.jpa.metamodel.facets.prop.onetoone;
+
+import javax.persistence.OneToOne;
+
+public class SimpleObjectWithOneToOneOptionalTrue {
+
+    private Long other;
+
+    @OneToOne(optional = true)
+    public Long getOther() {
+        return other;
+    }
+
+    public void setOther(final Long other) {
+        this.other = other;
+    }
+
+}
\ No newline at end of file

Propchange: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-metamodel/src/test/java/org/apache/isis/extensions/jpa/metamodel/facets/prop/onetoone/SimpleObjectWithOneToOneOptionalTrue.java
------------------------------------------------------------------------------
    svn:eol-style = native