Updated Branches: refs/heads/master 5ea11d450 -> 3f2a196f2
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/3f2a196f/enterprise/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiExpectTest.java ---------------------------------------------------------------------- diff --git a/enterprise/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiExpectTest.java b/enterprise/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiExpectTest.java index e859dc2..1ee2bdf 100644 --- a/enterprise/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiExpectTest.java +++ b/enterprise/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiExpectTest.java @@ -27,8 +27,6 @@ import javax.ws.rs.core.MediaType; import org.jclouds.chef.BaseChefApiExpectTest; import org.jclouds.chef.ChefApi; import org.jclouds.date.TimeStamp; -import org.jclouds.enterprisechef.EnterpriseChefApi; -import org.jclouds.enterprisechef.EnterpriseChefProviderMetadata; import org.jclouds.enterprisechef.config.EnterpriseChefHttpApiModule; import org.jclouds.enterprisechef.domain.Group; import org.jclouds.enterprisechef.domain.User; @@ -40,7 +38,6 @@ import org.jclouds.rest.ResourceNotFoundException; import org.testng.annotations.Test; import com.google.common.base.Supplier; -import com.google.common.collect.ImmutableSet; import com.google.inject.Module; /** @@ -174,11 +171,7 @@ public class EnterpriseChefApiExpectTest extends BaseChefApiExpectTest<Enterpris .build()), // HttpResponse.builder().statusCode(200).build()); - Group group = new Group("admins"); - group.setClients(ImmutableSet.of("abiquo")); - group.setGroups(ImmutableSet.of("admins")); - group.setUsers(ImmutableSet.of("nacx")); - + Group group = Group.builder("admins").client("abiquo").group("admins").user("nacx").build(); api.updateGroup(group); } @@ -193,11 +186,7 @@ public class EnterpriseChefApiExpectTest extends BaseChefApiExpectTest<Enterpris .build()), // HttpResponse.builder().statusCode(404).build()); - Group group = new Group("admins"); - group.setClients(ImmutableSet.of("abiquo")); - group.setGroups(ImmutableSet.of("admins")); - group.setUsers(ImmutableSet.of("nacx")); - + Group group = Group.builder("admins").client("abiquo").group("admins").user("nacx").build(); api.updateGroup(group); } http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/3f2a196f/enterprise/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiLiveTest.java ---------------------------------------------------------------------- diff --git a/enterprise/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiLiveTest.java b/enterprise/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiLiveTest.java index 576351a..47148c9 100644 --- a/enterprise/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiLiveTest.java +++ b/enterprise/src/test/java/org/jclouds/enterprisechef/EnterpriseChefApiLiveTest.java @@ -26,14 +26,11 @@ import java.util.Set; import java.util.UUID; import org.jclouds.chef.internal.BaseChefApiLiveTest; -import org.jclouds.enterprisechef.EnterpriseChefApi; import org.jclouds.enterprisechef.domain.Group; import org.jclouds.enterprisechef.domain.User; import org.jclouds.rest.ResourceNotFoundException; import org.testng.annotations.Test; -import com.google.common.collect.ImmutableSet; - /** * Tests behavior of the EnterpriseChefApi. * @@ -90,10 +87,16 @@ public class EnterpriseChefApiLiveTest extends BaseChefApiLiveTest<EnterpriseChe @Test(dependsOnMethods = "testCreateGroup") public void testUpdateGroup() { Group group = api.getGroup(GROUP_NAME); - group.setUsers(ImmutableSet.of(identity)); - group.setClients(ImmutableSet.of(ORG_NAME + "-validator")); - - api.updateGroup(group); + Group updated = Group.builder(group.getGroupname()) // + .actors(group.getActors()) // + .orgname(group.getOrgname()) // + .name(group.getName()) // + .groups(group.getGroups()) // + .client(ORG_NAME + "-validator") // + .user(identity) // + .build(); + + api.updateGroup(updated); group = api.getGroup(GROUP_NAME); assertNotNull(group); @@ -103,7 +106,7 @@ public class EnterpriseChefApiLiveTest extends BaseChefApiLiveTest<EnterpriseChe @Test(expectedExceptions = ResourceNotFoundException.class) public void testUpdateUnexistingGroup() { - api.updateGroup(new Group(UUID.randomUUID().toString())); + api.updateGroup(Group.builder(UUID.randomUUID().toString()).build()); } @Test(dependsOnMethods = "testUpdateGroup") http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/3f2a196f/enterprise/src/test/java/org/jclouds/enterprisechef/binders/BindGroupToUpdateRequestJsonPayloadTest.java ---------------------------------------------------------------------- diff --git a/enterprise/src/test/java/org/jclouds/enterprisechef/binders/BindGroupToUpdateRequestJsonPayloadTest.java b/enterprise/src/test/java/org/jclouds/enterprisechef/binders/BindGroupToUpdateRequestJsonPayloadTest.java index 90e84dd..29e120e 100644 --- a/enterprise/src/test/java/org/jclouds/enterprisechef/binders/BindGroupToUpdateRequestJsonPayloadTest.java +++ b/enterprise/src/test/java/org/jclouds/enterprisechef/binders/BindGroupToUpdateRequestJsonPayloadTest.java @@ -23,7 +23,6 @@ import java.net.URI; import org.jclouds.chef.ChefApi; import org.jclouds.chef.config.ChefParserModule; -import org.jclouds.enterprisechef.binders.BindGroupToUpdateRequestJsonPayload; import org.jclouds.enterprisechef.domain.Group; import org.jclouds.http.HttpRequest; import org.jclouds.json.config.GsonModule; @@ -31,7 +30,6 @@ import org.jclouds.rest.annotations.ApiVersion; import org.jclouds.util.Strings2; import org.testng.annotations.Test; -import com.google.common.collect.ImmutableSet; import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Injector; @@ -67,17 +65,14 @@ public class BindGroupToUpdateRequestJsonPayloadTest { public void testBindOnlyName() throws IOException { HttpRequest request = HttpRequest.builder().method("POST").endpoint(URI.create("http://localhost";)).build(); - HttpRequest newRequest = binder.bindToRequest(request, new Group("foo")); + HttpRequest newRequest = binder.bindToRequest(request, Group.builder("foo").build()); String payload = Strings2.toStringAndClose(newRequest.getPayload().getInput()); assertEquals(payload, "{\"groupname\":\"foo\",\"actors\":{\"clients\":[],\"groups\":[],\"users\":[]}}"); } public void testBindNameAndLists() throws IOException { - Group group = new Group("foo"); - group.setClients(ImmutableSet.of("nacx-validator")); - group.setGroups(ImmutableSet.of("admins")); - group.setUsers(ImmutableSet.of("nacx")); + Group group = Group.builder("foo").client("nacx-validator").group("admins").user("nacx").build(); HttpRequest request = HttpRequest.builder().method("POST").endpoint(URI.create("http://localhost";)).build(); HttpRequest newRequest = binder.bindToRequest(request, group); http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/3f2a196f/enterprise/src/test/java/org/jclouds/enterprisechef/binders/GroupNameTest.java ---------------------------------------------------------------------- diff --git a/enterprise/src/test/java/org/jclouds/enterprisechef/binders/GroupNameTest.java b/enterprise/src/test/java/org/jclouds/enterprisechef/binders/GroupNameTest.java index b93c68a..ee8ff46 100644 --- a/enterprise/src/test/java/org/jclouds/enterprisechef/binders/GroupNameTest.java +++ b/enterprise/src/test/java/org/jclouds/enterprisechef/binders/GroupNameTest.java @@ -38,6 +38,6 @@ public class GroupNameTest { } public void testApplyGroupName() throws IOException { - assertEquals(new GroupName().apply(new Group("foo")), "foo"); + assertEquals(new GroupName().apply(Group.builder("foo").build()), "foo"); } }
