mirror of https://github.com/apache/jclouds.git
Removed use of diamond operator in tests.
This commit is contained in:
parent
bec0a921da
commit
d30f354150
|
@ -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() {
|
||||
|
|
Loading…
Reference in New Issue