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 2011/10/24 14:42:56 UTC
svn commit: r1188122 - in /incubator/isis/trunk/framework:
tck/tck-dom/src/main/java/org/apache/isis/tck/dom/simples/
tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/simples/
viewer/json/json-applib/src/test/java/org/apache/isis/v...
Author: danhaywood
Date: Mon Oct 24 12:42:55 2011
New Revision: 1188122
URL: http://svn.apache.org/viewvc?rev=1188122&view=rev
Log:
ISIS-109: updating tck in readiness for test to test jsonvalueencoder for all built-in types
Added:
incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/blocks/LinkRepresentationTest_equals.java
- copied, changed from r1188108, incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/blocks/LinkTest_equals.java
Removed:
incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/blocks/LinkTest_equals.java
Modified:
incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/simples/SimpleEntity.java
incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/simples/SimpleEntityRepository.java
incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/simples/SimpleEntityRepositoryDefault.java
incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/service/invoke/DomainServiceResourceTest_invokeAction.java
Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/simples/SimpleEntity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/simples/SimpleEntity.java?rev=1188122&r1=1188121&r2=1188122&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/simples/SimpleEntity.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/simples/SimpleEntity.java Mon Oct 24 12:42:55 2011
@@ -42,18 +42,31 @@ public class SimpleEntity extends Abstra
// }}
// {{ Flag (boolean)
- private Boolean flag;
+ private boolean flag;
@MemberOrder(sequence = "1")
- public Boolean getFlag() {
+ public boolean getFlag() {
return flag;
}
- public void setFlag(final Boolean flag) {
+ public void setFlag(final boolean flag) {
this.flag = flag;
}
// }}
+ // {{ AnotherBoolean (Boolean)
+ private Boolean anotherBoolean;
+
+ @MemberOrder(sequence = "1")
+ @Optional
+ public Boolean getAnotherBoolean() {
+ return anotherBoolean;
+ }
+
+ public void setAnotherBoolean(final Boolean anotherBoolean) {
+ this.anotherBoolean = anotherBoolean;
+ }
+ // }}
// {{ AnInt (int)
private int anInt;
@@ -68,8 +81,7 @@ public class SimpleEntity extends Abstra
}
// }}
-
- // {{ AnotherInt
+ // {{ AnotherInt (Integer)
private Integer anotherInt;
@MemberOrder(sequence = "1")
@@ -83,7 +95,7 @@ public class SimpleEntity extends Abstra
}
// }}
- // {{ ALong
+ // {{ ALong (long)
private long aLong;
@MemberOrder(sequence = "1")
public long getALong() {
@@ -95,7 +107,6 @@ public class SimpleEntity extends Abstra
}
// }}
-
// {{ AnotherLong
private Long anotherLong;
@@ -111,7 +122,7 @@ public class SimpleEntity extends Abstra
// }}
- // {{ ADouble
+ // {{ ADouble (double)
private double aDouble;
@MemberOrder(sequence = "1")
@@ -124,8 +135,7 @@ public class SimpleEntity extends Abstra
}
// }}
-
- // {{ AnotherDouble
+ // {{ AnotherDouble (Double)
private Double anotherDouble;
@MemberOrder(sequence = "1")
@@ -154,7 +164,6 @@ public class SimpleEntity extends Abstra
}
// }}
-
// {{ ABigDecimal
private BigDecimal aBigDecimal;
Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/simples/SimpleEntityRepository.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/simples/SimpleEntityRepository.java?rev=1188122&r1=1188121&r2=1188122&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/simples/SimpleEntityRepository.java (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/simples/SimpleEntityRepository.java Mon Oct 24 12:42:55 2011
@@ -19,6 +19,8 @@
package org.apache.isis.tck.dom.simples;
+import java.math.BigDecimal;
+import java.math.BigInteger;
import java.util.List;
import org.apache.isis.applib.annotation.Idempotent;
@@ -50,4 +52,19 @@ public interface SimpleEntityRepository
public void toggle(
@Named("object") SimpleEntity object);
+ @MemberOrder(sequence="5")
+ public SimpleEntity update(
+ @Named("object") SimpleEntity object,
+ String name,
+ boolean flag,
+ Boolean anotherBoolean,
+ int anInt,
+ Integer anotherInt,
+ long aLong,
+ Long anotherLong,
+ double aDouble,
+ Double anotherDouble,
+ BigInteger aBigInteger,
+ BigDecimal aBigDecimal);
+
}
Modified: incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/simples/SimpleEntityRepositoryDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/simples/SimpleEntityRepositoryDefault.java?rev=1188122&r1=1188121&r2=1188122&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/simples/SimpleEntityRepositoryDefault.java (original)
+++ incubator/isis/trunk/framework/tck/tck-objstore-dflt/src/main/java/org/apache/isis/tck/objstore/dflt/simples/SimpleEntityRepositoryDefault.java Mon Oct 24 12:42:55 2011
@@ -19,6 +19,9 @@
package org.apache.isis.tck.objstore.dflt.simples;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
import org.apache.isis.tck.dom.AbstractEntityRepository;
import org.apache.isis.tck.dom.simples.SimpleEntity;
import org.apache.isis.tck.dom.simples.SimpleEntityRepository;
@@ -59,5 +62,34 @@ public class SimpleEntityRepositoryDefau
object.setFlag(!object.getFlag());
}
+ @Override
+ public SimpleEntity update(SimpleEntity object,
+ final String name,
+ final boolean flag,
+ final Boolean anotherBoolean,
+ final int anInt,
+ final Integer anotherInt,
+ final long aLong,
+ final Long anotherLong,
+ final double aDouble,
+ final Double anotherDouble,
+ final BigInteger aBigInteger,
+ final BigDecimal aBigDecimal) {
+
+ object.setName(name);
+ object.setFlag(flag);
+ object.setAnotherBoolean(anotherBoolean);
+ object.setAnInt(anInt);
+ object.setAnotherInt(anotherInt);
+ object.setALong(aLong);
+ object.setAnotherLong(anotherLong);
+ object.setADouble(aDouble);
+ object.setAnotherDouble(anotherDouble);
+ object.setABigInteger(aBigInteger);
+ object.setABigDecimal(aBigDecimal);
+
+ return object;
+ }
+
}
Copied: incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/blocks/LinkRepresentationTest_equals.java (from r1188108, incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/blocks/LinkTest_equals.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/blocks/LinkRepresentationTest_equals.java?p2=incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/blocks/LinkRepresentationTest_equals.java&p1=incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/blocks/LinkTest_equals.java&r1=1188108&r2=1188122&rev=1188122&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/blocks/LinkTest_equals.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/blocks/LinkRepresentationTest_equals.java Mon Oct 24 12:42:55 2011
@@ -27,7 +27,7 @@ import java.io.UnsupportedEncodingExcept
import org.junit.Test;
-public class LinkTest_equals {
+public class LinkRepresentationTest_equals {
@Test
public void equalDependsOnMethodAndHref() throws UnsupportedEncodingException {
Modified: incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/service/invoke/DomainServiceResourceTest_invokeAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/service/invoke/DomainServiceResourceTest_invokeAction.java?rev=1188122&r1=1188121&r2=1188122&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/service/invoke/DomainServiceResourceTest_invokeAction.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/service/invoke/DomainServiceResourceTest_invokeAction.java Mon Oct 24 12:42:55 2011
@@ -18,36 +18,35 @@
*/
package org.apache.isis.viewer.json.tck.resources.service.invoke;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-
-import javax.ws.rs.core.Response;
-
-import org.apache.isis.runtimes.dflt.webserver.WebServer;
-import org.apache.isis.viewer.json.applib.HttpMethod;
-import org.apache.isis.viewer.json.applib.JsonRepresentation;
-import org.apache.isis.viewer.json.applib.RestfulClient;
-import org.apache.isis.viewer.json.applib.RestfulRequest;
-import org.apache.isis.viewer.json.applib.RestfulRequest.QueryParameter;
-import org.apache.isis.viewer.json.applib.RestfulResponse;
-import org.apache.isis.viewer.json.applib.RestfulResponse.HttpStatusCode;
-import org.apache.isis.viewer.json.applib.blocks.LinkRepresentation;
-import org.apache.isis.viewer.json.applib.domainobjects.DomainObjectRepresentation;
-import org.apache.isis.viewer.json.applib.domainobjects.DomainServiceResource;
-import org.apache.isis.viewer.json.applib.domainobjects.ListRepresentation;
-import org.apache.isis.viewer.json.applib.domainobjects.ObjectActionRepresentation;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
+import java.io.IOException;
+
+import javax.ws.rs.core.Response;
+
+import org.apache.isis.runtimes.dflt.webserver.WebServer;
+import org.apache.isis.viewer.json.applib.HttpMethod;
+import org.apache.isis.viewer.json.applib.JsonRepresentation;
+import org.apache.isis.viewer.json.applib.RestfulClient;
+import org.apache.isis.viewer.json.applib.RestfulRequest;
+import org.apache.isis.viewer.json.applib.RestfulRequest.QueryParameter;
+import org.apache.isis.viewer.json.applib.RestfulResponse;
+import org.apache.isis.viewer.json.applib.RestfulResponse.HttpStatusCode;
+import org.apache.isis.viewer.json.applib.blocks.LinkRepresentation;
+import org.apache.isis.viewer.json.applib.domainobjects.DomainObjectRepresentation;
+import org.apache.isis.viewer.json.applib.domainobjects.DomainServiceResource;
+import org.apache.isis.viewer.json.applib.domainobjects.ListRepresentation;
+import org.apache.isis.viewer.json.applib.domainobjects.ObjectActionRepresentation;
import org.apache.isis.viewer.json.applib.domainobjects.ScalarValueRepresentation;
-import org.apache.isis.viewer.json.tck.IsisWebServerRule;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.apache.isis.viewer.json.tck.IsisWebServerRule;
+import org.codehaus.jackson.JsonParseException;
+import org.codehaus.jackson.map.JsonMappingException;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
public class DomainServiceResourceTest_invokeAction {
@@ -189,9 +188,12 @@ public class DomainServiceResourceTest_i
@org.junit.Ignore("up to here")
@Test
public void invoke_withAllBuiltInArgs_usingClientFollow() throws Exception {
+
+ // given simple entity with 'flag' property set to true
+ final LinkRepresentation linkToSimpleEntity = givenLinkToSimpleEntity(0);
// given
- JsonRepresentation givenAction = givenAction("simples", "newTransientEntity");
+ JsonRepresentation givenAction = givenAction("simples", "update");
final ObjectActionRepresentation actionRepr = givenAction.as(ObjectActionRepresentation.class);
// when