Skip to content
This repository was archived by the owner on Jan 15, 2020. It is now read-only.

Commit 3722d66

Browse files
xueyuanxueyuan
committed
Fixed up unit testing to use only an in class TestConfiguration
1 parent 074df0b commit 3722d66

25 files changed

Lines changed: 611 additions & 367 deletions

File tree

‎engine/api/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@
3030
<artifactId>cloud-api</artifactId>
3131
<version>${project.version}</version>
3232
</dependency>
33-
<dependency>
34-
<groupId>org.apache.cloudstack</groupId>
35-
<artifactId>cloud-framework-api</artifactId>
36-
<version>${project.version}</version>
37-
</dependency>
3833
<dependency>
3934
<groupId>org.apache.cxf</groupId>
4035
<artifactId>cxf-bundle-jaxrs</artifactId>
@@ -55,6 +50,11 @@
5550
<artifactId>cloud-framework-rest</artifactId>
5651
<version>${project.version}</version>
5752
</dependency>
53+
<dependency>
54+
<groupId>org.apache.cloudstack</groupId>
55+
<artifactId>cloud-framework-ipc</artifactId>
56+
<version>${project.version}</version>
57+
</dependency>
5858
</dependencies>
5959
<build>
6060
<defaultGoal>install</defaultGoal>

