diff options
Diffstat (limited to 'tests/bundles/org.eclipse.ecf.tests.sharedobject')
2 files changed, 3 insertions, 31 deletions
diff --git a/tests/bundles/org.eclipse.ecf.tests.sharedobject/src/org/eclipse/ecf/tests/sharedobject/AddTest.java b/tests/bundles/org.eclipse.ecf.tests.sharedobject/src/org/eclipse/ecf/tests/sharedobject/AddTest.java index 139a5fd23..bb2d62975 100755 --- a/tests/bundles/org.eclipse.ecf.tests.sharedobject/src/org/eclipse/ecf/tests/sharedobject/AddTest.java +++ b/tests/bundles/org.eclipse.ecf.tests.sharedobject/src/org/eclipse/ecf/tests/sharedobject/AddTest.java @@ -36,7 +36,7 @@ public class AddTest extends ContainerAbstractTestCase { * @see org.eclipse.ecf.tests.ContainerAbstractTestCase#getClientCount() */ protected int getClientCount() { - return 2; + return 1; } /* @@ -76,17 +76,6 @@ public class AddTest extends ContainerAbstractTestCase { final ISharedObject sharedObject = manager.getSharedObject(id); assertNotNull(sharedObject); sleep(3000); - for (int clientIndex = 0; clientIndex < getClientCount(); clientIndex++) { - socontainer = (ISharedObjectContainer) getClient(clientIndex) - .getAdapter(ISharedObjectContainer.class); - ISharedObject sharedObj = socontainer.getSharedObjectManager() - .getSharedObject( - IDFactory.getDefault().createStringID("foo")); - if (sharedObj != null) { - System.out.println("foo instance=" + sharedObj.toString()); - } - } - } public void testAddTwoSharedObjects() throws Exception { @@ -110,21 +99,6 @@ public class AddTest extends ContainerAbstractTestCase { final ISharedObject sharedObject1 = manager.getSharedObject(id1); assertNotNull(sharedObject1); sleep(3000); - for (int clientIndex = 0; clientIndex < getClientCount(); clientIndex++) { - socontainer = (ISharedObjectContainer) getClient(clientIndex) - .getAdapter(ISharedObjectContainer.class); - ISharedObject sharedObj = socontainer.getSharedObjectManager() - .getSharedObject( - IDFactory.getDefault().createStringID("foo0")); - if (sharedObj != null) { - System.out.println("foo0 instance=" + sharedObj.toString()); - } - sharedObj = socontainer.getSharedObjectManager().getSharedObject( - IDFactory.getDefault().createStringID("foo1")); - if (sharedObj != null) { - System.out.println("foo1 instance=" + sharedObj.toString()); - } - } } } diff --git a/tests/bundles/org.eclipse.ecf.tests.sharedobject/src/org/eclipse/ecf/tests/sharedobject/TestSharedObject.java b/tests/bundles/org.eclipse.ecf.tests.sharedobject/src/org/eclipse/ecf/tests/sharedobject/TestSharedObject.java index 200c0992e..f008e25b2 100755 --- a/tests/bundles/org.eclipse.ecf.tests.sharedobject/src/org/eclipse/ecf/tests/sharedobject/TestSharedObject.java +++ b/tests/bundles/org.eclipse.ecf.tests.sharedobject/src/org/eclipse/ecf/tests/sharedobject/TestSharedObject.java @@ -59,10 +59,8 @@ public class TestSharedObject extends BaseSharedObject { addEventProcessor(new IEventProcessor() { public boolean processEvent(Event event) { if (event instanceof ISharedObjectActivatedEvent) { - // If we've been activated, are primary and are connected - // then replicate to all remotes - // This calls the getReplicaDescription method below - if (isPrimary() && isConnected()) { + ISharedObjectActivatedEvent ae = (ISharedObjectActivatedEvent) event; + if (ae.getActivatedID().equals(getID()) && isConnected()) { TestSharedObject.this.replicateToRemoteContainers(null); } } |