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 2014/10/09 13:26:46 UTC
[4/6] git commit: ISIS-917: fixing TCK tests for RO viewer
post-refactoring.
ISIS-917: fixing TCK tests for RO viewer post-refactoring.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9af78330
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9af78330
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9af78330
Branch: refs/heads/master
Commit: 9af78330bf092df7736997b92f8a1fb576174d4e
Parents: 064c42e
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Oct 8 16:55:53 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Oct 8 16:55:53 2014 +0100
----------------------------------------------------------------------
..._givenDisabledMembers_thenRepresentation_ok.java | 2 +-
...ivenEntityWithActions_thenRepresentation_ok.java | 2 +-
...yWithCollections_thenRepresentation_ok_TODO.java | 2 +-
...ut_whenArgsValid_thenMultiplePropertyUpdate.java | 4 ++--
.../oid/property/Get_thenRepresentation_ok.java | 10 +++++-----
.../Get_thenResponseHeaders_ContentLength_ok.java | 2 +-
.../domainobject/oid/property/Get_then_200_ok.java | 2 +-
.../Get_whenQueryArg_xRoDomainModel_ok.java | 2 +-
.../oid/property/Post_then_405_bad.java | 2 +-
.../domainobject/oid/property/Put_then_200_ok.java | 2 +-
...henArgValid_thenPrimitivePropertyUpdated_ok.java | 16 ++++++++--------
.../Delete_givenObjectResource_then_405_bad.java | 2 +-
.../id/action/Get_thenRepresentation_ok.java | 8 ++++----
.../id/action/Get_thenResponseCode_200_ok.java | 2 +-
.../Get_thenResponseHeaders_ContentLength_ok.java | 2 +-
.../action/Get_whenQueryArg_xRoDomainModel_ok.java | 2 +-
.../Post_givenObjectResource_then_405_bad.java | 2 +-
.../Put_givenObjectResource_then_405_bad.java | 2 +-
...ost_whenInvokeArgWithObjectReference_thenOK.java | 6 +++---
19 files changed, 36 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/9af78330/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenDisabledMembers_thenRepresentation_ok.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenDisabledMembers_thenRepresentation_ok.java b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenDisabledMembers_thenRepresentation_ok.java
index 66590fc..7d87dad 100644
--- a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenDisabledMembers_thenRepresentation_ok.java
+++ b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenDisabledMembers_thenRepresentation_ok.java
@@ -58,7 +58,7 @@ public class Get_givenDisabledMembers_thenRepresentation_ok {
public void domainObjectWithDisabledMembers() throws Exception {
// given, when
- final DomainObjectRepresentation domainObjectRepr = givenDomainObjectRepresentationFor("BSRL","74");
+ final DomainObjectRepresentation domainObjectRepr = givenDomainObjectRepresentationFor("BSRL","75");
// property ('visibleButNotEditableProperty')
final JsonRepresentation properties = domainObjectRepr.getProperties();
http://git-wip-us.apache.org/repos/asf/isis/blob/9af78330/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenEntityWithActions_thenRepresentation_ok.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenEntityWithActions_thenRepresentation_ok.java b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenEntityWithActions_thenRepresentation_ok.java
index 8bc9a1e..a107a4f 100644
--- a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenEntityWithActions_thenRepresentation_ok.java
+++ b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenEntityWithActions_thenRepresentation_ok.java
@@ -57,7 +57,7 @@ public class Get_givenEntityWithActions_thenRepresentation_ok {
public void thenMembers() throws Exception {
// when
- final Response jaxrsResponse = domainObjectResource.object("RTNE","77");
+ final Response jaxrsResponse = domainObjectResource.object("RTNE","78");
final RestfulResponse<DomainObjectRepresentation> restfulResponse = RestfulResponse.ofT(jaxrsResponse);
assertThat(restfulResponse.getStatus(), is(HttpStatusCode.OK));
http://git-wip-us.apache.org/repos/asf/isis/blob/9af78330/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenEntityWithCollections_thenRepresentation_ok_TODO.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenEntityWithCollections_thenRepresentation_ok_TODO.java b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenEntityWithCollections_thenRepresentation_ok_TODO.java
index 3c6eca1..0ea7f76 100644
--- a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenEntityWithCollections_thenRepresentation_ok_TODO.java
+++ b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenEntityWithCollections_thenRepresentation_ok_TODO.java
@@ -56,7 +56,7 @@ public class Get_givenEntityWithCollections_thenRepresentation_ok_TODO {
public void thenCollections() throws Exception {
// when
- final Response jaxrsResponse = domainObjectResource.object("PRMV","42");
+ final Response jaxrsResponse = domainObjectResource.object("PRMV","43");
final RestfulResponse<DomainObjectRepresentation> restfulResponse = RestfulResponse.ofT(jaxrsResponse);
assertThat(restfulResponse.getStatus(), is(HttpStatusCode.OK));
http://git-wip-us.apache.org/repos/asf/isis/blob/9af78330/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Put_whenArgsValid_thenMultiplePropertyUpdate.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Put_whenArgsValid_thenMultiplePropertyUpdate.java b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Put_whenArgsValid_thenMultiplePropertyUpdate.java
index 8c72794..7e53275 100644
--- a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Put_whenArgsValid_thenMultiplePropertyUpdate.java
+++ b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Put_whenArgsValid_thenMultiplePropertyUpdate.java
@@ -76,7 +76,7 @@ public class Put_whenArgsValid_thenMultiplePropertyUpdate {
@Test
public void primitivePropertiesUpdated() throws Exception {
- final DomainObjectRepresentation domainObjectRepr = getObjectRepr("PRMV", "42");
+ final DomainObjectRepresentation domainObjectRepr = getObjectRepr("PRMV", "43");
final LinkRepresentation updateLink = domainObjectRepr.getLinkWithRel(Rel.UPDATE);
@@ -156,7 +156,7 @@ public class Put_whenArgsValid_thenMultiplePropertyUpdate {
@Test
public void jodaPropertiesUpdated() throws Exception {
- final DomainObjectRepresentation domainObjectRepr = getObjectRepr("JODA", "82");
+ final DomainObjectRepresentation domainObjectRepr = getObjectRepr("JODA", "83");
final LinkRepresentation updateLink = domainObjectRepr.getLinkWithRel(Rel.UPDATE);
http://git-wip-us.apache.org/repos/asf/isis/blob/9af78330/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_thenRepresentation_ok.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_thenRepresentation_ok.java b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_thenRepresentation_ok.java
index f0a302c..60968e3 100644
--- a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_thenRepresentation_ok.java
+++ b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_thenRepresentation_ok.java
@@ -60,7 +60,7 @@ public class Get_thenRepresentation_ok {
public void representation() throws Exception {
// when
- final Response idPropertyResp = domainObjectResource.propertyDetails("org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity","67", "anInt");
+ final Response idPropertyResp = domainObjectResource.propertyDetails("org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity","68", "anInt");
final RestfulResponse<ObjectPropertyRepresentation> idPropertyJsonResp = RestfulResponse.ofT(idPropertyResp);
assertThat(idPropertyJsonResp.getStatus().getFamily(), is(Family.SUCCESSFUL));
@@ -73,7 +73,7 @@ public class Get_thenRepresentation_ok {
final LinkRepresentation selfLink = propertyRepr.getLinkWithRel(Rel.SELF);
assertThat(selfLink, isLink(client)
.httpMethod(RestfulHttpMethod.GET)
- .href(endsWith("/objects/org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity/67/properties/anInt"))
+ .href(endsWith("/objects/org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity/68/properties/anInt"))
.returning(HttpStatusCode.OK)
.build());
@@ -81,7 +81,7 @@ public class Get_thenRepresentation_ok {
final LinkRepresentation upLink = propertyRepr.getLinkWithRel(Rel.UP);
assertThat(upLink, isLink(client)
.httpMethod(RestfulHttpMethod.GET)
- .href(endsWith("/objects/org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity/67"))
+ .href(endsWith("/objects/org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity/68"))
.returning(HttpStatusCode.OK)
.type(RepresentationType.DOMAIN_OBJECT.getMediaType())
.title("default-name")
@@ -92,7 +92,7 @@ public class Get_thenRepresentation_ok {
assertThat(modifyLink, isLink(client)
.httpMethod(RestfulHttpMethod.PUT)
.type(RepresentationType.OBJECT_PROPERTY.getMediaType())
- .href(endsWith("/objects/org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity/67/properties/anInt"))
+ .href(endsWith("/objects/org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity/68/properties/anInt"))
.build());
assertThat(modifyLink.getArguments(), is(not(nullValue())));
@@ -104,7 +104,7 @@ public class Get_thenRepresentation_ok {
assertThat(clearLink, isLink(client)
.httpMethod(RestfulHttpMethod.DELETE)
.type(RepresentationType.OBJECT_PROPERTY.getMediaType())
- .href(endsWith("/objects/org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity/67/properties/anInt"))
+ .href(endsWith("/objects/org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity/68/properties/anInt"))
.build());
// described by link
http://git-wip-us.apache.org/repos/asf/isis/blob/9af78330/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_thenResponseHeaders_ContentLength_ok.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_thenResponseHeaders_ContentLength_ok.java b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_thenResponseHeaders_ContentLength_ok.java
index d201d23..e7c8614 100644
--- a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_thenResponseHeaders_ContentLength_ok.java
+++ b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_thenResponseHeaders_ContentLength_ok.java
@@ -54,7 +54,7 @@ public class Get_thenResponseHeaders_ContentLength_ok {
public void propertyDetails() throws Exception {
// when
- final Response idPropertyResp = domainObjectResource.propertyDetails("org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity","67", "anInt");
+ final Response idPropertyResp = domainObjectResource.propertyDetails("org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity","68", "anInt");
//given
final RestfulResponse<ObjectPropertyRepresentation> idPropertyJsonResp = RestfulResponse.ofT(idPropertyResp);
//then
http://git-wip-us.apache.org/repos/asf/isis/blob/9af78330/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_then_200_ok.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_then_200_ok.java b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_then_200_ok.java
index 9f6e1ad..275e202 100644
--- a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_then_200_ok.java
+++ b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_then_200_ok.java
@@ -54,7 +54,7 @@ public class Get_then_200_ok {
public void propertyDetails() throws Exception {
// when
- final Response idPropertyResp = domainObjectResource.propertyDetails("org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity","67", "anInt");
+ final Response idPropertyResp = domainObjectResource.propertyDetails("org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity","68", "anInt");
final RestfulResponse<ObjectPropertyRepresentation> idPropertyJsonResp = RestfulResponse.ofT(idPropertyResp);
assertThat(idPropertyJsonResp.getStatus(), is(HttpStatusCode.OK));
http://git-wip-us.apache.org/repos/asf/isis/blob/9af78330/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_whenQueryArg_xRoDomainModel_ok.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_whenQueryArg_xRoDomainModel_ok.java b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_whenQueryArg_xRoDomainModel_ok.java
index 59e5486..8f87283 100644
--- a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_whenQueryArg_xRoDomainModel_ok.java
+++ b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_whenQueryArg_xRoDomainModel_ok.java
@@ -45,7 +45,7 @@ public class Get_whenQueryArg_xRoDomainModel_ok {
public void setUp() throws Exception {
final WebServer webServer = webServerRule.getWebServer();
client = new RestfulClient(webServer.getBase());
- request = client.createRequest(RestfulHttpMethod.GET, "/objects/org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity/67/properties/anInt");
+ request = client.createRequest(RestfulHttpMethod.GET, "/objects/org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity/68/properties/anInt");
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/9af78330/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Post_then_405_bad.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Post_then_405_bad.java b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Post_then_405_bad.java
index 5e09219..fe7dd9c 100644
--- a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Post_then_405_bad.java
+++ b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Post_then_405_bad.java
@@ -56,7 +56,7 @@ public class Post_then_405_bad {
public void representation() throws Exception {
// given
- final Response idPropertyResp = domainObjectResource.propertyDetails("org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity","67", "anInt");
+ final Response idPropertyResp = domainObjectResource.propertyDetails("org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity","68", "anInt");
final RestfulResponse<ObjectPropertyRepresentation> idPropertyJsonResp = RestfulResponse.ofT(idPropertyResp);
final ObjectPropertyRepresentation propertyRepr = idPropertyJsonResp.getEntity();
final LinkRepresentation selfLink = propertyRepr.getLinkWithRel(Rel.SELF);
http://git-wip-us.apache.org/repos/asf/isis/blob/9af78330/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_then_200_ok.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_then_200_ok.java b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_then_200_ok.java
index 859d0e4..d8bf6b9 100644
--- a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_then_200_ok.java
+++ b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_then_200_ok.java
@@ -79,7 +79,7 @@ public class Put_then_200_ok {
// given
final int i = 999999;
- final Response domainObjectResp = domainObjectResource.propertyDetails("PRMV", "42", "intProperty");
+ final Response domainObjectResp = domainObjectResource.propertyDetails("PRMV", "43", "intProperty");
final RestfulResponse<ObjectPropertyRepresentation> domainObjectJsonResp = RestfulResponse.ofT(domainObjectResp);
assertThat(domainObjectJsonResp.getStatus().getFamily(), is(Response.Status.Family.SUCCESSFUL));
http://git-wip-us.apache.org/repos/asf/isis/blob/9af78330/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValid_thenPrimitivePropertyUpdated_ok.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValid_thenPrimitivePropertyUpdated_ok.java b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValid_thenPrimitivePropertyUpdated_ok.java
index 6f77937..8759e66 100644
--- a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValid_thenPrimitivePropertyUpdated_ok.java
+++ b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValid_thenPrimitivePropertyUpdated_ok.java
@@ -73,49 +73,49 @@ public class Put_whenArgValid_thenPrimitivePropertyUpdated_ok {
// byte
final byte b = (byte)99;
- modifyLink = getObjectPropertyReprModifyLink("PRMV", "42", "byteProperty");
+ modifyLink = getObjectPropertyReprModifyLink("PRMV", "43", "byteProperty");
argRepr = modifyLink.getArguments().mapPut("value", b);
assertThat(followedRepr(modifyLink,argRepr).getByte("value"), is(b));
// char
final char c = 'b';
- modifyLink = getObjectPropertyReprModifyLink("PRMV", "42", "charProperty");
+ modifyLink = getObjectPropertyReprModifyLink("PRMV", "43", "charProperty");
argRepr = modifyLink.getArguments().mapPut("value", c);
assertThat(followedRepr(modifyLink,argRepr).getChar("value"), is(c));
// double
final double d = 12345.678;
- modifyLink = getObjectPropertyReprModifyLink("PRMV", "42", "doubleProperty");
+ modifyLink = getObjectPropertyReprModifyLink("PRMV", "43", "doubleProperty");
argRepr = modifyLink.getArguments().mapPut("value", d);
assertThat(followedRepr(modifyLink,argRepr).getDouble("value"), is(d));
// float
final float f = 54321.123F;
- modifyLink = getObjectPropertyReprModifyLink("PRMV", "42", "floatProperty");
+ modifyLink = getObjectPropertyReprModifyLink("PRMV", "43", "floatProperty");
argRepr = modifyLink.getArguments().mapPut("value", f);
assertThat(followedRepr(modifyLink,argRepr).getFloat("value"), is(f));
// int
final int i = 999999;
- modifyLink = getObjectPropertyReprModifyLink("PRMV", "42", "intProperty");
+ modifyLink = getObjectPropertyReprModifyLink("PRMV", "43", "intProperty");
argRepr = modifyLink.getArguments().mapPut("value", i);
assertThat(followedRepr(modifyLink,argRepr).getInt("value"), is(i));
// long
final long l = 99999999999L;
- modifyLink = getObjectPropertyReprModifyLink("PRMV", "42", "longProperty");
+ modifyLink = getObjectPropertyReprModifyLink("PRMV", "43", "longProperty");
argRepr = modifyLink.getArguments().mapPut("value", l);
assertThat(followedRepr(modifyLink,argRepr).getLong("value"), is(l));
// short
final short s = (short)999;
- modifyLink = getObjectPropertyReprModifyLink("PRMV", "42", "shortProperty");
+ modifyLink = getObjectPropertyReprModifyLink("PRMV", "43", "shortProperty");
argRepr = modifyLink.getArguments().mapPut("value", s);
assertThat(followedRepr(modifyLink,argRepr).getShort("value"), is(s));
// boolean
final boolean z = false;
- modifyLink = getObjectPropertyReprModifyLink("PRMV", "42", "booleanProperty");
+ modifyLink = getObjectPropertyReprModifyLink("PRMV", "43", "booleanProperty");
argRepr = modifyLink.getArguments().mapPut("value", z);
assertThat(followedRepr(modifyLink,argRepr).getBoolean("value"), is(z));
http://git-wip-us.apache.org/repos/asf/isis/blob/9af78330/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Delete_givenObjectResource_then_405_bad.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Delete_givenObjectResource_then_405_bad.java b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Delete_givenObjectResource_then_405_bad.java
index 09204e4..44f460f 100644
--- a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Delete_givenObjectResource_then_405_bad.java
+++ b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Delete_givenObjectResource_then_405_bad.java
@@ -55,7 +55,7 @@ public class Delete_givenObjectResource_then_405_bad {
public void representation() throws Exception {
// given
- final Response actionPromptResp = domainObjectResource.actionPrompt("RTNE", "77", "contains");
+ final Response actionPromptResp = domainObjectResource.actionPrompt("RTNE", "78", "contains");
final RestfulResponse<ObjectActionRepresentation> actionPromptJsonResp = RestfulResponse.ofT(actionPromptResp);
final ObjectActionRepresentation actionPromptRepr = actionPromptJsonResp.getEntity();
final LinkRepresentation selfLink = actionPromptRepr.getLinkWithRel(Rel.SELF);
http://git-wip-us.apache.org/repos/asf/isis/blob/9af78330/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenRepresentation_ok.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenRepresentation_ok.java b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenRepresentation_ok.java
index c915614..b08c954 100644
--- a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenRepresentation_ok.java
+++ b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenRepresentation_ok.java
@@ -59,7 +59,7 @@ public class Get_thenRepresentation_ok {
public void representation() throws Exception {
// when
- final Response actionPromptResp = domainObjectResource.actionPrompt("RTNE", "77", "contains");
+ final Response actionPromptResp = domainObjectResource.actionPrompt("RTNE", "78", "contains");
final RestfulResponse<ObjectActionRepresentation> actionPromptJsonResp = RestfulResponse.ofT(actionPromptResp);
assertThat(actionPromptJsonResp.getStatus().getFamily(), is(Family.SUCCESSFUL));
@@ -72,14 +72,14 @@ public class Get_thenRepresentation_ok {
final LinkRepresentation selfLink = actionPromptRepr.getLinkWithRel(Rel.SELF);
assertThat(selfLink, isLink(client)
.httpMethod(RestfulHttpMethod.GET)
- .href(endsWith("/objects/RTNE/77/actions/contains"))
+ .href(endsWith("/objects/RTNE/78/actions/contains"))
.returning(HttpStatusCode.OK));
// up link
final LinkRepresentation upLink = actionPromptRepr.getLinkWithRel(Rel.UP);
assertThat(upLink, isLink(client)
.httpMethod(RestfulHttpMethod.GET)
- .href(endsWith("/objects/RTNE/77"))
+ .href(endsWith("/objects/RTNE/78"))
.returning(HttpStatusCode.OK)
.type(RepresentationType.DOMAIN_OBJECT.getMediaType())
.title("Untitled Actions Entity"));
@@ -88,7 +88,7 @@ public class Get_thenRepresentation_ok {
final LinkRepresentation invokeLink = actionPromptRepr.getLinkWithRel(Rel.INVOKE);
assertThat(invokeLink, isLink(client)
.httpMethod(RestfulHttpMethod.GET)
- .href(endsWith("/objects/RTNE/77/actions/contains/invoke")));
+ .href(endsWith("/objects/RTNE/78/actions/contains/invoke")));
assertThat(invokeLink.getArguments(), is(not(nullValue())));
assertThat(invokeLink.getArguments().isArray(), is(false));
http://git-wip-us.apache.org/repos/asf/isis/blob/9af78330/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenResponseCode_200_ok.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenResponseCode_200_ok.java b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenResponseCode_200_ok.java
index 5f4b467..cf51675 100644
--- a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenResponseCode_200_ok.java
+++ b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenResponseCode_200_ok.java
@@ -52,7 +52,7 @@ public class Get_thenResponseCode_200_ok {
public void actionPrompt() throws Exception {
// when
- final Response actionPromptResp = domainObjectResource.actionPrompt("RTNE", "77", "contains");
+ final Response actionPromptResp = domainObjectResource.actionPrompt("RTNE", "78", "contains");
final RestfulResponse<ObjectActionRepresentation> actionPromptJsonResp = RestfulResponse.ofT(actionPromptResp);
assertThat(actionPromptJsonResp.getStatus(), is(HttpStatusCode.OK));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/9af78330/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenResponseHeaders_ContentLength_ok.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenResponseHeaders_ContentLength_ok.java b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenResponseHeaders_ContentLength_ok.java
index 29d3e67..1f9a112 100644
--- a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenResponseHeaders_ContentLength_ok.java
+++ b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenResponseHeaders_ContentLength_ok.java
@@ -52,7 +52,7 @@ public class Get_thenResponseHeaders_ContentLength_ok {
@Test
public void ok() throws Exception {
// given
- final Response actionPromptResp = domainObjectResource.actionPrompt("RTNE", "77", "contains");
+ final Response actionPromptResp = domainObjectResource.actionPrompt("RTNE", "78", "contains");
// when
final RestfulResponse<ObjectActionRepresentation> actionPromptJsonResp = RestfulResponse.ofT(actionPromptResp);
http://git-wip-us.apache.org/repos/asf/isis/blob/9af78330/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_whenQueryArg_xRoDomainModel_ok.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_whenQueryArg_xRoDomainModel_ok.java b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_whenQueryArg_xRoDomainModel_ok.java
index 80aefee..6bcce0c 100644
--- a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_whenQueryArg_xRoDomainModel_ok.java
+++ b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_whenQueryArg_xRoDomainModel_ok.java
@@ -46,7 +46,7 @@ public class Get_whenQueryArg_xRoDomainModel_ok {
public void setUp() throws Exception {
final WebServer webServer = webServerRule.getWebServer();
client = new RestfulClient(webServer.getBase());
- request = client.createRequest(RestfulHttpMethod.GET, "/objects/RTNE/77/actions/contains");
+ request = client.createRequest(RestfulHttpMethod.GET, "/objects/RTNE/78/actions/contains");
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/9af78330/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Post_givenObjectResource_then_405_bad.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Post_givenObjectResource_then_405_bad.java b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Post_givenObjectResource_then_405_bad.java
index ad15699..2917e30 100644
--- a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Post_givenObjectResource_then_405_bad.java
+++ b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Post_givenObjectResource_then_405_bad.java
@@ -55,7 +55,7 @@ public class Post_givenObjectResource_then_405_bad {
public void representation() throws Exception {
// given
- final Response actionPromptResp = domainObjectResource.actionPrompt("RTNE", "77", "contains");
+ final Response actionPromptResp = domainObjectResource.actionPrompt("RTNE", "78", "contains");
final RestfulResponse<ObjectActionRepresentation> actionPromptJsonResp = RestfulResponse.ofT(actionPromptResp);
final ObjectActionRepresentation actionPromptRepr = actionPromptJsonResp.getEntity();
final LinkRepresentation selfLink = actionPromptRepr.getLinkWithRel(Rel.SELF);
http://git-wip-us.apache.org/repos/asf/isis/blob/9af78330/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Put_givenObjectResource_then_405_bad.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Put_givenObjectResource_then_405_bad.java b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Put_givenObjectResource_then_405_bad.java
index 26978e4..83c086a 100644
--- a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Put_givenObjectResource_then_405_bad.java
+++ b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Put_givenObjectResource_then_405_bad.java
@@ -55,7 +55,7 @@ public class Put_givenObjectResource_then_405_bad {
public void representation() throws Exception {
// given
- final Response actionPromptResp = domainObjectResource.actionPrompt("RTNE", "77", "contains");
+ final Response actionPromptResp = domainObjectResource.actionPrompt("RTNE", "78", "contains");
final RestfulResponse<ObjectActionRepresentation> actionPromptJsonResp = RestfulResponse.ofT(actionPromptResp);
final ObjectActionRepresentation actionPromptRepr = actionPromptJsonResp.getEntity();
final LinkRepresentation selfLink = actionPromptRepr.getLinkWithRel(Rel.SELF);
http://git-wip-us.apache.org/repos/asf/isis/blob/9af78330/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Post_whenInvokeArgWithObjectReference_thenOK.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Post_whenInvokeArgWithObjectReference_thenOK.java b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Post_whenInvokeArgWithObjectReference_thenOK.java
index 28bdebe..2c1fc94 100644
--- a/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Post_whenInvokeArgWithObjectReference_thenOK.java
+++ b/core/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Post_whenInvokeArgWithObjectReference_thenOK.java
@@ -73,7 +73,7 @@ public class Post_whenInvokeArgWithObjectReference_thenOK {
// given
RestfulResponse<ObjectCollectionRepresentation> childrenRestfulResponse =
- RestfulResponse.ofT(objectResource.accessCollection("PRNT", "52", "children"));
+ RestfulResponse.ofT(objectResource.accessCollection("PRNT", "53", "children"));
ObjectCollectionRepresentation childrenRepr = childrenRestfulResponse.getEntity();
JsonRepresentation collValue = childrenRepr.getValue();
@@ -85,7 +85,7 @@ public class Post_whenInvokeArgWithObjectReference_thenOK {
// when
final RestfulResponse<ObjectActionRepresentation> removeChildRestfulResponse =
- RestfulResponse.ofT(objectResource.actionPrompt("PRNT", "52", "removeChild"));
+ RestfulResponse.ofT(objectResource.actionPrompt("PRNT", "53", "removeChild"));
final ObjectActionRepresentation removeChildRepr = removeChildRestfulResponse.getEntity();
LinkRepresentation invokeLinkRepr = removeChildRepr.getLinkWithRel(Rel.INVOKE);
@@ -100,7 +100,7 @@ public class Post_whenInvokeArgWithObjectReference_thenOK {
// then
childrenRestfulResponse =
- RestfulResponse.ofT(objectResource.accessCollection("PRNT", "52", "children"));
+ RestfulResponse.ofT(objectResource.accessCollection("PRNT", "53", "children"));
childrenRepr = childrenRestfulResponse.getEntity();
collValue = childrenRepr.getValue();