-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
29 changed files
with
288 additions
and
469 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -69,12 +69,8 @@ public void setup() throws MalformedXMLException, IOException, AgentAccessDenied | |
| eve.unlock("evespass"); | ||
| node.storeAgent(eve); | ||
|
|
||
| ServiceAgentImpl serviceAgent = ServiceAgentImpl | ||
| .createServiceAgent(ServiceNameVersion.fromString("[email protected]"), "pass"); | ||
| serviceAgent.unlock("pass"); | ||
| node.storeAgent(serviceAgent); | ||
| node.registerReceiver(serviceAgent); | ||
|
|
||
| ServiceAgentImpl serviceAgent = node | ||
| .startService(ServiceNameVersion.fromString("[email protected]"), "pass"); | ||
| context = new ExecutionContext(serviceAgent, node.getAgentContext(adam), node); | ||
| } | ||
|
|
||
|
|
@@ -429,53 +425,53 @@ public void testUserAgents() { | |
| fail(); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testGroupAgents() { | ||
| try { | ||
| // create group | ||
| GroupAgent a = context.createGroupAgent(new Agent[] {adam}); | ||
| assertEquals(1,a.getMemberList().length); | ||
| GroupAgent a = context.createGroupAgent(new Agent[] { adam }); | ||
| assertEquals(1, a.getMemberList().length); | ||
| context.storeAgent(a); | ||
|
|
||
| // add member | ||
| a = (GroupAgent) context.requestAgent(a.getIdentifier()); | ||
| assertEquals(1,a.getMemberList().length); | ||
| assertEquals(1, a.getMemberList().length); | ||
| a.addMember(eve); | ||
| assertEquals(2,a.getMemberList().length); | ||
| assertEquals(2, a.getMemberList().length); | ||
| context.storeAgent(a); | ||
| assertEquals(2,a.getMemberList().length); | ||
| assertEquals(2, a.getMemberList().length); | ||
|
|
||
| // request group | ||
| a = (GroupAgent) context.requestAgent(a.getIdentifier()); | ||
| assertTrue(a.hasMember(adam)); | ||
| assertTrue(a.hasMember(eve)); | ||
| assertEquals(2,a.getMemberList().length); | ||
| assertEquals(2, a.getMemberList().length); | ||
|
|
||
| // do the same with unlock instead of request: | ||
|
|
||
| // create group | ||
| GroupAgent b = context.createGroupAgent(new Agent[] {adam}); | ||
| GroupAgent b = context.createGroupAgent(new Agent[] { adam }); | ||
| context.storeAgent(b); | ||
|
|
||
| // add member | ||
| b = (GroupAgent) context.fetchAgent(b.getIdentifier()); | ||
| b.unlock(adam); | ||
| b.addMember(eve); | ||
| context.storeAgent(b); | ||
|
|
||
| // request group | ||
| b = (GroupAgent) context.fetchAgent(b.getIdentifier()); | ||
| b.unlock(adam); | ||
| assertTrue(b.hasMember(adam)); | ||
| assertTrue(b.hasMember(eve)); | ||
| assertEquals(2,b.getMemberList().length); | ||
| assertEquals(2, b.getMemberList().length); | ||
|
|
||
| } catch (AgentOperationFailedException | AgentAccessDeniedException | AgentAlreadyExistsException | ||
| | AgentLockedException | AgentNotFoundException e) { | ||
| fail(); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| @Test | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -41,10 +41,8 @@ public void testLocalInvocation() { | |
|
|
||
| node.launch(); | ||
|
|
||
| ServiceAgentImpl testServiceAgent = ServiceAgentImpl | ||
| .createServiceAgent(ServiceNameVersion.fromString("[email protected]"), "a pass"); | ||
| testServiceAgent.unlock("a pass"); | ||
| node.registerReceiver(testServiceAgent); | ||
| ServiceAgentImpl testServiceAgent = node | ||
| .startService(ServiceNameVersion.fromString("[email protected]"), "a pass"); | ||
|
|
||
| Object result = node.invokeLocally(eve, testServiceAgent, "inc", new Serializable[] { new Integer(10) }); | ||
|
|
||
|
|
@@ -66,10 +64,8 @@ public void testGlobalInvocation() { | |
| serviceNode.storeAgent(eve); | ||
| serviceNode.launch(); | ||
|
|
||
| ServiceAgentImpl testServiceAgent = ServiceAgentImpl | ||
| .createServiceAgent(ServiceNameVersion.fromString("[email protected]"), "a pass"); | ||
| testServiceAgent.unlock("a pass"); | ||
| serviceNode.registerReceiver(testServiceAgent); | ||
| ServiceAgentImpl testServiceAgent = serviceNode | ||
| .startService(ServiceNameVersion.fromString("[email protected]"), "a pass"); | ||
|
|
||
| LocalNode callerNode = manager.launchNode(); | ||
| Object result = callerNode.invokeGlobally(eve, testServiceAgent.getIdentifier(), | ||
|
|
@@ -94,15 +90,9 @@ public void testSubinvocation() { | |
| serviceNode1.launch(); | ||
| serviceNode2.launch(); | ||
|
|
||
| ServiceAgentImpl testServiceAgent = ServiceAgentImpl | ||
| .createServiceAgent(ServiceNameVersion.fromString("[email protected]"), "a pass"); | ||
| testServiceAgent.unlock("a pass"); | ||
| serviceNode1.registerReceiver(testServiceAgent); | ||
| serviceNode1.startService(ServiceNameVersion.fromString("[email protected]"), "a pass"); | ||
|
|
||
| ServiceAgentImpl testServiceAgent2 = ServiceAgentImpl.createServiceAgent( | ||
| ServiceNameVersion.fromString("[email protected]"), "a 2nd pass"); | ||
| testServiceAgent2.unlock("a 2nd pass"); | ||
| serviceNode2.registerReceiver(testServiceAgent2); | ||
| serviceNode2.startService(ServiceNameVersion.fromString("[email protected]"), "a 2nd pass"); | ||
|
|
||
| LocalNode callerNode = manager.launchNode(); | ||
| Object result = callerNode.invoke(eve, "[email protected]", "usingOther", | ||
|
|
@@ -125,10 +115,7 @@ public void testSubinvocationFail() { | |
| serviceNode2.storeAgent(eve); | ||
| serviceNode2.launch(); | ||
|
|
||
| ServiceAgentImpl testServiceAgent2 = ServiceAgentImpl.createServiceAgent( | ||
| ServiceNameVersion.fromString("[email protected]"), "a 2nd pass"); | ||
| testServiceAgent2.unlock("a 2nd pass"); | ||
| serviceNode2.registerReceiver(testServiceAgent2); | ||
| serviceNode2.startService(ServiceNameVersion.fromString("[email protected]"), "a 2nd pass"); | ||
|
|
||
| LocalNode callerNode = manager.launchNode(); | ||
| Object result = callerNode.invoke(eve, "[email protected]", "usingOther", | ||
|
|
@@ -154,20 +141,14 @@ public void testInvocation() { | |
| serviceNode1.launch(); | ||
| serviceNode2.launch(); | ||
|
|
||
| ServiceAgentImpl usingAgent = ServiceAgentImpl.createServiceAgent( | ||
| serviceNode1.startService( | ||
| ServiceNameVersion.fromString("[email protected]"), "a pass"); | ||
| usingAgent.unlock("a pass"); | ||
| serviceNode1.registerReceiver(usingAgent); | ||
|
|
||
| ServiceAgentImpl serviceAgent1 = ServiceAgentImpl.createServiceAgent( | ||
| serviceNode2.startService( | ||
| ServiceNameVersion.fromString("[email protected]"), "a pass"); | ||
| serviceAgent1.unlock("a pass"); | ||
| serviceNode2.registerReceiver(serviceAgent1); | ||
|
|
||
| ServiceAgentImpl serviceAgent2 = ServiceAgentImpl.createServiceAgent( | ||
| serviceNode2.startService( | ||
| ServiceNameVersion.fromString("[email protected]"), "a pass"); | ||
| serviceAgent2.unlock("a pass"); | ||
| serviceNode2.registerReceiver(serviceAgent2); | ||
|
|
||
| LocalNode callerNode = manager.launchNode(); | ||
|
|
||
|
|
@@ -259,17 +240,11 @@ public void testMultiNodeClassLoading() { | |
| // start two nodes with both powering the service | ||
| ServiceNameVersion snv = new ServiceNameVersion("i5.las2peer.testServices.testPackage3.PackageTestService", | ||
| "1.0"); | ||
| ServiceAgentImpl serviceAgent1 = ServiceAgentImpl.createServiceAgent(snv, "a pass"); | ||
| serviceAgent1.unlock("a pass"); | ||
| serviceNode1.storeAgent(serviceAgent1); | ||
| serviceNode1.registerReceiver(serviceAgent1); | ||
| ServiceAgentImpl serviceAgent1 = serviceNode1.startService(snv, "a pass"); | ||
| Assert.assertEquals(ServiceClassLoader.class, | ||
| serviceAgent1.getServiceInstance().getClass().getClassLoader().getClass()); | ||
|
|
||
| ServiceAgentImpl serviceAgent2 = ServiceAgentImpl.createServiceAgent(snv, "a pass"); | ||
| serviceAgent2.unlock("a pass"); | ||
| serviceNode2.storeAgent(serviceAgent2); | ||
| serviceNode2.registerReceiver(serviceAgent2); | ||
| ServiceAgentImpl serviceAgent2 = serviceNode2.startService(snv, "a pass"); | ||
| Assert.assertEquals(ServiceClassLoader.class, | ||
| serviceAgent2.getServiceInstance().getClass().getClassLoader().getClass()); | ||
|
|
||
|
|
||
Oops, something went wrong.