From 396008440c7bcdb1cbb7a3c5d6270814dfb0e341 Mon Sep 17 00:00:00 2001 From: antelder Date: Tue, 30 Nov 2010 19:00:47 +0000 Subject: delete the beta2 branch as i'd not seen raymonds mail when i made it and we might as well wait till he's got his changes in before creating the beta2 branch git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1040700 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca/binding/hazelcast/BadStringException.java | 29 ---- .../tuscany/sca/binding/hazelcast/ComplexType.java | 33 ----- .../hazelcast/HazelcastBindingTestCase.java | 114 -------------- .../tuscany/sca/binding/hazelcast/TestService.java | 30 ---- .../sca/binding/hazelcast/TestServiceClient.java | 45 ------ .../sca/binding/hazelcast/TestServiceImpl.java | 43 ------ .../sca/endpoint/hazelcast/MultiRegTestCase.java | 163 --------------------- .../sca/endpoint/hazelcast/RegistryTestCase.java | 142 ------------------ .../src/test/resources/client.composite | 29 ---- .../src/test/resources/client2.composite | 29 ---- .../src/test/resources/service.composite | 28 ---- 11 files changed, 685 deletions(-) delete mode 100644 sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/binding/hazelcast/BadStringException.java delete mode 100644 sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/binding/hazelcast/ComplexType.java delete mode 100644 sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingTestCase.java delete mode 100644 sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestService.java delete mode 100644 sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceClient.java delete mode 100644 sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceImpl.java delete mode 100644 sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/MultiRegTestCase.java delete mode 100644 sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryTestCase.java delete mode 100644 sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/resources/client.composite delete mode 100644 sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/resources/client2.composite delete mode 100644 sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/resources/service.composite (limited to 'sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test') diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/binding/hazelcast/BadStringException.java b/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/binding/hazelcast/BadStringException.java deleted file mode 100644 index 937046f0b1..0000000000 --- a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/binding/hazelcast/BadStringException.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.binding.hazelcast; - -public class BadStringException extends Exception { - private static final long serialVersionUID = 1L; - - public BadStringException(String msg) { - super(msg); - } - -} diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/binding/hazelcast/ComplexType.java b/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/binding/hazelcast/ComplexType.java deleted file mode 100644 index 68353c89cf..0000000000 --- a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/binding/hazelcast/ComplexType.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.binding.hazelcast; - -public class ComplexType { - - private String s; - - public void setString(String s) { - this.s = s; - } - - public String getString() { - return s; - } -} diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingTestCase.java b/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingTestCase.java deleted file mode 100644 index 18831eafac..0000000000 --- a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingTestCase.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.binding.hazelcast; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; - -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.oasisopen.sca.ServiceRuntimeException; - -public class HazelcastBindingTestCase { - - private static Node serviceNode; - private static Node clientNode; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - // Note use of NodeFactory.newInstance() so as to start separate runtimes - serviceNode = NodeFactory.newInstance("uri:HazelcastBindingTestCase?bind=127.0.0.1").createNode("service.composite", new String[]{"target/test-classes"}); - serviceNode.start(); - clientNode = NodeFactory.newInstance("uri:HazelcastBindingTestCase?bind=127.0.0.1").createNode("client.composite", new String[]{"target/test-classes"}); - clientNode.start(); - } - - @Test - public void testNestedClient() throws Exception { - Node client2Node = NodeFactory.newInstance("uri:HazelcastBindingTestCase?bind=127.0.0.1").createNode("client2.composite", new String[]{"target/test-classes"}); - client2Node.start(); - TestService service = client2Node.getService(TestService.class, "TestServiceClient2"); - assertNotNull(service); - assertEquals("Petra", service.echoString("Petra")); - client2Node.stop(); - } - - @Test - public void testEchoString() throws Exception { - TestService service = clientNode.getService(TestService.class, "TestServiceClient"); - assertNotNull(service); - assertEquals("Petra", service.echoString("Petra")); - } - - @Test - public void testOnewayString() throws Exception { - TestService service = clientNode.getService(TestService.class, "TestServiceClient"); - assertNotNull(service); - service.onewayString("Petra"); - } - - @Test - public void testEchoComplexType() throws Exception { - TestService service = clientNode.getService(TestService.class, "TestServiceClient"); - assertNotNull(service); - ComplexType ct = new ComplexType(); - ct.setString("beate"); - assertEquals("beate", service.echoComplexType(ct).getString()); - } - - @Test - public void testDeclaredException() throws Exception { - TestService service = clientNode.getService(TestService.class, "TestServiceClient"); - assertNotNull(service); - try { - service.testExceptions("Sue"); - fail(); - } catch (BadStringException e) { - assertEquals("Sue", e.getMessage()); - } - } - - @Test - public void testRuntimeException() throws Exception { - TestService service = clientNode.getService(TestService.class, "TestServiceClient"); - assertNotNull(service); - try { - service.testExceptions("runtime"); - fail(); - } catch (ServiceRuntimeException e) { - assertEquals("org.oasisopen.sca.ServiceRuntimeException: Remote exception: class java.lang.RuntimeException:runtime", e.getMessage()); - } - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (clientNode != null) { - clientNode.stop(); - } - if (serviceNode != null) { - serviceNode.stop(); - } - } -} - diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestService.java b/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestService.java deleted file mode 100644 index 3ffcb0d384..0000000000 --- a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestService.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.binding.hazelcast; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface TestService { - String echoString(String s); - void onewayString(String s); - ComplexType echoComplexType(ComplexType ct); - String testExceptions(String s) throws BadStringException; -} diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceClient.java b/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceClient.java deleted file mode 100644 index 4b462068f0..0000000000 --- a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceClient.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.binding.hazelcast; - -import org.oasisopen.sca.annotation.Reference; - -public class TestServiceClient implements TestService { - - @Reference - public TestService service; - - public String echoString(String s) { - return service.echoString(s); - } - - public void onewayString(String s) { - service.onewayString(s); - } - - public ComplexType echoComplexType(ComplexType ct) { - return service.echoComplexType(ct); - } - - public String testExceptions(String s) throws BadStringException { - return service.testExceptions(s); - } - -} diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceImpl.java b/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceImpl.java deleted file mode 100644 index 1f5a3872c6..0000000000 --- a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceImpl.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.binding.hazelcast; - -public class TestServiceImpl implements TestService { - - public String echoString(String s) { - return s; - } - - public void onewayString(String s) { - System.out.println("onewayString " + s); - } - - public ComplexType echoComplexType(ComplexType ct) { - return ct; - } - - public String testExceptions(String s) throws BadStringException { - if (s.equals("runtime")) { - throw new RuntimeException("runtime"); - } - throw new BadStringException(s); - } - -} diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/MultiRegTestCase.java b/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/MultiRegTestCase.java deleted file mode 100644 index 67ce2bb50b..0000000000 --- a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/MultiRegTestCase.java +++ /dev/null @@ -1,163 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.endpoint.hazelcast; - -import java.util.Properties; - -import org.apache.tuscany.sca.assembly.AssemblyFactory; -import org.apache.tuscany.sca.assembly.Binding; -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.Endpoint; -import org.apache.tuscany.sca.assembly.SCABindingFactory; -import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.apache.tuscany.sca.core.UtilityExtensionPoint; -import org.apache.tuscany.sca.runtime.RuntimeEndpoint; -import org.apache.tuscany.sca.runtime.RuntimeProperties; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -public class MultiRegTestCase { - private static ExtensionPointRegistry extensionPoints; - private static AssemblyFactory assemblyFactory; - private static SCABindingFactory scaBindingFactory; - - @BeforeClass - public static void init() { - extensionPoints = new DefaultExtensionPointRegistry(); - FactoryExtensionPoint factories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class); - assemblyFactory = factories.getFactory(AssemblyFactory.class); - scaBindingFactory = factories.getFactory(SCABindingFactory.class); - Properties properties = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class).getUtility(RuntimeProperties.class).getProperties(); - properties.setProperty("bind", "127.0.0.1"); - } - - @Test - public void testReplication() throws Exception { - - System.out.println("Starting reg1"); - HazelcastEndpointRegistry reg1 = new HazelcastEndpointRegistry(extensionPoints, null, null, "bar"); - reg1.start(); - - System.out.println("Adding ep1"); - RuntimeEndpoint ep1 = createEndpoint("ep1uri"); - ep1.bind(extensionPoints, reg1); - reg1.addEndpoint(ep1); - - System.out.println("Starting reg3"); - HazelcastEndpointRegistry reg2 = new HazelcastEndpointRegistry(extensionPoints, null, "tuscany:foo?listen=127.0.0.1:9877&multicast=off&remotes=127.0.0.1:9876", "bar"); - reg2.start(); - - System.out.println("Starting reg2"); - HazelcastEndpointRegistry reg3 = new HazelcastEndpointRegistry(extensionPoints, null, "tuscany:foo?listen=127.0.0.1:9878&multicast=off&remotes=127.0.0.1:9877", "bar"); - reg3.start(); - - assertExists(reg1, "ep1uri"); - assertExists(reg2, "ep1uri"); - assertExists(reg3, "ep1uri"); - - System.out.println("Adding ep2"); - RuntimeEndpoint ep2 = createEndpoint("ep2uri"); - ep2.bind(extensionPoints, reg2); - reg2.addEndpoint(ep2); - - assertExists(reg2, "ep2uri"); - assertExists(reg1, "ep2uri"); - assertExists(reg3, "ep2uri"); - - System.out.println("Stopping reg1"); - reg1.stop(); - System.out.println("Stopped reg1"); - Thread.sleep(500); - - Assert.assertNull(reg2.getEndpoint("ep1uri")); - Assert.assertNull(reg3.getEndpoint("ep1uri")); - - assertExists(reg2, "ep2uri"); - assertExists(reg3, "ep2uri"); - - System.out.println("Starting reg1"); - reg1.start(); - ep1.bind(extensionPoints, reg1); - - System.out.println("adding ep1"); - reg1.addEndpoint(ep1); - assertExists(reg1, "ep1uri"); - assertExists(reg2, "ep1uri"); - assertExists(reg3, "ep1uri"); - - System.out.println("Stopping reg1"); - reg1.stop(); - System.out.println("Stopping reg2"); - reg2.stop(); - System.out.println("Stopping reg3"); - reg3.stop(); - System.out.println("done"); - } - - @Test - public void testDuplicates() throws Exception { - HazelcastEndpointRegistry reg1 = new HazelcastEndpointRegistry(extensionPoints, null, "tuscany:foo?listen=127.0.0.1:9876&multicast=off", "bar"); - reg1.start(); - RuntimeEndpoint ep1 = createEndpoint("ep1uri"); - ep1.bind(extensionPoints, reg1); - reg1.addEndpoint(ep1); - - HazelcastEndpointRegistry reg2 = new HazelcastEndpointRegistry(extensionPoints, null, "tuscany:foo?listen=127.0.0.1:9877&multicast=off&remotes=127.0.0.1:9876", "bar"); - reg2.start(); - - try { - reg2.addEndpoint(ep1); - Assert.fail(); - } catch (IllegalStateException e) { - // expected - } - - reg1.stop(); - - Thread.sleep(200); - - // now it should work - reg2.addEndpoint(ep1); - - reg2.stop(); - } - - private Endpoint assertExists(HazelcastEndpointRegistry reg, String uri) throws InterruptedException { - Endpoint ep = reg.getEndpoint(uri); - Assert.assertNotNull(ep); - Assert.assertEquals(uri, ep.getURI()); - return ep; - } - - private RuntimeEndpoint createEndpoint(String uri) { - RuntimeEndpoint ep = (RuntimeEndpoint) assemblyFactory.createEndpoint(); - Component comp = assemblyFactory.createComponent(); - ep.setComponent(comp); - ep.setService(assemblyFactory.createComponentService()); - Binding b = scaBindingFactory.createSCABinding(); - ep.setBinding(b); - ep.setURI(uri); - return ep; - } - -} diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryTestCase.java b/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryTestCase.java deleted file mode 100644 index 12b420f010..0000000000 --- a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryTestCase.java +++ /dev/null @@ -1,142 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.endpoint.hazelcast; - -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.List; - -import junit.framework.Assert; - -import org.junit.Ignore; -import org.junit.Test; - -import com.hazelcast.config.Config; -import com.hazelcast.config.TcpIpConfig; -import com.hazelcast.config.XmlConfigBuilder; -import com.hazelcast.core.Hazelcast; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.core.IMap; -import com.hazelcast.nio.Address; - -@Ignore -public class RegistryTestCase { - - @Test - public void test1() throws UnknownHostException { - - HazelcastInstance h1 = create("54327", 9001); - - IMap h1map = h1.getMap("mymap"); - h1map.put("key1", "bla1"); - Assert.assertEquals("bla1", h1map.get("key1")); - - HazelcastInstance h2 = create("false", 9002, 9001); - IMap h2map = h2.getMap("mymap"); - Assert.assertEquals("bla1", h2map.get("key1")); - - HazelcastInstance h3 = create("false", 9003, 9002); - IMap h3map = h3.getMap("mymap"); - Assert.assertEquals("bla1", h3map.get("key1")); - - h3map.put("k3", "v3"); - h2map.put("k2", "v2"); - - Assert.assertEquals("v2", h1map.get("k2")); - Assert.assertEquals("v3", h1map.get("k3")); - Assert.assertEquals("v2", h2map.get("k2")); - Assert.assertEquals("v3", h2map.get("k3")); - Assert.assertEquals("v2", h3map.get("k2")); - Assert.assertEquals("v3", h3map.get("k3")); - - HazelcastInstance h4 = create("54328", 9004, 9001); - IMap h4map = h4.getMap("mymap"); -// Assert.assertNull(h4map.get("k2")); -// Assert.assertNull(h4map.get("k3")); - Assert.assertEquals("v2", h4map.get("k2")); - Assert.assertEquals("v3", h4map.get("k3")); - -// HazelcastInstance h5 = create("false", 9005, 9003, 9004); - HazelcastInstance h5 = create("54328", 9005); - -// Assert.assertEquals("v2", h4map.get("k2")); -// Assert.assertEquals("v3", h4map.get("k3")); - - IMap h5map = h5.getMap("mymap"); - Assert.assertEquals("v2", h5map.get("k2")); - Assert.assertEquals("v3", h5map.get("k3")); - - h1.shutdown(); - - Assert.assertEquals("v2", h2map.get("k2")); - Assert.assertEquals("v3", h2map.get("k3")); - Assert.assertEquals("v2", h3map.get("k2")); - Assert.assertEquals("v3", h3map.get("k3")); - Assert.assertEquals("v2", h4map.get("k2")); - Assert.assertEquals("v3", h4map.get("k3")); - - h3map.put("key1a", "bla1a"); - - Assert.assertEquals("bla1a", h2map.get("key1a")); - Assert.assertEquals("bla1a", h3map.get("key1a")); - Assert.assertEquals("bla1a", h4map.get("key1a")); - -// HazelcastInstance h4 = create(true, 9004, 9003); -// HazelcastInstance h5 = create(true, 9005); -// IMap h5map = h5.getMap("mymap"); -// Assert.assertEquals("bla1", h5map.get("key1")); - -// HazelcastInstance h6 = create(false, 9006, 9005); -// IMap h6map = h6.getMap("mymap"); -// Assert.assertEquals("bla1", h6map.get("key1")); - - } - - private HazelcastInstance create(String multicast, int listenPort, int... connectPorts) throws UnknownHostException { - Config config = new XmlConfigBuilder().build(); - config.setPort(listenPort); - config.setPortAutoIncrement(false); - - // declare the interface Hazelcast should bind to - config.getNetworkConfig().getInterfaces().clear(); - config.getNetworkConfig().getInterfaces().addInterface(InetAddress.getLocalHost().getHostAddress()); - config.getNetworkConfig().getInterfaces().setEnabled(true); - - if ("false".equals(multicast)) { - config.getNetworkConfig().getJoin().getMulticastConfig().setEnabled(false); - } else { - config.getNetworkConfig().getJoin().getMulticastConfig().setMulticastPort(Integer.parseInt(multicast)); - } - - if (connectPorts.length > 0) { - TcpIpConfig tcpconfig = config.getNetworkConfig().getJoin().getTcpIpConfig(); - tcpconfig.setEnabled(true); - - List
lsMembers = tcpconfig.getAddresses(); - lsMembers.clear(); - for (int p : connectPorts) { - lsMembers.add(new Address(InetAddress.getLocalHost(), p)); - } - } - - return Hazelcast.newHazelcastInstance(config); - } - -} diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/resources/client.composite b/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/resources/client.composite deleted file mode 100644 index 7436a5e24b..0000000000 --- a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/resources/client.composite +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/resources/client2.composite b/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/resources/client2.composite deleted file mode 100644 index 20667984ca..0000000000 --- a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/resources/client2.composite +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/resources/service.composite b/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/resources/service.composite deleted file mode 100644 index 83f13a35f2..0000000000 --- a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/test/resources/service.composite +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - -- cgit v1.2.3