Return-Path: X-Original-To: apmail-incubator-isis-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-isis-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 852922C77 for ; Tue, 3 May 2011 06:34:55 +0000 (UTC) Received: (qmail 32740 invoked by uid 500); 3 May 2011 06:34:54 -0000 Delivered-To: apmail-incubator-isis-commits-archive@incubator.apache.org Received: (qmail 32615 invoked by uid 500); 3 May 2011 06:34:51 -0000 Mailing-List: contact isis-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: isis-dev@incubator.apache.org Delivered-To: mailing list isis-commits@incubator.apache.org Received: (qmail 32252 invoked by uid 99); 3 May 2011 06:34:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 May 2011 06:34:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 May 2011 06:34:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 820252388C02; Tue, 3 May 2011 06:33:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1098939 [8/11] - in /incubator/isis/trunk/runtimes/dflt: profilestores/dflt/src/main/java/org/apache/isis/runtimes/dflt/profilestores/dflt/ profilestores/xml/src/main/java/org/apache/isis/runtimes/dflt/profilestores/xml/ profilestores/xml/... Date: Tue, 03 May 2011 06:33:49 -0000 To: isis-commits@incubator.apache.org From: danhaywood@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110503063353.820252388C02@eris.apache.org> Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/client/facets/ProxyAction_ExecuteRemotelyTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/client/facets/ProxyAction_ExecuteRemotelyTest.java?rev=1098939&r1=1098938&r2=1098939&view=diff ============================================================================== --- incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/client/facets/ProxyAction_ExecuteRemotelyTest.java (original) +++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/client/facets/ProxyAction_ExecuteRemotelyTest.java Tue May 3 06:33:43 2011 @@ -17,7 +17,6 @@ * under the License. */ - package org.apache.isis.runtimes.dflt.remoting.common.client.facets; import static org.easymock.EasyMock.expectLastCall; @@ -27,13 +26,9 @@ import static org.junit.Assert.assertEqu import java.util.List; -import org.apache.log4j.BasicConfigurator; -import org.apache.log4j.Level; -import org.apache.log4j.LogManager; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.facets.FacetedMethod; +import org.apache.isis.core.metamodel.spec.ActionType; import org.apache.isis.runtimes.dflt.remoting.common.data.Data; import org.apache.isis.runtimes.dflt.remoting.common.data.DummyNullValue; import org.apache.isis.runtimes.dflt.remoting.common.data.DummyReferenceData; @@ -43,25 +38,28 @@ import org.apache.isis.runtimes.dflt.rem import org.apache.isis.runtimes.dflt.remoting.common.exchange.ExecuteServerActionResponse; import org.apache.isis.runtimes.dflt.remoting.common.facade.ServerFacade; import org.apache.isis.runtimes.dflt.remoting.common.protocol.ObjectEncoderDecoder; -import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.core.metamodel.facets.FacetedMethod; -import org.apache.isis.core.metamodel.spec.ActionType; import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext; import org.apache.isis.runtimes.dflt.runtime.testsystem.TestProxySystem; +import org.apache.log4j.BasicConfigurator; +import org.apache.log4j.Level; +import org.apache.log4j.LogManager; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; public class ProxyAction_ExecuteRemotelyTest { - //private Mockery mockery = new JUnit4Mockery(); + // private Mockery mockery = new JUnit4Mockery(); private ActionInvocationFacetWrapProxy proxy; private FacetedMethod mockObjectActionPeer; private ObjectEncoderDecoder mockEncoder; private ServerFacade mockDistribution; private ObjectAdapter target; - //private ObjectAdapter param1; + // private ObjectAdapter param1; private TestProxySystem system; - //private Identifier identifier; - //private ActionInvocationFacet mockActionInvocationFacet; + // private Identifier identifier; + // private ActionInvocationFacet mockActionInvocationFacet; private ReferenceData targetData; private Data[] parameterData; @@ -73,49 +71,49 @@ public class ProxyAction_ExecuteRemotely BasicConfigurator.configure(); LogManager.getRootLogger().setLevel(Level.OFF); -// system = new TestProxySystem(); -// system.init(); -// -// mockObjectActionPeer = mockery.mock(ObjectActionPeer.class); -// mockEncoder = mockery.mock(ObjectEncoder.class); -// mockDistribution = mockery.mock(Distribution.class); -// mockActionInvocationFacet = mockery.mock(ActionInvocationFacet.class); -// -// identifier = Identifier.propertyOrCollectionIdentifier("A", "b"); -// -// mockObjectActionPeer.getIdentifier(); -// expectLastCall().andStubReturn(identifier); -// identifierString = identifier.getClassName() + "#" + identifier.getMemberName(); -// target = system.createTransientTestObject(); -// parameters = new ObjectAdapter[] { param1, param1 }; -// final ObjectSpecification[] parameterTypes = new ObjectSpecification[] { -// system.getSpecification(TestPojo.class), system.getSpecification(TestPojo.class) }; -// -// // actionPeer.getParameterTypes(); -// // expectLastCall().andStubReturn(parameterTypes); -// -// // actionPeer.getType(); -// // expectLastCall().andReturn(ObjectAction.USER); -// -// final KnownObjects encodersKnownObjects = new KnownObjects(); -// -// targetData = new DummyReferenceData(); -// parameterData = new Data[] { null, null }; -// mockEncoder.createParameters(parameterTypes, parameters, encodersKnownObjects); -// expectLastCall().andReturn(parameterData); -// -// mockEncoder.createActionTarget(target, encodersKnownObjects); -// expectLastCall().andReturn(targetData); -// -// mockEncoder.madePersistent(null, null); -// expectLastCall().times(2); - + // system = new TestProxySystem(); + // system.init(); + // + // mockObjectActionPeer = mockery.mock(ObjectActionPeer.class); + // mockEncoder = mockery.mock(ObjectEncoder.class); + // mockDistribution = mockery.mock(Distribution.class); + // mockActionInvocationFacet = mockery.mock(ActionInvocationFacet.class); + // + // identifier = Identifier.propertyOrCollectionIdentifier("A", "b"); + // + // mockObjectActionPeer.getIdentifier(); + // expectLastCall().andStubReturn(identifier); + // identifierString = identifier.getClassName() + "#" + identifier.getMemberName(); + // target = system.createTransientTestObject(); + // parameters = new ObjectAdapter[] { param1, param1 }; + // final ObjectSpecification[] parameterTypes = new ObjectSpecification[] { + // system.getSpecification(TestPojo.class), system.getSpecification(TestPojo.class) }; + // + // // actionPeer.getParameterTypes(); + // // expectLastCall().andStubReturn(parameterTypes); + // + // // actionPeer.getType(); + // // expectLastCall().andReturn(ObjectAction.USER); + // + // final KnownObjects encodersKnownObjects = new KnownObjects(); + // + // targetData = new DummyReferenceData(); + // parameterData = new Data[] { null, null }; + // mockEncoder.createParameters(parameterTypes, parameters, encodersKnownObjects); + // expectLastCall().andReturn(parameterData); + // + // mockEncoder.createActionTarget(target, encodersKnownObjects); + // expectLastCall().andReturn(targetData); + // + // mockEncoder.madePersistent(null, null); + // expectLastCall().times(2); } // to prevent a warning @Test - public void testDummy() {} + public void testDummy() { + } @Ignore("was commented out, don't know details") @Test @@ -123,14 +121,13 @@ public class ProxyAction_ExecuteRemotely // actionPeer.getTarget(); // expectLastCall().andStubReturn(ObjectAction.REMOTE); - ExecuteServerActionRequest request = - new ExecuteServerActionRequest( - IsisContext.getAuthenticationSession(), - ActionType.USER, - identifierString, targetData, parameterData); - mockDistribution.executeServerAction(request ); - final ExecuteServerActionResponse result = new ExecuteServerActionResponse(new DummyNullValue("type"), new ObjectData[0], - new ReferenceData[0], null, new ObjectData[2], new String[0], new String[0]); + final ExecuteServerActionRequest request = + new ExecuteServerActionRequest(IsisContext.getAuthenticationSession(), ActionType.USER, identifierString, + targetData, parameterData); + mockDistribution.executeServerAction(request); + final ExecuteServerActionResponse result = + new ExecuteServerActionResponse(new DummyNullValue("type"), new ObjectData[0], new ReferenceData[0], null, + new ObjectData[2], new String[0], new String[0]); expectLastCall().andReturn(result); mockEncoder.madePersistent(target, null); @@ -149,13 +146,13 @@ public class ProxyAction_ExecuteRemotely IsisContext.getPersistenceSession().makePersistent(target); - ExecuteServerActionRequest request = new ExecuteServerActionRequest( - IsisContext.getAuthenticationSession(), - ActionType.USER, - identifierString, targetData, parameterData); - mockDistribution.executeServerAction(request); - final ExecuteServerActionResponse result = new ExecuteServerActionResponse(new DummyNullValue("type"), new ObjectData[0], - new ReferenceData[0], null, new ObjectData[2], new String[0], new String[0]); + final ExecuteServerActionRequest request = + new ExecuteServerActionRequest(IsisContext.getAuthenticationSession(), ActionType.USER, identifierString, + targetData, parameterData); + mockDistribution.executeServerAction(request); + final ExecuteServerActionResponse result = + new ExecuteServerActionResponse(new DummyNullValue("type"), new ObjectData[0], new ReferenceData[0], null, + new ObjectData[2], new String[0], new String[0]); expectLastCall().andReturn(result); replay(mockObjectActionPeer, mockEncoder, mockDistribution); @@ -173,15 +170,16 @@ public class ProxyAction_ExecuteRemotely final ObjectAdapter object = system.createPersistentTestObject(); - ExecuteServerActionRequest request = new ExecuteServerActionRequest( - IsisContext.getAuthenticationSession(), - ActionType.USER, - identifierString, targetData, parameterData); - mockDistribution.executeServerAction(request); - final ReferenceData[] disposedReferenceData = new ReferenceData[] { new DummyReferenceData(object.getOid(), object - .getSpecification().getFullIdentifier(), null) }; - final ExecuteServerActionResponse result = new ExecuteServerActionResponse(new DummyNullValue("type"), new ObjectData[0], - disposedReferenceData, null, new ObjectData[2], new String[0], new String[0]); + final ExecuteServerActionRequest request = + new ExecuteServerActionRequest(IsisContext.getAuthenticationSession(), ActionType.USER, identifierString, + targetData, parameterData); + mockDistribution.executeServerAction(request); + final ReferenceData[] disposedReferenceData = + new ReferenceData[] { new DummyReferenceData(object.getOid(), + object.getSpecification().getFullIdentifier(), null) }; + final ExecuteServerActionResponse result = + new ExecuteServerActionResponse(new DummyNullValue("type"), new ObjectData[0], disposedReferenceData, null, + new ObjectData[2], new String[0], new String[0]); expectLastCall().andReturn(result); replay(mockObjectActionPeer, mockEncoder, mockDistribution); @@ -194,4 +192,3 @@ public class ProxyAction_ExecuteRemotely assertEquals(true, allDisposedObjects.isEmpty()); } } - Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/data/DummyCollectionData.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/data/DummyCollectionData.java?rev=1098939&r1=1098938&r2=1098939&view=diff ============================================================================== --- incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/data/DummyCollectionData.java (original) +++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/data/DummyCollectionData.java Tue May 3 06:33:43 2011 @@ -17,74 +17,76 @@ * under the License. */ +package org.apache.isis.runtimes.dflt.remoting.common.data; -package org.apache.isis.runtimes.dflt.remoting.common.data; - import java.util.Arrays; -import org.apache.isis.runtimes.dflt.remoting.common.data.common.CollectionData; -import org.apache.isis.runtimes.dflt.remoting.common.data.common.ReferenceData; import org.apache.isis.core.metamodel.adapter.oid.Oid; import org.apache.isis.core.metamodel.adapter.version.Version; - - -public class DummyCollectionData extends DummyReferenceData implements CollectionData { - - private static final long serialVersionUID = 1L; - - private final ReferenceData[] elements; - private final String elementType; - - public DummyCollectionData( - final Oid oid, - final String collectionType, - final String elementType, - final ReferenceData[] elements, - final Version version) { - super(oid, collectionType, version); - this.elementType = elementType; - this.elements = elements; - } - - public ReferenceData[] getElements() { - return elements; - } - - public String getElementype() { - return elementType; - } - - public boolean hasAllElements() { - return false; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = super.hashCode(); - result = prime * result + ((elementType == null) ? 0 : elementType.hashCode()); - result = prime * result + Arrays.hashCode(elements); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (!super.equals(obj)) - return false; - if (getClass() != obj.getClass()) - return false; - DummyCollectionData other = (DummyCollectionData) obj; - if (elementType == null) { - if (other.elementType != null) - return false; - } else if (!elementType.equals(other.elementType)) - return false; - if (!Arrays.equals(elements, other.elements)) - return false; - return true; - } - - -} +import org.apache.isis.runtimes.dflt.remoting.common.data.common.CollectionData; +import org.apache.isis.runtimes.dflt.remoting.common.data.common.ReferenceData; + +public class DummyCollectionData extends DummyReferenceData implements CollectionData { + + private static final long serialVersionUID = 1L; + + private final ReferenceData[] elements; + private final String elementType; + + public DummyCollectionData(final Oid oid, final String collectionType, final String elementType, + final ReferenceData[] elements, final Version version) { + super(oid, collectionType, version); + this.elementType = elementType; + this.elements = elements; + } + + @Override + public ReferenceData[] getElements() { + return elements; + } + + @Override + public String getElementype() { + return elementType; + } + + @Override + public boolean hasAllElements() { + return false; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = super.hashCode(); + result = prime * result + ((elementType == null) ? 0 : elementType.hashCode()); + result = prime * result + Arrays.hashCode(elements); + return result; + } + + @Override + public boolean equals(final Object obj) { + if (this == obj) { + return true; + } + if (!super.equals(obj)) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final DummyCollectionData other = (DummyCollectionData) obj; + if (elementType == null) { + if (other.elementType != null) { + return false; + } + } else if (!elementType.equals(other.elementType)) { + return false; + } + if (!Arrays.equals(elements, other.elements)) { + return false; + } + return true; + } + +} Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/data/DummyEncodeableObjectData.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/data/DummyEncodeableObjectData.java?rev=1098939&r1=1098938&r2=1098939&view=diff ============================================================================== --- incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/data/DummyEncodeableObjectData.java (original) +++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/data/DummyEncodeableObjectData.java Tue May 3 06:33:43 2011 @@ -17,75 +17,81 @@ * under the License. */ +package org.apache.isis.runtimes.dflt.remoting.common.data; -package org.apache.isis.runtimes.dflt.remoting.common.data; - -import org.apache.isis.runtimes.dflt.remoting.common.data.common.EncodableObjectData; import org.apache.isis.core.commons.lang.ToString; - - -public final class DummyEncodeableObjectData implements EncodableObjectData { - private static final long serialVersionUID = 1L; - - public String value; - public String type; - - public DummyEncodeableObjectData(final String value) { - this(value, String.class.getName()); - } - - public DummyEncodeableObjectData(final String value, final String type) { - super(); - this.value = value; - this.type = type; - } - - public String getEncodedObjectData() { - return value; - } - - public String getType() { - return type; - } - - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((type == null) ? 0 : type.hashCode()); - result = prime * result + ((value == null) ? 0 : value.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - DummyEncodeableObjectData other = (DummyEncodeableObjectData) obj; - if (type == null) { - if (other.type != null) - return false; - } else if (!type.equals(other.type)) - return false; - if (value == null) { - if (other.value != null) - return false; - } else if (!value.equals(other.value)) - return false; - return true; - } - - @Override - public String toString() { - final ToString str = new ToString(this); - str.append("type", type); - str.append("value", value); - return str.toString(); - } - -} +import org.apache.isis.runtimes.dflt.remoting.common.data.common.EncodableObjectData; + +public final class DummyEncodeableObjectData implements EncodableObjectData { + private static final long serialVersionUID = 1L; + + public String value; + public String type; + + public DummyEncodeableObjectData(final String value) { + this(value, String.class.getName()); + } + + public DummyEncodeableObjectData(final String value, final String type) { + super(); + this.value = value; + this.type = type; + } + + @Override + public String getEncodedObjectData() { + return value; + } + + @Override + public String getType() { + return type; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((type == null) ? 0 : type.hashCode()); + result = prime * result + ((value == null) ? 0 : value.hashCode()); + return result; + } + + @Override + public boolean equals(final Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final DummyEncodeableObjectData other = (DummyEncodeableObjectData) obj; + if (type == null) { + if (other.type != null) { + return false; + } + } else if (!type.equals(other.type)) { + return false; + } + if (value == null) { + if (other.value != null) { + return false; + } + } else if (!value.equals(other.value)) { + return false; + } + return true; + } + + @Override + public String toString() { + final ToString str = new ToString(this); + str.append("type", type); + str.append("value", value); + return str.toString(); + } + +} Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/data/DummyIdentityData.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/data/DummyIdentityData.java?rev=1098939&r1=1098938&r2=1098939&view=diff ============================================================================== --- incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/data/DummyIdentityData.java (original) +++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/data/DummyIdentityData.java Tue May 3 06:33:43 2011 @@ -17,13 +17,11 @@ * under the License. */ - package org.apache.isis.runtimes.dflt.remoting.common.data; -import org.apache.isis.runtimes.dflt.remoting.common.data.common.IdentityData; import org.apache.isis.core.metamodel.adapter.oid.Oid; import org.apache.isis.core.metamodel.adapter.version.Version; - +import org.apache.isis.runtimes.dflt.remoting.common.data.common.IdentityData; public class DummyIdentityData extends DummyReferenceData implements IdentityData { private static final long serialVersionUID = 1L; Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/data/DummyNullValue.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/data/DummyNullValue.java?rev=1098939&r1=1098938&r2=1098939&view=diff ============================================================================== --- incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/data/DummyNullValue.java (original) +++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/data/DummyNullValue.java Tue May 3 06:33:43 2011 @@ -17,46 +17,51 @@ * under the License. */ +package org.apache.isis.runtimes.dflt.remoting.common.data; -package org.apache.isis.runtimes.dflt.remoting.common.data; - import org.apache.isis.runtimes.dflt.remoting.common.data.common.NullData; - -public class DummyNullValue implements NullData { - - private static final long serialVersionUID = 1L; - private final String type; - - public DummyNullValue(final String type) { - this.type = type; - } - - public String getType() { - return type; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - DummyNullValue other = (DummyNullValue) obj; - if (type == null) { - if (other.type != null) - return false; - } else if (!type.equals(other.type)) - return false; - return true; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((type == null) ? 0 : type.hashCode()); - return result; - } -} + +public class DummyNullValue implements NullData { + + private static final long serialVersionUID = 1L; + private final String type; + + public DummyNullValue(final String type) { + this.type = type; + } + + @Override + public String getType() { + return type; + } + + @Override + public boolean equals(final Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final DummyNullValue other = (DummyNullValue) obj; + if (type == null) { + if (other.type != null) { + return false; + } + } else if (!type.equals(other.type)) { + return false; + } + return true; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((type == null) ? 0 : type.hashCode()); + return result; + } +} Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/data/DummyObjectData.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/data/DummyObjectData.java?rev=1098939&r1=1098938&r2=1098939&view=diff ============================================================================== --- incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/data/DummyObjectData.java (original) +++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/data/DummyObjectData.java Tue May 3 06:33:43 2011 @@ -17,89 +17,92 @@ * under the License. */ +package org.apache.isis.runtimes.dflt.remoting.common.data; -package org.apache.isis.runtimes.dflt.remoting.common.data; - import java.util.Arrays; -import org.apache.isis.runtimes.dflt.remoting.common.data.Data; -import org.apache.isis.runtimes.dflt.remoting.common.data.common.ObjectData; import org.apache.isis.core.commons.lang.ToString; import org.apache.isis.core.metamodel.adapter.oid.Oid; import org.apache.isis.core.metamodel.adapter.version.Version; - - -public class DummyObjectData extends DummyReferenceData implements ObjectData { - - private static final long serialVersionUID = 1L; - - private final boolean hasCompleteData; - private Data[] fieldContent; - - public DummyObjectData(final Oid oid, final String type, final boolean hasCompleteData, final Version version) { - super(oid, type, version); - this.hasCompleteData = hasCompleteData; - } - - public DummyObjectData() { - this(null, "", false, null); - } - - public Data[] getFieldContent() { - return fieldContent; - } - - public boolean hasCompleteData() { - return hasCompleteData; - } - - public void setFieldContent(final Data[] fieldContent) { - this.fieldContent = fieldContent; - } - - public void setFieldContent(final int i, final DummyReferenceData reference) { - fieldContent[i] = reference; - } - - /* - * public String toString() { ToString str = new ToString(this); toString(str); return str.toString(); } - */ - @Override - protected void toString(final ToString str) { - super.toString(str); - str.append("resolved", hasCompleteData); - str.append("fields", fieldContent == null ? 0 : fieldContent.length); - /* - * if(fieldContent == null) { str.append("fields", "none"); } else { for (int i = 0; i < - * fieldContent.length; i++) { str.append("field" + i + ": " + fieldContent[i].); } - */ - } - - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (!super.equals(obj)) - return false; - if (getClass() != obj.getClass()) - return false; - DummyObjectData other = (DummyObjectData) obj; - if (!Arrays.equals(fieldContent, other.fieldContent)) - return false; - if (hasCompleteData != other.hasCompleteData) - return false; - return true; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + Arrays.hashCode(fieldContent); - result = prime * result + (hasCompleteData ? 1231 : 1237); - return result; - } - - -} +import org.apache.isis.runtimes.dflt.remoting.common.data.common.ObjectData; + +public class DummyObjectData extends DummyReferenceData implements ObjectData { + + private static final long serialVersionUID = 1L; + + private final boolean hasCompleteData; + private Data[] fieldContent; + + public DummyObjectData(final Oid oid, final String type, final boolean hasCompleteData, final Version version) { + super(oid, type, version); + this.hasCompleteData = hasCompleteData; + } + + public DummyObjectData() { + this(null, "", false, null); + } + + @Override + public Data[] getFieldContent() { + return fieldContent; + } + + @Override + public boolean hasCompleteData() { + return hasCompleteData; + } + + @Override + public void setFieldContent(final Data[] fieldContent) { + this.fieldContent = fieldContent; + } + + public void setFieldContent(final int i, final DummyReferenceData reference) { + fieldContent[i] = reference; + } + + /* + * public String toString() { ToString str = new ToString(this); toString(str); return str.toString(); } + */ + @Override + protected void toString(final ToString str) { + super.toString(str); + str.append("resolved", hasCompleteData); + str.append("fields", fieldContent == null ? 0 : fieldContent.length); + /* + * if(fieldContent == null) { str.append("fields", "none"); } else { for (int i = 0; i < fieldContent.length; + * i++) { str.append("field" + i + ": " + fieldContent[i].); } + */ + } + + @Override + public boolean equals(final Object obj) { + if (this == obj) { + return true; + } + if (!super.equals(obj)) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final DummyObjectData other = (DummyObjectData) obj; + if (!Arrays.equals(fieldContent, other.fieldContent)) { + return false; + } + if (hasCompleteData != other.hasCompleteData) { + return false; + } + return true; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + Arrays.hashCode(fieldContent); + result = prime * result + (hasCompleteData ? 1231 : 1237); + return result; + } + +} Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/data/DummyReferenceData.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/data/DummyReferenceData.java?rev=1098939&r1=1098938&r2=1098939&view=diff ============================================================================== --- incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/data/DummyReferenceData.java (original) +++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/data/DummyReferenceData.java Tue May 3 06:33:43 2011 @@ -17,14 +17,12 @@ * under the License. */ - package org.apache.isis.runtimes.dflt.remoting.common.data; -import org.apache.isis.runtimes.dflt.remoting.common.data.common.IdentityData; import org.apache.isis.core.commons.lang.ToString; import org.apache.isis.core.metamodel.adapter.oid.Oid; import org.apache.isis.core.metamodel.adapter.version.Version; - +import org.apache.isis.runtimes.dflt.remoting.common.data.common.IdentityData; public class DummyReferenceData implements IdentityData { private static final long serialVersionUID = 1L; @@ -43,14 +41,17 @@ public class DummyReferenceData implemen this(null, null, null); } + @Override public Oid getOid() { return oid; } + @Override public String getType() { return type; } + @Override public Version getVersion() { return version; } @@ -80,31 +81,39 @@ public class DummyReferenceData implemen } @Override - public boolean equals(Object obj) { - if (this == obj) + public boolean equals(final Object obj) { + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; - DummyReferenceData other = (DummyReferenceData) obj; + } + final DummyReferenceData other = (DummyReferenceData) obj; if (oid == null) { - if (other.oid != null) + if (other.oid != null) { return false; - } else if (!oid.equals(other.oid)) + } + } else if (!oid.equals(other.oid)) { return false; + } if (type == null) { - if (other.type != null) + if (other.type != null) { return false; - } else if (!type.equals(other.type)) + } + } else if (!type.equals(other.type)) { return false; + } if (version == null) { - if (other.version != null) + if (other.version != null) { return false; - } else if (!version.equals(other.version)) + } + } else if (!version.equals(other.version)) { return false; + } return true; } - } Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/AuthenticationRequestEncodabilityTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/AuthenticationRequestEncodabilityTest.java?rev=1098939&r1=1098938&r2=1098939&view=diff ============================================================================== --- incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/AuthenticationRequestEncodabilityTest.java (original) +++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/AuthenticationRequestEncodabilityTest.java Tue May 3 06:33:43 2011 @@ -17,32 +17,29 @@ * under the License. */ +package org.apache.isis.runtimes.dflt.remoting.common.exchange; -package org.apache.isis.runtimes.dflt.remoting.common.exchange; - import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; -import org.apache.isis.runtimes.dflt.remoting.common.exchange.OpenSessionRequest; import org.apache.isis.core.commons.encoding.EncodabilityContractTest; import org.apache.isis.core.commons.encoding.Encodable; - -public class AuthenticationRequestEncodabilityTest extends EncodabilityContractTest { - - protected Encodable createEncodable() { - return new OpenSessionRequest("sven", "pass"); - } - - @Override - protected void assertRoundtripped( - Object decodedEncodable, - Object originalEncodable) { - OpenSessionRequest decoded = (OpenSessionRequest) decodedEncodable; - OpenSessionRequest original = (OpenSessionRequest) originalEncodable; - - assertThat(decoded.getId(), is(equalTo(original.getId()))); - assertThat(decoded.getResponse(), is(equalTo(original.getResponse()))); - - } -} + +public class AuthenticationRequestEncodabilityTest extends EncodabilityContractTest { + + @Override + protected Encodable createEncodable() { + return new OpenSessionRequest("sven", "pass"); + } + + @Override + protected void assertRoundtripped(final Object decodedEncodable, final Object originalEncodable) { + final OpenSessionRequest decoded = (OpenSessionRequest) decodedEncodable; + final OpenSessionRequest original = (OpenSessionRequest) originalEncodable; + + assertThat(decoded.getId(), is(equalTo(original.getId()))); + assertThat(decoded.getResponse(), is(equalTo(original.getResponse()))); + + } +} Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/AuthorizationRequestUsabilityEncodabilityTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/AuthorizationRequestUsabilityEncodabilityTest.java?rev=1098939&r1=1098938&r2=1098939&view=diff ============================================================================== --- incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/AuthorizationRequestUsabilityEncodabilityTest.java (original) +++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/AuthorizationRequestUsabilityEncodabilityTest.java Tue May 3 06:33:43 2011 @@ -17,55 +17,52 @@ * under the License. */ +package org.apache.isis.runtimes.dflt.remoting.common.exchange; -package org.apache.isis.runtimes.dflt.remoting.common.exchange; - import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import java.io.IOException; -import org.apache.isis.runtimes.dflt.remoting.common.data.common.IdentityData; -import org.apache.isis.runtimes.dflt.remoting.common.exchange.AuthorizationRequestUsability; import org.apache.isis.core.commons.encoding.EncodabilityContractTest; import org.apache.isis.core.commons.encoding.Encodable; +import org.apache.isis.runtimes.dflt.remoting.common.data.common.IdentityData; import org.jmock.integration.junit4.JMock; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; - -@RunWith(JMock.class) -public class AuthorizationRequestUsabilityEncodabilityTest extends EncodabilityContractTest { - - protected IdentityData mockTargetData; - - @Override - public void setUp() throws Exception { - super.setUp(); - mockTargetData = context.mock(IdentityData.class); - } - - protected Encodable createEncodable() { - return new AuthorizationRequestUsability(mockAuthSession, mockTargetData, "foobar"); - } - - @Override - @Ignore - @Test - public void shouldRoundTrip() throws IOException { - super.shouldRoundTrip(); - } - - @Override - protected void assertRoundtripped( - Object decodedEncodable, - Object originalEncodable) { - AuthorizationRequestUsability decoded = (AuthorizationRequestUsability) decodedEncodable; - AuthorizationRequestUsability original = (AuthorizationRequestUsability) originalEncodable; - - // TODO: to complete, may need to setup mock expectations - assertThat(decoded.getId(), is(equalTo(original.getId()))); - } - -} + +@RunWith(JMock.class) +public class AuthorizationRequestUsabilityEncodabilityTest extends EncodabilityContractTest { + + protected IdentityData mockTargetData; + + @Override + public void setUp() throws Exception { + super.setUp(); + mockTargetData = context.mock(IdentityData.class); + } + + @Override + protected Encodable createEncodable() { + return new AuthorizationRequestUsability(mockAuthSession, mockTargetData, "foobar"); + } + + @Override + @Ignore + @Test + public void shouldRoundTrip() throws IOException { + super.shouldRoundTrip(); + } + + @Override + protected void assertRoundtripped(final Object decodedEncodable, final Object originalEncodable) { + final AuthorizationRequestUsability decoded = (AuthorizationRequestUsability) decodedEncodable; + final AuthorizationRequestUsability original = (AuthorizationRequestUsability) originalEncodable; + + // TODO: to complete, may need to setup mock expectations + assertThat(decoded.getId(), is(equalTo(original.getId()))); + } + +} Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/AuthorizationRequestVisibilityEncodabilityTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/AuthorizationRequestVisibilityEncodabilityTest.java?rev=1098939&r1=1098938&r2=1098939&view=diff ============================================================================== --- incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/AuthorizationRequestVisibilityEncodabilityTest.java (original) +++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/AuthorizationRequestVisibilityEncodabilityTest.java Tue May 3 06:33:43 2011 @@ -17,53 +17,49 @@ * under the License. */ +package org.apache.isis.runtimes.dflt.remoting.common.exchange; -package org.apache.isis.runtimes.dflt.remoting.common.exchange; - import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import java.io.IOException; -import org.apache.isis.runtimes.dflt.remoting.common.data.common.IdentityData; -import org.apache.isis.runtimes.dflt.remoting.common.exchange.AuthorizationRequestVisibility; import org.apache.isis.core.commons.encoding.EncodabilityContractTest; import org.apache.isis.core.commons.encoding.Encodable; +import org.apache.isis.runtimes.dflt.remoting.common.data.common.IdentityData; import org.junit.Ignore; import org.junit.Test; - -public class AuthorizationRequestVisibilityEncodabilityTest extends EncodabilityContractTest { - - protected IdentityData mockTargetData; - - @Override - public void setUp() throws Exception { - super.setUp(); - mockTargetData = context.mock(IdentityData.class); - } - - protected Encodable createEncodable() { - return new AuthorizationRequestVisibility(mockAuthSession, mockTargetData, "foobar"); - } - - - @Override - @Ignore - @Test - public void shouldRoundTrip() throws IOException { - super.shouldRoundTrip(); - } - - @Override - protected void assertRoundtripped( - Object decodedEncodable, - Object originalEncodable) { - AuthorizationRequestVisibility decoded = (AuthorizationRequestVisibility) decodedEncodable; - AuthorizationRequestVisibility original = (AuthorizationRequestVisibility) originalEncodable; - - // TODO: to complete, may need to setup mock expectations - assertThat(decoded.getId(), is(equalTo(original.getId()))); - } - -} + +public class AuthorizationRequestVisibilityEncodabilityTest extends EncodabilityContractTest { + + protected IdentityData mockTargetData; + + @Override + public void setUp() throws Exception { + super.setUp(); + mockTargetData = context.mock(IdentityData.class); + } + + @Override + protected Encodable createEncodable() { + return new AuthorizationRequestVisibility(mockAuthSession, mockTargetData, "foobar"); + } + + @Override + @Ignore + @Test + public void shouldRoundTrip() throws IOException { + super.shouldRoundTrip(); + } + + @Override + protected void assertRoundtripped(final Object decodedEncodable, final Object originalEncodable) { + final AuthorizationRequestVisibility decoded = (AuthorizationRequestVisibility) decodedEncodable; + final AuthorizationRequestVisibility original = (AuthorizationRequestVisibility) originalEncodable; + + // TODO: to complete, may need to setup mock expectations + assertThat(decoded.getId(), is(equalTo(original.getId()))); + } + +} Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ClearAssociationRequestEncodabilityTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ClearAssociationRequestEncodabilityTest.java?rev=1098939&r1=1098938&r2=1098939&view=diff ============================================================================== --- incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ClearAssociationRequestEncodabilityTest.java (original) +++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ClearAssociationRequestEncodabilityTest.java Tue May 3 06:33:43 2011 @@ -17,58 +17,53 @@ * under the License. */ +package org.apache.isis.runtimes.dflt.remoting.common.exchange; -package org.apache.isis.runtimes.dflt.remoting.common.exchange; - import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import java.io.IOException; -import org.apache.isis.runtimes.dflt.remoting.common.data.common.IdentityData; -import org.apache.isis.runtimes.dflt.remoting.common.exchange.ClearAssociationRequest; import org.apache.isis.core.commons.encoding.EncodabilityContractTest; import org.apache.isis.core.commons.encoding.Encodable; +import org.apache.isis.runtimes.dflt.remoting.common.data.common.IdentityData; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; - -public class ClearAssociationRequestEncodabilityTest extends EncodabilityContractTest { - - private IdentityData mockTargetData; - private IdentityData mockAssociateData; - - @Override - @Before - public void setUp() throws Exception { - super.setUp(); - mockTargetData = context.mock(IdentityData.class, "identity"); - mockAssociateData = context.mock(IdentityData.class, "associate"); - } - - protected Encodable createEncodable() { - return new ClearAssociationRequest( - mockAuthSession, "firstName", mockTargetData, mockAssociateData); - } - - - @Override - @Ignore - @Test - public void shouldRoundTrip() throws IOException { - super.shouldRoundTrip(); - } - - @Override - protected void assertRoundtripped( - Object decodedEncodable, - Object originalEncodable) { - ClearAssociationRequest decoded = (ClearAssociationRequest) decodedEncodable; - ClearAssociationRequest original = (ClearAssociationRequest) originalEncodable; - - // TODO: to complete, may need to setup mock expectations - assertThat(decoded.getId(), is(equalTo(original.getId()))); - } - -} + +public class ClearAssociationRequestEncodabilityTest extends EncodabilityContractTest { + + private IdentityData mockTargetData; + private IdentityData mockAssociateData; + + @Override + @Before + public void setUp() throws Exception { + super.setUp(); + mockTargetData = context.mock(IdentityData.class, "identity"); + mockAssociateData = context.mock(IdentityData.class, "associate"); + } + + @Override + protected Encodable createEncodable() { + return new ClearAssociationRequest(mockAuthSession, "firstName", mockTargetData, mockAssociateData); + } + + @Override + @Ignore + @Test + public void shouldRoundTrip() throws IOException { + super.shouldRoundTrip(); + } + + @Override + protected void assertRoundtripped(final Object decodedEncodable, final Object originalEncodable) { + final ClearAssociationRequest decoded = (ClearAssociationRequest) decodedEncodable; + final ClearAssociationRequest original = (ClearAssociationRequest) originalEncodable; + + // TODO: to complete, may need to setup mock expectations + assertThat(decoded.getId(), is(equalTo(original.getId()))); + } + +} Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ClearValueRequestEncodabilityTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ClearValueRequestEncodabilityTest.java?rev=1098939&r1=1098938&r2=1098939&view=diff ============================================================================== --- incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ClearValueRequestEncodabilityTest.java (original) +++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ClearValueRequestEncodabilityTest.java Tue May 3 06:33:43 2011 @@ -17,55 +17,51 @@ * under the License. */ +package org.apache.isis.runtimes.dflt.remoting.common.exchange; -package org.apache.isis.runtimes.dflt.remoting.common.exchange; - import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import java.io.IOException; -import org.apache.isis.runtimes.dflt.remoting.common.data.common.IdentityData; -import org.apache.isis.runtimes.dflt.remoting.common.exchange.ClearValueRequest; import org.apache.isis.core.commons.encoding.EncodabilityContractTest; import org.apache.isis.core.commons.encoding.Encodable; +import org.apache.isis.runtimes.dflt.remoting.common.data.common.IdentityData; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; - -public class ClearValueRequestEncodabilityTest extends EncodabilityContractTest { - - private IdentityData mockTargetData; - - @Override - @Before - public void setUp() throws Exception { - super.setUp(); - mockTargetData = context.mock(IdentityData.class); - } - - protected Encodable createEncodable() { - return new ClearValueRequest(mockAuthSession, "firstName", mockTargetData); - } - - - @Override - @Ignore - @Test - public void shouldRoundTrip() throws IOException { - super.shouldRoundTrip(); - } - - @Override - protected void assertRoundtripped( - Object decodedEncodable, - Object originalEncodable) { - ClearValueRequest decoded = (ClearValueRequest) decodedEncodable; - ClearValueRequest original = (ClearValueRequest) originalEncodable; - - // TODO: to complete, may need to setup mock expectations - assertThat(decoded.getId(), is(equalTo(original.getId()))); - } - -} + +public class ClearValueRequestEncodabilityTest extends EncodabilityContractTest { + + private IdentityData mockTargetData; + + @Override + @Before + public void setUp() throws Exception { + super.setUp(); + mockTargetData = context.mock(IdentityData.class); + } + + @Override + protected Encodable createEncodable() { + return new ClearValueRequest(mockAuthSession, "firstName", mockTargetData); + } + + @Override + @Ignore + @Test + public void shouldRoundTrip() throws IOException { + super.shouldRoundTrip(); + } + + @Override + protected void assertRoundtripped(final Object decodedEncodable, final Object originalEncodable) { + final ClearValueRequest decoded = (ClearValueRequest) decodedEncodable; + final ClearValueRequest original = (ClearValueRequest) originalEncodable; + + // TODO: to complete, may need to setup mock expectations + assertThat(decoded.getId(), is(equalTo(original.getId()))); + } + +} Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/CloseSessionRequestEncodabilityTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/CloseSessionRequestEncodabilityTest.java?rev=1098939&r1=1098938&r2=1098939&view=diff ============================================================================== --- incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/CloseSessionRequestEncodabilityTest.java (original) +++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/CloseSessionRequestEncodabilityTest.java Tue May 3 06:33:43 2011 @@ -17,44 +17,40 @@ * under the License. */ +package org.apache.isis.runtimes.dflt.remoting.common.exchange; -package org.apache.isis.runtimes.dflt.remoting.common.exchange; - import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import java.io.IOException; -import org.apache.isis.runtimes.dflt.remoting.common.exchange.CloseSessionRequest; import org.apache.isis.core.commons.encoding.EncodabilityContractTest; import org.apache.isis.core.commons.encoding.Encodable; import org.junit.Ignore; import org.junit.Test; - -public class CloseSessionRequestEncodabilityTest extends EncodabilityContractTest { - - protected Encodable createEncodable() { - return new CloseSessionRequest(mockAuthSession); - } - - - @Override - @Ignore - @Test - public void shouldRoundTrip() throws IOException { - super.shouldRoundTrip(); - } - - @Override - protected void assertRoundtripped( - Object decodedEncodable, - Object originalEncodable) { - CloseSessionRequest decoded = (CloseSessionRequest) decodedEncodable; - CloseSessionRequest original = (CloseSessionRequest) originalEncodable; - - // TODO: to complete, may need to setup mock expectations - assertThat(decoded.getId(), is(equalTo(original.getId()))); - } - -} + +public class CloseSessionRequestEncodabilityTest extends EncodabilityContractTest { + + @Override + protected Encodable createEncodable() { + return new CloseSessionRequest(mockAuthSession); + } + + @Override + @Ignore + @Test + public void shouldRoundTrip() throws IOException { + super.shouldRoundTrip(); + } + + @Override + protected void assertRoundtripped(final Object decodedEncodable, final Object originalEncodable) { + final CloseSessionRequest decoded = (CloseSessionRequest) decodedEncodable; + final CloseSessionRequest original = (CloseSessionRequest) originalEncodable; + + // TODO: to complete, may need to setup mock expectations + assertThat(decoded.getId(), is(equalTo(original.getId()))); + } + +} Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ExecuteClientActionRequestEncodabilityTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ExecuteClientActionRequestEncodabilityTest.java?rev=1098939&r1=1098938&r2=1098939&view=diff ============================================================================== --- incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ExecuteClientActionRequestEncodabilityTest.java (original) +++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ExecuteClientActionRequestEncodabilityTest.java Tue May 3 06:33:43 2011 @@ -17,46 +17,41 @@ * under the License. */ +package org.apache.isis.runtimes.dflt.remoting.common.exchange; -package org.apache.isis.runtimes.dflt.remoting.common.exchange; - import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import java.io.IOException; -import org.apache.isis.runtimes.dflt.remoting.common.data.common.ReferenceData; -import org.apache.isis.runtimes.dflt.remoting.common.exchange.ExecuteClientActionRequest; import org.apache.isis.core.commons.encoding.EncodabilityContractTest; import org.apache.isis.core.commons.encoding.Encodable; +import org.apache.isis.runtimes.dflt.remoting.common.data.common.ReferenceData; import org.junit.Ignore; import org.junit.Test; - -public class ExecuteClientActionRequestEncodabilityTest extends EncodabilityContractTest { - - - protected Encodable createEncodable() { - return new ExecuteClientActionRequest(mockAuthSession, new ReferenceData[0], new int[0]); - } - - - @Override - @Ignore - @Test - public void shouldRoundTrip() throws IOException { - super.shouldRoundTrip(); - } - - @Override - protected void assertRoundtripped( - Object decodedEncodable, - Object originalEncodable) { - ExecuteClientActionRequest decoded = (ExecuteClientActionRequest) decodedEncodable; - ExecuteClientActionRequest original = (ExecuteClientActionRequest) originalEncodable; - - // TODO: to complete, may need to setup mock expectations - assertThat(decoded.getId(), is(equalTo(original.getId()))); - } - -} + +public class ExecuteClientActionRequestEncodabilityTest extends EncodabilityContractTest { + + @Override + protected Encodable createEncodable() { + return new ExecuteClientActionRequest(mockAuthSession, new ReferenceData[0], new int[0]); + } + + @Override + @Ignore + @Test + public void shouldRoundTrip() throws IOException { + super.shouldRoundTrip(); + } + + @Override + protected void assertRoundtripped(final Object decodedEncodable, final Object originalEncodable) { + final ExecuteClientActionRequest decoded = (ExecuteClientActionRequest) decodedEncodable; + final ExecuteClientActionRequest original = (ExecuteClientActionRequest) originalEncodable; + + // TODO: to complete, may need to setup mock expectations + assertThat(decoded.getId(), is(equalTo(original.getId()))); + } + +} Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ExecuteServerActionEncodabilityTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ExecuteServerActionEncodabilityTest.java?rev=1098939&r1=1098938&r2=1098939&view=diff ============================================================================== --- incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ExecuteServerActionEncodabilityTest.java (original) +++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ExecuteServerActionEncodabilityTest.java Tue May 3 06:33:43 2011 @@ -17,58 +17,54 @@ * under the License. */ +package org.apache.isis.runtimes.dflt.remoting.common.exchange; -package org.apache.isis.runtimes.dflt.remoting.common.exchange; - import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import java.io.IOException; -import org.apache.isis.runtimes.dflt.remoting.common.data.Data; -import org.apache.isis.runtimes.dflt.remoting.common.data.common.ReferenceData; -import org.apache.isis.runtimes.dflt.remoting.common.exchange.ExecuteServerActionRequest; import org.apache.isis.core.commons.encoding.EncodabilityContractTest; import org.apache.isis.core.commons.encoding.Encodable; import org.apache.isis.core.metamodel.spec.ActionType; - +import org.apache.isis.runtimes.dflt.remoting.common.data.Data; +import org.apache.isis.runtimes.dflt.remoting.common.data.common.ReferenceData; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; - -public class ExecuteServerActionEncodabilityTest extends EncodabilityContractTest { - - private ReferenceData mockTargetData; - - @Override - @Before - public void setUp() throws Exception { - super.setUp(); - mockTargetData = context.mock(ReferenceData.class); - } - - protected Encodable createEncodable() { - return new ExecuteServerActionRequest(mockAuthSession, ActionType.USER, "placeOrder", mockTargetData, new Data[0]); - } - - - @Override - @Ignore - @Test - public void shouldRoundTrip() throws IOException { - super.shouldRoundTrip(); - } - - @Override - protected void assertRoundtripped( - Object decodedEncodable, - Object originalEncodable) { - ExecuteServerActionRequest decoded = (ExecuteServerActionRequest) decodedEncodable; - ExecuteServerActionRequest original = (ExecuteServerActionRequest) originalEncodable; - - // TODO: to complete, may need to setup mock expectations - assertThat(decoded.getId(), is(equalTo(original.getId()))); - } - -} + +public class ExecuteServerActionEncodabilityTest extends EncodabilityContractTest { + + private ReferenceData mockTargetData; + + @Override + @Before + public void setUp() throws Exception { + super.setUp(); + mockTargetData = context.mock(ReferenceData.class); + } + + @Override + protected Encodable createEncodable() { + return new ExecuteServerActionRequest(mockAuthSession, ActionType.USER, "placeOrder", mockTargetData, + new Data[0]); + } + + @Override + @Ignore + @Test + public void shouldRoundTrip() throws IOException { + super.shouldRoundTrip(); + } + + @Override + protected void assertRoundtripped(final Object decodedEncodable, final Object originalEncodable) { + final ExecuteServerActionRequest decoded = (ExecuteServerActionRequest) decodedEncodable; + final ExecuteServerActionRequest original = (ExecuteServerActionRequest) originalEncodable; + + // TODO: to complete, may need to setup mock expectations + assertThat(decoded.getId(), is(equalTo(original.getId()))); + } + +} Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/FindInstancesRequestEncodabilityTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/FindInstancesRequestEncodabilityTest.java?rev=1098939&r1=1098938&r2=1098939&view=diff ============================================================================== --- incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/FindInstancesRequestEncodabilityTest.java (original) +++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/FindInstancesRequestEncodabilityTest.java Tue May 3 06:33:43 2011 @@ -17,58 +17,51 @@ * under the License. */ +package org.apache.isis.runtimes.dflt.remoting.common.exchange; -package org.apache.isis.runtimes.dflt.remoting.common.exchange; - import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import java.io.IOException; -import org.apache.isis.runtimes.dflt.remoting.common.data.query.PersistenceQueryData; -import org.apache.isis.runtimes.dflt.remoting.common.exchange.AuthorizationRequestUsability; -import org.apache.isis.runtimes.dflt.remoting.common.exchange.FindInstancesRequest; import org.apache.isis.core.commons.encoding.EncodabilityContractTest; import org.apache.isis.core.commons.encoding.Encodable; +import org.apache.isis.runtimes.dflt.remoting.common.data.query.PersistenceQueryData; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; - -public class FindInstancesRequestEncodabilityTest extends EncodabilityContractTest { - - private PersistenceQueryData mockPersistenceQueryData; - - - @Override - @Before - public void setUp() throws Exception { - super.setUp(); - mockPersistenceQueryData = context.mock(PersistenceQueryData.class); - } - - - protected Encodable createEncodable() { - return new FindInstancesRequest(mockAuthSession, mockPersistenceQueryData); - } - - - @Override - @Ignore - @Test - public void shouldRoundTrip() throws IOException { - super.shouldRoundTrip(); - } - - @Override - protected void assertRoundtripped( - Object decodedEncodable, - Object originalEncodable) { - AuthorizationRequestUsability decoded = (AuthorizationRequestUsability) decodedEncodable; - AuthorizationRequestUsability original = (AuthorizationRequestUsability) originalEncodable; - - // TODO: to complete, may need to setup mock expectations - assertThat(decoded.getId(), is(equalTo(original.getId()))); - } - -} + +public class FindInstancesRequestEncodabilityTest extends EncodabilityContractTest { + + private PersistenceQueryData mockPersistenceQueryData; + + @Override + @Before + public void setUp() throws Exception { + super.setUp(); + mockPersistenceQueryData = context.mock(PersistenceQueryData.class); + } + + @Override + protected Encodable createEncodable() { + return new FindInstancesRequest(mockAuthSession, mockPersistenceQueryData); + } + + @Override + @Ignore + @Test + public void shouldRoundTrip() throws IOException { + super.shouldRoundTrip(); + } + + @Override + protected void assertRoundtripped(final Object decodedEncodable, final Object originalEncodable) { + final AuthorizationRequestUsability decoded = (AuthorizationRequestUsability) decodedEncodable; + final AuthorizationRequestUsability original = (AuthorizationRequestUsability) originalEncodable; + + // TODO: to complete, may need to setup mock expectations + assertThat(decoded.getId(), is(equalTo(original.getId()))); + } + +} Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/GetObjectRequestEncodabilityTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/GetObjectRequestEncodabilityTest.java?rev=1098939&r1=1098938&r2=1098939&view=diff ============================================================================== --- incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/GetObjectRequestEncodabilityTest.java (original) +++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/GetObjectRequestEncodabilityTest.java Tue May 3 06:33:43 2011 @@ -17,55 +17,51 @@ * under the License. */ +package org.apache.isis.runtimes.dflt.remoting.common.exchange; -package org.apache.isis.runtimes.dflt.remoting.common.exchange; - import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import java.io.IOException; -import org.apache.isis.runtimes.dflt.remoting.common.exchange.GetObjectRequest; import org.apache.isis.core.commons.encoding.EncodabilityContractTest; import org.apache.isis.core.commons.encoding.Encodable; import org.apache.isis.core.metamodel.adapter.oid.Oid; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; - -public class GetObjectRequestEncodabilityTest extends EncodabilityContractTest { - - private Oid mockOid; - - @Override - @Before - public void setUp() throws Exception { - super.setUp(); - mockOid = context.mock(Oid.class); - } - - protected Encodable createEncodable() { - return new GetObjectRequest(mockAuthSession, mockOid, "com.mycompany.Customer"); - } - - - @Override - @Ignore - @Test - public void shouldRoundTrip() throws IOException { - super.shouldRoundTrip(); - } - - @Override - protected void assertRoundtripped( - Object decodedEncodable, - Object originalEncodable) { - GetObjectRequest decoded = (GetObjectRequest) decodedEncodable; - GetObjectRequest original = (GetObjectRequest) originalEncodable; - - // TODO: to complete, may need to setup mock expectations - assertThat(decoded.getId(), is(equalTo(original.getId()))); - } - -} + +public class GetObjectRequestEncodabilityTest extends EncodabilityContractTest { + + private Oid mockOid; + + @Override + @Before + public void setUp() throws Exception { + super.setUp(); + mockOid = context.mock(Oid.class); + } + + @Override + protected Encodable createEncodable() { + return new GetObjectRequest(mockAuthSession, mockOid, "com.mycompany.Customer"); + } + + @Override + @Ignore + @Test + public void shouldRoundTrip() throws IOException { + super.shouldRoundTrip(); + } + + @Override + protected void assertRoundtripped(final Object decodedEncodable, final Object originalEncodable) { + final GetObjectRequest decoded = (GetObjectRequest) decodedEncodable; + final GetObjectRequest original = (GetObjectRequest) originalEncodable; + + // TODO: to complete, may need to setup mock expectations + assertThat(decoded.getId(), is(equalTo(original.getId()))); + } + +} Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/GetPropertiesRequestEncodabilityTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/GetPropertiesRequestEncodabilityTest.java?rev=1098939&r1=1098938&r2=1098939&view=diff ============================================================================== --- incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/GetPropertiesRequestEncodabilityTest.java (original) +++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/GetPropertiesRequestEncodabilityTest.java Tue May 3 06:33:43 2011 @@ -17,44 +17,40 @@ * under the License. */ +package org.apache.isis.runtimes.dflt.remoting.common.exchange; -package org.apache.isis.runtimes.dflt.remoting.common.exchange; - import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import java.io.IOException; -import org.apache.isis.runtimes.dflt.remoting.common.exchange.GetPropertiesRequest; import org.apache.isis.core.commons.encoding.EncodabilityContractTest; import org.apache.isis.core.commons.encoding.Encodable; import org.junit.Ignore; import org.junit.Test; - -public class GetPropertiesRequestEncodabilityTest extends EncodabilityContractTest { - - protected Encodable createEncodable() { - return new GetPropertiesRequest(); - } - - - @Override - @Ignore - @Test - public void shouldRoundTrip() throws IOException { - super.shouldRoundTrip(); - } - - @Override - protected void assertRoundtripped( - Object decodedEncodable, - Object originalEncodable) { - GetPropertiesRequest decoded = (GetPropertiesRequest) decodedEncodable; - GetPropertiesRequest original = (GetPropertiesRequest) originalEncodable; - - // TODO: to complete, may need to setup mock expectations - assertThat(decoded.getId(), is(equalTo(original.getId()))); - } - -} + +public class GetPropertiesRequestEncodabilityTest extends EncodabilityContractTest { + + @Override + protected Encodable createEncodable() { + return new GetPropertiesRequest(); + } + + @Override + @Ignore + @Test + public void shouldRoundTrip() throws IOException { + super.shouldRoundTrip(); + } + + @Override + protected void assertRoundtripped(final Object decodedEncodable, final Object originalEncodable) { + final GetPropertiesRequest decoded = (GetPropertiesRequest) decodedEncodable; + final GetPropertiesRequest original = (GetPropertiesRequest) originalEncodable; + + // TODO: to complete, may need to setup mock expectations + assertThat(decoded.getId(), is(equalTo(original.getId()))); + } + +} Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/HasInstancesRequestEncodabilityTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/HasInstancesRequestEncodabilityTest.java?rev=1098939&r1=1098938&r2=1098939&view=diff ============================================================================== --- incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/HasInstancesRequestEncodabilityTest.java (original) +++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/HasInstancesRequestEncodabilityTest.java Tue May 3 06:33:43 2011 @@ -17,45 +17,40 @@ * under the License. */ +package org.apache.isis.runtimes.dflt.remoting.common.exchange; -package org.apache.isis.runtimes.dflt.remoting.common.exchange; - import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import java.io.IOException; -import org.apache.isis.runtimes.dflt.remoting.common.exchange.HasInstancesRequest; import org.apache.isis.core.commons.encoding.EncodabilityContractTest; import org.apache.isis.core.commons.encoding.Encodable; import org.junit.Ignore; import org.junit.Test; - -public class HasInstancesRequestEncodabilityTest extends EncodabilityContractTest { - - - protected Encodable createEncodable() { - return new HasInstancesRequest(mockAuthSession, "com.mycompany.Customer"); - } - - - @Override - @Ignore - @Test - public void shouldRoundTrip() throws IOException { - super.shouldRoundTrip(); - } - - @Override - protected void assertRoundtripped( - Object decodedEncodable, - Object originalEncodable) { - HasInstancesRequest decoded = (HasInstancesRequest) decodedEncodable; - HasInstancesRequest original = (HasInstancesRequest) originalEncodable; - - // TODO: to complete, may need to setup mock expectations - assertThat(decoded.getId(), is(equalTo(original.getId()))); - } - -} + +public class HasInstancesRequestEncodabilityTest extends EncodabilityContractTest { + + @Override + protected Encodable createEncodable() { + return new HasInstancesRequest(mockAuthSession, "com.mycompany.Customer"); + } + + @Override + @Ignore + @Test + public void shouldRoundTrip() throws IOException { + super.shouldRoundTrip(); + } + + @Override + protected void assertRoundtripped(final Object decodedEncodable, final Object originalEncodable) { + final HasInstancesRequest decoded = (HasInstancesRequest) decodedEncodable; + final HasInstancesRequest original = (HasInstancesRequest) originalEncodable; + + // TODO: to complete, may need to setup mock expectations + assertThat(decoded.getId(), is(equalTo(original.getId()))); + } + +} Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/OidForServiceRequestEncodabilityTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/OidForServiceRequestEncodabilityTest.java?rev=1098939&r1=1098938&r2=1098939&view=diff ============================================================================== --- incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/OidForServiceRequestEncodabilityTest.java (original) +++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/OidForServiceRequestEncodabilityTest.java Tue May 3 06:33:43 2011 @@ -17,45 +17,40 @@ * under the License. */ +package org.apache.isis.runtimes.dflt.remoting.common.exchange; -package org.apache.isis.runtimes.dflt.remoting.common.exchange; - import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import java.io.IOException; -import org.apache.isis.runtimes.dflt.remoting.common.exchange.OidForServiceRequest; import org.apache.isis.core.commons.encoding.EncodabilityContractTest; import org.apache.isis.core.commons.encoding.Encodable; import org.junit.Ignore; import org.junit.Test; - -public class OidForServiceRequestEncodabilityTest extends EncodabilityContractTest { - - - protected Encodable createEncodable() { - return new OidForServiceRequest(mockAuthSession, "customers"); - } - - - @Override - @Ignore - @Test - public void shouldRoundTrip() throws IOException { - super.shouldRoundTrip(); - } - - @Override - protected void assertRoundtripped( - Object decodedEncodable, - Object originalEncodable) { - OidForServiceRequest decoded = (OidForServiceRequest) decodedEncodable; - OidForServiceRequest original = (OidForServiceRequest) originalEncodable; - - // TODO: to complete, may need to setup mock expectations - assertThat(decoded.getId(), is(equalTo(original.getId()))); - } - -} + +public class OidForServiceRequestEncodabilityTest extends EncodabilityContractTest { + + @Override + protected Encodable createEncodable() { + return new OidForServiceRequest(mockAuthSession, "customers"); + } + + @Override + @Ignore + @Test + public void shouldRoundTrip() throws IOException { + super.shouldRoundTrip(); + } + + @Override + protected void assertRoundtripped(final Object decodedEncodable, final Object originalEncodable) { + final OidForServiceRequest decoded = (OidForServiceRequest) decodedEncodable; + final OidForServiceRequest original = (OidForServiceRequest) originalEncodable; + + // TODO: to complete, may need to setup mock expectations + assertThat(decoded.getId(), is(equalTo(original.getId()))); + } + +} Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResolveFieldRequestEncodabilityTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResolveFieldRequestEncodabilityTest.java?rev=1098939&r1=1098938&r2=1098939&view=diff ============================================================================== --- incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResolveFieldRequestEncodabilityTest.java (original) +++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResolveFieldRequestEncodabilityTest.java Tue May 3 06:33:43 2011 @@ -17,56 +17,51 @@ * under the License. */ +package org.apache.isis.runtimes.dflt.remoting.common.exchange; -package org.apache.isis.runtimes.dflt.remoting.common.exchange; - import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import java.io.IOException; -import org.apache.isis.runtimes.dflt.remoting.common.data.common.IdentityData; -import org.apache.isis.runtimes.dflt.remoting.common.exchange.ResolveFieldRequest; import org.apache.isis.core.commons.encoding.EncodabilityContractTest; import org.apache.isis.core.commons.encoding.Encodable; +import org.apache.isis.runtimes.dflt.remoting.common.data.common.IdentityData; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; - -public class ResolveFieldRequestEncodabilityTest extends EncodabilityContractTest { - - private IdentityData mockTargetData; - - @Override - @Before - public void setUp() throws Exception { - super.setUp(); - mockTargetData = context.mock(IdentityData.class); - } - - - protected Encodable createEncodable() { - return new ResolveFieldRequest(mockAuthSession, mockTargetData, "orders"); - } - - - @Override - @Ignore - @Test - public void shouldRoundTrip() throws IOException { - super.shouldRoundTrip(); - } - - @Override - protected void assertRoundtripped( - Object decodedEncodable, - Object originalEncodable) { - ResolveFieldRequest decoded = (ResolveFieldRequest) decodedEncodable; - ResolveFieldRequest original = (ResolveFieldRequest) originalEncodable; - - // TODO: to complete, may need to setup mock expectations - assertThat(decoded.getId(), is(equalTo(original.getId()))); - } - -} + +public class ResolveFieldRequestEncodabilityTest extends EncodabilityContractTest { + + private IdentityData mockTargetData; + + @Override + @Before + public void setUp() throws Exception { + super.setUp(); + mockTargetData = context.mock(IdentityData.class); + } + + @Override + protected Encodable createEncodable() { + return new ResolveFieldRequest(mockAuthSession, mockTargetData, "orders"); + } + + @Override + @Ignore + @Test + public void shouldRoundTrip() throws IOException { + super.shouldRoundTrip(); + } + + @Override + protected void assertRoundtripped(final Object decodedEncodable, final Object originalEncodable) { + final ResolveFieldRequest decoded = (ResolveFieldRequest) decodedEncodable; + final ResolveFieldRequest original = (ResolveFieldRequest) originalEncodable; + + // TODO: to complete, may need to setup mock expectations + assertThat(decoded.getId(), is(equalTo(original.getId()))); + } + +} Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResolveObjectRequestEncodabilityTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResolveObjectRequestEncodabilityTest.java?rev=1098939&r1=1098938&r2=1098939&view=diff ============================================================================== --- incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResolveObjectRequestEncodabilityTest.java (original) +++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ResolveObjectRequestEncodabilityTest.java Tue May 3 06:33:43 2011 @@ -17,56 +17,51 @@ * under the License. */ +package org.apache.isis.runtimes.dflt.remoting.common.exchange; -package org.apache.isis.runtimes.dflt.remoting.common.exchange; - import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import java.io.IOException; -import org.apache.isis.runtimes.dflt.remoting.common.data.common.IdentityData; -import org.apache.isis.runtimes.dflt.remoting.common.exchange.ResolveObjectRequest; import org.apache.isis.core.commons.encoding.EncodabilityContractTest; import org.apache.isis.core.commons.encoding.Encodable; +import org.apache.isis.runtimes.dflt.remoting.common.data.common.IdentityData; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; - -public class ResolveObjectRequestEncodabilityTest extends EncodabilityContractTest { - - - private IdentityData mockTargetData; - - @Override - @Before - public void setUp() throws Exception { - super.setUp(); - mockTargetData = context.mock(IdentityData.class); - } - - protected Encodable createEncodable() { - return new ResolveObjectRequest(mockAuthSession, mockTargetData); - } - - - @Override - @Ignore - @Test - public void shouldRoundTrip() throws IOException { - super.shouldRoundTrip(); - } - - @Override - protected void assertRoundtripped( - Object decodedEncodable, - Object originalEncodable) { - ResolveObjectRequest decoded = (ResolveObjectRequest) decodedEncodable; - ResolveObjectRequest original = (ResolveObjectRequest) originalEncodable; - - // TODO: to complete, may need to setup mock expectations - assertThat(decoded.getId(), is(equalTo(original.getId()))); - } - -} + +public class ResolveObjectRequestEncodabilityTest extends EncodabilityContractTest { + + private IdentityData mockTargetData; + + @Override + @Before + public void setUp() throws Exception { + super.setUp(); + mockTargetData = context.mock(IdentityData.class); + } + + @Override + protected Encodable createEncodable() { + return new ResolveObjectRequest(mockAuthSession, mockTargetData); + } + + @Override + @Ignore + @Test + public void shouldRoundTrip() throws IOException { + super.shouldRoundTrip(); + } + + @Override + protected void assertRoundtripped(final Object decodedEncodable, final Object originalEncodable) { + final ResolveObjectRequest decoded = (ResolveObjectRequest) decodedEncodable; + final ResolveObjectRequest original = (ResolveObjectRequest) originalEncodable; + + // TODO: to complete, may need to setup mock expectations + assertThat(decoded.getId(), is(equalTo(original.getId()))); + } + +}