You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2013/07/30 11:43:51 UTC
git commit: Updated test case to use junit4 and added tear down
functionality
Updated Branches:
refs/heads/master 5a5e2cd0c -> 98bfde131
Updated test case to use junit4 and added tear down functionality
Signed-off-by: Isuru Perera <is...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/98bfde13
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/98bfde13
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/98bfde13
Branch: refs/heads/master
Commit: 98bfde131ec1e5b1ffbaafb65ad5487edfa236cc
Parents: 5a5e2cd
Author: Imesh Gunaratne <im...@wso2.com>
Authored: Tue Jul 30 13:55:14 2013 +0530
Committer: Isuru Perera <is...@apache.org>
Committed: Tue Jul 30 15:13:34 2013 +0530
----------------------------------------------------------------------
.../lbautoscale/AppDomainContextsTest.java | 62 ++++++++++++--------
1 file changed, 38 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/98bfde13/components/org.apache.stratos.mediator.autoscale/src/test/java/org/apache/stratos/mediator/autoscale/lbautoscale/AppDomainContextsTest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mediator.autoscale/src/test/java/org/apache/stratos/mediator/autoscale/lbautoscale/AppDomainContextsTest.java b/components/org.apache.stratos.mediator.autoscale/src/test/java/org/apache/stratos/mediator/autoscale/lbautoscale/AppDomainContextsTest.java
index 8d467f6..e3f2158 100644
--- a/components/org.apache.stratos.mediator.autoscale/src/test/java/org/apache/stratos/mediator/autoscale/lbautoscale/AppDomainContextsTest.java
+++ b/components/org.apache.stratos.mediator.autoscale/src/test/java/org/apache/stratos/mediator/autoscale/lbautoscale/AppDomainContextsTest.java
@@ -18,10 +18,6 @@
*/
package org.apache.stratos.mediator.autoscale.lbautoscale;
-import java.io.File;
-import java.util.Iterator;
-import java.util.Map;
-
import org.apache.axis2.clustering.ClusteringAgent;
import org.apache.axis2.clustering.tribes.TribesClusteringAgent;
import org.apache.axis2.context.ConfigurationContext;
@@ -30,24 +26,31 @@ import org.apache.stratos.lb.common.conf.LoadBalancerConfiguration;
import org.apache.stratos.lb.common.conf.LoadBalancerConfiguration.ServiceConfiguration;
import org.apache.stratos.lb.common.group.mgt.SubDomainAwareGroupManagementAgent;
import org.apache.stratos.mediator.autoscale.lbautoscale.util.AutoscaleUtil;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-public class AppDomainContextsTest extends TestCase {
+import java.io.File;
+import java.util.Iterator;
+import java.util.Map;
+@RunWith(JUnit4.class)
+public class AppDomainContextsTest {
private static Map<String, Map<String, ?>> map;
- private LoadBalancerConfiguration lbConfig;
- ConfigurationContext configCtx;
- ClusteringAgent clusteringAgent;
-
- public void setUp() throws Exception {
- super.setUp();
+ private static LoadBalancerConfiguration lbConfig;
+ private static ConfigurationContext configCtx;
+ private static ClusteringAgent clusteringAgent;
+
+ @BeforeClass
+ public static void setUpBeforeClass() throws Exception {
configCtx = ConfigurationContextFactory.createEmptyConfigurationContext();
clusteringAgent = new TribesClusteringAgent();
clusteringAgent.addGroupManagementAgent(new SubDomainAwareGroupManagementAgent(
- "worker"),
- "wso2.as1.domain", "worker", -1);
+ "worker"),
+ "wso2.as1.domain", "worker", -1);
clusteringAgent.addGroupManagementAgent(new SubDomainAwareGroupManagementAgent(
"mgt"),
"wso2.as1.domain", "mgt", -1);
@@ -55,24 +58,33 @@ public class AppDomainContextsTest extends TestCase {
"mgt"),
"wso2.as2.domain", "mgt", -1);
configCtx.getAxisConfiguration().setClusteringAgent(clusteringAgent);
-
+
File f = new File("src/test/resources/loadbalancer.conf");
System.setProperty("loadbalancer.conf", f.getAbsolutePath());
lbConfig = LoadBalancerConfiguration.getInstance();
-
+
map = AutoscaleUtil.getAppDomainContexts(configCtx, lbConfig);
-
}
-
-
+
+ @AfterClass
+ public static void tearDownAfterClass() throws Exception {
+ // Remove service configurations since lbConfig is singleton
+ lbConfig = LoadBalancerConfiguration.getInstance();
+ lbConfig.removeServiceConfiguration("wso2.as1.domain", "worker");
+ lbConfig.removeServiceConfiguration("wso2.as1.domain", "mgt");
+ lbConfig.removeServiceConfiguration("wso2.as2.domain", "mgt");
+ map = AutoscaleUtil.getAppDomainContexts(configCtx, lbConfig);
+ }
+
+ @Test
public void testRemoval(){
- // removing a cluster domain with only 1 sub domain
+ // Removing a cluster domain with only 1 sub domain
lbConfig.removeServiceConfiguration("wso2.as2.domain", "mgt");
map = AutoscaleUtil.getAppDomainContexts(configCtx, lbConfig);
Assert.assertEquals(true, !map.containsKey("wso2.as2.domain"));
- // removing a cluster domain with more than 1 sub domain
+ // Removing a cluster domain with more than 1 sub domain
lbConfig.removeServiceConfiguration("wso2.as1.domain", "mgt");
map = AutoscaleUtil.getAppDomainContexts(configCtx, lbConfig);
@@ -80,7 +92,8 @@ public class AppDomainContextsTest extends TestCase {
Assert.assertEquals(true, map.get("wso2.as1.domain").get("mgt") == null);
Assert.assertEquals(true, map.get("wso2.as1.domain").get("worker") != null);
}
-
+
+ @Test
public void testAddition(){
ServiceConfiguration config1 = lbConfig.new ServiceConfiguration();
config1.setDomain("wso2.as3.domain");
@@ -96,6 +109,7 @@ public class AppDomainContextsTest extends TestCase {
// Remove service configuration since lbConfig is singleton
lbConfig.removeServiceConfiguration("wso2.as3.domain", "mgt");
+ map = AutoscaleUtil.getAppDomainContexts(configCtx, lbConfig);
}
@Deprecated // use only for writing test cases