pom and test case update

Author: jeevatkm

pom.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
 	Title		: Java Bindings for DigitalOcean API's
 	Copyright	: (c) Jeevanandam (jeeva@myjeeva.com)
-	@filename	: pom.xml 
+	@filename	: pom.xml
 	@author		: <a href="jeeva@myjeeva.com">Jeevanandam M.</a>
 	@date		: Jun 28, 2013 11:20:42 PM GMT+05:30
 -->
@@ -24,7 +24,7 @@
 	<licenses>
 		<license>
 			<name>The MIT License (MIT)</name>
-			<url>http://www.opensource.org/licenses/mit-license.php</url>
+			<url>https://github.com/jeevatkm/digitalocean-api-java/blob/master/LICENSE</url>
 			<distribution>repo</distribution>
 		</license>
 	</licenses>
@@ -70,9 +70,9 @@
 			<version>1.7.12</version>
 		</dependency>
 		<dependency>
-			<groupId>com.googlecode.jmockit</groupId>
+			<groupId>org.jmockit</groupId>
 			<artifactId>jmockit</artifactId>
-			<version>1.7</version>
+			<version>1.8</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -126,4 +126,3 @@
 		</pluginManagement>
 	</build>
 </project>
-

src/test/java/com/myjeeva/digitalocean/DigitalOceanIntegrationTest.java

@@ -20,12 +20,19 @@
  */
 package com.myjeeva.digitalocean;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 import org.junit.Ignore;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -78,8 +85,6 @@
 import com.myjeeva.digitalocean.pojo.Volume;
 import com.myjeeva.digitalocean.pojo.Volumes;
 
-import junit.framework.TestCase;
-
 /**
  * <p>
  * Junit Integration Test case for DigitalOcean API client wrapper methods
@@ -94,7 +99,8 @@
  */
 @Ignore
 // Marked as Ignore since its a Integration Test case with real values
-public class DigitalOceanIntegrationTest extends TestCase {
+@RunWith(JUnit4.class)
+public class DigitalOceanIntegrationTest {
 
   private final Logger log = LoggerFactory.getLogger(DigitalOceanIntegrationTest.class);
 

src/test/java/com/myjeeva/digitalocean/DigitalOceanMockTest.java

@@ -1,40 +1,47 @@
 package com.myjeeva.digitalocean;
 
+import static org.junit.Assert.assertEquals;
+
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
 
-import junit.framework.TestCase;
-import mockit.Expectations;
-import mockit.Mocked;
-
 import org.apache.http.HttpVersion;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.execchain.PublicHttpResponseProxy;
 import org.apache.http.message.BasicHttpResponse;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import com.myjeeva.digitalocean.impl.DigitalOceanClient;
 
+import mockit.Expectations;
+import mockit.Mocked;
+
 @SuppressWarnings("unused")
-public class DigitalOceanMockTest extends TestCase {
+@RunWith(JUnit4.class)
+public class DigitalOceanMockTest {
 
   private @Mocked CloseableHttpClient defaultHttpClient;
 
+  @Test
   public void testSnapshotWithName() throws Exception {
 
     new Expectations() {
       {
-        defaultHttpClient.execute((HttpUriRequest) with(new Object() {
+        defaultHttpClient.execute((HttpUriRequest)with(new Object() {
 
           void validate(HttpUriRequest httpUriRequest) throws MalformedURLException,
               URISyntaxException {
             assertEquals(new URL("https://api.digitalocean.com/v2/droplets/1234/actions").toURI(),
                 httpUriRequest.getURI());
           }
         }));
+        
         BasicHttpResponse basicHttpResponse = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "");
         basicHttpResponse
             .setEntity(new StringEntity(
@@ -43,7 +50,7 @@ void validate(HttpUriRequest httpUriRequest) throws MalformedURLException,
         basicHttpResponse.setHeader("RateLimit-Limit", "1200");
         basicHttpResponse.setHeader("RateLimit-Remaining", "900");
         basicHttpResponse.setHeader("RateLimit-Reset", "1415984218");
-        
+
         result = new PublicHttpResponseProxy(basicHttpResponse);
       }
     };
@@ -52,5 +59,3 @@ void validate(HttpUriRequest httpUriRequest) throws MalformedURLException,
     digitalOcean.takeDropletSnapshot(1234, "snapshot-name");
   }
 }
-
-