Updated Branches: refs/heads/javelin a26e075f0 -> 1567a112f
unit test works again Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1567a112 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1567a112 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1567a112 Branch: refs/heads/javelin Commit: 1567a112fa0284ed530e823f676940b31756c89f Parents: a26e075 Author: Alex Huang <[email protected]> Authored: Thu Jan 24 14:36:44 2013 -0800 Committer: Alex Huang <[email protected]> Committed: Thu Jan 24 14:36:44 2013 -0800 ---------------------------------------------------------------------- .../security/SecurityGroupManagerImpl2Test.java | 7 +++ .../cloud/utils/component/ComponentContext.java | 2 +- utils/test/com/cloud/utils/TestProfiler.java | 39 ++++++++------- utils/test/com/cloud/utils/net/NetUtilsTest.java | 4 +- 4 files changed, 30 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1567a112/server/test/com/cloud/network/security/SecurityGroupManagerImpl2Test.java ---------------------------------------------------------------------- diff --git a/server/test/com/cloud/network/security/SecurityGroupManagerImpl2Test.java b/server/test/com/cloud/network/security/SecurityGroupManagerImpl2Test.java index 2704083a..1209dc4 100644 --- a/server/test/com/cloud/network/security/SecurityGroupManagerImpl2Test.java +++ b/server/test/com/cloud/network/security/SecurityGroupManagerImpl2Test.java @@ -25,18 +25,25 @@ import javax.naming.ConfigurationException; import junit.framework.TestCase; import org.junit.After; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import com.cloud.utils.Profiler; +import com.cloud.utils.component.ComponentContext; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = "classpath:/SecurityGroupManagerTestContext.xml") public class SecurityGroupManagerImpl2Test extends TestCase { @Inject SecurityGroupManagerImpl2 _sgMgr = null; + + @Before + public void setup() throws Exception { + ComponentContext.initComponentsLifeCycle(); + } @Override @After http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1567a112/utils/src/com/cloud/utils/component/ComponentContext.java ---------------------------------------------------------------------- diff --git a/utils/src/com/cloud/utils/component/ComponentContext.java b/utils/src/com/cloud/utils/component/ComponentContext.java index f86c6e5..9d5e9c4 100644 --- a/utils/src/com/cloud/utils/component/ComponentContext.java +++ b/utils/src/com/cloud/utils/component/ComponentContext.java @@ -62,7 +62,7 @@ public class ComponentContext implements ApplicationContextAware { return s_appContext; } - public void initComponentsLifeCycle() { + public static void initComponentsLifeCycle() { @SuppressWarnings("rawtype") Collection<GenericDao> daos = ComponentContext.getApplicationContext().getBeansOfType(GenericDao.class).values(); Collection<Manager> mgrs = ComponentContext.getApplicationContext().getBeansOfType(Manager.class).values(); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1567a112/utils/test/com/cloud/utils/TestProfiler.java ---------------------------------------------------------------------- diff --git a/utils/test/com/cloud/utils/TestProfiler.java b/utils/test/com/cloud/utils/TestProfiler.java index 8f5c10b..465fdf8 100644 --- a/utils/test/com/cloud/utils/TestProfiler.java +++ b/utils/test/com/cloud/utils/TestProfiler.java @@ -18,28 +18,29 @@ package com.cloud.utils; import org.apache.log4j.Logger; import org.junit.Assert; +import org.junit.Test; -import com.cloud.utils.Profiler; import com.cloud.utils.testcase.Log4jEnabledTestCase; public class TestProfiler extends Log4jEnabledTestCase { protected final static Logger s_logger = Logger.getLogger(TestProfiler.class); - - public void testProfiler() { - s_logger.info("testProfiler() started"); - - Profiler pf = new Profiler(); - pf.start(); - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - } - pf.stop(); - - s_logger.info("Duration : " + pf.getDuration()); - - Assert.assertTrue(pf.getDuration() >= 1000); - - s_logger.info("testProfiler() stopped"); - } + + @Test + public void testProfiler() { + s_logger.info("testProfiler() started"); + + Profiler pf = new Profiler(); + pf.start(); + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + } + pf.stop(); + + s_logger.info("Duration : " + pf.getDuration()); + + Assert.assertTrue(pf.getDuration() >= 1000); + + s_logger.info("testProfiler() stopped"); + } } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1567a112/utils/test/com/cloud/utils/net/NetUtilsTest.java ---------------------------------------------------------------------- diff --git a/utils/test/com/cloud/utils/net/NetUtilsTest.java b/utils/test/com/cloud/utils/net/NetUtilsTest.java index 1eccba3..11965b1 100644 --- a/utils/test/com/cloud/utils/net/NetUtilsTest.java +++ b/utils/test/com/cloud/utils/net/NetUtilsTest.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.utils.net; -import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; @@ -50,11 +49,12 @@ public class NetUtilsTest extends TestCase { assertTrue("We should be able to retrieve an ip on the third call.", ip != -1); assertTrue("ip returned is not in the avoid list", !avoid.contains(ip)); avoid.add(ip); - + ip = NetUtils.getRandomIpFromCidr(cidr, 30, avoid); assertEquals("This should be -1 because we ran out of ip addresses: " + ip, ip, -1); } + @Test public void testVpnPolicy() { assertTrue(NetUtils.isValidS2SVpnPolicy("aes128-sha1")); assertTrue(NetUtils.isValidS2SVpnPolicy("3des-sha1"));
