Updated Branches: refs/heads/javelin e5b23e387 -> f85ac6564
Fix Snapshot unit testcase. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f85ac656 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f85ac656 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f85ac656 Branch: refs/heads/javelin Commit: f85ac656452e1091607d2a38f44735567c364658 Parents: e5b23e3 Author: Min Chen <[email protected]> Authored: Thu Jan 24 16:03:38 2013 -0800 Committer: Min Chen <[email protected]> Committed: Thu Jan 24 16:05:03 2013 -0800 ---------------------------------------------------------------------- .../test/com/cloud/snapshot/SnapshotDaoTest.java | 17 +++- .../snapshot/SnapshotDaoTestConfiguration.java | 72 +++++++++++++++ server/test/resources/SnapshotDaoTestContext.xml | 43 +++++++++ 3 files changed, 131 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f85ac656/server/test/com/cloud/snapshot/SnapshotDaoTest.java ---------------------------------------------------------------------- diff --git a/server/test/com/cloud/snapshot/SnapshotDaoTest.java b/server/test/com/cloud/snapshot/SnapshotDaoTest.java index 2f2803e..c84778d 100644 --- a/server/test/com/cloud/snapshot/SnapshotDaoTest.java +++ b/server/test/com/cloud/snapshot/SnapshotDaoTest.java @@ -20,17 +20,32 @@ import java.util.List; import javax.inject.Inject; +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.storage.Snapshot; import com.cloud.storage.SnapshotVO; import com.cloud.storage.dao.SnapshotDaoImpl; +import com.cloud.utils.component.ComponentContext; import junit.framework.Assert; import junit.framework.TestCase; +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(locations = "classpath:/SnapshotDaoTestContext.xml") public class SnapshotDaoTest extends TestCase { @Inject SnapshotDaoImpl dao; - + + @Before + public void setup() throws Exception { + ComponentContext.initComponentsLifeCycle(); + } + + @Test public void testListBy() { List<SnapshotVO> snapshots = dao.listByInstanceId(3, Snapshot.Status.BackedUp); for(SnapshotVO snapshot : snapshots) { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f85ac656/server/test/com/cloud/snapshot/SnapshotDaoTestConfiguration.java ---------------------------------------------------------------------- diff --git a/server/test/com/cloud/snapshot/SnapshotDaoTestConfiguration.java b/server/test/com/cloud/snapshot/SnapshotDaoTestConfiguration.java new file mode 100644 index 0000000..128a62c --- /dev/null +++ b/server/test/com/cloud/snapshot/SnapshotDaoTestConfiguration.java @@ -0,0 +1,72 @@ +// 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 +// 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 com.cloud.snapshot; + +import java.io.IOException; + +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.ComponentScan.Filter; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.FilterType; +import org.springframework.core.type.classreading.MetadataReader; +import org.springframework.core.type.classreading.MetadataReaderFactory; +import org.springframework.core.type.filter.TypeFilter; + +import com.cloud.cluster.agentlb.dao.HostTransferMapDaoImpl; +import com.cloud.dc.dao.ClusterDaoImpl; +import com.cloud.dc.dao.HostPodDaoImpl; +import com.cloud.host.dao.HostDaoImpl; +import com.cloud.host.dao.HostDetailsDaoImpl; +import com.cloud.host.dao.HostTagsDaoImpl; +import com.cloud.storage.dao.SnapshotDaoImpl; +import com.cloud.storage.dao.VolumeDaoImpl; +import com.cloud.tags.dao.ResourceTagsDaoImpl; +import com.cloud.utils.component.SpringComponentScanUtils; +import com.cloud.vm.dao.NicDaoImpl; +import com.cloud.vm.dao.VMInstanceDaoImpl; + +@Configuration +@ComponentScan(basePackageClasses={ + SnapshotDaoImpl.class, + ResourceTagsDaoImpl.class, + VMInstanceDaoImpl.class, + VolumeDaoImpl.class, + NicDaoImpl.class, + HostDaoImpl.class, + HostDetailsDaoImpl.class, + HostTagsDaoImpl.class, + HostTransferMapDaoImpl.class, + ClusterDaoImpl.class, + HostPodDaoImpl.class}, + includeFilters={@Filter(value=SnapshotDaoTestConfiguration.Library.class, type=FilterType.CUSTOM)}, + useDefaultFilters=false + ) +public class SnapshotDaoTestConfiguration { + + + public static class Library implements TypeFilter { + + @Override + public boolean match(MetadataReader mdr, MetadataReaderFactory arg1) throws IOException { + mdr.getClassMetadata().getClassName(); + ComponentScan cs = SnapshotDaoTestConfiguration.class.getAnnotation(ComponentScan.class); + return SpringComponentScanUtils.includedInBasePackageClasses(mdr.getClassMetadata().getClassName(), cs); + } + + } +} http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f85ac656/server/test/resources/SnapshotDaoTestContext.xml ---------------------------------------------------------------------- diff --git a/server/test/resources/SnapshotDaoTestContext.xml b/server/test/resources/SnapshotDaoTestContext.xml new file mode 100644 index 0000000..7ee0cef --- /dev/null +++ b/server/test/resources/SnapshotDaoTestContext.xml @@ -0,0 +1,43 @@ +<!-- 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. --> +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:context="http://www.springframework.org/schema/context"; + xmlns:tx="http://www.springframework.org/schema/tx"; xmlns:aop="http://www.springframework.org/schema/aop"; + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/tx + http://www.springframework.org/schema/tx/spring-tx-3.0.xsd + http://www.springframework.org/schema/aop + http://www.springframework.org/schema/aop/spring-aop-3.0.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context-3.0.xsd";> + + <context:annotation-config /> + + <!-- @DB support --> + <aop:config proxy-target-class="true"> + <aop:aspect id="dbContextBuilder" ref="transactionContextBuilder"> + <aop:pointcut id="captureAnyMethod" expression="execution(* *(..))" /> + + <aop:around pointcut-ref="captureAnyMethod" method="AroundAnyMethod" /> + </aop:aspect> + + </aop:config> + + <bean id="transactionContextBuilder" class="com.cloud.utils.db.TransactionContextBuilder" /> + <bean id="componentContext" class="com.cloud.utils.component.ComponentContext"/> + <!-- bean id="snapshotDaoImpl" class="com.cloud.storage.dao.SnapshotDaoImpl"/--> + <bean id="TestConfiguration" + class="com.cloud.snapshot.SnapshotDaoTestConfiguration" /> + <bean class="org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor" > + <property name="requiredParameterValue" value="false" /> + </bean> +</beans>
