Removed use of diamond operator in tests.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/d30f3541 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/d30f3541 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/d30f3541 Branch: refs/heads/master Commit: d30f3541508b71e472358622e331bcf09c9e8a69 Parents: bec0a92 Author: Adrian Cole <[email protected]> Authored: Sat Oct 25 13:50:06 2014 -0700 Committer: Adrian Cole <[email protected]> Committed: Sat Oct 25 14:18:29 2014 -0700 ---------------------------------------------------------------------- .../v2/extensions/lbaas/v1/LBaaSApiLiveTest.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/d30f3541/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApiLiveTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApiLiveTest.java b/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApiLiveTest.java index 64275e0..5d83d25 100644 --- a/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApiLiveTest.java +++ b/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApiLiveTest.java @@ -24,7 +24,6 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; -import java.util.HashMap; import java.util.Map; import org.jclouds.logging.Logger; @@ -54,17 +53,15 @@ import org.testng.annotations.Test; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; -/** - * Tests parsing and Guice wiring of RouterApi - */ @Test(groups = "live", testName = "LBaaSApiLiveTest") public class LBaaSApiLiveTest extends BaseNeutronApiLiveTest { private Logger logger = getLoggingModule().createLoggerFactory().getLogger(LBaaSApiLiveTest.class.getName()); - private Map<String, Network> networks; - private Map<String, Subnet> subnets; + private Map<String, Network> networks = Maps.newLinkedHashMap(); + private Map<String, Subnet> subnets = Maps.newLinkedHashMap(); public void testLBaaSPresence() throws Exception { for (String region : api.getConfiguredRegions()) { @@ -84,8 +81,6 @@ public class LBaaSApiLiveTest extends BaseNeutronApiLiveTest { @BeforeClass public void createSubnets() { - networks = new HashMap<>(); - subnets = new HashMap<>(); for (String region : api.getConfiguredRegions()) { Optional<LBaaSApi> lbaasApiExtension = api.getLBaaSApi(region); if (!lbaasApiExtension.isPresent()) { @@ -122,8 +117,6 @@ public class LBaaSApiLiveTest extends BaseNeutronApiLiveTest { } } } - networks = null; - subnets = null; } public void testCreateUpdateAndDeletePool() {
