http://git-wip-us.apache.org/repos/asf/isis/blob/430e8b3c/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenVoid_thenRepresentation_ok_TODO.java ---------------------------------------------------------------------- diff --git a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenVoid_thenRepresentation_ok_TODO.java b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenVoid_thenRepresentation_ok_TODO.java index 7207f1f..a85643e 100644 --- a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenVoid_thenRepresentation_ok_TODO.java +++ b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenVoid_thenRepresentation_ok_TODO.java @@ -1,10 +1,27 @@ package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.action.invoke; +import org.junit.Before; import org.junit.Ignore; +import org.junit.Rule; import org.junit.Test; +import org.apache.isis.core.webserver.WebServer; +import org.apache.isis.viewer.restfulobjects.applib.client.RestfulClient; +import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule; + public class Get_whenVoid_thenRepresentation_ok_TODO { + @Rule + public IsisWebServerRule webServerRule = new IsisWebServerRule(); + + protected RestfulClient client; + + @Before + public void setUp() throws Exception { + final WebServer webServer = webServerRule.getWebServer(); + client = new RestfulClient(webServer.getBase()); + } + @Ignore @Test public void todo() throws Exception {
http://git-wip-us.apache.org/repos/asf/isis/blob/430e8b3c/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenVoid_thenResponseHeaders_ContentLength_ok_TODO.java ---------------------------------------------------------------------- diff --git a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenVoid_thenResponseHeaders_ContentLength_ok_TODO.java b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenVoid_thenResponseHeaders_ContentLength_ok_TODO.java index d63e7d7..bb3b566 100644 --- a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenVoid_thenResponseHeaders_ContentLength_ok_TODO.java +++ b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenVoid_thenResponseHeaders_ContentLength_ok_TODO.java @@ -1,13 +1,25 @@ package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.action.invoke; +import org.junit.Before; import org.junit.Ignore; +import org.junit.Rule; import org.junit.Test; +import org.apache.isis.core.webserver.WebServer; +import org.apache.isis.viewer.restfulobjects.applib.client.RestfulClient; +import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule; + public class Get_whenVoid_thenResponseHeaders_ContentLength_ok_TODO { - @Ignore - @Test - public void todo() throws Exception { - + @Rule + public IsisWebServerRule webServerRule = new IsisWebServerRule(); + + protected RestfulClient client; + + @Before + public void setUp() throws Exception { + final WebServer webServer = webServerRule.getWebServer(); + client = new RestfulClient(webServer.getBase()); } + } http://git-wip-us.apache.org/repos/asf/isis/blob/430e8b3c/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenVoid_thenResponseHeaders_ContentType_ok_TODO.java ---------------------------------------------------------------------- diff --git a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenVoid_thenResponseHeaders_ContentType_ok_TODO.java b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenVoid_thenResponseHeaders_ContentType_ok_TODO.java index dd394f6..c0e2286 100644 --- a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenVoid_thenResponseHeaders_ContentType_ok_TODO.java +++ b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenVoid_thenResponseHeaders_ContentType_ok_TODO.java @@ -1,10 +1,27 @@ package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.action.invoke; +import org.junit.Before; import org.junit.Ignore; +import org.junit.Rule; import org.junit.Test; +import org.apache.isis.core.webserver.WebServer; +import org.apache.isis.viewer.restfulobjects.applib.client.RestfulClient; +import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule; + public class Get_whenVoid_thenResponseHeaders_ContentType_ok_TODO { + @Rule + public IsisWebServerRule webServerRule = new IsisWebServerRule(); + + protected RestfulClient client; + + @Before + public void setUp() throws Exception { + final WebServer webServer = webServerRule.getWebServer(); + client = new RestfulClient(webServer.getBase()); + } + @Ignore @Test public void todo() throws Exception { http://git-wip-us.apache.org/repos/asf/isis/blob/430e8b3c/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/objectsoftype/Post_ok_TODO.java ---------------------------------------------------------------------- diff --git a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/objectsoftype/Post_ok_TODO.java b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/objectsoftype/Post_ok_TODO.java index c9d3a89..01b9b22 100644 --- a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/objectsoftype/Post_ok_TODO.java +++ b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/objectsoftype/Post_ok_TODO.java @@ -1,13 +1,25 @@ package org.apache.isis.viewer.restfulobjects.tck.objectsoftype; +import org.junit.Before; import org.junit.Ignore; +import org.junit.Rule; import org.junit.Test; +import org.apache.isis.core.webserver.WebServer; +import org.apache.isis.viewer.restfulobjects.applib.client.RestfulClient; +import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule; + public class Post_ok_TODO { - @Ignore - @Test - public void todo() throws Exception { - + @Rule + public IsisWebServerRule webServerRule = new IsisWebServerRule(); + + protected RestfulClient client; + + @Before + public void setUp() throws Exception { + final WebServer webServer = webServerRule.getWebServer(); + client = new RestfulClient(webServer.getBase()); } + } http://git-wip-us.apache.org/repos/asf/isis/blob/430e8b3c/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/objectsoftype/Post_thenResponseHeaders_CacheControl_ok_TODO.java ---------------------------------------------------------------------- diff --git a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/objectsoftype/Post_thenResponseHeaders_CacheControl_ok_TODO.java b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/objectsoftype/Post_thenResponseHeaders_CacheControl_ok_TODO.java index 43f1704..326d20c 100644 --- a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/objectsoftype/Post_thenResponseHeaders_CacheControl_ok_TODO.java +++ b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/objectsoftype/Post_thenResponseHeaders_CacheControl_ok_TODO.java @@ -39,23 +39,4 @@ public class Post_thenResponseHeaders_CacheControl_ok_TODO { client = new RestfulClient(webServer.getBase()); } - @Ignore - @Test - public void noCaching() throws Exception { - - } - - @Ignore - @Test - public void shortTermCaching() throws Exception { - - } - - @Ignore - @Test - public void longTermCaching() throws Exception { - - } - - } http://git-wip-us.apache.org/repos/asf/isis/blob/430e8b3c/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/objectsoftype/Post_thenResponseHeaders_ContentLength_ok_TODO.java ---------------------------------------------------------------------- diff --git a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/objectsoftype/Post_thenResponseHeaders_ContentLength_ok_TODO.java b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/objectsoftype/Post_thenResponseHeaders_ContentLength_ok_TODO.java index e8e15d5..86acb53 100644 --- a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/objectsoftype/Post_thenResponseHeaders_ContentLength_ok_TODO.java +++ b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/objectsoftype/Post_thenResponseHeaders_ContentLength_ok_TODO.java @@ -39,23 +39,4 @@ public class Post_thenResponseHeaders_ContentLength_ok_TODO { client = new RestfulClient(webServer.getBase()); } - @Ignore - @Test - public void noCaching() throws Exception { - - } - - @Ignore - @Test - public void shortTermCaching() throws Exception { - - } - - @Ignore - @Test - public void longTermCaching() throws Exception { - - } - - } http://git-wip-us.apache.org/repos/asf/isis/blob/430e8b3c/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/objectsoftype/Post_thenResponseHeaders_ContentType_ok_TODO.java ---------------------------------------------------------------------- diff --git a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/objectsoftype/Post_thenResponseHeaders_ContentType_ok_TODO.java b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/objectsoftype/Post_thenResponseHeaders_ContentType_ok_TODO.java index 0cf1401..8ff7963 100644 --- a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/objectsoftype/Post_thenResponseHeaders_ContentType_ok_TODO.java +++ b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/objectsoftype/Post_thenResponseHeaders_ContentType_ok_TODO.java @@ -39,23 +39,4 @@ public class Post_thenResponseHeaders_ContentType_ok_TODO { client = new RestfulClient(webServer.getBase()); } - @Ignore - @Test - public void noCaching() throws Exception { - - } - - @Ignore - @Test - public void shortTermCaching() throws Exception { - - } - - @Ignore - @Test - public void longTermCaching() throws Exception { - - } - - } http://git-wip-us.apache.org/repos/asf/isis/blob/430e8b3c/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/version/Get_thenResponseHeaders_ContentLength_ok_TODO.java ---------------------------------------------------------------------- diff --git a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/version/Get_thenResponseHeaders_ContentLength_ok_TODO.java b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/version/Get_thenResponseHeaders_ContentLength_ok_TODO.java index ffc84fc..3f9e81f 100644 --- a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/version/Get_thenResponseHeaders_ContentLength_ok_TODO.java +++ b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/version/Get_thenResponseHeaders_ContentLength_ok_TODO.java @@ -38,24 +38,4 @@ public class Get_thenResponseHeaders_ContentLength_ok_TODO { final WebServer webServer = webServerRule.getWebServer(); client = new RestfulClient(webServer.getBase()); } - - @Ignore - @Test - public void noCaching() throws Exception { - - } - - @Ignore - @Test - public void shortTermCaching() throws Exception { - - } - - @Ignore - @Test - public void longTermCaching() throws Exception { - - } - - } http://git-wip-us.apache.org/repos/asf/isis/blob/430e8b3c/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/typeof/annotation/TypeOfAnnotationForActionsFacetFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/typeof/annotation/TypeOfAnnotationForActionsFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/typeof/annotation/TypeOfAnnotationForActionsFacetFactory.java index fb050bf..8ab6fef 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/typeof/annotation/TypeOfAnnotationForActionsFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/typeof/annotation/TypeOfAnnotationForActionsFacetFactory.java @@ -19,6 +19,8 @@ package org.apache.isis.core.progmodel.facets.actions.typeof.annotation; +import java.lang.reflect.GenericDeclaration; +import java.lang.reflect.Method; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.lang.reflect.TypeVariable; @@ -43,46 +45,68 @@ public class TypeOfAnnotationForActionsFacetFactory extends FacetFactoryAbstract @Override public void process(final ProcessMethodContext processMethodContext) { - final TypeOf annotation = Annotations.getAnnotation(processMethodContext.getMethod(), TypeOf.class); - - final Class<?> methodReturnType = processMethodContext.getMethod().getReturnType(); + final Method method = processMethodContext.getMethod(); + final Class<?> methodReturnType = method.getReturnType(); if (!collectionTypeRegistry.isCollectionType(methodReturnType) && !collectionTypeRegistry.isArrayType(methodReturnType)) { return; } - final Class<?> returnType = processMethodContext.getMethod().getReturnType(); + final Class<?> returnType = method.getReturnType(); if (returnType.isArray()) { final Class<?> componentType = returnType.getComponentType(); FacetUtil.addFacet(new TypeOfFacetInferredFromArray(componentType, processMethodContext.getFacetHolder(), getSpecificationLoader())); return; } + final TypeOf annotation = Annotations.getAnnotation(method, TypeOf.class); if (annotation != null) { FacetUtil.addFacet(new TypeOfFacetAnnotationForAction(annotation.value(), processMethodContext.getFacetHolder(), getSpecificationLoader())); return; } - final Type type = processMethodContext.getMethod().getGenericReturnType(); + final Type type = method.getGenericReturnType(); if (!(type instanceof ParameterizedType)) { return; } - final ParameterizedType parameterizedType = (ParameterizedType) type; - final Type[] actualTypeArguments = parameterizedType.getActualTypeArguments(); - if (actualTypeArguments.length == 0) { + final ParameterizedType methodParameterizedType = (ParameterizedType) type; + final Type[] methodActualTypeArguments = methodParameterizedType.getActualTypeArguments(); + if (methodActualTypeArguments.length == 0) { return; } - final Object actualTypeArgument = actualTypeArguments[0]; - if (actualTypeArgument instanceof Class) { - final Class<?> actualType = (Class<?>) actualTypeArgument; + final Object methodActualTypeArgument = methodActualTypeArguments[0]; + if (methodActualTypeArgument instanceof Class) { + final Class<?> actualType = (Class<?>) methodActualTypeArgument; FacetUtil.addFacet(new TypeOfFacetInferredFromGenerics(actualType, processMethodContext.getFacetHolder(), getSpecificationLoader())); return; } - if (actualTypeArgument instanceof TypeVariable) { - - // TODO: what to do here? + if (methodActualTypeArgument instanceof TypeVariable) { + + TypeVariable<?> methodTypeVariable = (TypeVariable<?>) methodActualTypeArgument; + final GenericDeclaration methodGenericClassDeclaration = methodTypeVariable.getGenericDeclaration(); + + // try to match up with the actual type argument of the generic superclass. + final Type genericSuperclass = processMethodContext.getCls().getGenericSuperclass(); + if(genericSuperclass instanceof ParameterizedType) { + final ParameterizedType parameterizedTypeOfSuperclass = (ParameterizedType)genericSuperclass; + if(parameterizedTypeOfSuperclass.getRawType() == methodGenericClassDeclaration) { + final Type[] genericSuperClassActualTypeArguments = parameterizedTypeOfSuperclass.getActualTypeArguments(); + // simplification: if there's just one, then use it. + if(methodActualTypeArguments.length == 1) { + final Type actualType = genericSuperClassActualTypeArguments[0]; + if(actualType instanceof Class) { + // just being safe + Class<?> actualCls = (Class<?>) actualType; + FacetUtil.addFacet(new TypeOfFacetInferredFromGenerics(actualCls, processMethodContext.getFacetHolder(), getSpecificationLoader())); + return; + } + } + } + } + + // TODO: otherwise, what to do? return; } http://git-wip-us.apache.org/repos/asf/isis/blob/430e8b3c/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/scalars/JodaValuedEntity.java ---------------------------------------------------------------------- diff --git a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/scalars/JodaValuedEntity.java b/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/scalars/JodaValuedEntity.java new file mode 100644 index 0000000..70a5e6d --- /dev/null +++ b/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/scalars/JodaValuedEntity.java @@ -0,0 +1,91 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.isis.core.tck.dom.scalars; + +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.Date; + +import org.joda.time.LocalDate; +import org.joda.time.LocalDateTime; + +import org.apache.isis.applib.AbstractDomainObject; +import org.apache.isis.applib.annotation.MemberOrder; +import org.apache.isis.applib.annotation.ObjectType; +import org.apache.isis.applib.annotation.Optional; +import org.apache.isis.applib.annotation.Title; + [email protected] [email protected]("JODA") [email protected]( + name="joda_findByStringProperty", language="JDOQL", + value="SELECT FROM org.apache.isis.tck.dom.scalars.JdkValuedEntity WHERE stringProperty == :i") +@ObjectType("JODA") +public class JodaValuedEntity extends AbstractDomainObject { + + // {{ StringProperty (also title, pk) + private String stringProperty; + + @javax.jdo.annotations.PrimaryKey + @Title + @Optional + @MemberOrder(sequence = "1") + public String getStringProperty() { + return stringProperty; + } + + public void setStringProperty(final String description) { + this.stringProperty = description; + } + + // }} + + // {{ LocalDateProperty + private LocalDate localDateProperty; + + @Optional + @MemberOrder(sequence = "1") + public LocalDate getLocalDateProperty() { + return localDateProperty; + } + + public void setLocalDateProperty(final LocalDate localDateProperty) { + this.localDateProperty = localDateProperty; + } + // }} + + + // {{ LocalDateTimeProperty + private LocalDateTime localDateTimeProperty; + + @Optional + @MemberOrder(sequence = "1") + public LocalDateTime getLocalDateTimeProperty() { + return localDateTimeProperty; + } + + public void setLocalDateTimeProperty(final LocalDateTime localDateTimeProperty) { + this.localDateTimeProperty = localDateTimeProperty; + } + // }} + + + +} http://git-wip-us.apache.org/repos/asf/isis/blob/430e8b3c/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/scalars/JodaValuedEntityRepository.java ---------------------------------------------------------------------- diff --git a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/scalars/JodaValuedEntityRepository.java b/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/scalars/JodaValuedEntityRepository.java new file mode 100644 index 0000000..1630539 --- /dev/null +++ b/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/scalars/JodaValuedEntityRepository.java @@ -0,0 +1,44 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.isis.core.tck.dom.scalars; + +import org.apache.isis.applib.annotation.MemberOrder; +import org.apache.isis.applib.annotation.Named; +import org.apache.isis.applib.annotation.ObjectType; +import org.apache.isis.core.tck.dom.AbstractEntityRepository; + +@Named("JodaValuedEntities") +@ObjectType("JodaValuedEntities") +public class JodaValuedEntityRepository extends AbstractEntityRepository<JodaValuedEntity> { + + public JodaValuedEntityRepository() { + super(JodaValuedEntity.class, "JodaValuedEntities"); + } + + /** + * Required to discover the JodaValueEntity type. + */ + @Override + @MemberOrder(sequence = "2") + public JodaValuedEntity newEntity() { + return super.newEntity(); + } + +} http://git-wip-us.apache.org/repos/asf/isis/blob/430e8b3c/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/JodaValuedEntityFixture.java ---------------------------------------------------------------------- diff --git a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/JodaValuedEntityFixture.java b/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/JodaValuedEntityFixture.java new file mode 100644 index 0000000..e86e457 --- /dev/null +++ b/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/JodaValuedEntityFixture.java @@ -0,0 +1,47 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.isis.core.tck.fixture.scalars; + +import org.apache.isis.applib.fixtures.AbstractFixture; +import org.apache.isis.core.tck.dom.scalars.JodaValuedEntity; +import org.apache.isis.core.tck.dom.scalars.JodaValuedEntityRepository; + +public class JodaValuedEntityFixture extends AbstractFixture { + + @Override + public void install() { + createEntity(); + createEntity(); + createEntity(); + createEntity(); + createEntity(); + } + + private JodaValuedEntity createEntity() { + return jodaValuesEntityRepository.newEntity(); + } + + private JodaValuedEntityRepository jodaValuesEntityRepository; + + public void setJdkValuesEntityRepository(final JodaValuedEntityRepository jodaValuesEntityRepository) { + this.jodaValuesEntityRepository = jodaValuesEntityRepository; + } + +} http://git-wip-us.apache.org/repos/asf/isis/blob/430e8b3c/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/PrimitiveValuedEntityFixture.java ---------------------------------------------------------------------- diff --git a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/PrimitiveValuedEntityFixture.java b/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/PrimitiveValuedEntityFixture.java index 612c18c..e9db111 100644 --- a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/PrimitiveValuedEntityFixture.java +++ b/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/PrimitiveValuedEntityFixture.java @@ -35,7 +35,16 @@ public class PrimitiveValuedEntityFixture extends AbstractFixture { } private PrimitiveValuedEntity createEntity() { - return primitiveValuesEntityRepository.newEntity(); + final PrimitiveValuedEntity pve = primitiveValuesEntityRepository.newEntity(); + pve.setBooleanProperty(true); + pve.setByteProperty((byte)123); + pve.setShortProperty((short)32123); + pve.setCharProperty('a'); + pve.setIntProperty(987654321); + pve.setLongProperty(2345678901234567890L); + pve.setFloatProperty(12345678901234567890.1234567890F); + pve.setDoubleProperty(12345678901234567890.1234567890); + return pve; } private PrimitiveValuedEntityRepository primitiveValuesEntityRepository; http://git-wip-us.apache.org/repos/asf/isis/blob/430e8b3c/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/WrapperValuedEntityFixture.java ---------------------------------------------------------------------- diff --git a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/WrapperValuedEntityFixture.java b/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/WrapperValuedEntityFixture.java index 9b9060c..0d9d869 100644 --- a/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/WrapperValuedEntityFixture.java +++ b/core/tck/tck-fixture/src/main/java/org/apache/isis/core/tck/fixture/scalars/WrapperValuedEntityFixture.java @@ -35,7 +35,17 @@ public class WrapperValuedEntityFixture extends AbstractFixture { } private WrapperValuedEntity createEntity() { - return wrapperValuesEntityRepository.newEntity(); + final WrapperValuedEntity wve = wrapperValuesEntityRepository.newEntity(); + wve.setBooleanProperty(true); + wve.setByteProperty((byte)123); + wve.setShortProperty((short)32123); + wve.setCharacterProperty('a'); + wve.setIntegerProperty(987654321); + wve.setLongProperty(2345678901234567890L); + wve.setFloatProperty(12345678901234567890.1234567890F); + wve.setDoubleProperty(12345678901234567890.1234567890); + + return wve; } private WrapperValuedEntityRepository wrapperValuesEntityRepository;
