apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Passed the unit test

Browse Source
This commit is contained in:
Alex Huang 2013-08-06 09:35:08 -07:00
parent e4f20c7ced
commit 90cfca0501
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/config/src/org/apache/cloudstack/framework/config/ConfigurationVO.java
View File

@ -79,6 +79,8 @@ public class ConfigurationVO implements Configuration {
public ConfigurationVO(String component, ConfigKey<?> key) { public ConfigurationVO(String component, ConfigKey<?> key) {
this(key.category(), "DEFAULT", component, key.key(), key.defaultValue(), key.description()); this(key.category(), "DEFAULT", component, key.key(), key.defaultValue(), key.description());
defaultValue = key.defaultValue(); defaultValue = key.defaultValue();
dynamic = key.isDynamic();
scope = key.scope();
} }
@Override @Override

12
framework/config/test/org/apache/cloudstack/framework/config/ConfigDepotAdminTest.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.framework.config; package org.apache.cloudstack.framework.config;
import static org.mockito.Matchers.any; import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@ -28,7 +29,6 @@ import javax.inject.Inject;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.context.annotation.ComponentScan.Filter;
@ -94,12 +94,12 @@ public class ConfigDepotAdminTest {
_depotAdmin.populateConfigurations(); _depotAdmin.populateConfigurations();
// This is once because DynamicIntCK is returned. // This is once because DynamicIntCK is returned.
verify(_configDao, times(1)).persist(Mockito.any(ConfigurationVO.class)); verify(_configDao, times(1)).persist(any(ConfigurationVO.class));
when(_configDao.findById(DynamicIntCK.key())).thenReturn(dynamicIntCV); when(_configDao.findById(DynamicIntCK.key())).thenReturn(dynamicIntCV);
_depotAdmin.populateConfigurations(); _depotAdmin.populateConfigurations();
// This is two because DynamicIntCK also returns null. // This is two because DynamicIntCK also returns null.
verify(_configDao, times(2)).persist(Mockito.any(ConfigurationVO.class)); verify(_configDao, times(2)).persist(any(ConfigurationVO.class));
} }
@Configuration @Configuration
@ -107,17 +107,17 @@ public class ConfigDepotAdminTest {
static class TestConfiguration extends SpringUtils.CloudStackTestConfiguration { static class TestConfiguration extends SpringUtils.CloudStackTestConfiguration {
@Bean @Bean
public Configurable configurable() { public Configurable configurable() {
return Mockito.mock(Configurable.class); return mock(Configurable.class);
} }
@Bean @Bean
public EntityManager entityMgr() { public EntityManager entityMgr() {
return Mockito.mock(EntityManager.class); return mock(EntityManager.class);
} }
@Bean @Bean
public ConfigurationDao configurationDao() { public ConfigurationDao configurationDao() {
return Mockito.mock(ConfigurationDao.class); return mock(ConfigurationDao.class);
} }
public static class Library implements TypeFilter { public static class Library implements TypeFilter {