Updated Branches: refs/heads/master 237dcbed0 -> 1f4c8656e
Address Checkstyle violations in tests Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/1f4c8656 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/1f4c8656 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/1f4c8656 Branch: refs/heads/master Commit: 1f4c8656e12667df8b3d54297ea2467e1b518a03 Parents: 237dcbe Author: Andrew Gaul <[email protected]> Authored: Mon Dec 9 21:33:20 2013 -0800 Committer: Andrew Gaul <[email protected]> Committed: Mon Dec 9 21:36:20 2013 -0800 ---------------------------------------------------------------------- .../jclouds/abiquo/binders/BindToPathTest.java | 2 +- ...indNetworkConfigurationRefToPayloadTest.java | 2 +- .../abiquo/environment/TestEnvironment.java | 4 ++-- .../abiquo/features/EventApiExpectTest.java | 2 +- .../VirtualMachineTemplateApiExpectTest.java | 2 +- .../cloudsigma2/CloudSigma2ApiExpectTest.java | 8 ++++---- .../cloudsigma2/CloudSigma2ApiLiveTest.java | 15 ++++++++------- .../cloudsigma2/functions/DriveToJsonTest.java | 15 ++++++++++----- .../functions/FirewallPolicyToJsonTest.java | 12 ++++++++---- .../cloudsigma2/functions/IPInfoToJsonTest.java | 6 +++--- .../functions/LibraryDriveToJsonTest.java | 20 ++++++++++++-------- .../functions/ProfileInfoToJsonTest.java | 4 ++-- .../functions/ServerInfoToJsonTest.java | 17 +++++++++++++---- .../cloudsigma2/functions/TagToJsonTest.java | 4 ++-- .../functions/VLANInfoToJsonTest.java | 4 ++-- .../config/ManagementLifecycleTest.java | 7 ++++++- .../internal/ManagementUtilsTest.java | 8 +++++++- .../testng/FormatApiResultsListener.java | 6 +++--- .../v1_5/features/MediaApiLiveTest.java | 3 ++- .../v1_5/features/admin/GroupApiLiveTest.java | 3 ++- .../compute/VirtualBoxExperimentLiveTest.java | 2 +- ...TAdapterToMachineIfNotAlreadyExistsTest.java | 7 ++++--- .../admin/ImageFromYamlStringTest.java | 2 +- .../statements/InstallGuestAdditionsTest.java | 2 +- 24 files changed, 97 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f4c8656/abiquo/src/test/java/org/jclouds/abiquo/binders/BindToPathTest.java ---------------------------------------------------------------------- diff --git a/abiquo/src/test/java/org/jclouds/abiquo/binders/BindToPathTest.java b/abiquo/src/test/java/org/jclouds/abiquo/binders/BindToPathTest.java index 7b32477..43b9f5c 100644 --- a/abiquo/src/test/java/org/jclouds/abiquo/binders/BindToPathTest.java +++ b/abiquo/src/test/java/org/jclouds/abiquo/binders/BindToPathTest.java @@ -126,7 +126,7 @@ public class BindToPathTest { assertEquals(newRequest.getRequestLine(), "GET http://linkuri?param=value HTTP/1.1"); } - static interface TestEndpointLink { + interface TestEndpointLink { @GET void withEndpointLink(@EndpointLink("edit") TestDto dto); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f4c8656/abiquo/src/test/java/org/jclouds/abiquo/binders/cloud/BindNetworkConfigurationRefToPayloadTest.java ---------------------------------------------------------------------- diff --git a/abiquo/src/test/java/org/jclouds/abiquo/binders/cloud/BindNetworkConfigurationRefToPayloadTest.java b/abiquo/src/test/java/org/jclouds/abiquo/binders/cloud/BindNetworkConfigurationRefToPayloadTest.java index 1601087..12b9367 100644 --- a/abiquo/src/test/java/org/jclouds/abiquo/binders/cloud/BindNetworkConfigurationRefToPayloadTest.java +++ b/abiquo/src/test/java/org/jclouds/abiquo/binders/cloud/BindNetworkConfigurationRefToPayloadTest.java @@ -120,7 +120,7 @@ public class BindNetworkConfigurationRefToPayloadTest { + "\" rel=\"network_configuration\"/></links>"), LinksDto.class); } - static interface TestNetworkConfig { + interface TestNetworkConfig { @GET void withoutVirtualMachine(VLANNetworkDto network); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f4c8656/abiquo/src/test/java/org/jclouds/abiquo/environment/TestEnvironment.java ---------------------------------------------------------------------- diff --git a/abiquo/src/test/java/org/jclouds/abiquo/environment/TestEnvironment.java b/abiquo/src/test/java/org/jclouds/abiquo/environment/TestEnvironment.java index d047abf..cb3d7f9 100644 --- a/abiquo/src/test/java/org/jclouds/abiquo/environment/TestEnvironment.java +++ b/abiquo/src/test/java/org/jclouds/abiquo/environment/TestEnvironment.java @@ -28,10 +28,10 @@ public interface TestEnvironment { /** * Builds the test environment. */ - public void setup() throws Exception; + void setup() throws Exception; /** * Cleans the test environment. */ - public void tearDown() throws Exception; + void tearDown() throws Exception; } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f4c8656/abiquo/src/test/java/org/jclouds/abiquo/features/EventApiExpectTest.java ---------------------------------------------------------------------- diff --git a/abiquo/src/test/java/org/jclouds/abiquo/features/EventApiExpectTest.java b/abiquo/src/test/java/org/jclouds/abiquo/features/EventApiExpectTest.java index 4c1d3c1..2b58e6c 100644 --- a/abiquo/src/test/java/org/jclouds/abiquo/features/EventApiExpectTest.java +++ b/abiquo/src/test/java/org/jclouds/abiquo/features/EventApiExpectTest.java @@ -105,4 +105,4 @@ public class EventApiExpectTest extends BaseAbiquoApiExpectTest<EventApi> { protected EventApi clientFrom(AbiquoApi api) { return api.getEventApi(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f4c8656/abiquo/src/test/java/org/jclouds/abiquo/features/VirtualMachineTemplateApiExpectTest.java ---------------------------------------------------------------------- diff --git a/abiquo/src/test/java/org/jclouds/abiquo/features/VirtualMachineTemplateApiExpectTest.java b/abiquo/src/test/java/org/jclouds/abiquo/features/VirtualMachineTemplateApiExpectTest.java index 7f8f267..ed32df8 100644 --- a/abiquo/src/test/java/org/jclouds/abiquo/features/VirtualMachineTemplateApiExpectTest.java +++ b/abiquo/src/test/java/org/jclouds/abiquo/features/VirtualMachineTemplateApiExpectTest.java @@ -121,4 +121,4 @@ public class VirtualMachineTemplateApiExpectTest extends BaseAbiquoApiExpectTest return api.getVirtualMachineTemplateApi(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f4c8656/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/CloudSigma2ApiExpectTest.java ---------------------------------------------------------------------- diff --git a/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/CloudSigma2ApiExpectTest.java b/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/CloudSigma2ApiExpectTest.java index 3941910..b2ed4e5 100644 --- a/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/CloudSigma2ApiExpectTest.java +++ b/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/CloudSigma2ApiExpectTest.java @@ -17,6 +17,7 @@ package org.jclouds.cloudsigma2; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Maps; import org.jclouds.cloudsigma2.domain.AccountBalance; import org.jclouds.cloudsigma2.domain.CalcSubscription; import org.jclouds.cloudsigma2.domain.CreateSubscriptionRequest; @@ -55,7 +56,6 @@ import org.testng.annotations.Test; import javax.ws.rs.core.MediaType; import java.math.BigInteger; import java.util.Date; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -1093,7 +1093,7 @@ public class CloudSigma2ApiExpectTest extends BaseRestApiExpectTest<CloudSigma2A @Test public void testEditVLAN() throws Exception { String uuid = "96537817-f4b6-496b-a861-e74192d3ccb0"; - Map<String, String> meta = new HashMap<String, String>(); + Map<String, String> meta = Maps.newHashMap(); meta.put("description", "test vlan"); meta.put("test_key_1", "test_value_1"); meta.put("test_key_2", "test_value_2"); @@ -1209,7 +1209,7 @@ public class CloudSigma2ApiExpectTest extends BaseRestApiExpectTest<CloudSigma2A @Test public void testEditIP() throws Exception { String uuid = "96537817-f4b6-496b-a861-e74192d3ccb0"; - Map<String, String> meta = new HashMap<String, String>(); + Map<String, String> meta = Maps.newHashMap(); meta.put("description", "test vlan"); meta.put("test_key_1", "test_value_1"); meta.put("test_key_2", "test_value_2"); @@ -1447,7 +1447,7 @@ public class CloudSigma2ApiExpectTest extends BaseRestApiExpectTest<CloudSigma2A .payload(payloadFromResourceWithContentType("/profile.json", MediaType.APPLICATION_JSON)) .build()); - Map<String, String> meta = new HashMap<String, String>(); + Map<String, String> meta = Maps.newHashMap(); meta.put("description", "profile info"); ProfileInfo result = api.editProfileInfo(new ProfileInfo.Builder() http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f4c8656/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/CloudSigma2ApiLiveTest.java ---------------------------------------------------------------------- diff --git a/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/CloudSigma2ApiLiveTest.java b/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/CloudSigma2ApiLiveTest.java index 88475f3..8a93fce 100644 --- a/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/CloudSigma2ApiLiveTest.java +++ b/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/CloudSigma2ApiLiveTest.java @@ -19,6 +19,7 @@ package org.jclouds.cloudsigma2; import com.google.common.base.Function; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Maps; import org.jclouds.apis.BaseApiLiveTest; import org.jclouds.cloudsigma2.domain.CalcSubscription; import org.jclouds.cloudsigma2.domain.DeviceEmulationType; @@ -423,7 +424,7 @@ public class CloudSigma2ApiLiveTest extends BaseApiLiveTest<CloudSigma2Api> { @Test public void testEditVLAN() throws Exception { - Map<String, String> meta = new HashMap<String, String>(); + Map<String, String> meta = Maps.newHashMap(); meta.put("test", "test data"); VLANInfo vlanInfo = new VLANInfo.Builder() @@ -454,7 +455,7 @@ public class CloudSigma2ApiLiveTest extends BaseApiLiveTest<CloudSigma2Api> { @Test public void testEditIP() throws Exception { - Map<String, String> meta = new HashMap<String, String>(); + Map<String, String> meta = Maps.newHashMap(); meta.put("test", "test data"); IPInfo ip = new IPInfo.Builder() @@ -485,13 +486,13 @@ public class CloudSigma2ApiLiveTest extends BaseApiLiveTest<CloudSigma2Api> { @Test(dependsOnMethods = { "testEditDrive" }) public void testCreateTag() throws Exception { - Map<String, String> meta = new HashMap<String, String>(); + Map<String, String> meta = Maps.newHashMap(); meta.put("description", "Test tag"); Tag newTag = new Tag.Builder() .meta(meta) .name("Cloudsigma2 Test tag") - .meta(new HashMap<String, String>()) + .meta(Maps.<String, String>newHashMap()) .resources(ImmutableList.of( new TagResource.Builder() .uuid(createdDrive.getUuid()) @@ -506,9 +507,9 @@ public class CloudSigma2ApiLiveTest extends BaseApiLiveTest<CloudSigma2Api> { public void testCreateTags() throws Exception { List<Tag> newTagsList = ImmutableList.of( new Tag.Builder().name("Cloudsigma2 New tag " + System.currentTimeMillis()) - .meta(new HashMap<String, String>()).build(), + .meta(Maps.<String, String>newHashMap()).build(), new Tag.Builder().name("Cloudsigma2 tag with resource " + System.currentTimeMillis()) - .meta(new HashMap<String, String>()) + .meta(Maps.<String, String>newHashMap()) .resources(ImmutableList.of(new TagResource.Builder().uuid(createdDrive.getUuid()).build())).build()); createdTags = api.createTags(newTagsList); @@ -521,7 +522,7 @@ public class CloudSigma2ApiLiveTest extends BaseApiLiveTest<CloudSigma2Api> { @Test(dependsOnMethods = { "testCreateTag" }) public void testEditTag() throws Exception { - Map<String, String> meta = new HashMap<String, String>(); + Map<String, String> meta = Maps.newHashMap(); meta.put("description", "test tag"); Tag editedTag = new Tag.Builder().meta(meta).name("Edited tag") http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f4c8656/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/DriveToJsonTest.java ---------------------------------------------------------------------- diff --git a/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/DriveToJsonTest.java b/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/DriveToJsonTest.java index 03d5e6b..c47feb5 100644 --- a/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/DriveToJsonTest.java +++ b/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/DriveToJsonTest.java @@ -17,11 +17,17 @@ package org.jclouds.cloudsigma2.functions; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Maps; import com.google.gson.Gson; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.google.inject.Guice; -import org.jclouds.cloudsigma2.domain.*; +import org.jclouds.cloudsigma2.domain.DriveInfo; +import org.jclouds.cloudsigma2.domain.DriveLicense; +import org.jclouds.cloudsigma2.domain.DriveStatus; +import org.jclouds.cloudsigma2.domain.License; +import org.jclouds.cloudsigma2.domain.MediaType; +import org.jclouds.cloudsigma2.domain.Server; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -29,7 +35,6 @@ import org.testng.annotations.Test; import java.math.BigInteger; import java.net.URI; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -39,9 +44,9 @@ import java.util.Map; @Test(groups = "unit") public class DriveToJsonTest { - private final static DriveToJson DRIVE_TO_JSON = Guice.createInjector().getInstance(DriveToJson.class); + private static final DriveToJson DRIVE_TO_JSON = Guice.createInjector().getInstance(DriveToJson.class); - private final static JsonObject result = new JsonObject(); + private static final JsonObject result = new JsonObject(); private DriveInfo input; @BeforeMethod @@ -49,7 +54,7 @@ public class DriveToJsonTest { List<String> affinities = ImmutableList.of("ssd", "sample"); List<String> tags = ImmutableList.of("tag_uuid_1", "tag_uuid_2"); - Map<String, String> metaMap = new HashMap<String, String>(); + Map<String, String> metaMap = Maps.newHashMap(); metaMap.put("description", "test_description"); metaMap.put("install_notes", "test_install_notes"); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f4c8656/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/FirewallPolicyToJsonTest.java ---------------------------------------------------------------------- diff --git a/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/FirewallPolicyToJsonTest.java b/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/FirewallPolicyToJsonTest.java index f3a1074..e6de6c1 100644 --- a/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/FirewallPolicyToJsonTest.java +++ b/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/FirewallPolicyToJsonTest.java @@ -17,16 +17,20 @@ package org.jclouds.cloudsigma2.functions; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Maps; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.inject.Guice; -import org.jclouds.cloudsigma2.domain.*; +import org.jclouds.cloudsigma2.domain.FirewallAction; +import org.jclouds.cloudsigma2.domain.FirewallDirection; +import org.jclouds.cloudsigma2.domain.FirewallIpProtocol; +import org.jclouds.cloudsigma2.domain.FirewallPolicy; +import org.jclouds.cloudsigma2.domain.FirewallRule; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import java.net.URI; -import java.util.HashMap; import java.util.Map; /** @@ -35,7 +39,7 @@ import java.util.Map; @Test(groups = "unit") public class FirewallPolicyToJsonTest { - private final static FirewallPolicyToJson FIREWALL_POLICY_TO_JSON = Guice + private static final FirewallPolicyToJson FIREWALL_POLICY_TO_JSON = Guice .createInjector() .getInstance(FirewallPolicyToJson.class); @@ -44,7 +48,7 @@ public class FirewallPolicyToJsonTest { @BeforeMethod public void setUp() throws Exception { - Map<String, String> meta = new HashMap<String, String>(); + Map<String, String> meta = Maps.newHashMap(); meta.put("description", "test firewall policy"); meta.put("test_key_1", "test_value_1"); meta.put("test_key_2", "test_value_2"); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f4c8656/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/IPInfoToJsonTest.java ---------------------------------------------------------------------- diff --git a/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/IPInfoToJsonTest.java b/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/IPInfoToJsonTest.java index 8b78c5e..0244a3f 100644 --- a/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/IPInfoToJsonTest.java +++ b/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/IPInfoToJsonTest.java @@ -17,6 +17,7 @@ package org.jclouds.cloudsigma2.functions; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Maps; import com.google.gson.JsonObject; import com.google.inject.Guice; import org.jclouds.cloudsigma2.domain.IPInfo; @@ -29,7 +30,6 @@ import org.testng.annotations.Test; import java.net.URI; import java.util.ArrayList; -import java.util.HashMap; import java.util.Map; /** @@ -38,7 +38,7 @@ import java.util.Map; @Test(groups = "unit") public class IPInfoToJsonTest { - private final static IPInfoToJson IP_INFO_TO_JSON = Guice.createInjector().getInstance(IPInfoToJson.class); + private static final IPInfoToJson IP_INFO_TO_JSON = Guice.createInjector().getInstance(IPInfoToJson.class); private IPInfo input; private JsonObject expected; @@ -50,7 +50,7 @@ public class IPInfoToJsonTest { .uuid("5b4a69a3-8e78-4c45-a8ba-8b13f0895e23") .build(); - Map<String, String> meta = new HashMap<String, String>(); + Map<String, String> meta = Maps.newHashMap(); meta.put("description", "test ip"); meta.put("test_key_1", "test_value_1"); meta.put("test_key_2", "test_value_2"); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f4c8656/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/LibraryDriveToJsonTest.java ---------------------------------------------------------------------- diff --git a/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/LibraryDriveToJsonTest.java b/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/LibraryDriveToJsonTest.java index c25311d..4c1a68d 100644 --- a/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/LibraryDriveToJsonTest.java +++ b/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/LibraryDriveToJsonTest.java @@ -17,18 +17,22 @@ package org.jclouds.cloudsigma2.functions; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.inject.Guice; -import org.jclouds.cloudsigma2.domain.*; +import org.jclouds.cloudsigma2.domain.DriveLicense; +import org.jclouds.cloudsigma2.domain.DriveStatus; +import org.jclouds.cloudsigma2.domain.MediaType; +import org.jclouds.cloudsigma2.domain.LibraryDrive; +import org.jclouds.cloudsigma2.domain.Server; import org.testng.Assert; import org.testng.annotations.Test; import java.math.BigInteger; import java.net.URI; import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.HashMap; /** * @author Vladimir Shevchenko @@ -61,11 +65,11 @@ public class LibraryDriveToJsonTest { .isFavorite(true) .imageType("install") .installNotes("test_install_notes") - .jobs(new ArrayList<String>()) - .licenses(new ArrayList<DriveLicense>()) + .jobs(Lists.<String>newArrayList()) + .licenses(Lists.<DriveLicense>newArrayList()) .media(MediaType.CDROM) - .meta(new HashMap<String, String>()) - .mountedOn(new ArrayList<Server>()) + .meta(Maps.<String, String>newHashMap()) + .mountedOn(Lists.<Server>newArrayList()) .name("Vyatta-6.5-32bit-Virtualization-ISO") .os("linux") .owner(null) @@ -73,7 +77,7 @@ public class LibraryDriveToJsonTest { .resourceUri(new URI("/api/2.0/libdrives/6d53b92c-42dc-472b-a7b6-7021f45f377a/")) .size(new BigInteger("1000000000")) .status(DriveStatus.MOUNTED) - .tags(new ArrayList<String>()) + .tags(Lists.<String>newArrayList()) .url("http://www.vyatta.org/";) .uuid("6d53b92c-42dc-472b-a7b6-7021f45f377a") .build(); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f4c8656/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/ProfileInfoToJsonTest.java ---------------------------------------------------------------------- diff --git a/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/ProfileInfoToJsonTest.java b/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/ProfileInfoToJsonTest.java index 4e769f0..c2c52d9 100644 --- a/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/ProfileInfoToJsonTest.java +++ b/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/ProfileInfoToJsonTest.java @@ -16,6 +16,7 @@ */ package org.jclouds.cloudsigma2.functions; +import com.google.common.collect.Maps; import com.google.gson.JsonObject; import com.google.inject.Guice; import org.jclouds.cloudsigma2.domain.ProfileInfo; @@ -24,7 +25,6 @@ import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.util.HashMap; import java.util.Map; /** @@ -40,7 +40,7 @@ public class ProfileInfoToJsonTest { @BeforeMethod public void setUp() throws Exception { - Map<String, String> meta = new HashMap<String, String>(); + Map<String, String> meta = Maps.newHashMap(); meta.put("description", "profile info"); input = new ProfileInfo.Builder() http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f4c8656/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/ServerInfoToJsonTest.java ---------------------------------------------------------------------- diff --git a/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/ServerInfoToJsonTest.java b/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/ServerInfoToJsonTest.java index c1453fe..281e951 100644 --- a/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/ServerInfoToJsonTest.java +++ b/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/ServerInfoToJsonTest.java @@ -17,11 +17,21 @@ package org.jclouds.cloudsigma2.functions; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Maps; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; import com.google.inject.Guice; -import org.jclouds.cloudsigma2.domain.*; +import org.jclouds.cloudsigma2.domain.DeviceEmulationType; +import org.jclouds.cloudsigma2.domain.Drive; +import org.jclouds.cloudsigma2.domain.IPConfiguration; +import org.jclouds.cloudsigma2.domain.IPConfigurationType; +import org.jclouds.cloudsigma2.domain.Model; +import org.jclouds.cloudsigma2.domain.NIC; +import org.jclouds.cloudsigma2.domain.Owner; +import org.jclouds.cloudsigma2.domain.ServerDrive; +import org.jclouds.cloudsigma2.domain.ServerInfo; +import org.jclouds.cloudsigma2.domain.ServerStatus; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -29,7 +39,6 @@ import org.testng.annotations.Test; import java.math.BigInteger; import java.net.URI; import java.util.ArrayList; -import java.util.HashMap; import java.util.Map; /** @@ -38,7 +47,7 @@ import java.util.Map; @Test(groups = "unit") public class ServerInfoToJsonTest { - private final static ServerInfoToJson SERVER_INFO_TO_JSON = Guice.createInjector().getInstance(ServerInfoToJson.class); + private static final ServerInfoToJson SERVER_INFO_TO_JSON = Guice.createInjector().getInstance(ServerInfoToJson.class); private ServerInfo input; private JsonObject expected = new JsonObject(); @@ -50,7 +59,7 @@ public class ServerInfoToJsonTest { .uuid("5b4a69a3-8e78-4c45-a8ba-8b13f0895e23") .build(); - Map<String, String> meta = new HashMap<String, String>(); + Map<String, String> meta = Maps.newHashMap(); meta.put("description", "A full server with description"); input = new ServerInfo.Builder() http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f4c8656/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/TagToJsonTest.java ---------------------------------------------------------------------- diff --git a/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/TagToJsonTest.java b/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/TagToJsonTest.java index 91d315f..2148d13 100644 --- a/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/TagToJsonTest.java +++ b/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/TagToJsonTest.java @@ -17,6 +17,7 @@ package org.jclouds.cloudsigma2.functions; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Maps; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; @@ -30,7 +31,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import java.net.URI; -import java.util.HashMap; import java.util.Map; /** @@ -51,7 +51,7 @@ public class TagToJsonTest { .uuid("5b4a69a3-8e78-4c45-a8ba-8b13f0895e23") .build(); - Map<String, String> meta = new HashMap<String, String>(); + Map<String, String> meta = Maps.newHashMap(); meta.put("description", "test tag"); input = new Tag.Builder() http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f4c8656/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/VLANInfoToJsonTest.java ---------------------------------------------------------------------- diff --git a/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/VLANInfoToJsonTest.java b/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/VLANInfoToJsonTest.java index 3aab795..0108f1b 100644 --- a/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/VLANInfoToJsonTest.java +++ b/cloudsigma2/src/test/java/org/jclouds/cloudsigma2/functions/VLANInfoToJsonTest.java @@ -17,6 +17,7 @@ package org.jclouds.cloudsigma2.functions; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Maps; import com.google.gson.Gson; import com.google.gson.JsonObject; import com.google.gson.JsonParser; @@ -31,7 +32,6 @@ import org.testng.annotations.Test; import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; -import java.util.HashMap; import java.util.Map; /** @@ -46,7 +46,7 @@ public class VLANInfoToJsonTest { private JsonObject expected; { - Map<String, String> meta = new HashMap<String, String>(); + Map<String, String> meta = Maps.newHashMap(); meta.put("description", "test vlan"); meta.put("test_key_1", "test_value_1"); meta.put("test_key_2", "test_value_2"); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f4c8656/jclouds-management/management-core/src/test/java/org/jclouds/management/config/ManagementLifecycleTest.java ---------------------------------------------------------------------- diff --git a/jclouds-management/management-core/src/test/java/org/jclouds/management/config/ManagementLifecycleTest.java b/jclouds-management/management-core/src/test/java/org/jclouds/management/config/ManagementLifecycleTest.java index 68baa5f..a747c61 100644 --- a/jclouds-management/management-core/src/test/java/org/jclouds/management/config/ManagementLifecycleTest.java +++ b/jclouds-management/management-core/src/test/java/org/jclouds/management/config/ManagementLifecycleTest.java @@ -26,7 +26,12 @@ import org.jclouds.management.internal.BaseManagementContext; import org.jclouds.providers.JcloudsTestComputeProviderMetadata; import org.testng.annotations.Test; -import static org.easymock.EasyMock.*; +import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.eq; +import static org.easymock.EasyMock.expectLastCall; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; @Test(groups = "unit", testName = "ManagementLifecycleTest") public class ManagementLifecycleTest { http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f4c8656/jclouds-management/management-core/src/test/java/org/jclouds/management/internal/ManagementUtilsTest.java ---------------------------------------------------------------------- diff --git a/jclouds-management/management-core/src/test/java/org/jclouds/management/internal/ManagementUtilsTest.java b/jclouds-management/management-core/src/test/java/org/jclouds/management/internal/ManagementUtilsTest.java index 25a6c9a..9953832 100644 --- a/jclouds-management/management-core/src/test/java/org/jclouds/management/internal/ManagementUtilsTest.java +++ b/jclouds-management/management-core/src/test/java/org/jclouds/management/internal/ManagementUtilsTest.java @@ -23,7 +23,13 @@ import javax.management.MBeanServer; import javax.management.ObjectInstance; import javax.management.ObjectName; -import static org.easymock.EasyMock.*; +import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.eq; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.expectLastCall; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; @Test(groups = "unit", testName = "ManagementUtilsTest") http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f4c8656/vcloud-director/src/test/java/org/jclouds/vcloud/director/testng/FormatApiResultsListener.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/testng/FormatApiResultsListener.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/testng/FormatApiResultsListener.java index 33e6fd3..f066ed0 100644 --- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/testng/FormatApiResultsListener.java +++ b/vcloud-director/src/test/java/org/jclouds/vcloud/director/testng/FormatApiResultsListener.java @@ -47,7 +47,7 @@ public class FormatApiResultsListener extends TestListenerAdapter { private static final Set<String> apis = ImmutableSet.of("admin", "user"); @Override - synchronized public void onTestSuccess(ITestResult res) { + public synchronized void onTestSuccess(ITestResult res) { if (methodInApiGroup(res)) { String statusLine = resultForState(res, "succeeded"); logger.info(statusLine); @@ -55,7 +55,7 @@ public class FormatApiResultsListener extends TestListenerAdapter { } @Override - synchronized public void onTestFailure(ITestResult res) { + public synchronized void onTestFailure(ITestResult res) { if (methodInApiGroup(res)) { String statusLine = resultForState(res, "failed"); logger.info(statusLine); @@ -63,7 +63,7 @@ public class FormatApiResultsListener extends TestListenerAdapter { } @Override - synchronized public void onTestSkipped(ITestResult res) { + public synchronized void onTestSkipped(ITestResult res) { if (methodInApiGroup(res)) { String statusLine = resultForState(res, "skipped"); logger.info(statusLine); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f4c8656/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaApiLiveTest.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaApiLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaApiLiveTest.java index 6910d0a..481dbf6 100644 --- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaApiLiveTest.java +++ b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaApiLiveTest.java @@ -87,7 +87,8 @@ public class MediaApiLiveTest extends BaseVCloudDirectorApiLiveTest { /* * Shared state between dependent tests. */ - private Media media, oldMedia; + private Media media; + private Media oldMedia; private Owner owner; private Metadata metadata; private String metadataValue; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f4c8656/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupApiLiveTest.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupApiLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupApiLiveTest.java index 0f9c246..b342385 100644 --- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupApiLiveTest.java +++ b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupApiLiveTest.java @@ -49,7 +49,8 @@ public class GroupApiLiveTest extends BaseVCloudDirectorApiLiveTest { * Shared state between dependant tests. */ private Group group; - private OrgLdapSettings oldLdapSettings, newLdapSettings; + private OrgLdapSettings oldLdapSettings; + private OrgLdapSettings newLdapSettings; @Override @BeforeClass(alwaysRun = true) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f4c8656/virtualbox/src/test/java/org/jclouds/virtualbox/compute/VirtualBoxExperimentLiveTest.java ---------------------------------------------------------------------- diff --git a/virtualbox/src/test/java/org/jclouds/virtualbox/compute/VirtualBoxExperimentLiveTest.java b/virtualbox/src/test/java/org/jclouds/virtualbox/compute/VirtualBoxExperimentLiveTest.java index 76e0322..f6c7616 100644 --- a/virtualbox/src/test/java/org/jclouds/virtualbox/compute/VirtualBoxExperimentLiveTest.java +++ b/virtualbox/src/test/java/org/jclouds/virtualbox/compute/VirtualBoxExperimentLiveTest.java @@ -87,4 +87,4 @@ public class VirtualBoxExperimentLiveTest extends BaseVirtualBoxClientLiveTest { }); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f4c8656/virtualbox/src/test/java/org/jclouds/virtualbox/functions/AttachNATAdapterToMachineIfNotAlreadyExistsTest.java ---------------------------------------------------------------------- diff --git a/virtualbox/src/test/java/org/jclouds/virtualbox/functions/AttachNATAdapterToMachineIfNotAlreadyExistsTest.java b/virtualbox/src/test/java/org/jclouds/virtualbox/functions/AttachNATAdapterToMachineIfNotAlreadyExistsTest.java index 4404863..ad2ba3a 100644 --- a/virtualbox/src/test/java/org/jclouds/virtualbox/functions/AttachNATAdapterToMachineIfNotAlreadyExistsTest.java +++ b/virtualbox/src/test/java/org/jclouds/virtualbox/functions/AttachNATAdapterToMachineIfNotAlreadyExistsTest.java @@ -25,9 +25,10 @@ import static org.easymock.EasyMock.verify; import static org.virtualbox_4_2.NATProtocol.TCP; import static org.virtualbox_4_2.NetworkAttachmentType.NAT; -import java.util.ArrayList; import java.util.List; +import com.google.common.collect.Lists; + import org.jclouds.virtualbox.domain.NetworkAdapter; import org.jclouds.virtualbox.domain.NetworkInterfaceCard; import org.testng.annotations.Test; @@ -54,7 +55,7 @@ public class AttachNATAdapterToMachineIfNotAlreadyExistsTest { iNetworkAdapter.setAttachmentType(NAT); expect(iNetworkAdapter.getNATEngine()).andReturn(natEngine).anyTimes(); - List<String> redirects = new ArrayList<String>(); + List<String> redirects = Lists.newArrayList(); expect(natEngine.getRedirects()).andReturn(redirects); natEngine.addRedirect("[email protected]:2222->:22", TCP, "127.0.0.1", 2222, "", 22); @@ -85,7 +86,7 @@ public class AttachNATAdapterToMachineIfNotAlreadyExistsTest { iNetworkAdapter.setAttachmentType(NAT); expect(iNetworkAdapter.getNATEngine()).andReturn(natEngine).anyTimes(); - List<String> redirects = new ArrayList<String>(); + List<String> redirects = Lists.newArrayList(); expect(natEngine.getRedirects()).andReturn(redirects); natEngine.addRedirect("[email protected]:2222->:22", TCP, "127.0.0.1", http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f4c8656/virtualbox/src/test/java/org/jclouds/virtualbox/functions/admin/ImageFromYamlStringTest.java ---------------------------------------------------------------------- diff --git a/virtualbox/src/test/java/org/jclouds/virtualbox/functions/admin/ImageFromYamlStringTest.java b/virtualbox/src/test/java/org/jclouds/virtualbox/functions/admin/ImageFromYamlStringTest.java index b7774b3..f00f685 100644 --- a/virtualbox/src/test/java/org/jclouds/virtualbox/functions/admin/ImageFromYamlStringTest.java +++ b/virtualbox/src/test/java/org/jclouds/virtualbox/functions/admin/ImageFromYamlStringTest.java @@ -57,4 +57,4 @@ public class ImageFromYamlStringTest { public void testNodesParse() { assertEquals(Iterables.getFirst(images.keySet(), null), TEST1); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/1f4c8656/virtualbox/src/test/java/org/jclouds/virtualbox/statements/InstallGuestAdditionsTest.java ---------------------------------------------------------------------- diff --git a/virtualbox/src/test/java/org/jclouds/virtualbox/statements/InstallGuestAdditionsTest.java b/virtualbox/src/test/java/org/jclouds/virtualbox/statements/InstallGuestAdditionsTest.java index e15352f..62a97c4 100644 --- a/virtualbox/src/test/java/org/jclouds/virtualbox/statements/InstallGuestAdditionsTest.java +++ b/virtualbox/src/test/java/org/jclouds/virtualbox/statements/InstallGuestAdditionsTest.java @@ -27,7 +27,7 @@ import org.virtualbox_4_2.StorageBus; public class InstallGuestAdditionsTest { - private final static String VBOX_VERISION = "4.2.0"; + private static final String VBOX_VERISION = "4.2.0"; @Test public void testInstallGAWhenIsoIsPresent() {
