Repository: jclouds
Updated Branches:
refs/heads/1.9.x 6c94f3eb9 -> 1a27a619d
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
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/1a27a619
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/1a27a619
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/1a27a619
Branch: refs/heads/1.9.x
Commit: 1a27a619d22b3bf23b2184258162a5d99c2a8c51
Parents: 6c94f3e
Author: Zack Shoylev <[email protected]>
Authored: Tue Jul 28 09:49:58 2015 -0500
Committer: Zack Shoylev <[email protected]>
Committed: Tue Jul 28 12:10:00 2015 -0500
----------------------------------------------------------------------
.../v2_0/functions/InternalURLLiveTest.java | 127 ++++++++++---------
1 file changed, 64 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/1a27a619/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/functions/InternalURLLiveTest.java
----------------------------------------------------------------------
diff --git
a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/functions/InternalURLLiveTest.java
b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/functions/InternalURLLiveTest.java
index 7886d7e..602831c 100644
---
a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/functions/InternalURLLiveTest.java
+++
b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/functions/InternalURLLiveTest.java
@@ -1,63 +1,64 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * 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 obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.openstack.nova.v2_0.functions;
-
-import static org.jclouds.Constants.PROPERTY_CONNECTION_TIMEOUT;
-
-import java.util.Properties;
-
-import org.jclouds.openstack.nova.v2_0.internal.BaseNovaApiLiveTest;
-import org.jclouds.openstack.v2_0.config.InternalUrlModule;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Module;
-
-/**
- * Simple live test to check the correct loading of the internal endpoint
- * services.
- *
- *
- */
-@Test(groups = "live", testName = "InternalURLLiveTest")
-public class InternalURLLiveTest extends BaseNovaApiLiveTest {
-
- @Test(description = "InternalUrl service endpoints loader")
- public void testGetInternalUrlServiceEndpoint() throws Exception {
- String region = api.getConfiguredRegions().iterator().next();
- // List current servers to ensure that can reach nova with internalUrl ip
- try {
- api.getServerApi(region).list().concat().toList();
- } catch (Exception e) {
- Assert.fail("Could not retrieve servers list using the internalUrl",
e);
- }
- }
-
- @Override
- protected Properties setupProperties() {
- Properties properties = super.setupProperties();
- properties.setProperty(PROPERTY_CONNECTION_TIMEOUT, "5000");
- return properties;
- }
-
- @Override
- protected Iterable<Module> setupModules() {
- return ImmutableSet.<Module> of(getLoggingModule(), new
InternalUrlModule());
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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 obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jclouds.openstack.nova.v2_0.functions;
+
+import static org.jclouds.Constants.PROPERTY_CONNECTION_TIMEOUT;
+import static org.testng.Assert.assertNotNull;
+
+import java.util.Properties;
+
+import org.jclouds.openstack.nova.v2_0.internal.BaseNovaApiLiveTest;
+import org.jclouds.openstack.v2_0.config.InternalUrlModule;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Module;
+
+/**
+ * Simple live test to check the correct loading of the internal endpoint
+ * services.
+ *
+ *
+ */
+@Test(groups = "live", testName = "InternalURLLiveTest")
+public class InternalURLLiveTest extends BaseNovaApiLiveTest {
+
+ @Test(description = "InternalUrl service endpoints loader")
+ public void testGetInternalUrlServiceEndpoint() throws Exception {
+ String region = api.getConfiguredRegions().iterator().next();
+ // List current servers to ensure that can reach nova with internalUrl ip
+ try {
+ assertNotNull(api.getServerApi(region).list().concat().toList());
+ } catch (Exception e) {
+ Assert.fail("Could not retrieve servers list using the internalUrl",
e);
+ }
+ }
+
+ @Override
+ protected Properties setupProperties() {
+ Properties properties = super.setupProperties();
+ properties.setProperty(PROPERTY_CONNECTION_TIMEOUT, "5000");
+ return properties;
+ }
+
+ @Override
+ protected Iterable<Module> setupModules() {
+ return ImmutableSet.<Module> of(getLoggingModule(), new
InternalUrlModule());
+ }
+
+}
