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

Cleanup tests 

* Use TestNG assertions
* Formatted code in compute tests
* Removed unnecessary local variables in tests to avoid using them by
  mistake between independent tests.
This commit is contained in:
Ignasi Barrera 2013-09-09 16:20:46 +02:00
parent 2a8b1d3513
commit 9cadf008f6
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
apis/chef/src/test/java/org/jclouds/chef/internal/BaseChefApiLiveTest.java
View File

@ -46,6 +46,7 @@ import org.jclouds.chef.domain.Metadata;
import org.jclouds.chef.domain.Node; import org.jclouds.chef.domain.Node;
import org.jclouds.chef.domain.Resource; import org.jclouds.chef.domain.Resource;
import org.jclouds.chef.domain.Role; import org.jclouds.chef.domain.Role;
import org.jclouds.chef.domain.Sandbox;
import org.jclouds.chef.domain.SearchResult; import org.jclouds.chef.domain.SearchResult;
import org.jclouds.chef.domain.UploadSandbox; import org.jclouds.chef.domain.UploadSandbox;
import org.jclouds.chef.options.CreateClientOptions; import org.jclouds.chef.options.CreateClientOptions;
@ -76,10 +77,9 @@ public abstract class BaseChefApiLiveTest<A extends ChefApi> extends BaseChefLiv
// It may take a bit until the search index is populated // It may take a bit until the search index is populated
protected int maxWaitForIndexInMs = 60000; protected int maxWaitForIndexInMs = 60000;
private Node node; // The id of the data bag item used in search tests
private Role role; private String databagitemId;
protected DatabagItem databagItem;
public void testCreateNewCookbook() throws Exception { public void testCreateNewCookbook() throws Exception {
// Define the file you want in the cookbook // Define the file you want in the cookbook
@ -103,7 +103,8 @@ public abstract class BaseChefApiLiveTest<A extends ChefApi> extends BaseChefLiv
if (status.needsUpload()) { if (status.needsUpload()) {
api.uploadContent(status.getUrl(), content); api.uploadContent(status.getUrl(), content);
} }
api.commitSandbox(site.getSandboxId(), true); Sandbox sandbox = api.commitSandbox(site.getSandboxId(), true);
assertTrue(sandbox.isCompleted(), "Sandbox should be completed after uploading");
} catch (RuntimeException e) { } catch (RuntimeException e) {
api.commitSandbox(site.getSandboxId(), false); api.commitSandbox(site.getSandboxId(), false);
fail("Could not upload content"); fail("Could not upload content");
@ -210,7 +211,7 @@ public abstract class BaseChefApiLiveTest<A extends ChefApi> extends BaseChefLiv
public void testCreateNode() throws Exception { public void testCreateNode() throws Exception {
api.deleteNode(PREFIX); api.deleteNode(PREFIX);
api.createNode(Node.builder().name(PREFIX).runListElement("role[" + PREFIX + "]").environment("_default").build()); api.createNode(Node.builder().name(PREFIX).runListElement("role[" + PREFIX + "]").environment("_default").build());
node = api.getNode(PREFIX); Node node = api.getNode(PREFIX);
// TODO check recipes // TODO check recipes
assertNotNull(node, "Created node should not be null"); assertNotNull(node, "Created node should not be null");
Set<String> nodes = api.listNodes(); Set<String> nodes = api.listNodes();
@ -235,7 +236,7 @@ public abstract class BaseChefApiLiveTest<A extends ChefApi> extends BaseChefLiv
public void testCreateRole() throws Exception { public void testCreateRole() throws Exception {
api.deleteRole(PREFIX); api.deleteRole(PREFIX);
api.createRole(Role.builder().name(PREFIX).runListElement("recipe[java]").build()); api.createRole(Role.builder().name(PREFIX).runListElement("recipe[java]").build());
role = api.getRole(PREFIX); Role role = api.getRole(PREFIX);
assertNotNull(role, "Created role should not be null"); assertNotNull(role, "Created role should not be null");
assertEquals(role.getName(), PREFIX); assertEquals(role.getName(), PREFIX);
assertEquals(role.getRunList(), Collections.singleton("recipe[java]")); assertEquals(role.getRunList(), Collections.singleton("recipe[java]"));
@ -272,7 +273,8 @@ public abstract class BaseChefApiLiveTest<A extends ChefApi> extends BaseChefLiv
Properties config = new Properties(); Properties config = new Properties();
config.setProperty("foo", "bar"); config.setProperty("foo", "bar");
api.deleteDatabagItem(PREFIX, PREFIX); api.deleteDatabagItem(PREFIX, PREFIX);
databagItem = api.createDatabagItem(PREFIX, new DatabagItem("config", json.toJson(config))); DatabagItem databagItem = api.createDatabagItem(PREFIX, new DatabagItem("config", json.toJson(config)));
databagitemId = databagItem.getId();
assertNotNull(databagItem, "Created data bag item should not be null"); assertNotNull(databagItem, "Created data bag item should not be null");
assertEquals(databagItem.getId(), "config"); assertEquals(databagItem.getId(), "config");
@ -401,7 +403,7 @@ public abstract class BaseChefApiLiveTest<A extends ChefApi> extends BaseChefLiv
assertNotNull(results); assertNotNull(results);
if (results.size() > 0) { if (results.size() > 0) {
assertEquals(results.size(), 1); assertEquals(results.size(), 1);
assertEquals(results.iterator().next().getId(), databagItem.getId()); assertEquals(results.iterator().next().getId(), databagitemId);
return true; return true;
} else { } else {
// The index may still not be populated // The index may still not be populated
@ -410,7 +412,7 @@ public abstract class BaseChefApiLiveTest<A extends ChefApi> extends BaseChefLiv
} }
}, maxWaitForIndexInMs, 5000L, MILLISECONDS); }, maxWaitForIndexInMs, 5000L, MILLISECONDS);
SearchOptions options = SearchOptions.Builder.query("id:" + databagItem.getId()); SearchOptions options = SearchOptions.Builder.query("id:" + databagitemId);
assertTrue(waitForIndex.apply(options)); assertTrue(waitForIndex.apply(options));
} }
@ -475,7 +477,7 @@ public abstract class BaseChefApiLiveTest<A extends ChefApi> extends BaseChefLiv
public void testListEnvironmentNodes() { public void testListEnvironmentNodes() {
api.deleteNode(ENV_NODE); api.deleteNode(ENV_NODE);
api.createNode(Node.builder().name(ENV_NODE).runListElement("role[" + PREFIX + "]").environment(PREFIX).build()); api.createNode(Node.builder().name(ENV_NODE).runListElement("role[" + PREFIX + "]").environment(PREFIX).build());
node = api.getNode(ENV_NODE); Node node = api.getNode(ENV_NODE);
assertNotNull(node, "Created node should not be null"); assertNotNull(node, "Created node should not be null");
Set<String> nodeList = api.listEnvironmentNodes(PREFIX); Set<String> nodeList = api.listEnvironmentNodes(PREFIX);
assertTrue(!nodeList.isEmpty()); assertTrue(!nodeList.isEmpty());