Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ensure setting options still uses the default template

This commit is contained in:
Adrian Cole 2010-05-21 15:16:08 -07:00
parent 3a1ff2e29c
commit 0f30c81466
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compute/src/main/java/org/jclouds/compute/internal/TemplateBuilderImpl.java
View File

@ -394,8 +394,12 @@ public class TemplateBuilderImpl implements TemplateBuilder {
*/ */
@Override @Override
public Template build() { public Template build() {
if (nothingChangedExceptOptions()) if (nothingChangedExceptOptions()) {
return defaultTemplateProvider.get().build(); TemplateBuilder defaultTemplate = defaultTemplateProvider.get();
if (options != null)
defaultTemplate.options(options);
return defaultTemplate.build();
}
if (locationId == null) if (locationId == null)
locationId = defaultLocation.getId(); locationId = defaultLocation.getId();
if (options == null) if (options == null)

6
compute/src/test/java/org/jclouds/compute/internal/TemplateBuilderImplTest.java
View File

@ -50,6 +50,8 @@ public class TemplateBuilderImplTest {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Test @Test
public void testOptionsUsesDefaultTemplateBuilder() { public void testOptionsUsesDefaultTemplateBuilder() {
TemplateOptions options = new TemplateOptions();
Set<Location> locations = ImmutableSet.<Location> of(); Set<Location> locations = ImmutableSet.<Location> of();
Set<Image> images = ImmutableSet.<Image> of(); Set<Image> images = ImmutableSet.<Image> of();
Set<Size> sizes = ImmutableSet.<Size> of(); Set<Size> sizes = ImmutableSet.<Size> of();
@ -59,6 +61,7 @@ public class TemplateBuilderImplTest {
TemplateBuilder defaultTemplate = createMock(TemplateBuilder.class); TemplateBuilder defaultTemplate = createMock(TemplateBuilder.class);
expect(templateBuilderProvider.get()).andReturn(defaultTemplate); expect(templateBuilderProvider.get()).andReturn(defaultTemplate);
expect(defaultTemplate.options(options)).andReturn(defaultTemplate);
expect(defaultTemplate.build()).andReturn(null); expect(defaultTemplate.build()).andReturn(null);
replay(defaultTemplate); replay(defaultTemplate);
@ -69,13 +72,14 @@ public class TemplateBuilderImplTest {
TemplateBuilderImpl template = createTemplateBuilder(locations, images, sizes, TemplateBuilderImpl template = createTemplateBuilder(locations, images, sizes,
defaultLocation, optionsProvider, templateBuilderProvider); defaultLocation, optionsProvider, templateBuilderProvider);
template.options(new TemplateOptions()).build(); template.options(options).build();
verify(defaultTemplate); verify(defaultTemplate);
verify(defaultLocation); verify(defaultLocation);
verify(optionsProvider); verify(optionsProvider);
verify(templateBuilderProvider); verify(templateBuilderProvider);
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Test @Test
public void testNothingUsesDefaultTemplateBuilder() { public void testNothingUsesDefaultTemplateBuilder() {