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

Fixup session and login live testing

This commit is contained in:
Andrew Donald Kennedy 2012-04-16 16:23:08 +01:00
parent 27fb042c11
commit d7bf98017b
2 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/HttpClientLiveTest.java
View File

@ -32,7 +32,6 @@ import org.jclouds.http.HttpResponse;
import org.jclouds.util.Strings2; import org.jclouds.util.Strings2;
import org.jclouds.vcloud.director.v1_5.domain.SessionWithToken; import org.jclouds.vcloud.director.v1_5.domain.SessionWithToken;
import org.jclouds.vcloud.director.v1_5.domain.org.OrgList; import org.jclouds.vcloud.director.v1_5.domain.org.OrgList;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminCatalogClient;
import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorClientLiveTest; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorClientLiveTest;
import org.jclouds.xml.internal.JAXBParser; import org.jclouds.xml.internal.JAXBParser;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -41,7 +40,7 @@ import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
/** /**
* Tests live behavior of {@link AdminCatalogClient}. * Tests live behavior of operations that use {@link HttpClient}.
* *
* @author danikov * @author danikov
*/ */

29
labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/login/SessionClientLiveTest.java
View File

@ -23,9 +23,7 @@ import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue; import static org.testng.Assert.assertTrue;
import java.net.URI; import java.net.URI;
import java.util.Properties;
import org.jclouds.Constants;
import org.jclouds.apis.ApiMetadata; import org.jclouds.apis.ApiMetadata;
import org.jclouds.apis.BaseContextLiveTest; import org.jclouds.apis.BaseContextLiveTest;
import org.jclouds.rest.AnonymousRestApiMetadata; import org.jclouds.rest.AnonymousRestApiMetadata;
@ -39,18 +37,20 @@ import org.testng.annotations.Test;
import com.google.common.reflect.TypeToken; import com.google.common.reflect.TypeToken;
/** /**
* Tests behavior of {@code SessionClient}. Note this class is tested completely independently of * Tests behavior of {@link SessionClient}. Note this class is tested completely independently of
* VCloudClient as it is a dependency of the VCloud context working. * {@link VCloudDirectorClient} as it is a dependency of the {@code vcloud-director} context working.
* *
* @author Adrian Cole * @author Adrian Cole
*/ */
@Listeners(FormatApiResultsListener.class) @Listeners(FormatApiResultsListener.class)
@Test(groups = { "live", "user", "login" }, testName = "SessionClientLiveTest") @Test(groups = { "live", "user" }, testName = "SessionClientLiveTest")
public class SessionClientLiveTest extends BaseContextLiveTest<RestContext<SessionClient, SessionAsyncClient>> { public class SessionClientLiveTest extends BaseContextLiveTest<RestContext<SessionClient, SessionAsyncClient>> {
public SessionClientLiveTest() { public SessionClientLiveTest() {
provider = "vcloud-director"; provider = "vcloud-director";
} }
@Override
@BeforeGroups(groups = { "live" }) @BeforeGroups(groups = { "live" })
public void setupContext() { public void setupContext() {
super.setupContext(); super.setupContext();
@ -61,25 +61,6 @@ public class SessionClientLiveTest extends BaseContextLiveTest<RestContext<Sessi
private SessionClient client; private SessionClient client;
private SessionWithToken sessionWithToken; private SessionWithToken sessionWithToken;
//temporary until we marry up the test fixtures
protected String identity;
protected String credential;
protected String endpoint;
@Override
protected Properties setupProperties() {
Properties overrides = new Properties();
overrides.setProperty(Constants.PROPERTY_TRUST_ALL_CERTS, "true");
overrides.setProperty(Constants.PROPERTY_RELAX_HOSTNAME, "true");
identity = setIfTestSystemPropertyPresent(overrides, provider + ".identity");
credential = setIfTestSystemPropertyPresent(overrides, provider + ".credential");
endpoint = setIfTestSystemPropertyPresent(overrides, provider + ".endpoint");
setIfTestSystemPropertyPresent(overrides, provider + ".api-version");
setIfTestSystemPropertyPresent(overrides, provider + ".build-version");
return overrides;
}
@Test(testName = "POST /sessions") @Test(testName = "POST /sessions")
public void testLogin() { public void testLogin() {
String user = identity.substring(0, identity.lastIndexOf('@')); String user = identity.substring(0, identity.lastIndexOf('@'));