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

Fixes an error caused by not using an assert by @CheckReturnValue. Also see jsr305 

Conflicts:
	apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/functions/InternalURLLiveTest.java
This commit is contained in:
Zack Shoylev 2015-07-28 09:49:58 -05:00
parent 6c94f3eb9e
commit 1a27a619d2
1 changed files with 64 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/functions/InternalURLLiveTest.java
View File

@ -1,63 +1,64 @@
/* /*
* Licensed to the Apache Software Foundation (ASF) under one or more * Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with * contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. * this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0 * The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with * (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at * the License. You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.jclouds.openstack.nova.v2_0.functions; package org.jclouds.openstack.nova.v2_0.functions;
import static org.jclouds.Constants.PROPERTY_CONNECTION_TIMEOUT; import static org.jclouds.Constants.PROPERTY_CONNECTION_TIMEOUT;
import static org.testng.Assert.assertNotNull;
import java.util.Properties;
import java.util.Properties;
import org.jclouds.openstack.nova.v2_0.internal.BaseNovaApiLiveTest;
import org.jclouds.openstack.v2_0.config.InternalUrlModule; import org.jclouds.openstack.nova.v2_0.internal.BaseNovaApiLiveTest;
import org.testng.Assert; import org.jclouds.openstack.v2_0.config.InternalUrlModule;
import org.testng.annotations.Test; import org.testng.Assert;
import org.testng.annotations.Test;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module; import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
/**
* Simple live test to check the correct loading of the internal endpoint /**
* services. * Simple live test to check the correct loading of the internal endpoint
* * services.
* *
*/ *
@Test(groups = "live", testName = "InternalURLLiveTest") */
public class InternalURLLiveTest extends BaseNovaApiLiveTest { @Test(groups = "live", testName = "InternalURLLiveTest")
public class InternalURLLiveTest extends BaseNovaApiLiveTest {
@Test(description = "InternalUrl service endpoints loader")
public void testGetInternalUrlServiceEndpoint() throws Exception { @Test(description = "InternalUrl service endpoints loader")
String region = api.getConfiguredRegions().iterator().next(); public void testGetInternalUrlServiceEndpoint() throws Exception {
// List current servers to ensure that can reach nova with internalUrl ip String region = api.getConfiguredRegions().iterator().next();
try { // List current servers to ensure that can reach nova with internalUrl ip
api.getServerApi(region).list().concat().toList(); try {
} catch (Exception e) { assertNotNull(api.getServerApi(region).list().concat().toList());
Assert.fail("Could not retrieve servers list using the internalUrl", e); } catch (Exception e) {
} Assert.fail("Could not retrieve servers list using the internalUrl", e);
} }
}
@Override
protected Properties setupProperties() { @Override
Properties properties = super.setupProperties(); protected Properties setupProperties() {
properties.setProperty(PROPERTY_CONNECTION_TIMEOUT, "5000"); Properties properties = super.setupProperties();
return properties; properties.setProperty(PROPERTY_CONNECTION_TIMEOUT, "5000");
} return properties;
}
@Override
protected Iterable<Module> setupModules() { @Override
return ImmutableSet.<Module> of(getLoggingModule(), new InternalUrlModule()); protected Iterable<Module> setupModules() {
} return ImmutableSet.<Module> of(getLoggingModule(), new InternalUrlModule());
}
}
}