‎engine/schema/src/com/cloud/storage/StoragePoolHostVO.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ public class StoragePoolHostVO implements StoragePoolHostAssoc {
5050
private String localPath;
5151

5252
@Column(name=GenericDaoBase.CREATED_COLUMN)
53-
private final Date created = null;
53+
private Date created = null;
5454

5555
@Column(name="last_updated")
5656
@Temporal(value=TemporalType.TIMESTAMP)
57-
private final Date lastUpdated = null;
57+
private Date lastUpdated = null;
5858

5959

6060
public StoragePoolHostVO() {

‎engine/storage/integration-test/test/org/apache/cloudstack/storage/allocator/StorageAllocatorTestConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import org.apache.cloudstack.storage.allocator.StorageAllocatorTestConfiguration.Library;
2222
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl;
23+
import org.apache.cloudstack.test.utils.SpringUtils;
2324
import org.mockito.Mockito;
2425
import org.springframework.context.annotation.Bean;
2526
import org.springframework.context.annotation.ComponentScan;
@@ -36,7 +37,6 @@
3637
import com.cloud.storage.StorageManager;
3738
import com.cloud.storage.dao.StoragePoolDetailsDaoImpl;
3839
import com.cloud.storage.dao.VMTemplateDaoImpl;
39-
import com.cloud.utils.component.SpringComponentScanUtils;
4040
import com.cloud.vm.UserVmManager;
4141

4242

@@ -67,7 +67,7 @@ public static class Library implements TypeFilter {
6767
public boolean match(MetadataReader mdr, MetadataReaderFactory arg1) throws IOException {
6868
mdr.getClassMetadata().getClassName();
6969
ComponentScan cs = StorageAllocatorTestConfiguration.class.getAnnotation(ComponentScan.class);
70-
return SpringComponentScanUtils.includedInBasePackageClasses(mdr.getClassMetadata().getClassName(), cs);
70+
return SpringUtils.includedInBasePackageClasses(mdr.getClassMetadata().getClassName(), cs);
7171
}
7272
}
7373
}

‎engine/storage/integration-test/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.apache.cloudstack.storage.HostEndpointRpcServer;
2525
import org.apache.cloudstack.storage.endpoint.EndPointSelector;
2626
import org.apache.cloudstack.storage.test.ChildTestConfiguration.Library;
27+
import org.apache.cloudstack.test.utils.SpringUtils;
2728
import org.mockito.Mockito;
2829
import org.springframework.context.annotation.Bean;
2930
import org.springframework.context.annotation.ComponentScan;
@@ -75,7 +76,6 @@
7576
import com.cloud.tags.dao.ResourceTagsDaoImpl;
7677
import com.cloud.template.TemplateManager;
7778
import com.cloud.user.dao.UserDaoImpl;
78-
import com.cloud.utils.component.SpringComponentScanUtils;
7979
import com.cloud.vm.VirtualMachineManager;
8080
import com.cloud.vm.dao.ConsoleProxyDaoImpl;
8181
import com.cloud.vm.dao.DomainRouterDao;
@@ -222,7 +222,7 @@ public static class Library implements TypeFilter {
222222
public boolean match(MetadataReader mdr, MetadataReaderFactory arg1) throws IOException {
223223
mdr.getClassMetadata().getClassName();
224224
ComponentScan cs = ChildTestConfiguration.class.getAnnotation(ComponentScan.class);
225-
return SpringComponentScanUtils.includedInBasePackageClasses(mdr.getClassMetadata().getClassName(), cs);
225+
return SpringUtils.includedInBasePackageClasses(mdr.getClassMetadata().getClassName(), cs);
226226
}
227227

228228
}

‎plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java‎

Lines changed: 66 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,74 @@
1616
// under the License.
1717
package com.cloud.agent.manager;
1818

19-
import com.cloud.agent.api.*;
19+
import java.util.HashMap;
20+
import java.util.Map;
21+
22+
import javax.ejb.Local;
23+
import javax.inject.Inject;
24+
import javax.naming.ConfigurationException;
25+
26+
import org.apache.log4j.Logger;
27+
import org.springframework.stereotype.Component;
28+
29+
import com.cloud.agent.api.Answer;
30+
import com.cloud.agent.api.AttachIsoCommand;
31+
import com.cloud.agent.api.AttachVolumeCommand;
32+
import com.cloud.agent.api.BackupSnapshotCommand;
33+
import com.cloud.agent.api.BumpUpPriorityCommand;
34+
import com.cloud.agent.api.CheckHealthCommand;
35+
import com.cloud.agent.api.CheckNetworkCommand;
36+
import com.cloud.agent.api.CheckRouterCommand;
37+
import com.cloud.agent.api.CheckVirtualMachineCommand;
38+
import com.cloud.agent.api.CleanupNetworkRulesCmd;
39+
import com.cloud.agent.api.ClusterSyncCommand;
40+
import com.cloud.agent.api.Command;
41+
import com.cloud.agent.api.ComputeChecksumCommand;
42+
import com.cloud.agent.api.CreatePrivateTemplateFromSnapshotCommand;
43+
import com.cloud.agent.api.CreatePrivateTemplateFromVolumeCommand;
44+
import com.cloud.agent.api.CreateStoragePoolCommand;
45+
import com.cloud.agent.api.CreateVolumeFromSnapshotCommand;
46+
import com.cloud.agent.api.DeleteSnapshotBackupCommand;
47+
import com.cloud.agent.api.DeleteStoragePoolCommand;
48+
import com.cloud.agent.api.GetDomRVersionCmd;
49+
import com.cloud.agent.api.GetHostStatsCommand;
50+
import com.cloud.agent.api.GetStorageStatsCommand;
51+
import com.cloud.agent.api.GetVmStatsCommand;
52+
import com.cloud.agent.api.GetVncPortCommand;
53+
import com.cloud.agent.api.MaintainCommand;
54+
import com.cloud.agent.api.ManageSnapshotCommand;
55+
import com.cloud.agent.api.MigrateCommand;
56+
import com.cloud.agent.api.ModifyStoragePoolCommand;
57+
import com.cloud.agent.api.NetworkUsageCommand;
58+
import com.cloud.agent.api.PingTestCommand;
59+
import com.cloud.agent.api.PrepareForMigrationCommand;
60+
import com.cloud.agent.api.RebootCommand;
61+
import com.cloud.agent.api.SecStorageSetupCommand;
62+
import com.cloud.agent.api.SecStorageVMSetupCommand;
63+
import com.cloud.agent.api.SecurityGroupRulesCmd;
64+
import com.cloud.agent.api.StartCommand;
65+
import com.cloud.agent.api.StopCommand;
66+
import com.cloud.agent.api.StoragePoolInfo;
2067
import com.cloud.agent.api.check.CheckSshCommand;
2168
import com.cloud.agent.api.proxy.CheckConsoleProxyLoadCommand;
2269
import com.cloud.agent.api.proxy.WatchConsoleProxyLoadCommand;
23-
import com.cloud.agent.api.routing.*;
24-
import com.cloud.agent.api.storage.*;
70+
import com.cloud.agent.api.routing.DhcpEntryCommand;
71+
import com.cloud.agent.api.routing.IpAssocCommand;
72+
import com.cloud.agent.api.routing.LoadBalancerConfigCommand;
73+
import com.cloud.agent.api.routing.SavePasswordCommand;
74+
import com.cloud.agent.api.routing.SetFirewallRulesCommand;
75+
import com.cloud.agent.api.routing.SetPortForwardingRulesCommand;
76+
import com.cloud.agent.api.routing.SetStaticNatRulesCommand;
77+
import com.cloud.agent.api.routing.VmDataCommand;
78+
import com.cloud.agent.api.storage.CopyVolumeCommand;
79+
import com.cloud.agent.api.storage.CreateCommand;
80+
import com.cloud.agent.api.storage.DeleteTemplateCommand;
81+
import com.cloud.agent.api.storage.DestroyCommand;
82+
import com.cloud.agent.api.storage.DownloadCommand;
83+
import com.cloud.agent.api.storage.DownloadProgressCommand;
84+
import com.cloud.agent.api.storage.ListTemplateCommand;
85+
import com.cloud.agent.api.storage.ListVolumeCommand;
86+
import com.cloud.agent.api.storage.PrimaryStorageDownloadCommand;
2587
import com.cloud.simulator.MockConfigurationVO;
2688
import com.cloud.simulator.MockHost;
2789
import com.cloud.simulator.MockVMVO;
@@ -34,14 +96,6 @@
3496
import com.cloud.utils.db.Transaction;
3597
import com.cloud.utils.exception.CloudRuntimeException;
3698
import com.cloud.vm.VirtualMachine.State;
37-
import org.apache.log4j.Logger;
38-
import org.springframework.stereotype.Component;
39-
40-
import javax.ejb.Local;
41-
import javax.inject.Inject;
42-
import javax.naming.ConfigurationException;
43-
import java.util.HashMap;
44-
import java.util.Map;
4599

46100
@Component
47101
@Local(value = { SimulatorManager.class })
@@ -256,7 +310,7 @@ public Answer simulate(Command cmd, String hostGuid) {
256310
return Answer.createUnsupportedCommandAnswer(cmd);
257311
}
258312
} catch(Exception e) {
259-
s_logger.error("Failed execute cmd: " + e.toString());
313+
s_logger.error("Failed execute cmd: ", e);
260314
txn.rollback();
261315
return new Answer(cmd, false, e.toString());
262316
} finally {

‎pom.xml‎

Lines changed: 36 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
22
license agreements. See the NOTICE file distributed with this work for additional
3-
information regarding copyright ownership. The ASF licenses this file to
4-
you under the Apache License, Version 2.0 (the "License"); you may not use
5-
this file except in compliance with the License. You may obtain a copy of
6-
the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
7-
by applicable law or agreed to in writing, software distributed under the
8-
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
9-
OF ANY KIND, either express or implied. See the License for the specific
10-
language governing permissions and limitations under the License. -->
3+
information regarding copyright ownership. The ASF licenses this file to you under
4+
the Apache License, Version 2.0 (the "License"); you may not use this file except
5+
in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
6+
Unless required by applicable law or agreed to in writing, software distributed under
7+
the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
8+
OF ANY KIND, either express or implied. See the License for the specific language
9+
governing permissions and limitations under the License. -->
1110
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1211
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1312
<modelVersion>4.0.0</modelVersion>
@@ -171,6 +170,7 @@
171170
<module>framework</module>
172171
<module>test</module>
173172
<module>client</module>
173+
<module>services</module>
174174
</modules>
175175

176176
<dependencyManagement>
@@ -206,22 +206,18 @@
206206
<version>${org.springframework.version}</version>
207207
</dependency>
208208
<!-- <dependency> <groupId>org.springframework</groupId> <artifactId>spring-expression</artifactId>
209-
<version>${org.springframework.version}</version> </dependency> <dependency>
210-
<groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId>
211-
<version>${org.springframework.version}</version> </dependency> <dependency>
212-
<groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId>
213-
<version>${org.springframework.version}</version> </dependency> <dependency>
214-
<groupId>org.springframework</groupId> <artifactId>spring-context-support</artifactId>
215-
<version>${org.springframework.version}</version> </dependency> <dependency>
216-
<groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId>
217-
<version>${org.springframework.version}</version> </dependency> <dependency>
218-
<groupId>org.springframework</groupId> <artifactId>spring-jdbc</artifactId>
219-
<version>${org.springframework.version}</version> </dependency> <dependency>
220-
<groupId>org.springframework</groupId> <artifactId>spring-orm</artifactId>
221-
<version>${org.springframework.version}</version> </dependency> <dependency>
222-
<groupId>org.springframework</groupId> <artifactId>spring-oxm</artifactId>
223-
<version>${org.springframework.version}</version> </dependency> <dependency>
224-
<groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId>
209+
<version>${org.springframework.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId>
210+
<artifactId>spring-beans</artifactId> <version>${org.springframework.version}</version>
211+
</dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId>
212+
<version>${org.springframework.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId>
213+
<artifactId>spring-context-support</artifactId> <version>${org.springframework.version}</version>
214+
</dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId>
215+
<version>${org.springframework.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId>
216+
<artifactId>spring-jdbc</artifactId> <version>${org.springframework.version}</version>
217+
</dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-orm</artifactId>
218+
<version>${org.springframework.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId>
219+
<artifactId>spring-oxm</artifactId> <version>${org.springframework.version}</version>
220+
</dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId>
225221
<version>${org.springframework.version}</version> </dependency> -->
226222
<dependency>
227223
<groupId>org.mockito</groupId>
@@ -265,6 +261,20 @@
265261
<testOutputDirectory>${basedir}/${cs.target.dir}/test-classes</testOutputDirectory>
266262
<pluginManagement>
267263
<plugins>
264+
<plugin>
265+
<artifactId>maven-clean-plugin</artifactId>
266+
<configuration>
267+
<excludeDefaultDirectories>true</excludeDefaultDirectories>
268+
<filesets>
269+
<fileset>
270+
<directory>target</directory>
271+
<includes>
272+
<include>**/*</include>
273+
</includes>
274+
</fileset>
275+
</filesets>
276+
</configuration>
277+
</plugin>
268278
<plugin>
269279
<groupId>org.apache.maven.plugins</groupId>
270280
<artifactId>maven-release-plugin</artifactId>
@@ -504,7 +514,7 @@
504514
<cs.target.dir>target-eclipse</cs.target.dir>
505515
</properties>
506516
</profile>
507-
<profile>
517+
<profile>
508518
<id>developer</id>
509519
<properties>
510520
<marvin.config>tools/devcloud/devcloud.cfg</marvin.config>
@@ -521,7 +531,7 @@
521531
</properties>
522532
<modules>
523533
<module>developer</module>
524-
<!--module>tools/devcloud</module-->
534+
<!--module>tools/devcloud</module -->
525535
</modules>
526536
</profile>
527537
<profile>

‎server/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,11 @@
9595
<artifactId>cloud-framework-events</artifactId>
9696
<version>${project.version}</version>
9797
</dependency>
98+
<dependency>
99+
<groupId>org.apache.cloudstack</groupId>
100+
<artifactId>cloud-utils</artifactId>
101+
<version>${project.version}</version>
102+
</dependency>
98103
</dependencies>
99104
<build>
100105
<defaultGoal>install</defaultGoal>

0 commit comments

Comments
 (0)