Author: gawor
Date: Tue Sep 21 00:30:24 2010
New Revision: 999170
URL: http://svn.apache.org/viewvc?rev=999170&view=rev
Log:
fix test errors
Modified:
openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/BasicClusterableRequestHandlerTest.java
Modified:
openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/BasicClusterableRequestHandlerTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/BasicClusterableRequestHandlerTest.java?rev=999170&r1=999169&r2=999170&view=diff
==============================================================================
---
openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/BasicClusterableRequestHandlerTest.java
(original)
+++
openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/BasicClusterableRequestHandlerTest.java
Tue Sep 21 00:30:24 2010
@@ -20,10 +20,13 @@ import java.io.IOException;
import java.net.URI;
import org.apache.openejb.BeanContext;
+import org.apache.openejb.ModuleContext;
import org.apache.openejb.ClusteredRPCContainer;
+import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.client.ClusterableRequest;
import org.apache.openejb.client.ClusterableResponse;
import org.apache.openejb.client.ServerMetaData;
+import org.apache.openejb.AppContext;
import com.agical.rmock.core.describe.ExpressionDescriber;
import com.agical.rmock.core.match.operator.AbstractExpression;
@@ -43,8 +46,8 @@ public class BasicClusterableRequestHand
requestHandler = new BasicClusterableRequestHandler();
request = (ClusterableRequest) mock(ClusterableRequest.class);
response = (ClusterableResponse) mock(ClusterableResponse.class);
- beanContext = (BeanContext) mock(BeanContext.class);
clusteredContainer = (ClusteredRPCContainer)
mock(ClusteredRPCContainer.class);
+ beanContext = new BeanContext("aDeploymentId", null, new
ModuleContext("", new AppContext("", SystemInstance.get(), null, null, null,
false), null), BasicClusterableRequestHandlerTest.class, null, null, null,
null, null, null, null, null, null, false);
}
public void testNoOpWhenNotAClusteredContainer() throws Exception {
@@ -59,8 +62,7 @@ public class BasicClusterableRequestHand
final URI[] locations = new URI[] {new URI("ejbd://localhost:4201")};
ServerMetaData server = new ServerMetaData(locations);
- beanContext.getContainer();
- modify().returnValue(clusteredContainer);
+ beanContext.setContainer(clusteredContainer);
request.getServerHash();
modify().returnValue(server.buildHash() + 1);
@@ -89,8 +91,7 @@ public class BasicClusterableRequestHand
URI[] locations = new URI[] {new URI("ejbd://localhost:4201")};
ServerMetaData server = new ServerMetaData(locations);
- beanContext.getContainer();
- modify().returnValue(clusteredContainer);
+ beanContext.setContainer(clusteredContainer);
request.getServerHash();
modify().returnValue(server.buildHash());