fixing and moving tests after upstream merge

This commit is contained in:
Mike Arnold 2012-03-12 16:42:01 -05:00
parent 60528df8c6
commit 80604e98e6
2 changed files with 2 additions and 2 deletions

View File

@ -20,6 +20,7 @@ package org.jclouds.openstack.nova.v1_1.features;
import org.jclouds.openstack.nova.v1_1.domain.SecurityGroup;
import org.jclouds.openstack.nova.v1_1.domain.SecurityGroupRule;
import org.jclouds.openstack.nova.v1_1.extensions.SecurityGroupClient;
import org.jclouds.openstack.nova.v1_1.internal.BaseNovaClientLiveTest;
import org.testng.annotations.Test;

View File

@ -30,8 +30,6 @@ import org.testng.annotations.Test;
import javax.ws.rs.Consumes;
import javax.ws.rs.core.MediaType;
import java.util.HashMap;
import java.util.Map;
/**
*
@ -46,6 +44,7 @@ public class ParseKeyPairTest extends BaseItemParserTest<KeyPair> {
}
@Override
@SelectJson("keypair")
@Consumes(MediaType.APPLICATION_JSON)
public KeyPair expected() {
return KeyPair