Skip to content

Commit 9759ad5

Browse files
author
Alex Huang
committed
Commit the current changes to unit tests
1 parent 727fab7 commit 9759ad5

12 files changed

Lines changed: 112 additions & 181 deletions

File tree

‎engine/api/src/org/apache/cloudstack/engine/rest/service/api/ClusterRestService.java‎

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

2121
import java.util.List;
2222

23-
import javax.inject.Inject;
2423
import javax.ws.rs.GET;
2524
import javax.ws.rs.POST;
2625
import javax.ws.rs.PUT;
@@ -38,7 +37,7 @@
3837
@Service("ClusterRestService")
3938
@Produces("application/json")
4039
public class ClusterRestService {
41-
@Inject
40+
// @Inject
4241
ProvisioningService _provisioningService;
4342

4443
@GET @Path("/clusters")

‎engine/api/src/org/apache/cloudstack/engine/rest/service/api/PodRestService.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919
package org.apache.cloudstack.engine.rest.service.api;
2020

21-
import javax.inject.Inject;
2221
import javax.ws.rs.GET;
2322
import javax.ws.rs.POST;
2423
import javax.ws.rs.PUT;
@@ -36,7 +35,7 @@
3635
@Service("PodService")
3736
@Produces({"application/json"})
3837
public class PodRestService {
39-
@Inject
38+
// @Inject
4039
ProvisioningService _provisioningService;
4140

4241
@GET @Path("/pod/{pod-id}")

‎engine/api/src/org/apache/cloudstack/engine/rest/service/api/ZoneRestService.java‎

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

2121
import java.util.List;
2222

23-
import javax.inject.Inject;
2423
import javax.ws.rs.DELETE;
2524
import javax.ws.rs.GET;
2625
import javax.ws.rs.POST;
@@ -39,7 +38,7 @@
3938
@Service("zoneService")
4039
@Produces({"application/json"})
4140
public class ZoneRestService {
42-
@Inject
41+
// @Inject
4342
ProvisioningService _provisioningService;
4443

4544
@GET @Path("/zones")

‎engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java‎

Lines changed: 36 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,11 @@
2222
import java.util.List;
2323
import java.util.Map;
2424

25-
2625
import javax.inject.Inject;
27-
import javax.ws.rs.GET;
2826
import javax.ws.rs.Path;
29-
import javax.ws.rs.Produces;
3027

3128
import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntity;
3229
import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntityImpl;
33-
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State;
3430
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceManager;
3531
import org.apache.cloudstack.engine.datacenter.entity.api.HostEntity;
3632
import org.apache.cloudstack.engine.datacenter.entity.api.HostEntityImpl;
@@ -42,63 +38,62 @@
4238
import org.springframework.stereotype.Component;
4339
import org.springframework.stereotype.Service;
4440

45-
import com.cloud.dc.Pod;
4641
import com.cloud.host.Host;
4742
import com.cloud.host.Status;
4843
import com.cloud.storage.StoragePool;
4944

5045

51-
46+
@Component
5247
@Service("provisioningService")
5348
@Path("/provisioning")
5449
public class ProvisioningServiceImpl implements ProvisioningService {
5550

56-
@Inject
57-
DataCenterResourceManager manager;
58-
59-
@Override
51+
@Inject
52+
DataCenterResourceManager manager;
53+
54+
@Override
6055
public StorageEntity registerStorage(String name, List<String> tags, Map<String, String> details) {
6156
// TODO Auto-generated method stub
6257
return null;
6358
}
6459

6560
@Override
6661
public ZoneEntity registerZone(String zoneUuid, String name, String owner, List<String> tags, Map<String, String> details) {
67-
ZoneEntityImpl zoneEntity = new ZoneEntityImpl(zoneUuid, manager);
68-
zoneEntity.setName(name);
69-
zoneEntity.setOwner(owner);
70-
zoneEntity.setDetails(details);
71-
zoneEntity.persist();
72-
return zoneEntity;
62+
ZoneEntityImpl zoneEntity = new ZoneEntityImpl(zoneUuid, manager);
63+
zoneEntity.setName(name);
64+
zoneEntity.setOwner(owner);
65+
zoneEntity.setDetails(details);
66+
zoneEntity.persist();
67+
return zoneEntity;
7368
}
7469

7570
@Override
7671
public PodEntity registerPod(String podUuid, String name, String owner, String zoneUuid, List<String> tags, Map<String, String> details) {
77-
PodEntityImpl podEntity = new PodEntityImpl(podUuid, manager);
78-
podEntity.setOwner(owner);
79-
podEntity.setName(name);
80-
podEntity.persist();
81-
return podEntity;
72+
PodEntityImpl podEntity = new PodEntityImpl(podUuid, manager);
73+
podEntity.setOwner(owner);
74+
podEntity.setName(name);
75+
podEntity.persist();
76+
return podEntity;
8277
}
8378

8479
@Override
8580
public ClusterEntity registerCluster(String clusterUuid, String name, String owner, List<String> tags, Map<String, String> details) {
86-
ClusterEntityImpl clusterEntity = new ClusterEntityImpl(clusterUuid, manager);
87-
clusterEntity.setOwner(owner);
88-
clusterEntity.setName(name);
89-
clusterEntity.persist();
90-
return clusterEntity;
81+
ClusterEntityImpl clusterEntity = new ClusterEntityImpl(clusterUuid, manager);
82+
clusterEntity.setOwner(owner);
83+
clusterEntity.setName(name);
84+
clusterEntity.persist();
85+
return clusterEntity;
9186
}
9287

9388
@Override
9489
public HostEntity registerHost(String hostUuid, String name, String owner, List<String> tags, Map<String, String> details) {
95-
HostEntityImpl hostEntity = new HostEntityImpl(hostUuid, manager);
96-
hostEntity.setOwner(owner);
97-
hostEntity.setName(name);
98-
hostEntity.setDetails(details);
99-
100-
hostEntity.persist();
101-
return hostEntity;
90+
HostEntityImpl hostEntity = new HostEntityImpl(hostUuid, manager);
91+
hostEntity.setOwner(owner);
92+
hostEntity.setName(name);
93+
hostEntity.setDetails(details);
94+
95+
hostEntity.persist();
96+
return hostEntity;
10297
}
10398

10499
@Override
@@ -109,27 +104,27 @@ public void deregisterStorage(String uuid) {
109104

110105
@Override
111106
public void deregisterZone(String uuid) {
112-
ZoneEntityImpl zoneEntity = new ZoneEntityImpl(uuid, manager);
113-
zoneEntity.disable();
107+
ZoneEntityImpl zoneEntity = new ZoneEntityImpl(uuid, manager);
108+
zoneEntity.disable();
114109
}
115110

116111
@Override
117112
public void deregisterPod(String uuid) {
118-
PodEntityImpl podEntity = new PodEntityImpl(uuid, manager);
119-
podEntity.disable();
113+
PodEntityImpl podEntity = new PodEntityImpl(uuid, manager);
114+
podEntity.disable();
120115
}
121116

122117
@Override
123118
public void deregisterCluster(String uuid) {
124-
ClusterEntityImpl clusterEntity = new ClusterEntityImpl(uuid, manager);
125-
clusterEntity.disable();
119+
ClusterEntityImpl clusterEntity = new ClusterEntityImpl(uuid, manager);
120+
clusterEntity.disable();
126121

127122
}
128123

129124
@Override
130125
public void deregisterHost(String uuid) {
131-
HostEntityImpl hostEntity = new HostEntityImpl(uuid, manager);
132-
hostEntity.disable();
126+
HostEntityImpl hostEntity = new HostEntityImpl(uuid, manager);
127+
hostEntity.disable();
133128
}
134129

135130
@Override

‎framework/rest/test/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationTest.java‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,32 +16,33 @@
1616
// under the License.
1717
package org.apache.cloudstack.framework.ws.jackson;
1818

19-
import java.io.IOException;
20-
import java.io.StringWriter;
21-
import java.util.ArrayList;
22-
import java.util.HashMap;
23-
import java.util.List;
24-
import java.util.Map;
25-
26-
import javax.xml.bind.annotation.XmlElement;
27-
import javax.xml.bind.annotation.XmlRootElement;
28-
29-
import org.junit.Before;
30-
import org.junit.Test;
31-
32-
import com.fasterxml.jackson.core.JsonGenerationException;
33-
import com.fasterxml.jackson.databind.JsonMappingException;
34-
import com.fasterxml.jackson.databind.ObjectMapper;
35-
import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
36-
import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule.Priority;
19+
import java.io.IOException;
20+
import java.io.StringWriter;
21+
import java.util.ArrayList;
22+
import java.util.HashMap;
23+
import java.util.List;
24+
import java.util.Map;
25+
26+
import javax.xml.bind.annotation.XmlElement;
27+
import javax.xml.bind.annotation.XmlRootElement;
28+
29+
import org.junit.Before;
30+
import org.junit.Ignore;
31+
import org.junit.Test;
32+
33+
import com.fasterxml.jackson.core.JsonGenerationException;
34+
import com.fasterxml.jackson.databind.JsonMappingException;
35+
import com.fasterxml.jackson.databind.ObjectMapper;
36+
import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
37+
import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule.Priority;
3738

3839
public class CSJacksonAnnotationTest {
3940

4041
@Before
4142
public void setUp() throws Exception {
4243
}
4344

44-
@Test
45+
@Test @Ignore
4546
public void test() {
4647
ObjectMapper mapper = new ObjectMapper();
4748
JaxbAnnotationModule jaxbModule = new JaxbAnnotationModule();

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
</issueManagement>
4444

4545
<properties>
46-
<skipTests>true</skipTests>
46+
<!-- <skipTests>true</skipTests-->
4747
<cs.jdk.version>1.6</cs.jdk.version>
4848
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4949

‎server/test/com/cloud/network/security/SecurityGroupManagerImpl2Test.java‎

Lines changed: 22 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -25,97 +25,52 @@
2525
import junit.framework.TestCase;
2626

2727
import org.junit.After;
28-
import org.junit.Before;
2928
import org.junit.Ignore;
29+
import org.junit.Test;
30+
import org.junit.runner.RunWith;
31+
import org.springframework.test.context.ContextConfiguration;
32+
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
3033

31-
import com.cloud.agent.MockAgentManagerImpl;
32-
import com.cloud.api.query.dao.SecurityGroupJoinDaoImpl;
33-
import com.cloud.configuration.DefaultInterceptorLibrary;
34-
import com.cloud.configuration.dao.ConfigurationDaoImpl;
35-
import com.cloud.domain.dao.DomainDaoImpl;
36-
import com.cloud.event.dao.UsageEventDaoImpl;
37-
import com.cloud.network.MockNetworkManagerImpl;
38-
import com.cloud.network.security.dao.SecurityGroupDaoImpl;
39-
import com.cloud.network.security.dao.SecurityGroupRuleDaoImpl;
40-
import com.cloud.network.security.dao.SecurityGroupRulesDaoImpl;
41-
import com.cloud.network.security.dao.SecurityGroupVMMapDaoImpl;
42-
import com.cloud.network.security.dao.SecurityGroupWorkDaoImpl;
43-
import com.cloud.network.security.dao.VmRulesetLogDaoImpl;
44-
import com.cloud.projects.MockProjectManagerImpl;
45-
import com.cloud.tags.dao.ResourceTagsDaoImpl;
46-
import com.cloud.user.MockAccountManagerImpl;
47-
import com.cloud.user.MockDomainManagerImpl;
48-
import com.cloud.user.dao.AccountDaoImpl;
4934
import com.cloud.utils.Profiler;
50-
51-
import com.cloud.vm.MockUserVmManagerImpl;
52-
import com.cloud.vm.MockVirtualMachineManagerImpl;
5335
import com.cloud.vm.dao.UserVmDaoImpl;
54-
import com.cloud.vm.dao.VMInstanceDaoImpl;
5536

37+
@RunWith(SpringJUnit4ClassRunner.class)
38+
@ContextConfiguration(locations = "classpath:/testContext.xml")
5639
public class SecurityGroupManagerImpl2Test extends TestCase {
57-
//private final static Logger s_logger = Logger.getLogger(SecurityGroupManagerImpl2Test.class);
58-
@Inject SecurityGroupManagerImpl2 _sgMgr = null;
59-
@Inject UserVmDaoImpl _vmDao = null;
60-
61-
@Before
62-
@Override
63-
public void setUp() {
64-
/*
65-
locator.addDao("ConfigurationDao", ConfigurationDaoImpl.class);
66-
locator.addDao("SecurityGroupDao", SecurityGroupDaoImpl.class);
67-
68-
locator.addDao("SecurityGroupRuleDao", SecurityGroupRuleDaoImpl.class);
69-
locator.addDao("SecurityGroupJoinDao", SecurityGroupJoinDaoImpl.class);
70-
locator.addDao("SecurityGroupVMMapDao", SecurityGroupVMMapDaoImpl.class);
71-
locator.addDao("SecurityGroupRulesDao", SecurityGroupRulesDaoImpl.class);
72-
locator.addDao("UserVmDao", UserVmDaoImpl.class);
73-
locator.addDao("AccountDao", AccountDaoImpl.class);
74-
locator.addDao("ConfigurationDao", ConfigurationDaoImpl.class);
75-
locator.addDao("SecurityGroupWorkDao", SecurityGroupWorkDaoImpl.class);
76-
locator.addDao("VmRulesetLogDao", VmRulesetLogDaoImpl.class);
77-
locator.addDao("VMInstanceDao", VMInstanceDaoImpl.class);
78-
locator.addDao("DomainDao", DomainDaoImpl.class);
79-
locator.addDao("UsageEventDao", UsageEventDaoImpl.class);
80-
locator.addDao("ResourceTagDao", ResourceTagsDaoImpl.class);
81-
locator.addManager("AgentManager", MockAgentManagerImpl.class);
82-
locator.addManager("VirtualMachineManager", MockVirtualMachineManagerImpl.class);
83-
locator.addManager("UserVmManager", MockUserVmManagerImpl.class);
84-
locator.addManager("NetworkManager", MockNetworkManagerImpl.class);
85-
locator.addManager("AccountManager", MockAccountManagerImpl.class);
86-
locator.addManager("DomainManager", MockDomainManagerImpl.class);
87-
locator.addManager("ProjectManager", MockProjectManagerImpl.class);
88-
locator.makeActive(new DefaultInterceptorLibrary());
89-
*/
90-
}
91-
40+
@Inject
41+
SecurityGroupManagerImpl2 _sgMgr = null;
42+
@Inject
43+
UserVmDaoImpl _vmDao = null;
44+
9245
@Override
9346
@After
9447
public void tearDown() throws Exception {
9548
}
96-
49+
9750
protected void _schedule(final int numVms) {
9851
System.out.println("Starting");
9952
List<Long> work = new ArrayList<Long>();
100-
for (long i=100; i <= 100+numVms; i++) {
53+
for (long i = 100; i <= 100 + numVms; i++) {
10154
work.add(i);
10255
}
10356
Profiler profiler = new Profiler();
10457
profiler.start();
10558
_sgMgr.scheduleRulesetUpdateToHosts(work, false, null);
10659
profiler.stop();
107-
108-
System.out.println("Done " + numVms + " in " + profiler.getDuration() + " ms");
60+
61+
System.out.println("Done " + numVms + " in " + profiler.getDuration()
62+
+ " ms");
10963
}
110-
64+
11165
@Ignore
11266
public void testSchedule() throws ConfigurationException {
11367
_schedule(1000);
11468
}
115-
69+
70+
@Test
11671
public void testWork() throws ConfigurationException {
117-
_schedule(1000);
118-
_sgMgr.work();
119-
72+
_schedule(1000);
73+
_sgMgr.work();
74+
12075
}
12176
}

‎utils/pom.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,20 @@
157157
<defaultGoal>install</defaultGoal>
158158
<sourceDirectory>src</sourceDirectory>
159159
<testSourceDirectory>test</testSourceDirectory>
160+
<testResources>
161+
<testResource>
162+
<directory>${project.basedir}/test/resources</directory>
163+
</testResource>
164+
</testResources>
165+
<!--
160166
<testResources>
161167
<testResource>
162168
<directory>test/resources</directory>
163169
</testResource>
164170
<testResource>
165171
<directory>conf</directory>
166172
</testResource>
167-
</testResources>
173+
</testResources> -->
168174
<plugins>
169175
<plugin>
170176
<groupId>org.apache.maven.plugins</groupId>

0 commit comments

Comments
 (0)