Author: jbonofre
Date: Mon Jan 16 14:46:45 2012
New Revision: 1232010
URL: http://svn.apache.org/viewvc?rev=1232010&view=rev
Log:
Fiwed HazelcastServiceFactoryTest
Modified:
karaf/cellar/trunk/hazelcast/src/test/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManagerTest.java
karaf/cellar/trunk/hazelcast/src/test/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactoryTest.java
Modified:
karaf/cellar/trunk/hazelcast/src/test/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManagerTest.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/test/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManagerTest.java?rev=1232010&r1=1232009&r2=1232010&view=diff
==============================================================================
---
karaf/cellar/trunk/hazelcast/src/test/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManagerTest.java
(original)
+++
karaf/cellar/trunk/hazelcast/src/test/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManagerTest.java
Mon Jan 16 14:46:45 2012
@@ -1,22 +1,28 @@
+/*
+ * Licensed 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.karaf.cellar.hazelcast.factory;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.Properties;
-import java.util.Set;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
+import java.util.Properties;
+
@RunWith(JUnit4.class)
public class HazelcastConfigurationManagerTest {
-
-
@Test
public void testIsUpdatedWithNoProperties() {
HazelcastConfigurationManager cm = new HazelcastConfigurationManager();
@@ -30,4 +36,5 @@ public class HazelcastConfigurationManag
p.put(HazelcastConfigurationManager.TCPIP_MEMBERS,"");
Assert.assertFalse(cm.isUpdated(p));
}
+
}
Modified:
karaf/cellar/trunk/hazelcast/src/test/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactoryTest.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/test/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactoryTest.java?rev=1232010&r1=1232009&r2=1232010&view=diff
==============================================================================
---
karaf/cellar/trunk/hazelcast/src/test/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactoryTest.java
(original)
+++
karaf/cellar/trunk/hazelcast/src/test/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactoryTest.java
Mon Jan 16 14:46:45 2012
@@ -13,13 +13,17 @@
*/
package org.apache.karaf.cellar.hazelcast.factory;
-import com.hazelcast.config.GroupConfig;
import com.hazelcast.core.Hazelcast;
import com.hazelcast.core.HazelcastInstance;
-import org.junit.*;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
+import java.util.Properties;
+
/**
* Hazelcast service factory test.
*/
@@ -42,6 +46,14 @@ public class HazelcastServiceFactoryTest
factory.getInstance();
factory.update(null);
HazelcastInstance defaultInstance =
Hazelcast.newHazelcastInstance(null);
+
+ // define the username and password as in the hazelcast-default.xml
provided by Hazelcast
+ // without this, "cellar" instance is not in the same cluster as the
Hazelcast default one
+ Properties properties = new Properties();
+ properties.put(HazelcastConfigurationManager.USERNAME, "dev");
+ properties.put(HazelcastConfigurationManager.PASSWORD, "dev-pass");
+ factory.update(properties);
+
HazelcastInstance factoryInstance = factory.getInstance();
Assert.assertEquals(true,
factoryInstance.getCluster().getMembers().size() >= 2);
}
