mirror of https://github.com/apache/jclouds.git
normalized overrides on test setup
This commit is contained in:
parent
9da3336290
commit
d820e4fab8
|
@ -22,6 +22,7 @@ import static org.testng.Assert.assertEquals;
|
||||||
|
|
||||||
import org.jclouds.vcloud.director.v1_5.domain.Session;
|
import org.jclouds.vcloud.director.v1_5.domain.Session;
|
||||||
import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorClientLiveTest;
|
import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorClientLiveTest;
|
||||||
|
import org.testng.annotations.BeforeClass;
|
||||||
import org.testng.annotations.Test;
|
import org.testng.annotations.Test;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -42,6 +43,7 @@ public class VCloudDirectorClientExperimentLiveTest extends BaseVCloudDirectorCl
|
||||||
* @see BaseVCloudDirectorClientLiveTest#setupRequiredClients()
|
* @see BaseVCloudDirectorClientLiveTest#setupRequiredClients()
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
|
@BeforeClass(inheritGroups = true)
|
||||||
public void setupRequiredClients() { }
|
public void setupRequiredClients() { }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -66,6 +66,7 @@ public class AdminCatalogClientLiveTest extends BaseVCloudDirectorClientLiveTest
|
||||||
private AdminCatalog catalog;
|
private AdminCatalog catalog;
|
||||||
private Owner owner;
|
private Owner owner;
|
||||||
|
|
||||||
|
@Override
|
||||||
@BeforeClass(inheritGroups = true)
|
@BeforeClass(inheritGroups = true)
|
||||||
public void setupRequiredClients() {
|
public void setupRequiredClients() {
|
||||||
catalogClient = context.getApi().getAdminCatalogClient();
|
catalogClient = context.getApi().getAdminCatalogClient();
|
||||||
|
|
|
@ -49,6 +49,7 @@ public class AdminOrgClientLiveTest extends BaseVCloudDirectorClientLiveTest {
|
||||||
private ReferenceType<?> orgRef;
|
private ReferenceType<?> orgRef;
|
||||||
private AdminOrg org;
|
private AdminOrg org;
|
||||||
|
|
||||||
|
@Override
|
||||||
@BeforeClass(inheritGroups = true)
|
@BeforeClass(inheritGroups = true)
|
||||||
public void setupRequiredClients() {
|
public void setupRequiredClients() {
|
||||||
orgClient = context.getApi().getAdminOrgClient();
|
orgClient = context.getApi().getAdminOrgClient();
|
||||||
|
|
|
@ -79,6 +79,7 @@ public class CatalogClientLiveTest extends BaseVCloudDirectorClientLiveTest {
|
||||||
private CatalogItem newCatalogItem;
|
private CatalogItem newCatalogItem;
|
||||||
private Metadata catalogMetadata;
|
private Metadata catalogMetadata;
|
||||||
|
|
||||||
|
@Override
|
||||||
@BeforeClass(inheritGroups = true)
|
@BeforeClass(inheritGroups = true)
|
||||||
public void setupRequiredClients() {
|
public void setupRequiredClients() {
|
||||||
catalogClient = context.getApi().getCatalogClient();
|
catalogClient = context.getApi().getCatalogClient();
|
||||||
|
|
|
@ -62,6 +62,7 @@ public class GroupClientLiveTest extends BaseVCloudDirectorClientLiveTest {
|
||||||
private ReferenceType<?> groupRef;
|
private ReferenceType<?> groupRef;
|
||||||
private Group group;
|
private Group group;
|
||||||
|
|
||||||
|
@Override
|
||||||
@BeforeClass(inheritGroups = true)
|
@BeforeClass(inheritGroups = true)
|
||||||
public void setupRequiredClients() {
|
public void setupRequiredClients() {
|
||||||
groupClient = context.getApi().getGroupClient();
|
groupClient = context.getApi().getGroupClient();
|
||||||
|
|
|
@ -86,8 +86,8 @@ public class MediaClientLiveTest extends BaseVCloudDirectorClientLiveTest {
|
||||||
protected VdcClient vdcClient;
|
protected VdcClient vdcClient;
|
||||||
protected MediaClient mediaClient;
|
protected MediaClient mediaClient;
|
||||||
|
|
||||||
@BeforeClass(inheritGroups = true)
|
|
||||||
@Override
|
@Override
|
||||||
|
@BeforeClass(inheritGroups = true)
|
||||||
public void setupRequiredClients() {
|
public void setupRequiredClients() {
|
||||||
vdcClient = context.getApi().getVdcClient();
|
vdcClient = context.getApi().getVdcClient();
|
||||||
mediaClient = context.getApi().getMediaClient();
|
mediaClient = context.getApi().getMediaClient();
|
||||||
|
|
|
@ -57,8 +57,8 @@ public class NetworkClientLiveTest extends BaseVCloudDirectorClientLiveTest {
|
||||||
*/
|
*/
|
||||||
protected NetworkClient networkClient;
|
protected NetworkClient networkClient;
|
||||||
|
|
||||||
@BeforeClass(inheritGroups = true)
|
|
||||||
@Override
|
@Override
|
||||||
|
@BeforeClass(inheritGroups = true)
|
||||||
public void setupRequiredClients() {
|
public void setupRequiredClients() {
|
||||||
networkClient = context.getApi().getNetworkClient();
|
networkClient = context.getApi().getNetworkClient();
|
||||||
}
|
}
|
||||||
|
|
|
@ -57,8 +57,8 @@ public class OrgClientLiveTest extends BaseVCloudDirectorClientLiveTest {
|
||||||
|
|
||||||
private OrgClient orgClient;
|
private OrgClient orgClient;
|
||||||
|
|
||||||
@BeforeClass(inheritGroups = true)
|
|
||||||
@Override
|
@Override
|
||||||
|
@BeforeClass(inheritGroups = true)
|
||||||
public void setupRequiredClients() {
|
public void setupRequiredClients() {
|
||||||
orgClient = context.getApi().getOrgClient();
|
orgClient = context.getApi().getOrgClient();
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,8 +42,8 @@ public class QueryClientLiveTest extends BaseVCloudDirectorClientLiveTest {
|
||||||
private CatalogClient catalogClient;
|
private CatalogClient catalogClient;
|
||||||
private QueryClient queryClient;
|
private QueryClient queryClient;
|
||||||
|
|
||||||
@BeforeClass(inheritGroups = true)
|
|
||||||
@Override
|
@Override
|
||||||
|
@BeforeClass(inheritGroups = true)
|
||||||
public void setupRequiredClients() {
|
public void setupRequiredClients() {
|
||||||
catalogClient = context.getApi().getCatalogClient();
|
catalogClient = context.getApi().getCatalogClient();
|
||||||
queryClient = context.getApi().getQueryClient();
|
queryClient = context.getApi().getQueryClient();
|
||||||
|
|
|
@ -50,8 +50,8 @@ public class TaskClientLiveTest extends BaseVCloudDirectorClientLiveTest {
|
||||||
private OrgClient orgClient;
|
private OrgClient orgClient;
|
||||||
private TaskClient taskClient;
|
private TaskClient taskClient;
|
||||||
|
|
||||||
@BeforeClass(inheritGroups = true)
|
|
||||||
@Override
|
@Override
|
||||||
|
@BeforeClass(inheritGroups = true)
|
||||||
public void setupRequiredClients() {
|
public void setupRequiredClients() {
|
||||||
orgClient = context.getApi().getOrgClient();
|
orgClient = context.getApi().getOrgClient();
|
||||||
taskClient = context.getApi().getTaskClient();
|
taskClient = context.getApi().getTaskClient();
|
||||||
|
|
|
@ -37,8 +37,8 @@ public class UploadClientLiveTest extends BaseVCloudDirectorClientLiveTest {
|
||||||
*/
|
*/
|
||||||
protected UploadClient uploadClient;
|
protected UploadClient uploadClient;
|
||||||
|
|
||||||
@BeforeClass(inheritGroups = true)
|
|
||||||
@Override
|
@Override
|
||||||
|
@BeforeClass(inheritGroups = true)
|
||||||
public void setupRequiredClients() {
|
public void setupRequiredClients() {
|
||||||
uploadClient = context.getApi().getUploadClient();
|
uploadClient = context.getApi().getUploadClient();
|
||||||
}
|
}
|
||||||
|
|
|
@ -61,8 +61,8 @@ public class VdcClientLiveTest extends BaseVCloudDirectorClientLiveTest {
|
||||||
*/
|
*/
|
||||||
protected VdcClient vdcClient;
|
protected VdcClient vdcClient;
|
||||||
|
|
||||||
@BeforeClass(inheritGroups = true)
|
|
||||||
@Override
|
@Override
|
||||||
|
@BeforeClass(inheritGroups = true)
|
||||||
public void setupRequiredClients() {
|
public void setupRequiredClients() {
|
||||||
vdcClient = context.getApi().getVdcClient();
|
vdcClient = context.getApi().getVdcClient();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue