Merge pull request #26 from indigo-dc/devel

Update tests to increment coverage

Author: alpegon

README.md

@@ -37,23 +37,23 @@ The log4j.properties file of the tests can help you with the logger configuratio
 
 1.4 USAGE
 -----------------
-The tests defined in the class **InfrastructureManagerApiClientTest** show how to use the im-java-api.
+The tests defined in the class **InfrastructureManagerTest** show how to use the im-java-api.
 Also check the following lines to see some examples of use:
 
 ### 1.4.1 Create the API client
 ```
-InfrastructureManagerApiClient imClient = new InfrastructureManagerApiClient("IM_ENDPOINT", "AUTH_FILE_PATH");
+InfrastructureManager im = new InfrastructureManager("IM_ENDPOINT", "AUTH_FILE_PATH");
 ```
-When creating a new client you have to specify a valid IM URL, and an authorization file path with the credentials required for the infrastrcture deployment.
+When creating a new client you have to specify a valid IM URL, and an authorization file path with the credentials required for the infrastructure deployment.
 More information about the authorization file can be found here: [Auth file](http://www.grycap.upv.es/im/doc/client.html#auth-file).
 You can also check the authorization file used for the tests that is available in 'src/test/resources/'.
 
 ### 1.4.2 Create and destroy an infrastructure
 ```
 // Infrastructure creation based on a TOSCA file
-ServiceResponse response = getImApiClient().createInfrastructure(FileIO.readUTF8File(TOSCA_FILE_PATH));
+InfrastructureUri newInfrastructureUri = im.createInfrastructure(readFile(TOSCA_FILE_PATH), BodyContentType.TOSCA);
 ... USE THE INFRASTRUCTURE ...
 // Infrastructure destruction
-imClient.destroyInfrastructure(getInfrastructureId());
+im.destroyInfrastructure(getInfrastructureId());
 ```
-The **ServiceResponse** class returned by the **createInfrastructure** method contains all the information of the web service response. Check the **ServiceResponse** class methods for more information.
+The 'im' client always returns a POJO with the information of the call. If an error occurs, an **ImClientErrorException** is thrown. This exception contains the error message and the error code returned by the server.

src/test/java/es/upv/i3m/grycap/im/lang/ImMessagesTest.java

@@ -3,8 +3,25 @@
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
 public class ImMessagesTest {
 
+  /**
+   * Try to build a private class.
+   */
+  @Test(expected = InvocationTargetException.class)
+  public void testImMessagesBuilder() throws NoSuchMethodException,
+      SecurityException, InstantiationException, IllegalAccessException,
+      IllegalArgumentException, InvocationTargetException {
+
+    Constructor<ImMessages> constructor =
+        ImMessages.class.getDeclaredConstructor(new Class[0]);
+    constructor.setAccessible(true);
+    constructor.newInstance(new Object[0]);
+  }
+
   @Test
   public void testMessages() {
     Assert.assertEquals("REST call with empty body content",

src/test/java/es/upv/i3m/grycap/im/pojo/PojoTest.java

@@ -19,6 +19,7 @@ public void testInfOutputValuesEquals() {
     outputValues.put("test", "test");
     InfOutputValues outputs1 = new InfOutputValues(outputValues);
     InfOutputValues outputs2 = new InfOutputValues(outputValues);
+    Assert.assertEquals(outputs1, outputs1);
     Assert.assertEquals(outputs1, outputs2);
   }
 
@@ -39,6 +40,7 @@ public void testInfrastructureStateEquals() {
         new InfrastructureState("infState", infStates);
     InfrastructureState infState2 =
         new InfrastructureState("infState", infStates);
+    Assert.assertEquals(infState1, infState1);
     Assert.assertEquals(infState1, infState2);
   }
 
@@ -56,6 +58,7 @@ public void testInfrastructureStateNotEquals() {
   public void testInfrastructureUriEquals() {
     InfrastructureUri uri1 = new InfrastructureUri("uri");
     InfrastructureUri uri2 = new InfrastructureUri("uri");
+    Assert.assertEquals(uri1, uri1);
     Assert.assertEquals(uri1, uri2);
   }
 
@@ -89,6 +92,7 @@ public void testInfrastructureUrisEquals() {
         .asList(new InfrastructureUri("uri"), new InfrastructureUri("uri")));
     InfrastructureUris uris2 = new InfrastructureUris(Arrays
         .asList(new InfrastructureUri("uri"), new InfrastructureUri("uri")));
+    Assert.assertEquals(uris1, uris1);
     Assert.assertEquals(uris1, uris2);
   }
 
@@ -106,6 +110,7 @@ public void testInfrastructureUrisNotEquals() {
   public void testPropertyEquals() {
     Property prop1 = new Property("key", "value");
     Property prop2 = new Property("key", "value");
+    Assert.assertEquals(prop1, prop1);
     Assert.assertEquals(prop1, prop2);
   }
 
@@ -120,6 +125,7 @@ public void testPropertyNotEquals() {
   public void testErrorEquals() {
     ResponseError error1 = new ResponseError("message", 200);
     ResponseError error2 = new ResponseError("message", 200);
+    Assert.assertEquals(error1, error1);
     Assert.assertEquals(error1, error2);
   }
 
@@ -159,6 +165,7 @@ public void testVirtualMachineInfoEquals() throws FileException {
     VirtualMachineInfo vmInfo2 =
         new VirtualMachineInfo(Arrays.asList(property3, property4));
 
+    Assert.assertEquals(vmInfo1, vmInfo1);
     Assert.assertEquals(vmInfo1, vmInfo2);
   }