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

Removed use of diamond operator in tests.

This commit is contained in:
Adrian Cole 2014-10-25 13:50:06 -07:00 committed by Adrian Cole
parent bec0a921da
commit d30f354150
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApiLiveTest.java
View File

@ -24,7 +24,6 @@ import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull; import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue; import static org.testng.Assert.assertTrue;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.jclouds.logging.Logger; import org.jclouds.logging.Logger;
@ -54,17 +53,15 @@ import org.testng.annotations.Test;
import com.google.common.base.Optional; import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
/**
* Tests parsing and Guice wiring of RouterApi
*/
@Test(groups = "live", testName = "LBaaSApiLiveTest") @Test(groups = "live", testName = "LBaaSApiLiveTest")
public class LBaaSApiLiveTest extends BaseNeutronApiLiveTest { public class LBaaSApiLiveTest extends BaseNeutronApiLiveTest {
private Logger logger = getLoggingModule().createLoggerFactory().getLogger(LBaaSApiLiveTest.class.getName()); private Logger logger = getLoggingModule().createLoggerFactory().getLogger(LBaaSApiLiveTest.class.getName());
private Map<String, Network> networks; private Map<String, Network> networks = Maps.newLinkedHashMap();
private Map<String, Subnet> subnets; private Map<String, Subnet> subnets = Maps.newLinkedHashMap();
public void testLBaaSPresence() throws Exception { public void testLBaaSPresence() throws Exception {
for (String region : api.getConfiguredRegions()) { for (String region : api.getConfiguredRegions()) {
@ -84,8 +81,6 @@ public class LBaaSApiLiveTest extends BaseNeutronApiLiveTest {
@BeforeClass @BeforeClass
public void createSubnets() { public void createSubnets() {
networks = new HashMap<>();
subnets = new HashMap<>();
for (String region : api.getConfiguredRegions()) { for (String region : api.getConfiguredRegions()) {
Optional<LBaaSApi> lbaasApiExtension = api.getLBaaSApi(region); Optional<LBaaSApi> lbaasApiExtension = api.getLBaaSApi(region);
if (!lbaasApiExtension.isPresent()) { if (!lbaasApiExtension.isPresent()) {
@ -122,8 +117,6 @@ public class LBaaSApiLiveTest extends BaseNeutronApiLiveTest {
} }
} }
} }
networks = null;
subnets = null;
} }
public void testCreateUpdateAndDeletePool() { public void testCreateUpdateAndDeletePool() {