From 56c586bdf3987740f1a76140a603af8bb1c042db Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Sat, 25 Oct 2014 13:50:06 -0700 Subject: [PATCH] Removed use of diamond operator in tests. --- .../v2/extensions/lbaas/v1/LBaaSApiLiveTest.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApiLiveTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApiLiveTest.java index 64275e0..5d83d25 100644 --- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApiLiveTest.java +++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApiLiveTest.java @@ -24,7 +24,6 @@ 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 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 networks; - private Map subnets; + private Map networks = Maps.newLinkedHashMap(); + private Map subnets = Maps.newLinkedHashMap(); public void testLBaaSPresence() throws Exception { for (String region : api.getConfiguredRegions()) { @@ -84,8 +81,6 @@ public void testLBaaSPresence() throws Exception { @BeforeClass public void createSubnets() { - networks = new HashMap<>(); - subnets = new HashMap<>(); for (String region : api.getConfiguredRegions()) { Optional lbaasApiExtension = api.getLBaaSApi(region); if (!lbaasApiExtension.isPresent()) { @@ -122,8 +117,6 @@ public void deleteSubnets() { } } } - networks = null; - subnets = null; } public void testCreateUpdateAndDeletePool() {